Refactor method order

core/auto_process/movies.py

@@ -15,135 +15,6 @@ requests.packages.urllib3.disable_warnings()
 
 
 class Movie(object):
-    def get_release(self, base_url, imdb_id=None, download_id=None, release_id=None):
-        results = {}
-        params = {}
-
-        # determine cmd and params to send to CouchPotato to get our results
-        section = 'movies'
-        cmd = "media.list"
-        if release_id or imdb_id:
-            section = 'media'
-            cmd = "media.get"
-            params['id'] = release_id or imdb_id
-
-        if not (release_id or imdb_id or download_id):
-            logger.debug("No information available to filter CP results")
-            return results
-
-        url = "{0}{1}".format(base_url, cmd)
-        logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params))
-
-        try:
-            r = requests.get(url, params=params, verify=False, timeout=(30, 60))
-        except requests.ConnectionError:
-            logger.error("Unable to open URL {0}".format(url))
-            return results
-
-        try:
-            result = r.json()
-        except ValueError:
-            # ValueError catches simplejson's JSONDecodeError and json's ValueError
-            logger.error("CouchPotato returned the following non-json data")
-            for line in r.iter_lines():
-                logger.error("{0}".format(line))
-            return results
-
-        if not result['success']:
-            if 'error' in result:
-                logger.error('{0}'.format(result['error']))
-            else:
-                logger.error("no media found for id {0}".format(params['id']))
-            return results
-
-        # Gather release info and return it back, no need to narrow results
-        if release_id:
-            try:
-                id = result[section]['_id']
-                results[id] = result[section]
-                return results
-            except:
-                pass
-
-        # Gather release info and proceed with trying to narrow results to one release choice
-
-        movies = result[section]
-        if not isinstance(movies, list):
-            movies = [movies]
-        for movie in movies:
-            if movie['status'] not in ['active', 'done']:
-                continue
-            releases = movie['releases']
-            if not releases:
-                continue
-            for release in releases:
-                try:
-                    if release['status'] not in ['snatched', 'downloaded', 'done']:
-                        continue
-                    if download_id:
-                        if download_id.lower() != release['download_info']['id'].lower():
-                            continue
-
-                    id = release['_id']
-                    results[id] = release
-                    results[id]['title'] = movie['title']
-                except:
-                    continue
-
-        # Narrow results by removing old releases by comparing their last_edit field
-        if len(results) > 1:
-            for id1, x1 in results.items():
-                for id2, x2 in results.items():
-                    try:
-                        if x2["last_edit"] > x1["last_edit"]:
-                            results.pop(id1)
-                    except:
-                        continue
-
-        # Search downloads on clients for a match to try and narrow our results down to 1
-        if len(results) > 1:
-            for id, x in results.items():
-                try:
-                    if not find_download(str(x['download_info']['downloader']).lower(), x['download_info']['id']):
-                        results.pop(id)
-                except:
-                    continue
-
-        return results
-
-    def command_complete(self, url, params, headers, section):
-        try:
-            r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60))
-        except requests.ConnectionError:
-            logger.error("Unable to open URL: {0}".format(url), section)
-            return None
-        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
-            logger.error("Server returned status {0}".format(r.status_code), section)
-            return None
-        else:
-            try:
-                return r.json()['state']
-            except (ValueError, KeyError):
-                # ValueError catches simplejson's JSONDecodeError and json's ValueError
-                logger.error("{0} did not return expected json data.".format(section), section)
-                return None
-
-    def completed_download_handling(self, url2, headers, section="MAIN"):
-        try:
-            r = requests.get(url2, params={}, headers=headers, stream=True, verify=False, timeout=(30, 60))
-        except requests.ConnectionError:
-            logger.error("Unable to open URL: {0}".format(url2), section)
-            return False
-        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
-            logger.error("Server returned status {0}".format(r.status_code), section)
-            return False
-        else:
-            try:
-                return r.json().get("enableCompletedDownloadHandling", False)
-            except ValueError:
-                # ValueError catches simplejson's JSONDecodeError and json's ValueError
-                return False
-
     def process(self, section, dir_name, input_name=None, status=0, client_agent="manual", download_id="", input_category=None, failure_link=None):
 
         cfg = dict(core.CFG[section][input_category])
@@ -464,3 +335,132 @@ class Movie(object):
             "{0} does not appear to have changed status after {1} minutes, Please check your logs.".format(input_name, wait_for),
             section)
         return [1, "{0}: Failed to post-process - No change in status".format(section)]
+
+    def command_complete(self, url, params, headers, section):
+        try:
+            r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60))
+        except requests.ConnectionError:
+            logger.error("Unable to open URL: {0}".format(url), section)
+            return None
+        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
+            logger.error("Server returned status {0}".format(r.status_code), section)
+            return None
+        else:
+            try:
+                return r.json()['state']
+            except (ValueError, KeyError):
+                # ValueError catches simplejson's JSONDecodeError and json's ValueError
+                logger.error("{0} did not return expected json data.".format(section), section)
+                return None
+
+    def completed_download_handling(self, url2, headers, section="MAIN"):
+        try:
+            r = requests.get(url2, params={}, headers=headers, stream=True, verify=False, timeout=(30, 60))
+        except requests.ConnectionError:
+            logger.error("Unable to open URL: {0}".format(url2), section)
+            return False
+        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
+            logger.error("Server returned status {0}".format(r.status_code), section)
+            return False
+        else:
+            try:
+                return r.json().get("enableCompletedDownloadHandling", False)
+            except ValueError:
+                # ValueError catches simplejson's JSONDecodeError and json's ValueError
+                return False
+
+    def get_release(self, base_url, imdb_id=None, download_id=None, release_id=None):
+        results = {}
+        params = {}
+
+        # determine cmd and params to send to CouchPotato to get our results
+        section = 'movies'
+        cmd = "media.list"
+        if release_id or imdb_id:
+            section = 'media'
+            cmd = "media.get"
+            params['id'] = release_id or imdb_id
+
+        if not (release_id or imdb_id or download_id):
+            logger.debug("No information available to filter CP results")
+            return results
+
+        url = "{0}{1}".format(base_url, cmd)
+        logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params))
+
+        try:
+            r = requests.get(url, params=params, verify=False, timeout=(30, 60))
+        except requests.ConnectionError:
+            logger.error("Unable to open URL {0}".format(url))
+            return results
+
+        try:
+            result = r.json()
+        except ValueError:
+            # ValueError catches simplejson's JSONDecodeError and json's ValueError
+            logger.error("CouchPotato returned the following non-json data")
+            for line in r.iter_lines():
+                logger.error("{0}".format(line))
+            return results
+
+        if not result['success']:
+            if 'error' in result:
+                logger.error('{0}'.format(result['error']))
+            else:
+                logger.error("no media found for id {0}".format(params['id']))
+            return results
+
+        # Gather release info and return it back, no need to narrow results
+        if release_id:
+            try:
+                id = result[section]['_id']
+                results[id] = result[section]
+                return results
+            except:
+                pass
+
+        # Gather release info and proceed with trying to narrow results to one release choice
+
+        movies = result[section]
+        if not isinstance(movies, list):
+            movies = [movies]
+        for movie in movies:
+            if movie['status'] not in ['active', 'done']:
+                continue
+            releases = movie['releases']
+            if not releases:
+                continue
+            for release in releases:
+                try:
+                    if release['status'] not in ['snatched', 'downloaded', 'done']:
+                        continue
+                    if download_id:
+                        if download_id.lower() != release['download_info']['id'].lower():
+                            continue
+
+                    id = release['_id']
+                    results[id] = release
+                    results[id]['title'] = movie['title']
+                except:
+                    continue
+
+        # Narrow results by removing old releases by comparing their last_edit field
+        if len(results) > 1:
+            for id1, x1 in results.items():
+                for id2, x2 in results.items():
+                    try:
+                        if x2["last_edit"] > x1["last_edit"]:
+                            results.pop(id1)
+                    except:
+                        continue
+
+        # Search downloads on clients for a match to try and narrow our results down to 1
+        if len(results) > 1:
+            for id, x in results.items():
+                try:
+                    if not find_download(str(x['download_info']['downloader']).lower(), x['download_info']['id']):
+                        results.pop(id)
+                except:
+                    continue
+
+        return results

core/auto_process/music.py

@@ -15,87 +15,6 @@ requests.packages.urllib3.disable_warnings()
 
 
 class Music(object):
-    def command_complete(self, url, params, headers, section):
-        try:
-            r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60))
-        except requests.ConnectionError:
-            logger.error("Unable to open URL: {0}".format(url), section)
-            return None
-        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
-            logger.error("Server returned status {0}".format(r.status_code), section)
-            return None
-        else:
-            try:
-                return r.json()['state']
-            except (ValueError, KeyError):
-                # ValueError catches simplejson's JSONDecodeError and json's ValueError
-                logger.error("{0} did not return expected json data.".format(section), section)
-                return None
-
-    def get_status(self, url, apikey, dir_name):
-        logger.debug("Attempting to get current status for release:{0}".format(os.path.basename(dir_name)))
-
-        params = {
-            'apikey': apikey,
-            'cmd': "getHistory"
-        }
-
-        logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params))
-
-        try:
-            r = requests.get(url, params=params, verify=False, timeout=(30, 120))
-        except requests.RequestException:
-            logger.error("Unable to open URL")
-            return None
-
-        try:
-            result = r.json()
-        except ValueError:
-            # ValueError catches simplejson's JSONDecodeError and json's ValueError
-            return None
-
-        for album in result:
-            if os.path.basename(dir_name) == album['FolderName']:
-                return album["Status"].lower()
-
-    def force_process(self, params, url, apikey, input_name, dir_name, section, wait_for):
-        release_status = self.get_status(url, apikey, dir_name)
-        if not release_status:
-            logger.error("Could not find a status for {0}, is it in the wanted list ?".format(input_name), section)
-
-        logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params), section)
-
-        try:
-            r = requests.get(url, params=params, verify=False, timeout=(30, 300))
-        except requests.ConnectionError:
-            logger.error("Unable to open URL {0}".format(url), section)
-            return [1, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)]
-
-        logger.debug("Result: {0}".format(r.text), section)
-
-        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
-            logger.error("Server returned status {0}".format(r.status_code), section)
-            return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, r.status_code)]
-        elif r.text == "OK":
-            logger.postprocess("SUCCESS: Post-Processing started for {0} in folder {1} ...".format(input_name, dir_name), section)
-        else:
-            logger.error("FAILED: Post-Processing has NOT started for {0} in folder {1}. exiting!".format(input_name, dir_name), section)
-            return [1, "{0}: Failed to post-process - Returned log from {1} was not as expected.".format(section, section)]
-
-        # we will now wait for this album to be processed before returning to TorrentToMedia and unpausing.
-        timeout = time.time() + 60 * wait_for
-        while time.time() < timeout:
-            current_status = self.get_status(url, apikey, dir_name)
-            if current_status is not None and current_status != release_status:  # Something has changed. CPS must have processed this movie.
-                logger.postprocess("SUCCESS: This release is now marked as status [{0}]".format(current_status), section)
-                return [0, "{0}: Successfully post-processed {1}".format(section, input_name)]
-            if not os.path.isdir(dir_name):
-                logger.postprocess("SUCCESS: The input directory {0} has been removed Processing must have finished.".format(dir_name), section)
-                return [0, "{0}: Successfully post-processed {1}".format(section, input_name)]
-            time.sleep(10 * wait_for)
-        # The status hasn't changed.
-        return [2, "no change"]
-
     def process(self, section, dir_name, input_name=None, status=0, client_agent="manual", input_category=None):
         status = int(status)
 
@@ -236,4 +155,85 @@ class Music(object):
                 if delete_failed and os.path.isdir(dir_name) and not os.path.dirname(dir_name) == dir_name:
                     logger.postprocess("Deleting failed files and folder {0}".format(dir_name), section)
                     remove_dir(dir_name)
-                return [1, "{0}: Failed to post-process. {1} does not support failed downloads".format(section, section)]  # Return as failed to flag this in the downloader.
+                return [1, "{0}: Failed to post-process. {1} does not support failed downloads".format(section, section)]  # Return as failed to flag this in the downloader.
+
+    def command_complete(self, url, params, headers, section):
+        try:
+            r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60))
+        except requests.ConnectionError:
+            logger.error("Unable to open URL: {0}".format(url), section)
+            return None
+        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
+            logger.error("Server returned status {0}".format(r.status_code), section)
+            return None
+        else:
+            try:
+                return r.json()['state']
+            except (ValueError, KeyError):
+                # ValueError catches simplejson's JSONDecodeError and json's ValueError
+                logger.error("{0} did not return expected json data.".format(section), section)
+                return None
+
+    def get_status(self, url, apikey, dir_name):
+        logger.debug("Attempting to get current status for release:{0}".format(os.path.basename(dir_name)))
+
+        params = {
+            'apikey': apikey,
+            'cmd': "getHistory"
+        }
+
+        logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params))
+
+        try:
+            r = requests.get(url, params=params, verify=False, timeout=(30, 120))
+        except requests.RequestException:
+            logger.error("Unable to open URL")
+            return None
+
+        try:
+            result = r.json()
+        except ValueError:
+            # ValueError catches simplejson's JSONDecodeError and json's ValueError
+            return None
+
+        for album in result:
+            if os.path.basename(dir_name) == album['FolderName']:
+                return album["Status"].lower()
+
+    def force_process(self, params, url, apikey, input_name, dir_name, section, wait_for):
+        release_status = self.get_status(url, apikey, dir_name)
+        if not release_status:
+            logger.error("Could not find a status for {0}, is it in the wanted list ?".format(input_name), section)
+
+        logger.debug("Opening URL: {0} with PARAMS: {1}".format(url, params), section)
+
+        try:
+            r = requests.get(url, params=params, verify=False, timeout=(30, 300))
+        except requests.ConnectionError:
+            logger.error("Unable to open URL {0}".format(url), section)
+            return [1, "{0}: Failed to post-process - Unable to connect to {1}".format(section, section)]
+
+        logger.debug("Result: {0}".format(r.text), section)
+
+        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
+            logger.error("Server returned status {0}".format(r.status_code), section)
+            return [1, "{0}: Failed to post-process - Server returned status {1}".format(section, r.status_code)]
+        elif r.text == "OK":
+            logger.postprocess("SUCCESS: Post-Processing started for {0} in folder {1} ...".format(input_name, dir_name), section)
+        else:
+            logger.error("FAILED: Post-Processing has NOT started for {0} in folder {1}. exiting!".format(input_name, dir_name), section)
+            return [1, "{0}: Failed to post-process - Returned log from {1} was not as expected.".format(section, section)]
+
+        # we will now wait for this album to be processed before returning to TorrentToMedia and unpausing.
+        timeout = time.time() + 60 * wait_for
+        while time.time() < timeout:
+            current_status = self.get_status(url, apikey, dir_name)
+            if current_status is not None and current_status != release_status:  # Something has changed. CPS must have processed this movie.
+                logger.postprocess("SUCCESS: This release is now marked as status [{0}]".format(current_status), section)
+                return [0, "{0}: Successfully post-processed {1}".format(section, input_name)]
+            if not os.path.isdir(dir_name):
+                logger.postprocess("SUCCESS: The input directory {0} has been removed Processing must have finished.".format(dir_name), section)
+                return [0, "{0}: Successfully post-processed {1}".format(section, input_name)]
+            time.sleep(10 * wait_for)
+        # The status hasn't changed.
+        return [2, "no change"]

core/auto_process/tv.py

@@ -18,39 +18,6 @@ requests.packages.urllib3.disable_warnings()
 
 
 class TV(object):
-    def command_complete(self, url, params, headers, section):
-        try:
-            r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60))
-        except requests.ConnectionError:
-            logger.error("Unable to open URL: {0}".format(url), section)
-            return None
-        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
-            logger.error("Server returned status {0}".format(r.status_code), section)
-            return None
-        else:
-            try:
-                return r.json()['state']
-            except (ValueError, KeyError):
-                # ValueError catches simplejson's JSONDecodeError and json's ValueError
-                logger.error("{0} did not return expected json data.".format(section), section)
-                return None
-
-    def completed_download_handling(self, url2, headers, section="MAIN"):
-        try:
-            r = requests.get(url2, params={}, headers=headers, stream=True, verify=False, timeout=(30, 60))
-        except requests.ConnectionError:
-            logger.error("Unable to open URL: {0}".format(url2), section)
-            return False
-        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
-            logger.error("Server returned status {0}".format(r.status_code), section)
-            return False
-        else:
-            try:
-                return r.json().get("enableCompletedDownloadHandling", False)
-            except ValueError:
-                # ValueError catches simplejson's JSONDecodeError and json's ValueError
-                return False
-
     def process(self, section, dir_name, input_name=None, failed=False, client_agent="manual", download_id=None, input_category=None, failure_link=None):
 
         cfg = dict(core.CFG[section][input_category])
@@ -372,3 +339,36 @@ class TV(object):
                 return [1, "{0}: Failed to post-process {1}".format(section, input_name)]
         else:
             return [1, "{0}: Failed to post-process - Returned log from {1} was not as expected.".format(section, section)]  # We did not receive Success confirmation.
+
+    def command_complete(self, url, params, headers, section):
+        try:
+            r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60))
+        except requests.ConnectionError:
+            logger.error("Unable to open URL: {0}".format(url), section)
+            return None
+        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
+            logger.error("Server returned status {0}".format(r.status_code), section)
+            return None
+        else:
+            try:
+                return r.json()['state']
+            except (ValueError, KeyError):
+                # ValueError catches simplejson's JSONDecodeError and json's ValueError
+                logger.error("{0} did not return expected json data.".format(section), section)
+                return None
+
+    def completed_download_handling(self, url2, headers, section="MAIN"):
+        try:
+            r = requests.get(url2, params={}, headers=headers, stream=True, verify=False, timeout=(30, 60))
+        except requests.ConnectionError:
+            logger.error("Unable to open URL: {0}".format(url2), section)
+            return False
+        if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
+            logger.error("Server returned status {0}".format(r.status_code), section)
+            return False
+        else:
+            try:
+                return r.json().get("enableCompletedDownloadHandling", False)
+            except ValueError:
+                # ValueError catches simplejson's JSONDecodeError and json's ValueError
+                return False