Update spotify.py

plugins/spotify.py

@@ -10,23 +10,23 @@ spotify_re = (r'(spotify:(track|album|artist|user):([a-zA-Z0-9]+))', re.I)
 http_re = (r'(open\.spotify\.com\/(track|album|artist|user)\/'
            '([a-zA-Z0-9]+))', re.I)
 
-def sptfy(inp):
+def sptfy(inp, sptfy=False):
-#  try:
+    if sptfy:
-#    login = http.get("http://sptfy.com/login.php", post_data=urlencode({'loginUsername': 'xDCloudBot', 'loginPassword': 'rjgw67kf', 'submit': '', 'submitme': '1'}), cookies=True)
+        shortenurl = "http://sptfy.com/index.php"
-#  except Exception as e:
+        data = urlencode({'longUrl': inp, 'shortUrlDomain': 1, 'submitted': 1, "shortUrlFolder": 6, "customUrl": "", "shortUrlPassword": "", "shortUrlExpiryDate": "", "shortUrlUses": 0, "shortUrlType": 0})
-#    return inp
+        try:
-  shortenurl = "http://sptfy.com/index.php"
+            soup = http.get_soup(shortenurl, post_data=data, cookies=True)
-  data = urlencode({'longUrl': inp, 'shortUrlDomain': 1, 'submitted': 1, "shortUrlFolder": 6, "customUrl": "", "shortUrlPassword": "", "shortUrlExpiryDate": "", "shortUrlUses": 0, "shortUrlType": 0})
+        except:
-  try:
+            return inp
-    soup = http.get_soup(shortenurl, post_data=data, cookies=True)
+        try:
-  except:
+            link = soup.find('div', {'class': 'resultLink'}).text.strip()
-    return inp
+            return link
-  try:
+        except:
-    link = soup.find('div', {'class': 'resultLink'}).text.strip()
+            message = "Unable to shorten URL: %s" % soup.find('div', {'class': 'messagebox_text'}).find('p').text.split("<br/>")[0]
-    return link
+            return message
-  except:
+    else:
-    message = "Unable to shorten URL: %s" % soup.find('div', {'class': 'messagebox_text'}).find('p').text.split("<br/>")[0]
+        return web.try_isgd(inp)
-    return message
+
 
 @hook.command('sptrack')
 @hook.command