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

Fix Transmission

Browse Source
This commit is contained in:
mano3m
2013-04-05 00:09:23 +02:00
parent 72cc3576d3
commit 63609bb52c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/downloaders/transmission/main.py
+11 -10
View File
@@ -128,27 +128,28 @@ class Transmission(Downloader):
try: try:
trpc.stop_torrent(item['hashString'], {}) trpc.stop_torrent(item['hashString'], {})
if not os.path.isdir(item['downloadDir']): if not os.path.isdir(os.path.join(item['downloadDir'], item['name'])):
raise Exception('Missing folder: %s' % item['downloadDir']) raise Exception('Missing folder: %s' % os.path.join(item['downloadDir'], item['name']))
elif item['downloadDir'].rstrip(os.path.sep) in Env.setting('from', 'renamer').rstrip(os.path.sep):
raise Exception('Transmission download folder should not be the same or in the renamer "from" folder!')
else: else:
log.info('Moving folder from "%s" to "%s"', (item['downloadDir'], Env.setting('from', 'renamer'))) log.info('Moving folder from "%s" to "%s"', (os.path.join(item['downloadDir'], item['name']), Env.setting('from', 'renamer')))
shutil.move(item['downloadDir'], Env.setting('from', 'renamer')) shutil.move(os.path.join(item['downloadDir'], item['name']), Env.setting('from', 'renamer'))
statuses.append({ statuses.append({
'id': item['hashString'], 'id': item['hashString'],
'name': item['downloadDir'], 'name': item['name'],
'status': 'completed', 'status': 'completed',
'original_status': item['status'], 'original_status': item['status'],
'timeleft': str(timedelta(seconds = 0)), 'timeleft': str(timedelta(seconds = 0)),
'folder': os.path.join(Env.setting('from', 'renamer'), os.path.basename(item['downloadDir'].rstrip(os.path.sep))), 'folder': os.path.join(Env.setting('from', 'renamer'), item['name']),
}) })
trpc.remove_torrent(item['hashString'], True, {}) trpc.remove_torrent(item['hashString'], True, {})
except Exception, err: except Exception, err:
log.error('Failed to stop and remove torrent "%s" with error: %s', (item['name'], err)) log.error('Failed to stop and remove torrent "%s" with error: %s', (item['name'], err))
statuses.append({ statuses.append({
'id': item['hashString'], 'id': item['hashString'],
'name': item['downloadDir'], 'name': item['name'],
'status': 'failed', 'status': 'failed',
'original_status': item['status'], 'original_status': item['status'],
'timeleft': str(timedelta(seconds = 0)), 'timeleft': str(timedelta(seconds = 0)),
@@ -156,7 +157,7 @@ class Transmission(Downloader):
else: else:
statuses.append({ statuses.append({
'id': item['hashString'], 'id': item['hashString'],
'name': item['downloadDir'], 'name': item['name'],
'status': 'busy', 'status': 'busy',
'original_status': item['status'], 'original_status': item['status'],
'timeleft': str(timedelta(seconds = item['eta'])), # Is ETA in seconds?? 'timeleft': str(timedelta(seconds = item['eta'])), # Is ETA in seconds??