Python 3 Start
This commit is contained in:
parent
9f029c8ceb
commit
141fe8d80c
67 changed files with 264 additions and 274 deletions
|
@ -1,4 +1,4 @@
|
|||
from urllib import urlencode
|
||||
from urllib.parse import urlencode
|
||||
import re
|
||||
|
||||
from util import hook, http, web, text
|
||||
|
@ -13,17 +13,17 @@ def soundcloud(url, api_key):
|
|||
data = http.get_json(api_url + '/resolve.json?' + urlencode({'url': url, 'client_id': api_key}))
|
||||
|
||||
if data['description']:
|
||||
desc = u": {} ".format(text.truncate_str(data['description'], 50))
|
||||
desc = ": {} ".format(text.truncate_str(data['description'], 50))
|
||||
else:
|
||||
desc = ""
|
||||
if data['genre']:
|
||||
genre = u"- Genre: \x02{}\x02 ".format(data['genre'])
|
||||
genre = "- Genre: \x02{}\x02 ".format(data['genre'])
|
||||
else:
|
||||
genre = ""
|
||||
|
||||
url = web.try_isgd(data['permalink_url'])
|
||||
|
||||
return u"SoundCloud track: \x02{}\x02 by \x02{}\x02 {}{}- {} plays, {} downloads, {} comments - {}".format(
|
||||
return "SoundCloud track: \x02{}\x02 by \x02{}\x02 {}{}- {} plays, {} downloads, {} comments - {}".format(
|
||||
data['title'], data['user']['username'], desc, genre, data['playback_count'], data['download_count'],
|
||||
data['comment_count'], url)
|
||||
|
||||
|
@ -32,7 +32,7 @@ def soundcloud(url, api_key):
|
|||
def soundcloud_url(match, bot=None):
|
||||
api_key = bot.config.get("api_keys", {}).get("soundcloud")
|
||||
if not api_key:
|
||||
print "Error: no api key set"
|
||||
print("Error: no api key set")
|
||||
return None
|
||||
url = match.group(1).split(' ')[-1] + "//" + (match.group(2) if match.group(2) else "") + match.group(3) + \
|
||||
match.group(4).split(' ')[0]
|
||||
|
@ -43,7 +43,7 @@ def soundcloud_url(match, bot=None):
|
|||
def sndsc_url(match, bot=None):
|
||||
api_key = bot.config.get("api_keys", {}).get("soundcloud")
|
||||
if not api_key:
|
||||
print "Error: no api key set"
|
||||
print("Error: no api key set")
|
||||
return None
|
||||
url = match.group(1).split(' ')[-1] + "//" + (match.group(2) if match.group(2) else "") + match.group(3) + \
|
||||
match.group(4).split(' ')[0]
|
||||
|
|
Reference in a new issue