Merge branches 'develop' and 'tv' of https://github.com/RuudBurger/CouchPotatoServer into tv

Conflicts:
	couchpotato/core/plugins/renamer/main.py

couchpotato/core/downloaders/base.py

@@ -57,13 +57,18 @@ class Downloader(Provider):
             return
         return self.download(data = data, media = media, filedata = filedata)
 
-    def _getAllDownloadStatus(self):
+    def _getAllDownloadStatus(self, download_ids):
         if self.isDisabled(manual = True, data = {}):
             return
 
-        return self.getAllDownloadStatus()
+        ids = [download_id['id'] for download_id in download_ids if download_id['downloader'] == self.getName()]
 
-    def getAllDownloadStatus(self):
+        if ids:
+            return self.getAllDownloadStatus(ids)
+        else:
+            return
+
+    def getAllDownloadStatus(self, ids):
         return
 
     def _removeFailed(self, release_download):

couchpotato/core/downloaders/blackhole/main.py

@@ -51,10 +51,10 @@ class Blackhole(Downloader):
                         with open(full_path, 'wb') as f:
                             f.write(filedata)
                         os.chmod(full_path, Env.getPermission('file'))
-                        return True
+                        return self.downloadReturnId('')
                     else:
                         log.info('File %s already exists.', full_path)
-                        return True
+                        return self.downloadReturnId('')
 
                 except:
                     log.error('Failed to download to blackhole %s', traceback.format_exc())

couchpotato/core/downloaders/deluge/main.py

@@ -86,7 +86,7 @@ class Deluge(Downloader):
         log.info('Torrent sent to Deluge successfully.')
         return self.downloadReturnId(remote_torrent)
 
-    def getAllDownloadStatus(self):
+    def getAllDownloadStatus(self, ids):
 
         log.debug('Checking Deluge download status.')
 
@@ -103,6 +103,7 @@ class Deluge(Downloader):
 
         for torrent_id in queue:
             torrent = queue[torrent_id]
+            if torrent['hash'] in ids:
                 log.debug('name=%s / id=%s / save_path=%s / move_completed_path=%s / hash=%s / progress=%s / state=%s / eta=%s / ratio=%s / stop_ratio=%s / is_seed=%s / is_finished=%s / paused=%s', (torrent['name'], torrent['hash'], torrent['save_path'], torrent['move_completed_path'], torrent['hash'], torrent['progress'], torrent['state'], torrent['eta'], torrent['ratio'], torrent['stop_ratio'], torrent['is_seed'], torrent['is_finished'], torrent['paused']))
     
                 # Deluge has no easy way to work out if a torrent is stalled or failing.

couchpotato/core/downloaders/nzbget/main.py

@@ -67,7 +67,7 @@ class NZBGet(Downloader):
             log.error('NZBGet could not add %s to the queue.', nzb_name)
             return False
 
-    def getAllDownloadStatus(self):
+    def getAllDownloadStatus(self, ids):
 
         log.debug('Checking NZBGet download status.')
 
@@ -102,13 +102,13 @@ class NZBGet(Downloader):
         release_downloads = ReleaseDownloadList(self)
 
         for nzb in groups:
-            log.debug('Found %s in NZBGet download queue', nzb['NZBFilename'])
             try:
                 nzb_id = [param['Value'] for param in nzb['Parameters'] if param['Name'] == 'couchpotato'][0]
             except:
                 nzb_id = nzb['NZBID']
 
-
+            if nzb_id in ids:
+                log.debug('Found %s in NZBGet download queue', nzb['NZBFilename'])
                 timeleft = -1
                 try:
                     if nzb['ActiveDownloads'] > 0 and nzb['DownloadRate'] > 0 and not (status['DownloadPaused'] or status['Download2Paused']):
@@ -125,6 +125,7 @@ class NZBGet(Downloader):
                 })
 
         for nzb in queue: # 'Parameters' is not passed in rpc.postqueue
+            if nzb['NZBID'] in ids:
                 log.debug('Found %s in NZBGet postprocessing queue', nzb['NZBFilename'])
                 release_downloads.append({
                     'id': nzb['NZBID'],
@@ -134,11 +135,13 @@ class NZBGet(Downloader):
                 })
 
         for nzb in history:
-            log.debug('Found %s in NZBGet history. ParStatus: %s, ScriptStatus: %s, Log: %s', (nzb['NZBFilename'] , nzb['ParStatus'], nzb['ScriptStatus'] , nzb['Log']))
             try:
                 nzb_id = [param['Value'] for param in nzb['Parameters'] if param['Name'] == 'couchpotato'][0]
             except:
                 nzb_id = nzb['NZBID']
+
+            if nzb_id in ids:
+                log.debug('Found %s in NZBGet history. ParStatus: %s, ScriptStatus: %s, Log: %s', (nzb['NZBFilename'] , nzb['ParStatus'], nzb['ScriptStatus'] , nzb['Log']))
                 release_downloads.append({
                     'id': nzb_id,
                     'name': nzb['NZBFilename'],

couchpotato/core/downloaders/nzbvortex/main.py

@@ -8,9 +8,11 @@ from uuid import uuid4
 import hashlib
 import httplib
 import json
+import os
 import socket
 import ssl
 import sys
+import time
 import traceback
 import urllib2
 
@@ -32,19 +34,21 @@ class NZBVortex(Downloader):
             nzb_filename = self.createFileName(data, filedata, media)
             self.call('nzb/add', params = {'file': (nzb_filename, filedata)}, multipart = True)
 
+            time.sleep(10)
             raw_statuses = self.call('nzb')
-            nzb_id = [nzb['id'] for nzb in raw_statuses.get('nzbs', []) if nzb['name'] == nzb_filename][0]
+            nzb_id = [nzb['id'] for nzb in raw_statuses.get('nzbs', []) if os.path.basename(item['nzbFileName']) == nzb_filename][0]
             return self.downloadReturnId(nzb_id)
         except:
             log.error('Something went wrong sending the NZB file: %s', traceback.format_exc())
             return False
 
-    def getAllDownloadStatus(self):
+    def getAllDownloadStatus(self, ids):
 
         raw_statuses = self.call('nzb')
 
         release_downloads = ReleaseDownloadList(self)
         for nzb in raw_statuses.get('nzbs', []):
+            if nzb['id'] in ids:
 
                 # Check status
                 status = 'busy'

couchpotato/core/downloaders/pneumatic/main.py

@@ -41,11 +41,11 @@ class Pneumatic(Downloader):
                         strm_file.write(strmContent)
                         strm_file.close()
 
-                        return True
+                        return self.downloadReturnId('')
 
                     else:
                         log.info('File %s already exists.', fullPath)
-                        return True
+                        return self.downloadReturnId('')
 
                 except:
                     log.error('Failed to download .strm: %s', traceback.format_exc())

couchpotato/core/downloaders/rtorrent/main.py

@@ -143,7 +143,7 @@ class rTorrent(Downloader):
             log.error('Failed to send torrent to rTorrent: %s', err)
             return False
 
-    def getAllDownloadStatus(self):
+    def getAllDownloadStatus(self, ids):
         log.debug('Checking rTorrent download status.')
 
         if not self.connect():
@@ -155,6 +155,7 @@ class rTorrent(Downloader):
             release_downloads = ReleaseDownloadList(self)
 
             for torrent in torrents:
+                if torrent.info_hash in ids:
                     torrent_files = []
                     for file_item in torrent.get_files():
                         torrent_files.append(sp(os.path.join(torrent.directory, file_item.path)))

couchpotato/core/downloaders/sabnzbd/main.py

@@ -64,7 +64,7 @@ class Sabnzbd(Downloader):
             log.error('Error getting data from SABNZBd: %s', sab_data)
             return False
 
-    def getAllDownloadStatus(self):
+    def getAllDownloadStatus(self, ids):
 
         log.debug('Checking SABnzbd download status.')
 
@@ -91,6 +91,7 @@ class Sabnzbd(Downloader):
 
         # Get busy releases
         for nzb in queue.get('slots', []):
+            if nzb['nzo_id'] in ids:
                 status = 'busy'
                 if 'ENCRYPTED / ' in nzb['filename']:
                     status = 'failed'
@@ -105,7 +106,7 @@ class Sabnzbd(Downloader):
 
         # Get old releases
         for nzb in history.get('slots', []):
-
+            if nzb['nzo_id'] in ids:
                 status = 'busy'
                 if nzb['status'] == 'Failed' or (nzb['status'] == 'Completed' and nzb['fail_message'].strip()):
                     status = 'failed'

couchpotato/core/downloaders/synology/main.py

@@ -42,7 +42,7 @@ class Synology(Downloader):
         except:
             log.error('Exception while adding torrent: %s', traceback.format_exc())
         finally:
-            return response
+            return self.downloadReturnId('') if response else False
 
     def getEnabledProtocol(self):
         if self.conf('use_for') == 'both':

couchpotato/core/downloaders/transmission/main.py

@@ -83,7 +83,7 @@ class Transmission(Downloader):
         log.info('Torrent sent to Transmission successfully.')
         return self.downloadReturnId(remote_torrent['torrent-added']['hashString'])
 
-    def getAllDownloadStatus(self):
+    def getAllDownloadStatus(self, ids):
 
         log.debug('Checking Transmission download status.')
 
@@ -102,6 +102,7 @@ class Transmission(Downloader):
             return False
 
         for torrent in queue['torrents']:
+            if torrent['hashString'] in ids:
                 log.debug('name=%s / id=%s / downloadDir=%s / hashString=%s / percentDone=%s / status=%s / eta=%s / uploadRatio=%s / isFinished=%s',
                     (torrent['name'], torrent['id'], torrent['downloadDir'], torrent['hashString'], torrent['percentDone'], torrent['status'], torrent['eta'], torrent['uploadRatio'], torrent['isFinished']))
     

couchpotato/core/downloaders/utorrent/main.py

@@ -105,7 +105,7 @@ class uTorrent(Downloader):
 
         return self.downloadReturnId(torrent_hash)
 
-    def getAllDownloadStatus(self):
+    def getAllDownloadStatus(self, ids):
 
         log.debug('Checking uTorrent download status.')
 
@@ -130,6 +130,7 @@ class uTorrent(Downloader):
 
         # Get torrents
         for torrent in queue['torrents']:
+            if torrent[0] in ids:
 
                 #Get files of the torrent
                 torrent_files = []

couchpotato/core/helpers/encoding.py

@@ -54,6 +54,10 @@ def sp(path, *args):
     if not path or len(path) == 0:
         return path
 
+    # convert windows path (from remote box) to *nix path
+    if os.path.sep == '/' and '\\' in path:
+        path = '/' + path.replace(':', '').replace('\\', '/')
+
     path = os.path.normcase(os.path.normpath(ss(path, *args)))
 
     if path != os.path.sep:

couchpotato/core/plugins/manage/main.py

@@ -1,6 +1,6 @@
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.helpers.variable import splitString, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
@@ -122,12 +122,10 @@ class Manage(Plugin):
                         releases = fireEvent('release.for_movie', id = done_movie.get('id'), single = True)
 
                         for release in releases:
-                            if len(release.get('files', [])) == 0:
-                                fireEvent('release.delete', release['id'])
-                            else:
+                            if len(release.get('files', [])) > 0:
                                 for release_file in release.get('files', []):
                                     # Remove release not available anymore
-                                    if not os.path.isfile(ss(release_file['path'])):
+                                    if not os.path.isfile(sp(release_file['path'])):
                                         fireEvent('release.clean', release['id'])
                                         break
 

couchpotato/core/plugins/renamer/main.py

@@ -403,13 +403,13 @@ class Renamer(Plugin):
                 remove_leftovers = True
 
                 # Add it to the wanted list before we continue
-                if len(library_ent.media) == 0:
+                if len(library_ent.movies) == 0:
                     profile = db.query(Profile).filter_by(core = True, label = group['meta_data']['quality']['label']).first()
                     fireEvent('movie.add', params = {'identifier': group['library']['identifier'], 'profile_id': profile.id}, search_after = False)
                     db.expire_all()
                     library_ent = db.query(Library).filter_by(identifier = group['library']['identifier']).first()
 
-                for movie in library_ent.media:
+                for movie in library_ent.movies:
 
                     # Mark movie "done" once it's found the quality with the finish check
                     try:
@@ -820,7 +820,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
                 try:
                     for rel in rels:
                         rel_dict = rel.to_dict({'info': {}})
-                        movie_dict = fireEvent('media.get', media_id = rel.media_id, single = True)
+                        movie_dict = fireEvent('media.get', media_id = rel.movie_id, single = True)
 
                         if not isinstance(rel_dict['info'], (dict)):
                             log.error('Faulty release found without any info, ignoring.')
@@ -878,7 +878,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
                                     fireEvent('download.remove_failed', release_download, single = True)
 
                                     if self.conf('next_on_failed'):
-                                        fireEvent('movie.searcher.try_next_release', media_id = rel.media_id)
+                                        fireEvent('movie.searcher.try_next_release', media_id = rel.movie_id)
                                 elif release_download['status'] == 'completed':
                                     log.info('Download of %s completed!', release_download['name'])
                                     if self.statusInfoComplete(release_download):