dinislage/CouchPotatoServer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rTorrent rename type to protocol

Browse Source 
code styling
This commit is contained in:
Ruud committed 2013-08-24 14:35:57 +02:00
1 parent ee60ec962b
commit ee709054f2
1 file changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/downloaders/rtorrent/main.py
+12 -12
View File
@@ -14,8 +14,7 @@ log = CPLog(__name__)
class rTorrent(Downloader): class rTorrent(Downloader):
protocol = ['torrent', 'torrent_magnet']
type = ['torrent', 'torrent_magnet']
rt = None rt = None
def connect(self): def connect(self):
@@ -78,8 +77,8 @@ class rTorrent(Downloader):
return True return True
def download(self, data, movie, filedata=None): def download(self, data, movie, filedata = None):
log.debug('Sending "%s" (%s) to rTorrent.', (data.get('name'), data.get('type'))) log.debug('Sending "%s" to rTorrent.', (data.get('name')))
if not self.connect(): if not self.connect():
return False return False
@@ -92,18 +91,18 @@ class rTorrent(Downloader):
if self.conf('label'): if self.conf('label'):
torrent_params['label'] = self.conf('label') torrent_params['label'] = self.conf('label')
if not filedata and data.get('type') == 'torrent': if not filedata and data.get('protocol') == 'torrent':
log.error('Failed sending torrent, no data') log.error('Failed sending torrent, no data')
return False return False
# Try download magnet torrents # Try download magnet torrents
if data.get('type') == 'torrent_magnet': if data.get('protocol') == 'torrent_magnet':
filedata = self.magnetToTorrent(data.get('url')) filedata = self.magnetToTorrent(data.get('url'))
if filedata is False: if filedata is False:
return False return False
data['type'] = 'torrent' data['protocol'] = 'torrent'
info = bdecode(filedata)["info"] info = bdecode(filedata)["info"]
torrent_hash = sha1(bencode(info)).hexdigest().upper() torrent_hash = sha1(bencode(info)).hexdigest().upper()
@@ -125,7 +124,7 @@ class rTorrent(Downloader):
torrent.set_visible(group_name) torrent.set_visible(group_name)
# Start torrent # Start torrent
if not self.conf('paused', default=0): if not self.conf('paused', default = 0):
torrent.start() torrent.start()
return self.downloadReturnId(torrent_hash) return self.downloadReturnId(torrent_hash)
@@ -158,8 +157,8 @@ class rTorrent(Downloader):
'status': status, 'status': status,
'seed_ratio': item.ratio, 'seed_ratio': item.ratio,
'original_status': item.state, 'original_status': item.state,
'timeleft': str(timedelta(seconds=float(item.left_bytes) / item.down_rate)) 'timeleft': str(timedelta(seconds = float(item.left_bytes) / item.down_rate))
if item.down_rate > 0 else -1, if item.down_rate > 0 else -1,
'folder': item.directory 'folder': item.directory
}) })
@@ -183,10 +182,11 @@ class rTorrent(Downloader):
def removeFailed(self, item): def removeFailed(self, item):
log.info('%s failed downloading, deleting...', item['name']) log.info('%s failed downloading, deleting...', item['name'])
return self.processComplete(item, delete_files=True) return self.processComplete(item, delete_files = True)
def processComplete(self, item, delete_files): def processComplete(self, item, delete_files):
log.debug('Requesting rTorrent to remove the torrent %s%s.', (item['name'], ' and cleanup the downloaded files' if delete_files else '')) log.debug('Requesting rTorrent to remove the torrent %s%s.',
(item['name'], ' and cleanup the downloaded files' if delete_files else ''))
if not self.connect(): if not self.connect():
return False return False