From a08fb81b40c4755d6a5030c3b71ad348572de5cb Mon Sep 17 00:00:00 2001 From: JackDandy Date: Mon, 19 Feb 2018 11:58:49 +0000 Subject: [PATCH] Fix sending notification on snatch or download to Kodi/Emby. Fix config/notifications/Pushover priority selector. Remove NZB.is and HD4Free providers. --- CHANGES.md | 10 +- gui/slick/images/providers/hd4free.png | Bin 621 -> 0 bytes gui/slick/images/providers/nzb_is.png | Bin 1082 -> 0 bytes sickbeard/__init__.py | 10 +- sickbeard/notifiers/emby.py | 2 +- sickbeard/notifiers/kodi.py | 2 +- sickbeard/providers/__init__.py | 3 +- sickbeard/providers/hd4free.py | 171 ------------------------- 8 files changed, 17 insertions(+), 181 deletions(-) delete mode 100644 gui/slick/images/providers/hd4free.png delete mode 100644 gui/slick/images/providers/nzb_is.png delete mode 100644 sickbeard/providers/hd4free.py diff --git a/CHANGES.md b/CHANGES.md index be0344de..a730c9d9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,12 @@ -### 0.14.4 (2018-02-18 23:55:00 UTC) +### 0.14.5 (2018-02-23 22:15:00 UTC) + +Remove NZB.is usenet provider +Remove HD4Free torrent provider +Fix config/notifications/Pushover priority selector +Fix sending notification on snatch or download to Kodi/Emby + + +### 0.14.4 (2018-02-18 23:55:00 UTC) Change relax strict mode from subtitle languages and show unknown.png flag for 'Undetermined' subtitle languages Add Paramount Network icon diff --git a/gui/slick/images/providers/hd4free.png b/gui/slick/images/providers/hd4free.png deleted file mode 100644 index fcb1982003c7d48a9f0f5caade3646e0748dccf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmV-z0+RiSP)8bpDGOgSVk&yWmEBCQ&))*fTY2r-c)n=bMq z@Q8f2z)(LGytx=Rrf(B46>d#YS+!_pY;xHgN?X+59zivteU&oGl`2~Jgk=J+sW=n~ z5p+z#a)er|%-G>1g*B%yfRqbWK4q53x4%#`)2!}1Wu^3-iL*(*Ro*c;8YMPnphG6E z6g>dyPFp;Dwz0;{-Ae?*nhO(ioJvjMt8H9!i;2`pmOn327%#H(-6dG<1`zW~>9Wv# zoV5wf1{rXM5lB3(DVFmjh7>ZNUv^x5hEJfyYoOr{6ECZ6`O+y4G33n8#OZ@cX?@}WT1l(bBVIcPC{&E`izliw~gT=y^l zCB#01gKRfY*P8WFO)4XZ2+=h{&u8jdP{)UbU@|KZy&~`%+E~`lpr?jU00000NkvXX Hu0mjfY{V1- diff --git a/gui/slick/images/providers/nzb_is.png b/gui/slick/images/providers/nzb_is.png deleted file mode 100644 index 886a600e5ee5587a94a5893e137af04d55a728a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1082 zcmV-A1jYM_P)`6pHR5*-ZSShQ7L}>{qejf;G4kVt3d|uV% zlms!J$JJ(w^5oXUerk1no^?ChSVdD+8qS?z1g;Uf9TJ=iSQgWM&AS!@^%R3X`BS)ghQAVxKAbENc=XNxW5R|tPVk#)zH6Tn) zou=(JBzZl?ud_2iRu>nb_LVj;n)agZCL|v&rpBkhdi-7@$9Zr5q!Mfeq~;mM=lLi8 zXujLq+mi{r7J;EZ28?sphJj#0LFVyY2u9vAt|VQ!tbmS3ox#%VjfyRIo4tggaKYF. - -try: - from collections import OrderedDict -except ImportError: - from requests.compat import OrderedDict -import re -import traceback - -from . import generic -from sickbeard import logger -from sickbeard.bs4_parser import BS4Parser -from sickbeard.helpers import tryInt -from lib.unidecode import unidecode - - -class HD4FreeProvider(generic.TorrentProvider): - - def __init__(self): - generic.TorrentProvider.__init__(self, 'HD4Free') - self.url_base = 'https://hd4Free.xyz/' - self.urls = {'config_provider_home_uri': self.url_base, - 'login': self.url_base + 'torrents', - 'search': self.url_base + 'filter?%s' % '&'.join( - ['_token=%s', 'search=%s', 'categories[]=%s', 'freeleech=%s', 'doubleupload=%s', 'featured=%s', - 'username=', 'imdb=', 'tvdb=', 'tmdb=', 'mal=', - 'sorting=created_at', 'direction=desc', 'qty=50'])} - - self.categories = {'Season': [2], 'Episode': [2], 'Cache': [2]} - - self.url = self.urls['config_provider_home_uri'] - - self.filter = [] - self.may_filter = OrderedDict([ - ('f0', ('not marked', False)), ('free', ('free', True)), - ('double', ('2x up', True)), ('feat', ('featured', True))]) - self.digest, self.token, self.resp, self.scene, self.minseed, self.minleech = 6 * [None] - - def logged_in(self, resp): - try: - self.token = re.findall('csrf\s*=\s*"([^"]+)', resp)[0] - self.resp = re.findall('(?sim)()', resp)[0] - except (IndexError, TypeError): - return False - return self.has_all_cookies('XSRF-TOKEN') - - def _authorised(self, **kwargs): - - return super(HD4FreeProvider, self)._authorised( - logged_in=lambda y=None: self.logged_in(y)) - - def _search_provider(self, search_params, **kwargs): - - results = [] - if not self._authorised(): - return results - - items = {'Cache': [], 'Season': [], 'Episode': [], 'Propers': []} - - rc = dict((k, re.compile('(?i)' + v)) - for (k, v) in {'info': 'torrents', 'get': '(.*?download)_check(.*)'}.items()) - log = '' - if self.filter: - non_marked = 'f0' in self.filter - # if search_any, use unselected to exclude, else use selected to keep - filters = ([f for f in self.may_filter if f in self.filter], - [f for f in self.may_filter if f not in self.filter])[non_marked] - filters += (((all([x in filters for x in 'free', 'double', 'feat']) and ['freedoublefeat'] or []) - + (all([x in filters for x in 'free', 'double']) and ['freedouble'] or []) - + (all([x in filters for x in 'feat', 'double']) and ['featdouble'] or [])), - ((not all([x not in filters for x in 'free', 'double', 'feat']) and ['freedoublefeat'] or []) - + (not all([x not in filters for x in 'free', 'double']) and ['freedouble'] or []) - + (not all([x not in filters for x in 'feat', 'double']) and ['featdouble'] or [])) - )[non_marked] - rc['filter'] = re.compile('(?i)^(%s)$' % '|'.join( - ['%s' % f for f in filters if (f in self.may_filter and self.may_filter[f][1]) or f])) - log = '%sing (%s) ' % (('keep', 'skipp')[non_marked], ', '.join( - [f in self.may_filter and self.may_filter[f][0] or f for f in filters])) - for mode in search_params.keys(): - if mode in ['Season', 'Episode']: - show_type = self.show.air_by_date and 'Air By Date' \ - or self.show.is_sports and 'Sports' or None - if show_type: - logger.log(u'Provider does not carry shows of type: [%s], skipping' % show_type, logger.DEBUG) - return results - - for search_string in search_params[mode]: - search_string = isinstance(search_string, unicode) and unidecode(search_string) or search_string - search_url = self.urls['search'] % ( - self.token, '+'.join(search_string.split()), self._categories_string(mode, ''), '', '', '') - - resp = self.get_url(search_url, json=True) - if self.should_skip(): - return results - - cnt = len(items[mode]) - try: - if not resp or not resp.get('rows'): - raise generic.HaltParseException - - html = '%s' % \ - self.resp.replace('', '%s' % ''.join(resp.get('result', []))) - with BS4Parser(html, features=['html5lib', 'permissive']) as soup: - torrent_table = soup.find('table', class_='table') - torrent_rows = [] if not torrent_table else torrent_table.find_all('tr') - - if 2 > len(torrent_rows): - raise generic.HaltParseException - - head = None - for tr in torrent_rows[1:]: - cells = tr.find_all('td') - if 5 > len(cells): - continue - if any(self.filter): - marked = ','.join([x.attrs.get('data-original-title', '').lower() for x in tr.find_all( - 'i', attrs={'class': ['text-gold', 'fa-diamond', 'fa-certificate']})]) - # noinspection PyTypeChecker - munged = ''.join(filter(marked.__contains__, ['free', 'double', 'feat'])) - if ((non_marked and rc['filter'].search(munged)) or - (not non_marked and not rc['filter'].search(munged))): - continue - try: - head = head if None is not head else self._header_row( - tr, {'seed': r'circle-up', 'leech': r'circle-down', 'size': r'fa-file'}) - seeders, leechers, size = [tryInt(n, n) for n in [ - cells[head[x]].get_text().strip() for x in 'seed', 'leech', 'size']] - if self._peers_fail(mode, seeders, leechers): - continue - - title = tr.find('a', href=rc['info'])['data-original-title'] - download_url = self._link(rc['get'].sub(r'\1\2', tr.find('a', href=rc['get'])['href'])) - except (AttributeError, TypeError, ValueError, IndexError): - continue - - if title and download_url: - items[mode].append((title, download_url, seeders, self._bytesizer(size))) - - except generic.HaltParseException: - pass - except (StandardError, Exception): - logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR) - - self._log_search(mode, len(items[mode]) - cnt, log + search_url) - - results = self._sort_seeding(mode, results + items[mode]) - - return results - - @staticmethod - def ui_string(key): - - return 'hd4free_digest' == key and 'use... \'laravel_session=yy\'' or '' - - -provider = HD4FreeProvider()