From 2a81346aa9484a28f4460214a3d3ffa8179c6cff Mon Sep 17 00:00:00 2001 From: JackDandy Date: Thu, 17 Sep 2015 17:51:33 +0100 Subject: [PATCH] Add FunFile torrent provider. --- CHANGES.md | 1 + gui/slick/images/providers/funfile.png | Bin 0 -> 1370 bytes sickbeard/__init__.py | 2 +- sickbeard/providers/__init__.py | 1 + sickbeard/providers/funfile.py | 150 +++++++++++++++++++++++++ sickbeard/providers/torrenting.py | 5 +- sickbeard/webserve.py | 4 +- 7 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 gui/slick/images/providers/funfile.png create mode 100644 sickbeard/providers/funfile.py diff --git a/CHANGES.md b/CHANGES.md index cd21ec35..50c1fd04 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -41,6 +41,7 @@ * Change downloads to prevent cache misfiring with "Result is not a valid torrent file" * Change remove AlphaRatio until their secure login page over https is fixed * Add Torrenting provider +* Add FunFile torrent provider ### 0.10.0 (2015-08-06 11:05:00 UTC) diff --git a/gui/slick/images/providers/funfile.png b/gui/slick/images/providers/funfile.png new file mode 100644 index 0000000000000000000000000000000000000000..7ee997be8aff067d75711a4878b7cbf68b61fde1 GIT binary patch literal 1370 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8|t&FV24B9_#?bMML ztz^>we{-^evUDY@@#|xaSLcSBG8j+JlgRP6?`PmQS@nG_Bj*wUPTR7%`ZFJH-L>0} z!TH(aM=ngx>t{v_b8;M+5+k9kl*}NR%phIGYT45s{qgRCWCl5T0d7e_-YpCapH6pN zK7Qo+?)>w6T1y#>-d=mZW=3Dh=2w!+N&zbI=MPQY%E0*l`_owr{5m3>uGW^aqJj&= z8I{F_pPZj=sHbD7r>i3+EXT&6BP*dJD;dlnqoXXYqbyMz%(8XE3LRxB9cAeccNV<8 zy>!dbvpUL3A4M3ZR@qoEm`e-ttz}?)aQDuK`>U2P@GqMhePlw2ij=6RgzS~Qt%-HL zijvY|oGeG?L|8JI-rG{PVaqlpF@XznbNHAU&hKthl@fNHbMw#3t6|Poe_mb_WM?r* z>3w?XWCgQfPB2q+RP>u$3vz-v4Hc!|-(Fxc;li6+OLYX83{~WG1ekRMSWG6|lvFkP z|NmtrgNBM-z?D^LLhMYM(qf_*rtnyrolK zUXc5NDzmB>-@0Y9&+lsf^yRyxw1glVLo$nzARD7WayK6<%m0_xt{!T;dZPMn{NEL4*gGNQNsA=rAm1U|?h@3GxdD z2KZ0}3{-P;`um5#u;BD`aSV}|np{v?n3JDA-zqe`>em<3)k-#!F)lk7tLvC0h;W!Z zG7c_e;>vk9Z_NtL7q4!;Hb1^PeVTUjW3{j66rvwLy0lj3R7~4B2gbrk-JP43wmy|q zRh(?~$wu-`jaZoJGjXn5foJ8B$L72}X>fbVq{Tb)N_Y5f4W0D2C(OU?%MrhediVCF z%fqr>mdKI;Vst E01iu5@c;k- literal 0 HcmV?d00001 diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 75e122df..bf3b9c1f 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -38,7 +38,7 @@ from sickbeard import providers, metadata, config, webserveInit, searchBacklog, from sickbeard.providers.generic import GenericProvider from providers import btn, newznab, womble, thepiratebay, torrentleech, kat, iptorrents, grabtheinfo, scenetime, pretome, \ omgwtfnzbs, scc, torrentday, hdbits, speedcd, nyaatorrents, torrentbytes, beyondhd, gftracker, transmithe_net, \ - freshontv, bitsoup, tokyotoshokan, animenzb, totv, rarbg, morethan, pisexy, strike, torrentshack, torrenting + freshontv, bitsoup, tokyotoshokan, animenzb, totv, rarbg, morethan, pisexy, strike, torrentshack, torrenting, funfile from sickbeard.config import CheckSection, check_setting_int, check_setting_str, check_setting_float, ConfigMigrator, \ naming_ep_type, minimax from indexers.indexer_api import indexerApi diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 89cc41a7..174616cc 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -46,6 +46,7 @@ __all__ = ['womble', 'scenetime', 'pretome', 'torrenting', + 'funfile', ] from os import sys diff --git a/sickbeard/providers/funfile.py b/sickbeard/providers/funfile.py new file mode 100644 index 00000000..6e76ef88 --- /dev/null +++ b/sickbeard/providers/funfile.py @@ -0,0 +1,150 @@ +# coding=utf-8 +# +# This file is part of SickGear. +# +# SickGear is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# SickGear is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with SickGear. If not, see . + +import re +import datetime +import traceback + +from . import generic +from sickbeard import logger, tvcache, helpers +from sickbeard.bs4_parser import BS4Parser +from lib.unidecode import unidecode + + +class FunFileProvider(generic.TorrentProvider): + + def __init__(self): + generic.TorrentProvider.__init__(self, 'FunFile') + + self.url_base = 'https://www.funfile.org/' + self.urls = {'config_provider_home_uri': self.url_base, + 'login': self.url_base + 'takelogin.php', + 'search': self.url_base + 'browse.php?%ssearch=%s', + 'get': self.url_base + '%s'} + + self.categories = 'cat=7&incldead=0&s_title=1&showspam=1&' + + self.url = self.urls['config_provider_home_uri'] + self.url_timeout = 90 + self.username, self.password, self.minseed, self.minleech = 4 * [None] + self.cache = FunFileCache(self) + + def _do_login(self): + + logged_in = lambda: None is not self.session.cookies.get('uid', domain='.funfile.org') and None is not self.session.cookies.get('pass', domain='.funfile.org') + if logged_in(): + return True + + if self._check_auth(): + login_params = {'username': self.username, 'password': self.password, 'submit': 'Log in'} + response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session, timeout=self.url_timeout) + if response and logged_in(): + return True + + msg = u'Failed to authenticate with %s, abort provider' + if response and 'Username or password incorrect' in response: + msg = u'Invalid username or password for %s. Check settings' + logger.log(msg % self.name, logger.ERROR) + + return False + + def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0): + + results = [] + if not self._do_login(): + return results + + items = {'Season': [], 'Episode': [], 'Cache': []} + + rc = dict((k, re.compile('(?i)' + v)) for (k, v) in {'info': 'detail', 'get': 'download', + 'cats': 'cat=(?:7)'}.items()) + for mode in search_params.keys(): + for search_string in search_params[mode]: + if isinstance(search_string, unicode): + search_string = unidecode(search_string) + + search_url = self.urls['search'] % (self.categories, search_string) + html = self.get_url(search_url, timeout=self.url_timeout) + + cnt = len(items[mode]) + try: + if not html or self._has_no_results(html): + raise generic.HaltParseException + + with BS4Parser(html, features=['html5lib', 'permissive']) as soup: + torrent_table = soup.find('td', attrs={'class': 'colhead'}).find_parent('table') + torrent_rows = [] if not torrent_table else torrent_table.find_all('tr') + + if 2 > len(torrent_rows): + raise generic.HaltParseException + + for tr in torrent_rows[1:]: + try: + info = tr.find('a', href=rc['info']) + if not info: + continue + + seeders, leechers = [int(tr.find_all('td')[x].get_text().strip()) for x in (-2, -1)] + if None is tr.find('a', href=rc['cats'])\ + or ('Cache' != mode and (seeders < self.minseed or leechers < self.minleech)): + continue + + title = 'title' in info.attrs and info.attrs['title'] or info.get_text().strip() + download_url = self.urls['get'] % tr.find('a', href=rc['get']).get('href') + + except (AttributeError, TypeError): + continue + + if title and download_url: + items[mode].append((title, download_url, seeders)) + + except (generic.HaltParseException, AttributeError): + pass + except Exception: + logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR) + + self._log_result(mode, len(items[mode]) - cnt, search_url) + + # For each search mode sort all the items by seeders + items[mode].sort(key=lambda tup: tup[2], reverse=True) + + results += items[mode] + + return results + + def find_propers(self, search_date=datetime.datetime.today()): + + return self._find_propers(search_date) + + def _get_episode_search_strings(self, ep_obj, add_string='', **kwargs): + + return generic.TorrentProvider._get_episode_search_strings(self, ep_obj, add_string, use_or=False) + + +class FunFileCache(tvcache.TVCache): + + def __init__(self, this_provider): + tvcache.TVCache.__init__(self, this_provider) + + self.minTime = 15 # cache update frequency + + def _getRSSData(self): + + return self.provider.get_cache_data() + + +provider = FunFileProvider() diff --git a/sickbeard/providers/torrenting.py b/sickbeard/providers/torrenting.py index 9e4645c1..e3f6a4f5 100644 --- a/sickbeard/providers/torrenting.py +++ b/sickbeard/providers/torrenting.py @@ -47,7 +47,8 @@ class TorrentingProvider(generic.TorrentProvider): def _do_login(self): - logged_in = lambda: 'uid' in self.session.cookies and 'pass' in self.session.cookies + logged_in = lambda: 'uid' in self.session.cookies and self.session.cookies['uid'] in self.digest and \ + 'pass' in self.session.cookies and self.session.cookies['pass'] in self.digest if logged_in(): return True @@ -88,7 +89,7 @@ class TorrentingProvider(generic.TorrentProvider): raise generic.HaltParseException with BS4Parser(html, features=['html5lib', 'permissive']) as soup: - torrent_table = soup.find('div', id='torrenttable').find('table') + torrent_table = soup.find('table', id='torrentsTable') torrent_rows = [] if not torrent_table else torrent_table.find_all('tr') if 2 > len(torrent_rows): diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index cea09773..5cd43065 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -4166,7 +4166,9 @@ class ConfigProviders(Config): if hasattr(curTorrentProvider, 'digest'): try: - curTorrentProvider.digest = str(kwargs[curTorrentProvider.get_id() + '_digest']).strip() + key = str(kwargs[curTorrentProvider.get_id() + '_digest']).strip() + if not starify(key, True): + curTorrentProvider.digest = key except: curTorrentProvider.digest = None