Removed leftover DownloadStation [beta] changes

headphones/notifiers.py

@@ -388,6 +388,7 @@ class NMA:
         logger.debug(u"NMA title: " + title)
         logger.debug(u"NMA API: " + api)
         logger.debug(u"NMA Priority: " + str(nma_priority))
+
         if snatched:
             event = snatched + " snatched!"
             message = "Headphones has snatched: " + snatched
@@ -395,7 +396,6 @@ class NMA:
             event = artist + ' - ' + album + ' complete!'
             message = "Headphones has downloaded and postprocessed: " + artist + ' [' + album + ']'
 
-
         logger.debug(u"NMA event: " + event)
         logger.debug(u"NMA message: " + message)
 

headphones/searcher.py

@@ -699,7 +699,7 @@ def send_to_downloader(data, bestqual, album):
                 except Exception, e:
                     logger.exception("Unhandled exception")
 
-        elif headphones.TORRENT_DOWNLOADER == 2:
+        else:# if headphones.TORRENT_DOWNLOADER == 2:
             logger.info("Sending torrent to uTorrent")
  
             # rutracker needs cookies to be set, pass the .torrent file instead of url
@@ -725,32 +725,6 @@ def send_to_downloader(data, bestqual, album):
                 except Exception, e:
                     logger.exception("Unhandled exception")
 
-        else:
-            logger.info("Sending torrent to DownloadStation")
- 
-            # rutracker needs cookies to be set, pass the .torrent file instead of url
-            if bestqual[3] == 'rutracker.org':
-                file_or_url = rutracker.get_torrent(bestqual[2])
-            else:
-                file_or_url = bestqual[2]
-
-            _hash = CalculateTorrentHash(file_or_url, data)
-
-            folder_name = download_station.addTorrent(file_or_url)
-
-            if folder_name:
-                logger.info('Torrent folder name: %s' % folder_name)
-            else:
-                logger.error('Torrent folder name could not be determined')
-                return
-
-            # remove temp .torrent file created above
-            if bestqual[3] == 'rutracker.org':
-                try:
-                    shutil.rmtree(os.path.split(file_or_url)[0])
-                except Exception, e:
-                    logger.exception("Unhandled exception")
-
     myDB = db.DBConnection()
     myDB.action('UPDATE albums SET status = "Snatched" WHERE AlbumID=?', [album['AlbumID']])
     myDB.action('INSERT INTO snatched VALUES( ?, ?, ?, ?, DATETIME("NOW", "localtime"), ?, ?, ?)', [album['AlbumID'], bestqual[0], bestqual[1], bestqual[2], "Snatched", folder_name, kind])
@@ -1431,7 +1405,7 @@ def preprocess(resultlist):
     for result in resultlist:
 
         if result[4] == 'torrent':
-            #Get out of here if we're using Transmission or uTorrent
+            #Get out of here if we're using Transmission
             if headphones.TORRENT_DOWNLOADER == 1:  ## if not a magnet link still need the .torrent to generate hash... uTorrent support labeling
                 return True, result
             # get outta here if rutracker
@@ -1495,6 +1469,6 @@ def CalculateTorrentHash(link, data):
         info = bdecode(data)["info"]
         tor_hash = sha1(bencode(info)).hexdigest()
 
-    logger.info('Torrent Hash: ' + str(tor_hash))
+    logger.debug('Torrent Hash: ' + str(tor_hash))
 
     return tor_hash

headphones/utorrent.py

@@ -13,17 +13,12 @@
 #  You should have received a copy of the GNU General Public License
 #  along with Headphones.  If not, see <http://www.gnu.org/licenses/>.
 
-import urllib
-import urllib2
-import urlparse
-import cookielib
-import json
-import re
-import os
-import time
+import urllib, urllib2, urlparse, cookielib
+import json, re, os, time
+
 import headphones
 
-from headphones import logger, notifiers
+from headphones import logger
 
 class utorrentclient(object):
     TOKEN_REGEX = "<div id='token' style='display:none;'>([^<>]+)</div>"
@@ -77,7 +72,7 @@ class utorrentclient(object):
         return self._action(params)
 
     def add_url(self, url):
-        #can recieve magnet or normal .torrent link
+        #can receive magnet or normal .torrent link
         params = [('action', 'add-url'), ('s', url)]
         return self._action(params)
 
@@ -146,8 +141,8 @@ def addTorrent(link, hash):
     label = headphones.UTORRENT_LABEL
     uTorrentClient = utorrentclient()
     uTorrentClient.add_url(link)
-    time.sleep(1) #need to ensure file is loaded uTorrent...
-    uTorrentClient.setprops(hash,'label', label)
+    time.sleep(1) #ensure file is loaded in uTorrent...
+    uTorrentClient.setprops(hash,'label',label)
     torrentList = uTorrentClient.list()
     for torrent in torrentList[1].get('torrents'):
         if (torrent[0].lower()==hash):