From 383ec4d54c673d4df28c2ddee43f202626a0988d Mon Sep 17 00:00:00 2001 From: Panagiotis Koutsias Date: Thu, 19 Nov 2015 12:14:55 +0200 Subject: [PATCH 1/3] Improved awesomehd provider Try to construct the release name to help in keyword filtering Skip releases including only the audio channel Better release scoring --- .../media/_base/providers/torrent/awesomehd.py | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/couchpotato/core/media/_base/providers/torrent/awesomehd.py b/couchpotato/core/media/_base/providers/torrent/awesomehd.py index bd9e193..83b84c7 100644 --- a/couchpotato/core/media/_base/providers/torrent/awesomehd.py +++ b/couchpotato/core/media/_base/providers/torrent/awesomehd.py @@ -29,7 +29,7 @@ class Base(TorrentProvider): soup = BeautifulSoup(data) if soup.find('error'): - log.error(soup.find('error').get_text()) + log.info(soup.find('error').get_text()) return authkey = soup.find('authkey').get_text() @@ -45,20 +45,33 @@ class Base(TorrentProvider): resolution = entry.find('resolution').get_text() encoding = entry.find('encoding').get_text() freeleech = entry.find('freeleech').get_text() - torrent_desc = '/ %s / %s / %s ' % (releasegroup, resolution, encoding) + media = entry.find('media').get_text() + audioformat = entry.find('audioformat').get_text() - if freeleech == '0.25' and self.conf('prefer_internal'): - torrent_desc += '/ Internal' - torrentscore += 200 + # skip audio channel only releases + if resolution == '': + continue + + torrent_desc = '%s.%s.%s.%s-%s' % (resolution, media, audioformat, encoding, releasegroup) + + if self.conf('prefer_internal'): + if freeleech == '0.25': + torrentscore += 150 + if freeleech == '0.50': + torrentscore += 200 + if freeleech == '0.75': + torrentscore += 250 if encoding == 'x264' and self.conf('favor') in ['encode', 'both']: - torrentscore += 300 + torrentscore += 200 if re.search('Remux', encoding) and self.conf('favor') in ['remux', 'both']: torrentscore += 200 + name = re.sub(r'\W', '.', name) + name = re.sub(r'\.+', '.', name) results.append({ 'id': torrent_id, - 'name': re.sub('[^A-Za-z0-9\-_ \(\).]+', '', '%s (%s) %s' % (name, year, torrent_desc)), + 'name': '%s.%s.%s' % (name, year, torrent_desc), 'url': self.urls['download'] % (torrent_id, authkey, self.conf('passkey')), 'detail_url': self.urls['detail'] % torrent_id, 'size': tryInt(entry.find('size').get_text()) / 1048576, From d2290404c8686c4c56853656f7cee0e94076781c Mon Sep 17 00:00:00 2001 From: Panagiotis Koutsias Date: Thu, 19 Nov 2015 22:58:44 +0200 Subject: [PATCH 2/3] Fixed release scoring --- couchpotato/core/media/_base/providers/torrent/awesomehd.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/couchpotato/core/media/_base/providers/torrent/awesomehd.py b/couchpotato/core/media/_base/providers/torrent/awesomehd.py index 83b84c7..7fcf626 100644 --- a/couchpotato/core/media/_base/providers/torrent/awesomehd.py +++ b/couchpotato/core/media/_base/providers/torrent/awesomehd.py @@ -54,17 +54,12 @@ class Base(TorrentProvider): torrent_desc = '%s.%s.%s.%s-%s' % (resolution, media, audioformat, encoding, releasegroup) - if self.conf('prefer_internal'): - if freeleech == '0.25': - torrentscore += 150 - if freeleech == '0.50': - torrentscore += 200 - if freeleech == '0.75': - torrentscore += 250 + if self.conf('prefer_internal') and freeleech in ['0.25', '0.50']: + torrentscore += 200 if encoding == 'x264' and self.conf('favor') in ['encode', 'both']: torrentscore += 200 - if re.search('Remux', encoding) and self.conf('favor') in ['remux', 'both']: + else if re.search('Remux', encoding) and self.conf('favor') in ['remux', 'both']: torrentscore += 200 name = re.sub(r'\W', '.', name) From 5cf80d311b2f61c3525928543cbce2720619934e Mon Sep 17 00:00:00 2001 From: Panagiotis Koutsias Date: Thu, 19 Nov 2015 23:42:05 +0200 Subject: [PATCH 3/3] fixed typo --- couchpotato/core/media/_base/providers/torrent/awesomehd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/media/_base/providers/torrent/awesomehd.py b/couchpotato/core/media/_base/providers/torrent/awesomehd.py index 7fcf626..b6ea919 100644 --- a/couchpotato/core/media/_base/providers/torrent/awesomehd.py +++ b/couchpotato/core/media/_base/providers/torrent/awesomehd.py @@ -59,7 +59,7 @@ class Base(TorrentProvider): if encoding == 'x264' and self.conf('favor') in ['encode', 'both']: torrentscore += 200 - else if re.search('Remux', encoding) and self.conf('favor') in ['remux', 'both']: + elif re.search('Remux', encoding) and self.conf('favor') in ['remux', 'both']: torrentscore += 200 name = re.sub(r'\W', '.', name)