Merge branch 'hotfix/0.12.4'

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
 

gui/slick/interfaces/default/config_providers.tmpl

@@ -87,6 +87,7 @@
 					<fieldset class="component-group-list">
 						<div class="component-group-desc">
 							<h3>Provider Priorities</h3>
+							<p>Allows searching recent and past releases.</p>
 							<p>Check off and drag the providers into the order you want them to be used.</p>
 							<p>At least one provider is required, two are recommended.</p>
 
@@ -128,8 +129,6 @@
 
 						<div id="provider_key">
 							<span style="float:left;font-size:10px;vertical-align:top;font-weight:normal">(PA)</span><p class="note">Public access, no account required</p>
-							<h4 class="note"></h4><p class="note">Searches current and past releases</p>
-							<h4 class="note">*</h4><p class="note">Searches current but not past releases</p>
 ## #if $sickbeard.USE_TORRENTS
 ##							<h4 class="note">**</h4><p class="note">Supports <b>limited</b> backlog searches, some episodes/qualities may not be available</p>
 ## #end if

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',

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:

sickbeard/providers/womble.py

@@ -1,57 +0,0 @@
-# Author: Nic Wolfe <nic@wolfeden.ca>
-# 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 <http://www.gnu.org/licenses/>.
-
-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()