From b61de4866c74ad1522339515d68c49aebeb526cb Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 5 Jul 2013 20:40:27 +0200 Subject: [PATCH 1/3] Make subliminal work with Requests 1.0+ --- libs/subliminal/services/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/subliminal/services/__init__.py b/libs/subliminal/services/__init__.py index 929c2163..b82b309c 100755 --- a/libs/subliminal/services/__init__.py +++ b/libs/subliminal/services/__init__.py @@ -81,7 +81,8 @@ class ServiceBase(object): def init(self): """Initialize connection""" logger.debug(u'Initializing %s' % self.__class__.__name__) - self.session = requests.session(timeout=10, headers={'User-Agent': self.user_agent}) + self.session = requests.session() + self.session.headers.update({'User-Agent': self.user_agent}) def init_cache(self): """Initialize cache, make sure it is loaded from disk""" @@ -191,7 +192,7 @@ class ServiceBase(object): """ logger.info(u'Downloading %s in %s' % (url, filepath)) try: - r = self.session.get(url, headers={'Referer': url, 'User-Agent': self.user_agent}) + r = self.session.get(url, timeout = 10, headers = {'Referer': url, 'User-Agent': self.user_agent}) with open(filepath, 'wb') as f: f.write(r.content) except Exception as e: @@ -212,7 +213,7 @@ class ServiceBase(object): logger.info(u'Downloading %s in %s' % (url, filepath)) try: zippath = filepath + '.zip' - r = self.session.get(url, headers={'Referer': url, 'User-Agent': self.user_agent}) + r = self.session.get(url, timeout = 10, headers = {'Referer': url, 'User-Agent': self.user_agent}) with open(zippath, 'wb') as f: f.write(r.content) if not zipfile.is_zipfile(zippath): From 797dedfcbb486b79e449289b2c1d5e50a921c1ac Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 5 Jul 2013 21:28:07 +0200 Subject: [PATCH 2/3] Remove cdX from subname. fix #1524 --- couchpotato/core/plugins/renamer/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py index c219f17b..a2fb5dc5 100644 --- a/couchpotato/core/plugins/renamer/main.py +++ b/couchpotato/core/plugins/renamer/main.py @@ -220,15 +220,15 @@ class Renamer(Plugin): replacements['cd_nr'] = cd if multiple else '' # Naming - final_folder_name = self.doReplace(folder_name, replacements).lstrip('. ') - final_file_name = self.doReplace(file_name, replacements).lstrip('. ') + final_folder_name = self.doReplace(folder_name, replacements) + final_file_name = self.doReplace(file_name, replacements) replacements['filename'] = final_file_name[:-(len(getExt(final_file_name)) + 1)] # Meta naming if file_type is 'trailer': - final_file_name = self.doReplace(trailer_name, replacements, remove_multiple = True).lstrip('. ') + final_file_name = self.doReplace(trailer_name, replacements, remove_multiple = True) elif file_type is 'nfo': - final_file_name = self.doReplace(nfo_name, replacements, remove_multiple = True).lstrip('. ') + final_file_name = self.doReplace(nfo_name, replacements, remove_multiple = True) # Seperator replace if separator: @@ -282,7 +282,7 @@ class Renamer(Plugin): # Don't add language if multiple languages in 1 subtitle file if len(sub_langs) == 1: - sub_name = final_file_name.replace(replacements['ext'], '%s.%s' % (sub_langs[0], replacements['ext'])) + sub_name = sub_name.replace(replacements['ext'], '%s.%s' % (sub_langs[0], replacements['ext'])) rename_files[current_file] = os.path.join(destination, final_folder_name, sub_name) rename_files = mergeDicts(rename_files, rename_extras) @@ -556,7 +556,7 @@ Remove it if you want it to be renamed (again, or at least let it try again) replaced = re.sub(r"[\x00:\*\?\"<>\|]", '', replaced) sep = self.conf('separator') - return self.replaceDoubles(replaced).replace(' ', ' ' if not sep else sep) + return self.replaceDoubles(replaced.lstrip('. ')).replace(' ', ' ' if not sep else sep) def replaceDoubles(self, string): return string.replace(' ', ' ').replace(' .', '.') From cdf9cf5cf47b60ef78952d059883d422bb314854 Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 5 Jul 2013 21:54:55 +0200 Subject: [PATCH 3/3] Yifi: don't search empty results. fix #1900 --- couchpotato/core/providers/torrent/yify/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/providers/torrent/yify/main.py b/couchpotato/core/providers/torrent/yify/main.py index ad21362b..4c059463 100644 --- a/couchpotato/core/providers/torrent/yify/main.py +++ b/couchpotato/core/providers/torrent/yify/main.py @@ -27,7 +27,7 @@ class Yify(TorrentProvider): data = self.getJsonData(self.urls['search'] % (title, quality['identifier'])) - if data: + if data and data.get('MovieList'): try: for result in data.get('MovieList'):