From a7f4915c2bfdf350953fbb13b245af73139cbfd8 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Sat, 31 Dec 2016 00:49:20 +0000 Subject: [PATCH] Remove Wombles nzb provider. --- CHANGES.md | 7 ++- gui/slick/images/providers/womble_s_index.png | Bin 213 -> 0 bytes .../interfaces/default/config_providers.tmpl | 3 +- sickbeard/providers/__init__.py | 3 +- sickbeard/providers/generic.py | 2 +- sickbeard/providers/womble.py | 57 ------------------ 6 files changed, 9 insertions(+), 63 deletions(-) delete mode 100644 gui/slick/images/providers/womble_s_index.png delete mode 100644 sickbeard/providers/womble.py diff --git a/CHANGES.md b/CHANGES.md index 9fa424fd..bc7a647a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 0.12.3 (2016-12-27 15:20:00 UTC) +### 0.12.4 (2016-12-31 00:50:00 UTC) + +* Remove Wombles nzb provider + + +### 0.12.3 (2016-12-27 15:20:00 UTC) * Add UK date format handling to name parser diff --git a/gui/slick/images/providers/womble_s_index.png b/gui/slick/images/providers/womble_s_index.png deleted file mode 100644 index c4d3a8f16d80d556bb21fe560919eab52193b070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=95mX=kn;WY9J~^Z)

Provider Priorities

+

Allows searching recent and past releases.

Check off and drag the providers into the order you want them to be used.

At least one provider is required, two are recommended.

@@ -128,8 +129,6 @@
(PA)

Public access, no account required

-

Searches current and past releases

-

*

Searches current but not past releases

## #if $sickbeard.USE_TORRENTS ##

**

Supports limited backlog searches, some episodes/qualities may not be available

## #end if diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 6d1a4e86..870b04be 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -24,7 +24,7 @@ import sickbeard from . import generic from sickbeard import logger, encodingKludge as ek # usenet -from . import newznab, omgwtfnzbs, womble +from . import newznab, omgwtfnzbs # torrent from . import alpharatio, beyondhd, bithdtv, bitmetv, btn, btscene, dh, extratorrent, \ fano, filelist, freshontv, funfile, gftracker, grabtheinfo, hd4free, hdbits, hdspace, hdtorrents, \ @@ -41,7 +41,6 @@ except: pass __all__ = ['omgwtfnzbs', - 'womble', 'alpharatio', 'anizb', 'beyondhd', diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 8e1bb84a..ac087f31 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -107,7 +107,7 @@ class GenericProvider: def is_public_access(self): try: - return bool(re.search('(?i)rarbg|sick|womble|anizb', self.name)) \ + return bool(re.search('(?i)rarbg|sick|anizb', self.name)) \ or False is bool(('_authorised' in self.__class__.__dict__ or hasattr(self, 'digest') or self._check_auth(is_required=True))) except AuthException: diff --git a/sickbeard/providers/womble.py b/sickbeard/providers/womble.py deleted file mode 100644 index 80b3b5bb..00000000 --- a/sickbeard/providers/womble.py +++ /dev/null @@ -1,57 +0,0 @@ -# Author: Nic Wolfe -# URL: http://code.google.com/p/sickbeard/ -# -# 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 . - -from . import generic -from sickbeard import tvcache -import time - - -class WombleProvider(generic.NZBProvider): - - def __init__(self): - generic.NZBProvider.__init__(self, 'Womble\'s Index', supports_backlog=False) - - self.url = 'https://newshost.co.za/' - self.cache = WombleCache(self) - - -class WombleCache(tvcache.TVCache): - - def __init__(self, this_provider): - tvcache.TVCache.__init__(self, this_provider) - - self.update_freq = 6 - - def _cache_data(self): - - result = [] - for section in ['sd', 'hd', 'x264', 'dvd']: - url = '%srss/?sec=tv-%s&fr=false' % (self.provider.url, section) - xml_data = self.getRSSFeed(url) - time.sleep(1.1) - cnt = len(result) - for entry in (xml_data and xml_data.get('entries', []) or []): - if entry.get('title') and entry.get('link', '').startswith('http'): - result.append((entry.get('title'), entry.get('link'), None, None)) - - self.provider.log_result(count=len(result) - cnt, url=url) - - return result - - -provider = WombleProvider()