diff --git a/CHANGES.md b/CHANGES.md
index 08e22ccc..9882a4fa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -42,8 +42,12 @@
* Change default de-referrer url to blank
* Change javascript urls in templates to allow proper caching
* Change downloads to prevent cache misfiring with "Result is not a valid torrent file"
+* Add BitMeTV torrent provider
* Add Torrenting provider
* Add FunFile torrent provider
+* Add TVChaosUK torrent provider
+* Add HD-Space torrent provider
+* Add Shazbat torrent provider
* Remove unnecessary call to indexers during nameparsing
* Change disable ToTV due to non-deletable yet reported hacker BTC inbox scam and also little to no new content listings
* Fix Episode View KeyError: 'state-title' failure for shows without a runtime
@@ -53,8 +57,7 @@
* Fix add existing shows from folders that contain a plus char
* Fix post process issue where items in history were processed out of turn
* Change increase frequency of updating show data
-* Remove FreshOnTV (TvT) torrent provider
-* Remove Strike torrent provider
+* Remove Animenzb provider
* Change increase the scope and number of non release group text that is identified and removed
* Add a general config setting to allow adding incomplete show data
* Change to throttle connection rate on thread initiation for adba library
@@ -74,12 +77,21 @@
* Add IMDb Popular to Add Show page
* Add version to anime renaming pattern
* Add Code Climate configuration files
-* Change to move init-scripts to single folder
+* Change move init-scripts to single folder
* Change sickbeard variables to sickgear variables in init-scripts
* Change improve the use of multiple plex servers
-* Change to move JS code out of home template and into dedicated file
-* Change to remove branch from window title
-* Change to move JS code out of inc_top template and into dedicated file
+* Change move JS code out of home template and into dedicated file
+* Change remove branch from window title
+* Change move JS code out of inc_top template and into dedicated file
+* Change cleanup torrent providers
+* Change utilise tvdbid for searching usenet providers
+* Add setting to provider BTN to Reject Blu-ray M2TS releases
+* Remove jsonrpclib library
+* Change consolidate global and per show ignore and require words functions
+* Change "Require word" title and notes on Config Search page to properly describe its functional logic
+* Add regular expression capability to ignore and require words by starting wordlist with "regex:"
+* Add list shows with custom ignore and require words under the global counterparts on the Search Settings page
+* Fix failure to search for more than one selected wanted episode
* Add notice for users with Python 2.7.8 or below to update to latest Python
[develop changelog]
@@ -87,6 +99,8 @@
* Add ability to parse command line output from unix unrar version 4 and below
* Fix show search box on non-poster show list views
* Fix removal of non-release groups such that anime qualities are not trimmed from name
+* Change readd Strike torrent provider
+* Change readd FreshOnTV (TvT) torrent provider
### 0.10.0 (2015-08-06 11:05:00 UTC)
diff --git a/SickBeard.py b/SickBeard.py
index 932886fa..451d64b7 100755
--- a/SickBeard.py
+++ b/SickBeard.py
@@ -340,7 +340,7 @@ class SickGear(object):
logger.ERROR)
if sickbeard.LAUNCH_BROWSER and not self.runAsDaemon:
logger.log(u'Launching browser and exiting', logger.ERROR)
- sickbeard.launchBrowser(self.startPort)
+ sickbeard.launch_browser(self.startPort)
os._exit(1)
# Check if we need to perform a restore first
@@ -377,7 +377,7 @@ class SickGear(object):
# Launch browser
if sickbeard.LAUNCH_BROWSER and not (self.noLaunch or self.runAsDaemon):
- sickbeard.launchBrowser(self.startPort)
+ sickbeard.launch_browser(self.startPort)
# main loop
while True:
@@ -488,7 +488,7 @@ class SickGear(object):
sickbeard.halt()
# save all shows to DB
- sickbeard.saveAll()
+ sickbeard.save_all()
# shutdown web server
if self.webserver:
diff --git a/gui/slick/images/providers/animenzb.png b/gui/slick/images/providers/animenzb.png
deleted file mode 100644
index 4fd6707b..00000000
Binary files a/gui/slick/images/providers/animenzb.png and /dev/null differ
diff --git a/gui/slick/images/providers/bitmetv.png b/gui/slick/images/providers/bitmetv.png
new file mode 100644
index 00000000..ce5b91ce
Binary files /dev/null and b/gui/slick/images/providers/bitmetv.png differ
diff --git a/gui/slick/images/providers/freshontv.png b/gui/slick/images/providers/freshontv.png
new file mode 100644
index 00000000..089d3479
Binary files /dev/null and b/gui/slick/images/providers/freshontv.png differ
diff --git a/gui/slick/images/providers/hdspace.png b/gui/slick/images/providers/hdspace.png
new file mode 100644
index 00000000..60494603
Binary files /dev/null and b/gui/slick/images/providers/hdspace.png differ
diff --git a/gui/slick/images/providers/shazbat.png b/gui/slick/images/providers/shazbat.png
new file mode 100644
index 00000000..d1c3f9b6
Binary files /dev/null and b/gui/slick/images/providers/shazbat.png differ
diff --git a/gui/slick/images/providers/strike.png b/gui/slick/images/providers/strike.png
new file mode 100644
index 00000000..a857f5ff
Binary files /dev/null and b/gui/slick/images/providers/strike.png differ
diff --git a/gui/slick/images/providers/tvchaosuk.png b/gui/slick/images/providers/tvchaosuk.png
new file mode 100644
index 00000000..d6e968a7
Binary files /dev/null and b/gui/slick/images/providers/tvchaosuk.png differ
diff --git a/gui/slick/interfaces/default/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl
index 2fcfc5eb..f2f2268e 100644
--- a/gui/slick/interfaces/default/config_providers.tmpl
+++ b/gui/slick/interfaces/default/config_providers.tmpl
@@ -11,9 +11,9 @@
#import os.path
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
-#if $varExists('header')
+#if $varExists('header')
-#else
+#else
$title
#end if
@@ -281,7 +281,7 @@
#set $field_name = curNzbProvider.get_id() + '_api_key'
${curNzbProvider.ui_string($field_name)}
@@ -347,6 +347,17 @@
##
#for $curTorrentProvider in [$curProvider for $curProvider in $sickbeard.providers.sortedProviderList() if $curProvider.providerType == $GenericProvider.TORRENT]:
+ #if callable(getattr(curTorrentProvider, 'ui_string', None))
+ #set $field_name = curTorrentProvider.get_id() + '_tip'
+ #set $tip_text = curTorrentProvider.ui_string($field_name)
+ #if $tip_text
+
+
+ Important! ${curTorrentProvider.name} $tip_text
+
+ #end if
+ #end if
#if $hasattr($curTorrentProvider, 'api_key'):
@@ -419,7 +430,7 @@
this ratio is requested of each item sent to $torrent_method_text[$sickbeard.TORRENT_METHOD]
- (set -1 to seed forever, or leave blank for the $torrent_method_text[$sickbeard.TORRENT_METHOD] setting)
(#if 'Transmission' in $torrent_method_text[$sickbeard.TORRENT_METHOD]#set -1 to seed forever, or #end if#leave blank for the $torrent_method_text[$sickbeard.TORRENT_METHOD] setting)
+
+ Reject Blu-ray M2TS releases
+
+ enable to ignore Blu-ray MPEG-2 Transport Stream container releases
+
+
+
Ignore result with any word
e.g. [word1,word2, ... ,word_n]
- ignore search result if its title contains any of these comma seperated words
+ e.g. [[regex:]word1, word2, ..., word_n, regex_n]
+ ignore search result if its title contains any of these comma seperated words or regular expressions
@@ -136,8 +136,8 @@
Require at least one word
e.g. [word1,word2, ... ,word_n]
- ignore search result unless its title contains one of these comma seperated words
+ e.g. [[regex:]word1, word2, ..., word_n, regex_n]
+ ignore search result unless its title contains one of these comma seperated words or regular expressions
@@ -276,7 +276,7 @@
var scene_ex = \$('#SceneName').val()
var option = \$('')
all_exceptions = []
-
+
\$('#exceptions_list option').each ( function() {
all_exceptions.push( \$(this).val() )
});
@@ -295,7 +295,7 @@
\$('#removeSceneName').click(function() {
\$('#exceptions_list option:selected').remove();
-
+
\$(this).toggle_SceneException()
});
@@ -317,4 +317,4 @@
-#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
\ No newline at end of file
+#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
diff --git a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl
index c77b2b63..d8c1a9a9 100644
--- a/gui/slick/interfaces/default/manage_subtitleMissed.tmpl
+++ b/gui/slick/interfaces/default/manage_subtitleMissed.tmpl
@@ -3,8 +3,8 @@
#from lib import subliminal
#from sickbeard import common
##
-#set global $title = 'Episode Overview'
-#set global $header = 'Episode Overview'
+#set global $title = 'Missing Subtitles'
+#set global $header = 'Missing Subtitles'
#set global $sbPath = '..'
#set global $topmenu = 'manage'
##
@@ -12,9 +12,9 @@
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
-#if $varExists('header')
+#if $varExists('header')
-#else
+#else
$title
#end if
##
@@ -64,4 +64,4 @@
#end if
-#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
\ No newline at end of file
+#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
diff --git a/lib/jsonrpclib/SimpleJSONRPCServer.py b/lib/jsonrpclib/SimpleJSONRPCServer.py
deleted file mode 100644
index d76da73e..00000000
--- a/lib/jsonrpclib/SimpleJSONRPCServer.py
+++ /dev/null
@@ -1,229 +0,0 @@
-import jsonrpclib
-from jsonrpclib import Fault
-from jsonrpclib.jsonrpc import USE_UNIX_SOCKETS
-import SimpleXMLRPCServer
-import SocketServer
-import socket
-import logging
-import os
-import types
-import traceback
-import sys
-try:
- import fcntl
-except ImportError:
- # For Windows
- fcntl = None
-
-def get_version(request):
- # must be a dict
- if 'jsonrpc' in request.keys():
- return 2.0
- if 'id' in request.keys():
- return 1.0
- return None
-
-def validate_request(request):
- if type(request) is not types.DictType:
- fault = Fault(
- -32600, 'Request must be {}, not %s.' % type(request)
- )
- return fault
- rpcid = request.get('id', None)
- version = get_version(request)
- if not version:
- fault = Fault(-32600, 'Request %s invalid.' % request, rpcid=rpcid)
- return fault
- request.setdefault('params', [])
- method = request.get('method', None)
- params = request.get('params')
- param_types = (types.ListType, types.DictType, types.TupleType)
- if not method or type(method) not in types.StringTypes or \
- type(params) not in param_types:
- fault = Fault(
- -32600, 'Invalid request parameters or method.', rpcid=rpcid
- )
- return fault
- return True
-
-class SimpleJSONRPCDispatcher(SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
-
- def __init__(self, encoding=None):
- SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self,
- allow_none=True,
- encoding=encoding)
-
- def _marshaled_dispatch(self, data, dispatch_method = None):
- response = None
- try:
- request = jsonrpclib.loads(data)
- except Exception, e:
- fault = Fault(-32700, 'Request %s invalid. (%s)' % (data, e))
- response = fault.response()
- return response
- if not request:
- fault = Fault(-32600, 'Request invalid -- no request data.')
- return fault.response()
- if type(request) is types.ListType:
- # This SHOULD be a batch, by spec
- responses = []
- for req_entry in request:
- result = validate_request(req_entry)
- if type(result) is Fault:
- responses.append(result.response())
- continue
- resp_entry = self._marshaled_single_dispatch(req_entry)
- if resp_entry is not None:
- responses.append(resp_entry)
- if len(responses) > 0:
- response = '[%s]' % ','.join(responses)
- else:
- response = ''
- else:
- result = validate_request(request)
- if type(result) is Fault:
- return result.response()
- response = self._marshaled_single_dispatch(request)
- return response
-
- def _marshaled_single_dispatch(self, request):
- # TODO - Use the multiprocessing and skip the response if
- # it is a notification
- # Put in support for custom dispatcher here
- # (See SimpleXMLRPCServer._marshaled_dispatch)
- method = request.get('method')
- params = request.get('params')
- try:
- response = self._dispatch(method, params)
- except:
- exc_type, exc_value, exc_tb = sys.exc_info()
- fault = Fault(-32603, '%s:%s' % (exc_type, exc_value))
- return fault.response()
- if 'id' not in request.keys() or request['id'] == None:
- # It's a notification
- return None
- try:
- response = jsonrpclib.dumps(response,
- methodresponse=True,
- rpcid=request['id']
- )
- return response
- except:
- exc_type, exc_value, exc_tb = sys.exc_info()
- fault = Fault(-32603, '%s:%s' % (exc_type, exc_value))
- return fault.response()
-
- def _dispatch(self, method, params):
- func = None
- try:
- func = self.funcs[method]
- except KeyError:
- if self.instance is not None:
- if hasattr(self.instance, '_dispatch'):
- return self.instance._dispatch(method, params)
- else:
- try:
- func = SimpleXMLRPCServer.resolve_dotted_attribute(
- self.instance,
- method,
- True
- )
- except AttributeError:
- pass
- if func is not None:
- try:
- if type(params) is types.ListType:
- response = func(*params)
- else:
- response = func(**params)
- return response
- except TypeError:
- return Fault(-32602, 'Invalid parameters.')
- except:
- err_lines = traceback.format_exc().splitlines()
- trace_string = '%s | %s' % (err_lines[-3], err_lines[-1])
- fault = jsonrpclib.Fault(-32603, 'Server error: %s' %
- trace_string)
- return fault
- else:
- return Fault(-32601, 'Method %s not supported.' % method)
-
-class SimpleJSONRPCRequestHandler(
- SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
-
- def do_POST(self):
- if not self.is_rpc_path_valid():
- self.report_404()
- return
- try:
- max_chunk_size = 10*1024*1024
- size_remaining = int(self.headers["content-length"])
- L = []
- while size_remaining:
- chunk_size = min(size_remaining, max_chunk_size)
- L.append(self.rfile.read(chunk_size))
- size_remaining -= len(L[-1])
- data = ''.join(L)
- response = self.server._marshaled_dispatch(data)
- self.send_response(200)
- except Exception, e:
- self.send_response(500)
- err_lines = traceback.format_exc().splitlines()
- trace_string = '%s | %s' % (err_lines[-3], err_lines[-1])
- fault = jsonrpclib.Fault(-32603, 'Server error: %s' % trace_string)
- response = fault.response()
- if response == None:
- response = ''
- self.send_header("Content-type", "application/json-rpc")
- self.send_header("Content-length", str(len(response)))
- self.end_headers()
- self.wfile.write(response)
- self.wfile.flush()
- self.connection.shutdown(1)
-
-class SimpleJSONRPCServer(SocketServer.TCPServer, SimpleJSONRPCDispatcher):
-
- allow_reuse_address = True
-
- def __init__(self, addr, requestHandler=SimpleJSONRPCRequestHandler,
- logRequests=True, encoding=None, bind_and_activate=True,
- address_family=socket.AF_INET):
- self.logRequests = logRequests
- SimpleJSONRPCDispatcher.__init__(self, encoding)
- # TCPServer.__init__ has an extra parameter on 2.6+, so
- # check Python version and decide on how to call it
- vi = sys.version_info
- self.address_family = address_family
- if USE_UNIX_SOCKETS and address_family == socket.AF_UNIX:
- # Unix sockets can't be bound if they already exist in the
- # filesystem. The convention of e.g. X11 is to unlink
- # before binding again.
- if os.path.exists(addr):
- try:
- os.unlink(addr)
- except OSError:
- logging.warning("Could not unlink socket %s", addr)
- # if python 2.5 and lower
- if vi[0] < 3 and vi[1] < 6:
- SocketServer.TCPServer.__init__(self, addr, requestHandler)
- else:
- SocketServer.TCPServer.__init__(self, addr, requestHandler,
- bind_and_activate)
- if fcntl is not None and hasattr(fcntl, 'FD_CLOEXEC'):
- flags = fcntl.fcntl(self.fileno(), fcntl.F_GETFD)
- flags |= fcntl.FD_CLOEXEC
- fcntl.fcntl(self.fileno(), fcntl.F_SETFD, flags)
-
-class CGIJSONRPCRequestHandler(SimpleJSONRPCDispatcher):
-
- def __init__(self, encoding=None):
- SimpleJSONRPCDispatcher.__init__(self, encoding)
-
- def handle_jsonrpc(self, request_text):
- response = self._marshaled_dispatch(request_text)
- print 'Content-Type: application/json-rpc'
- print 'Content-Length: %d' % len(response)
- print
- sys.stdout.write(response)
-
- handle_xmlrpc = handle_jsonrpc
diff --git a/lib/jsonrpclib/__init__.py b/lib/jsonrpclib/__init__.py
deleted file mode 100644
index 6e884b83..00000000
--- a/lib/jsonrpclib/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from jsonrpclib.config import Config
-config = Config.instance()
-from jsonrpclib.history import History
-history = History.instance()
-from jsonrpclib.jsonrpc import Server, MultiCall, Fault
-from jsonrpclib.jsonrpc import ProtocolError, loads, dumps
diff --git a/lib/jsonrpclib/config.py b/lib/jsonrpclib/config.py
deleted file mode 100644
index 4d28f1b1..00000000
--- a/lib/jsonrpclib/config.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import sys
-
-class LocalClasses(dict):
- def add(self, cls):
- self[cls.__name__] = cls
-
-class Config(object):
- """
- This is pretty much used exclusively for the 'jsonclass'
- functionality... set use_jsonclass to False to turn it off.
- You can change serialize_method and ignore_attribute, or use
- the local_classes.add(class) to include "local" classes.
- """
- use_jsonclass = True
- # Change to False to keep __jsonclass__ entries raw.
- serialize_method = '_serialize'
- # The serialize_method should be a string that references the
- # method on a custom class object which is responsible for
- # returning a tuple of the constructor arguments and a dict of
- # attributes.
- ignore_attribute = '_ignore'
- # The ignore attribute should be a string that references the
- # attribute on a custom class object which holds strings and / or
- # references of the attributes the class translator should ignore.
- classes = LocalClasses()
- # The list of classes to use for jsonclass translation.
- version = 2.0
- # Version of the JSON-RPC spec to support
- user_agent = 'jsonrpclib/0.1 (Python %s)' % \
- '.'.join([str(ver) for ver in sys.version_info[0:3]])
- # User agent to use for calls.
- _instance = None
-
- @classmethod
- def instance(cls):
- if not cls._instance:
- cls._instance = cls()
- return cls._instance
diff --git a/lib/jsonrpclib/history.py b/lib/jsonrpclib/history.py
deleted file mode 100644
index d11863dc..00000000
--- a/lib/jsonrpclib/history.py
+++ /dev/null
@@ -1,40 +0,0 @@
-class History(object):
- """
- This holds all the response and request objects for a
- session. A server using this should call "clear" after
- each request cycle in order to keep it from clogging
- memory.
- """
- requests = []
- responses = []
- _instance = None
-
- @classmethod
- def instance(cls):
- if not cls._instance:
- cls._instance = cls()
- return cls._instance
-
- def add_response(self, response_obj):
- self.responses.append(response_obj)
-
- def add_request(self, request_obj):
- self.requests.append(request_obj)
-
- @property
- def request(self):
- if len(self.requests) == 0:
- return None
- else:
- return self.requests[-1]
-
- @property
- def response(self):
- if len(self.responses) == 0:
- return None
- else:
- return self.responses[-1]
-
- def clear(self):
- del self.requests[:]
- del self.responses[:]
diff --git a/lib/jsonrpclib/jsonclass.py b/lib/jsonrpclib/jsonclass.py
deleted file mode 100644
index 1d86d5fc..00000000
--- a/lib/jsonrpclib/jsonclass.py
+++ /dev/null
@@ -1,152 +0,0 @@
-import types
-import inspect
-import re
-import traceback
-
-from jsonrpclib import config
-
-iter_types = [
- types.DictType,
- types.ListType,
- types.TupleType
-]
-
-string_types = [
- types.StringType,
- types.UnicodeType
-]
-
-numeric_types = [
- types.IntType,
- types.LongType,
- types.FloatType
-]
-
-value_types = [
- types.BooleanType,
- types.NoneType
-]
-
-supported_types = iter_types+string_types+numeric_types+value_types
-invalid_module_chars = r'[^a-zA-Z0-9\_\.]'
-
-class TranslationError(Exception):
- pass
-
-def dump(obj, serialize_method=None, ignore_attribute=None, ignore=[]):
- if not serialize_method:
- serialize_method = config.serialize_method
- if not ignore_attribute:
- ignore_attribute = config.ignore_attribute
- obj_type = type(obj)
- # Parse / return default "types"...
- if obj_type in numeric_types+string_types+value_types:
- return obj
- if obj_type in iter_types:
- if obj_type in (types.ListType, types.TupleType):
- new_obj = []
- for item in obj:
- new_obj.append(dump(item, serialize_method,
- ignore_attribute, ignore))
- if obj_type is types.TupleType:
- new_obj = tuple(new_obj)
- return new_obj
- # It's a dict...
- else:
- new_obj = {}
- for key, value in obj.iteritems():
- new_obj[key] = dump(value, serialize_method,
- ignore_attribute, ignore)
- return new_obj
- # It's not a standard type, so it needs __jsonclass__
- module_name = inspect.getmodule(obj).__name__
- class_name = obj.__class__.__name__
- json_class = class_name
- if module_name not in ['', '__main__']:
- json_class = '%s.%s' % (module_name, json_class)
- return_obj = {"__jsonclass__":[json_class,]}
- # If a serialization method is defined..
- if serialize_method in dir(obj):
- # Params can be a dict (keyword) or list (positional)
- # Attrs MUST be a dict.
- serialize = getattr(obj, serialize_method)
- params, attrs = serialize()
- return_obj['__jsonclass__'].append(params)
- return_obj.update(attrs)
- return return_obj
- # Otherwise, try to figure it out
- # Obviously, we can't assume to know anything about the
- # parameters passed to __init__
- return_obj['__jsonclass__'].append([])
- attrs = {}
- ignore_list = getattr(obj, ignore_attribute, [])+ignore
- for attr_name, attr_value in obj.__dict__.iteritems():
- if type(attr_value) in supported_types and \
- attr_name not in ignore_list and \
- attr_value not in ignore_list:
- attrs[attr_name] = dump(attr_value, serialize_method,
- ignore_attribute, ignore)
- return_obj.update(attrs)
- return return_obj
-
-def load(obj):
- if type(obj) in string_types+numeric_types+value_types:
- return obj
- if type(obj) is types.ListType:
- return_list = []
- for entry in obj:
- return_list.append(load(entry))
- return return_list
- # Othewise, it's a dict type
- if '__jsonclass__' not in obj.keys():
- return_dict = {}
- for key, value in obj.iteritems():
- new_value = load(value)
- return_dict[key] = new_value
- return return_dict
- # It's a dict, and it's a __jsonclass__
- orig_module_name = obj['__jsonclass__'][0]
- params = obj['__jsonclass__'][1]
- if orig_module_name == '':
- raise TranslationError('Module name empty.')
- json_module_clean = re.sub(invalid_module_chars, '', orig_module_name)
- if json_module_clean != orig_module_name:
- raise TranslationError('Module name %s has invalid characters.' %
- orig_module_name)
- json_module_parts = json_module_clean.split('.')
- json_class = None
- if len(json_module_parts) == 1:
- # Local class name -- probably means it won't work
- if json_module_parts[0] not in config.classes.keys():
- raise TranslationError('Unknown class or module %s.' %
- json_module_parts[0])
- json_class = config.classes[json_module_parts[0]]
- else:
- json_class_name = json_module_parts.pop()
- json_module_tree = '.'.join(json_module_parts)
- try:
- temp_module = __import__(json_module_tree)
- except ImportError:
- raise TranslationError('Could not import %s from module %s.' %
- (json_class_name, json_module_tree))
-
- # The returned class is the top-level module, not the one we really
- # want. (E.g., if we import a.b.c, we now have a.) Walk through other
- # path components to get to b and c.
- for i in json_module_parts[1:]:
- temp_module = getattr(temp_module, i)
-
- json_class = getattr(temp_module, json_class_name)
- # Creating the object...
- new_obj = None
- if type(params) is types.ListType:
- new_obj = json_class(*params)
- elif type(params) is types.DictType:
- new_obj = json_class(**params)
- else:
- raise TranslationError('Constructor args must be a dict or list.')
- for key, value in obj.iteritems():
- if key == '__jsonclass__':
- continue
- setattr(new_obj, key, value)
- return new_obj
diff --git a/lib/jsonrpclib/jsonrpc.py b/lib/jsonrpclib/jsonrpc.py
deleted file mode 100644
index 5bde5510..00000000
--- a/lib/jsonrpclib/jsonrpc.py
+++ /dev/null
@@ -1,561 +0,0 @@
-"""
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-============================
-JSONRPC Library (jsonrpclib)
-============================
-
-This library is a JSON-RPC v.2 (proposed) implementation which
-follows the xmlrpclib API for portability between clients. It
-uses the same Server / ServerProxy, loads, dumps, etc. syntax,
-while providing features not present in XML-RPC like:
-
-* Keyword arguments
-* Notifications
-* Versioning
-* Batches and batch notifications
-
-Eventually, I'll add a SimpleXMLRPCServer compatible library,
-and other things to tie the thing off nicely. :)
-
-For a quick-start, just open a console and type the following,
-replacing the server address, method, and parameters
-appropriately.
->>> import jsonrpclib
->>> server = jsonrpclib.Server('http://localhost:8181')
->>> server.add(5, 6)
-11
->>> server._notify.add(5, 6)
->>> batch = jsonrpclib.MultiCall(server)
->>> batch.add(3, 50)
->>> batch.add(2, 3)
->>> batch._notify.add(3, 5)
->>> batch()
-[53, 5]
-
-See http://code.google.com/p/jsonrpclib/ for more info.
-"""
-
-import types
-import sys
-from xmlrpclib import Transport as XMLTransport
-from xmlrpclib import SafeTransport as XMLSafeTransport
-from xmlrpclib import ServerProxy as XMLServerProxy
-from xmlrpclib import _Method as XML_Method
-import time
-import string
-import random
-
-# Library includes
-import jsonrpclib
-from jsonrpclib import config
-from jsonrpclib import history
-
-# JSON library importing
-cjson = None
-json = None
-try:
- import cjson
-except ImportError:
- try:
- import json
- except ImportError:
- try:
- import simplejson as json
- except ImportError:
- raise ImportError(
- 'You must have the cjson, json, or simplejson ' +
- 'module(s) available.'
- )
-
-IDCHARS = string.ascii_lowercase+string.digits
-
-class UnixSocketMissing(Exception):
- """
- Just a properly named Exception if Unix Sockets usage is
- attempted on a platform that doesn't support them (Windows)
- """
- pass
-
-#JSON Abstractions
-
-def jdumps(obj, encoding='utf-8'):
- # Do 'serialize' test at some point for other classes
- global cjson
- if cjson:
- return cjson.encode(obj)
- else:
- return json.dumps(obj, encoding=encoding)
-
-def jloads(json_string):
- global cjson
- if cjson:
- return cjson.decode(json_string)
- else:
- return json.loads(json_string)
-
-
-# XMLRPClib re-implementations
-
-class ProtocolError(Exception):
- pass
-
-class TransportMixIn(object):
- """ Just extends the XMLRPC transport where necessary. """
- user_agent = config.user_agent
- # for Python 2.7 support
- _connection = None
-
- def send_content(self, connection, request_body):
- connection.putheader("Content-Type", "application/json-rpc")
- connection.putheader("Content-Length", str(len(request_body)))
- connection.endheaders()
- if request_body:
- connection.send(request_body)
-
- def getparser(self):
- target = JSONTarget()
- return JSONParser(target), target
-
-class JSONParser(object):
- def __init__(self, target):
- self.target = target
-
- def feed(self, data):
- self.target.feed(data)
-
- def close(self):
- pass
-
-class JSONTarget(object):
- def __init__(self):
- self.data = []
-
- def feed(self, data):
- self.data.append(data)
-
- def close(self):
- return ''.join(self.data)
-
-class Transport(TransportMixIn, XMLTransport):
- def __init__(self):
- TransportMixIn.__init__(self)
- XMLTransport.__init__(self)
-
-class SafeTransport(TransportMixIn, XMLSafeTransport):
- def __init__(self):
- TransportMixIn.__init__(self)
- XMLSafeTransport.__init__(self)
-
-from httplib import HTTP, HTTPConnection
-from socket import socket
-
-USE_UNIX_SOCKETS = False
-
-try:
- from socket import AF_UNIX, SOCK_STREAM
- USE_UNIX_SOCKETS = True
-except ImportError:
- pass
-
-if (USE_UNIX_SOCKETS):
-
- class UnixHTTPConnection(HTTPConnection):
- def connect(self):
- self.sock = socket(AF_UNIX, SOCK_STREAM)
- self.sock.connect(self.host)
-
- class UnixHTTP(HTTP):
- _connection_class = UnixHTTPConnection
-
- class UnixTransport(TransportMixIn, XMLTransport):
- def make_connection(self, host):
- import httplib
- host, extra_headers, x509 = self.get_host_info(host)
- return UnixHTTP(host)
-
-
-class ServerProxy(XMLServerProxy):
- """
- Unfortunately, much more of this class has to be copied since
- so much of it does the serialization.
- """
-
- def __init__(self, uri, transport=None, encoding=None,
- verbose=0, version=None):
- import urllib
- if not version:
- version = config.version
- self.__version = version
- schema, uri = urllib.splittype(uri)
- if schema not in ('http', 'https', 'unix'):
- raise IOError('Unsupported JSON-RPC protocol.')
- if schema == 'unix':
- if not USE_UNIX_SOCKETS:
- # Don't like the "generic" Exception...
- raise UnixSocketMissing("Unix sockets not available.")
- self.__host = uri
- self.__handler = '/'
- else:
- self.__host, self.__handler = urllib.splithost(uri)
- if not self.__handler:
- # Not sure if this is in the JSON spec?
- #self.__handler = '/'
- self.__handler == '/'
- if transport is None:
- if schema == 'unix':
- transport = UnixTransport()
- elif schema == 'https':
- transport = SafeTransport()
- else:
- transport = Transport()
- self.__transport = transport
- self.__encoding = encoding
- self.__verbose = verbose
-
- def _request(self, methodname, params, rpcid=None):
- request = dumps(params, methodname, encoding=self.__encoding,
- rpcid=rpcid, version=self.__version)
- response = self._run_request(request)
- check_for_errors(response)
- return response['result']
-
- def _request_notify(self, methodname, params, rpcid=None):
- request = dumps(params, methodname, encoding=self.__encoding,
- rpcid=rpcid, version=self.__version, notify=True)
- response = self._run_request(request, notify=True)
- check_for_errors(response)
- return
-
- def _run_request(self, request, notify=None):
- history.add_request(request)
-
- response = self.__transport.request(
- self.__host,
- self.__handler,
- request,
- verbose=self.__verbose
- )
-
- # Here, the XMLRPC library translates a single list
- # response to the single value -- should we do the
- # same, and require a tuple / list to be passed to
- # the response object, or expect the Server to be
- # outputting the response appropriately?
-
- history.add_response(response)
- if not response:
- return None
- return_obj = loads(response)
- return return_obj
-
- def __getattr__(self, name):
- # Same as original, just with new _Method reference
- return _Method(self._request, name)
-
- @property
- def _notify(self):
- # Just like __getattr__, but with notify namespace.
- return _Notify(self._request_notify)
-
-
-class _Method(XML_Method):
-
- def __call__(self, *args, **kwargs):
- if len(args) > 0 and len(kwargs) > 0:
- raise ProtocolError('Cannot use both positional ' +
- 'and keyword arguments (according to JSON-RPC spec.)')
- if len(args) > 0:
- return self.__send(self.__name, args)
- else:
- return self.__send(self.__name, kwargs)
-
- def __getattr__(self, name):
- self.__name = '%s.%s' % (self.__name, name)
- return self
- # The old method returned a new instance, but this seemed wasteful.
- # The only thing that changes is the name.
- #return _Method(self.__send, "%s.%s" % (self.__name, name))
-
-class _Notify(object):
- def __init__(self, request):
- self._request = request
-
- def __getattr__(self, name):
- return _Method(self._request, name)
-
-# Batch implementation
-
-class MultiCallMethod(object):
-
- def __init__(self, method, notify=False):
- self.method = method
- self.params = []
- self.notify = notify
-
- def __call__(self, *args, **kwargs):
- if len(kwargs) > 0 and len(args) > 0:
- raise ProtocolError('JSON-RPC does not support both ' +
- 'positional and keyword arguments.')
- if len(kwargs) > 0:
- self.params = kwargs
- else:
- self.params = args
-
- def request(self, encoding=None, rpcid=None):
- return dumps(self.params, self.method, version=2.0,
- encoding=encoding, rpcid=rpcid, notify=self.notify)
-
- def __repr__(self):
- return '%s' % self.request()
-
- def __getattr__(self, method):
- new_method = '%s.%s' % (self.method, method)
- self.method = new_method
- return self
-
-class MultiCallNotify(object):
-
- def __init__(self, multicall):
- self.multicall = multicall
-
- def __getattr__(self, name):
- new_job = MultiCallMethod(name, notify=True)
- self.multicall._job_list.append(new_job)
- return new_job
-
-class MultiCallIterator(object):
-
- def __init__(self, results):
- self.results = results
-
- def __iter__(self):
- for i in range(0, len(self.results)):
- yield self[i]
- raise StopIteration
-
- def __getitem__(self, i):
- item = self.results[i]
- check_for_errors(item)
- return item['result']
-
- def __len__(self):
- return len(self.results)
-
-class MultiCall(object):
-
- def __init__(self, server):
- self._server = server
- self._job_list = []
-
- def _request(self):
- if len(self._job_list) < 1:
- # Should we alert? This /is/ pretty obvious.
- return
- request_body = '[ %s ]' % ','.join([job.request() for
- job in self._job_list])
- responses = self._server._run_request(request_body)
- del self._job_list[:]
- if not responses:
- responses = []
- return MultiCallIterator(responses)
-
- @property
- def _notify(self):
- return MultiCallNotify(self)
-
- def __getattr__(self, name):
- new_job = MultiCallMethod(name)
- self._job_list.append(new_job)
- return new_job
-
- __call__ = _request
-
-# These lines conform to xmlrpclib's "compatibility" line.
-# Not really sure if we should include these, but oh well.
-Server = ServerProxy
-
-class Fault(object):
- # JSON-RPC error class
- def __init__(self, code=-32000, message='Server error', rpcid=None):
- self.faultCode = code
- self.faultString = message
- self.rpcid = rpcid
-
- def error(self):
- return {'code':self.faultCode, 'message':self.faultString}
-
- def response(self, rpcid=None, version=None):
- if not version:
- version = config.version
- if rpcid:
- self.rpcid = rpcid
- return dumps(
- self, methodresponse=True, rpcid=self.rpcid, version=version
- )
-
- def __repr__(self):
- return '' % (self.faultCode, self.faultString)
-
-def random_id(length=8):
- return_id = ''
- for i in range(length):
- return_id += random.choice(IDCHARS)
- return return_id
-
-class Payload(dict):
- def __init__(self, rpcid=None, version=None):
- if not version:
- version = config.version
- self.id = rpcid
- self.version = float(version)
-
- def request(self, method, params=[]):
- if type(method) not in types.StringTypes:
- raise ValueError('Method name must be a string.')
- if not self.id:
- self.id = random_id()
- request = { 'id':self.id, 'method':method }
- if params:
- request['params'] = params
- if self.version >= 2:
- request['jsonrpc'] = str(self.version)
- return request
-
- def notify(self, method, params=[]):
- request = self.request(method, params)
- if self.version >= 2:
- del request['id']
- else:
- request['id'] = None
- return request
-
- def response(self, result=None):
- response = {'result':result, 'id':self.id}
- if self.version >= 2:
- response['jsonrpc'] = str(self.version)
- else:
- response['error'] = None
- return response
-
- def error(self, code=-32000, message='Server error.'):
- error = self.response()
- if self.version >= 2:
- del error['result']
- else:
- error['result'] = None
- error['error'] = {'code':code, 'message':message}
- return error
-
-def dumps(params=[], methodname=None, methodresponse=None,
- encoding=None, rpcid=None, version=None, notify=None):
- """
- This differs from the Python implementation in that it implements
- the rpcid argument since the 2.0 spec requires it for responses.
- """
- if not version:
- version = config.version
- valid_params = (types.TupleType, types.ListType, types.DictType)
- if methodname in types.StringTypes and \
- type(params) not in valid_params and \
- not isinstance(params, Fault):
- """
- If a method, and params are not in a listish or a Fault,
- error out.
- """
- raise TypeError('Params must be a dict, list, tuple or Fault ' +
- 'instance.')
- # Begin parsing object
- payload = Payload(rpcid=rpcid, version=version)
- if not encoding:
- encoding = 'utf-8'
- if type(params) is Fault:
- response = payload.error(params.faultCode, params.faultString)
- return jdumps(response, encoding=encoding)
- if type(methodname) not in types.StringTypes and methodresponse != True:
- raise ValueError('Method name must be a string, or methodresponse '+
- 'must be set to True.')
- if config.use_jsonclass == True:
- from jsonrpclib import jsonclass
- params = jsonclass.dump(params)
- if methodresponse is True:
- if rpcid is None:
- raise ValueError('A method response must have an rpcid.')
- response = payload.response(params)
- return jdumps(response, encoding=encoding)
- request = None
- if notify == True:
- request = payload.notify(methodname, params)
- else:
- request = payload.request(methodname, params)
- return jdumps(request, encoding=encoding)
-
-def loads(data):
- """
- This differs from the Python implementation, in that it returns
- the request structure in Dict format instead of the method, params.
- It will return a list in the case of a batch request / response.
- """
- if data == '':
- # notification
- return None
- result = jloads(data)
- # if the above raises an error, the implementing server code
- # should return something like the following:
- # { 'jsonrpc':'2.0', 'error': fault.error(), id: None }
- if config.use_jsonclass == True:
- from jsonrpclib import jsonclass
- result = jsonclass.load(result)
- return result
-
-def check_for_errors(result):
- if not result:
- # Notification
- return result
- if type(result) is not types.DictType:
- raise TypeError('Response is not a dict.')
- if 'jsonrpc' in result.keys() and float(result['jsonrpc']) > 2.0:
- raise NotImplementedError('JSON-RPC version not yet supported.')
- if 'result' not in result.keys() and 'error' not in result.keys():
- raise ValueError('Response does not have a result or error key.')
- if 'error' in result.keys() and result['error'] != None:
- code = result['error']['code']
- message = result['error']['message']
- raise ProtocolError((code, message))
- return result
-
-def isbatch(result):
- if type(result) not in (types.ListType, types.TupleType):
- return False
- if len(result) < 1:
- return False
- if type(result[0]) is not types.DictType:
- return False
- if 'jsonrpc' not in result[0].keys():
- return False
- try:
- version = float(result[0]['jsonrpc'])
- except ValueError:
- raise ProtocolError('"jsonrpc" key must be a float(able) value.')
- if version < 2:
- return False
- return True
-
-def isnotification(request):
- if 'id' not in request.keys():
- # 2.0 notification
- return True
- if request['id'] == None:
- # 1.0 notification
- return True
- return False
diff --git a/readme.md b/readme.md
index ed6c09ae..63095a3a 100644
--- a/readme.md
+++ b/readme.md
@@ -55,7 +55,7 @@ Some of our innovative features;
## Required software
-* Python 2.6+
+* Python 2.7.9+ (earlier versions must be used with a current version of openssl)
* Cheetah 2.1.0+
## Howto
@@ -90,7 +90,6 @@ Finally, a massive thanks to all those that remain in the shadows, the quiet one
* Support
* Please note that, aside from bug reports, we do *not* offer support. We can offer some help, but we really need you to understand the basics of your Linux or Windows OS. If you do not understand basics such as locating a database file, not running as root, setting up file permissions, or claiming a user derp, then we really cannot help you!
* IRC: `irc.freenode.net` channel `#SickGear`
- * Webchat IRC: [webchat link](http://webchat.freenode.net/?channels=SickGear)
## Screenies
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 0ead3e49..0158628f 100755
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -32,21 +32,16 @@ import os.path
import uuid
import base64
sys.path.insert(1, os.path.abspath('../lib'))
-from sickbeard import providers, metadata, config, webserveInit, searchBacklog, showUpdater, versionChecker, \
- autoPostProcesser, subtitles, traktChecker, helpers, db, exceptions, show_queue, search_queue, scheduler, \
- show_name_helpers, logger, naming, searchRecent, searchProper, scene_numbering, scene_exceptions, name_cache
-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, \
- bitsoup, tokyotoshokan, animenzb, rarbg, morethan, alpharatio, pisexy, torrentshack, torrenting, funfile
-from sickbeard.config import CheckSection, check_setting_int, check_setting_str, check_setting_float, ConfigMigrator, \
- naming_ep_type, minimax
+from sickbeard import helpers, logger, db, naming, metadata, providers, scene_exceptions, scene_numbering, \
+ scheduler, auto_post_processer, search_queue, search_propers, search_recent, search_backlog, \
+ show_queue, show_updater, subtitles, traktChecker, version_checker
+from sickbeard.config import CheckSection, check_setting_int, check_setting_str, ConfigMigrator, minimax
+from sickbeard.common import SD, SKIPPED
+from sickbeard.databases import mainDB, cache_db, failed_db
from indexers.indexer_api import indexerApi
from indexers.indexer_exceptions import indexer_shownotfound, indexer_exception, indexer_error, \
indexer_episodenotfound, indexer_attributenotfound, indexer_seasonnotfound, indexer_userabort, indexerExcepts
-from sickbeard.common import SD, SKIPPED, NAMING_REPEAT
-from sickbeard.databases import mainDB, cache_db, failed_db
-
+from sickbeard.providers.generic import GenericProvider
from lib.configobj import ConfigObj
PID = None
@@ -1020,7 +1015,7 @@ def initialize(consoleLogging=True):
if hasattr(torrent_prov, 'options'):
torrent_prov.options = check_setting_str(CFG, prov_id_uc, prov_id + '_options', '')
if hasattr(torrent_prov, '_seed_ratio'):
- torrent_prov._seed_ratio = check_setting_str(CFG, prov_id_uc, prov_id + '_seed_ratio', '')
+ torrent_prov._seed_ratio = check_setting_str(CFG, prov_id_uc, prov_id + '_seed_ratio', '').replace('None', '')
if hasattr(torrent_prov, 'seed_time'):
torrent_prov.seed_time = check_setting_int(CFG, prov_id_uc, prov_id + '_seed_time', '')
if hasattr(torrent_prov, 'minseed'):
@@ -1029,6 +1024,8 @@ def initialize(consoleLogging=True):
torrent_prov.minleech = check_setting_int(CFG, prov_id_uc, prov_id + '_minleech', 0)
if hasattr(torrent_prov, 'freeleech'):
torrent_prov.freeleech = bool(check_setting_int(CFG, prov_id_uc, prov_id + '_freeleech', 0))
+ if hasattr(torrent_prov, 'reject_m2ts'):
+ torrent_prov.reject_m2ts = bool(check_setting_int(CFG, prov_id_uc, prov_id + '_reject_m2ts', 0))
if hasattr(torrent_prov, 'enable_recentsearch'):
torrent_prov.enable_recentsearch = bool(check_setting_int(CFG, prov_id_uc,
prov_id + '_enable_recentsearch', 1))
@@ -1105,7 +1102,7 @@ def initialize(consoleLogging=True):
# initialize schedulers
# updaters
update_now = datetime.timedelta(minutes=0)
- versionCheckScheduler = scheduler.Scheduler(versionChecker.CheckVersion(),
+ versionCheckScheduler = scheduler.Scheduler(version_checker.CheckVersion(),
cycleTime=datetime.timedelta(hours=UPDATE_FREQUENCY),
threadName='CHECKVERSION',
silent=False)
@@ -1114,7 +1111,7 @@ def initialize(consoleLogging=True):
cycleTime=datetime.timedelta(seconds=3),
threadName='SHOWQUEUE')
- showUpdateScheduler = scheduler.Scheduler(showUpdater.ShowUpdater(),
+ showUpdateScheduler = scheduler.Scheduler(show_updater.ShowUpdater(),
cycleTime=datetime.timedelta(hours=1),
threadName='SHOWUPDATER',
start_time=datetime.time(hour=SHOW_UPDATE_HOUR),
@@ -1126,19 +1123,19 @@ def initialize(consoleLogging=True):
threadName='SEARCHQUEUE')
update_interval = datetime.timedelta(minutes=RECENTSEARCH_FREQUENCY)
- recentSearchScheduler = scheduler.Scheduler(searchRecent.RecentSearcher(),
+ recentSearchScheduler = scheduler.Scheduler(search_recent.RecentSearcher(),
cycleTime=update_interval,
threadName='RECENTSEARCHER',
run_delay=update_now if RECENTSEARCH_STARTUP
else datetime.timedelta(minutes=5),
prevent_cycle_run=searchQueueScheduler.action.is_recentsearch_in_progress)
- backlogSearchScheduler = searchBacklog.BacklogSearchScheduler(searchBacklog.BacklogSearcher(),
- cycleTime=datetime.timedelta(minutes=get_backlog_cycle_time()),
- threadName='BACKLOG',
- run_delay=update_now if BACKLOG_STARTUP
- else datetime.timedelta(minutes=10),
- prevent_cycle_run=searchQueueScheduler.action.is_standard_backlog_in_progress)
+ backlogSearchScheduler = search_backlog.BacklogSearchScheduler(search_backlog.BacklogSearcher(),
+ cycleTime=datetime.timedelta(minutes=get_backlog_cycle_time()),
+ threadName='BACKLOG',
+ run_delay=update_now if BACKLOG_STARTUP
+ else datetime.timedelta(minutes=10),
+ prevent_cycle_run=searchQueueScheduler.action.is_standard_backlog_in_progress)
search_intervals = {'15m': 15, '45m': 45, '90m': 90, '4h': 4 * 60, 'daily': 24 * 60}
if CHECK_PROPERS_INTERVAL in search_intervals:
@@ -1148,7 +1145,7 @@ def initialize(consoleLogging=True):
update_interval = datetime.timedelta(hours=1)
run_at = datetime.time(hour=1) # 1 AM
- properFinderScheduler = scheduler.Scheduler(searchProper.ProperSearcher(),
+ properFinderScheduler = scheduler.Scheduler(search_propers.ProperSearcher(),
cycleTime=update_interval,
threadName='FINDPROPERS',
start_time=run_at,
@@ -1156,7 +1153,7 @@ def initialize(consoleLogging=True):
prevent_cycle_run=searchQueueScheduler.action.is_propersearch_in_progress)
# processors
- autoPostProcesserScheduler = scheduler.Scheduler(autoPostProcesser.PostProcesser(),
+ autoPostProcesserScheduler = scheduler.Scheduler(auto_post_processer.PostProcesser(),
cycleTime=datetime.timedelta(
minutes=AUTOPOSTPROCESSER_FREQUENCY),
threadName='POSTPROCESSER',
@@ -1335,12 +1332,12 @@ def halt():
def sig_handler(signum=None, frame=None):
- if type(signum) != type(None):
+ if isinstance(signum, type(None)):
logger.log(u'Signal %i caught, saving and exiting...' % int(signum))
events.put(events.SystemEvent.SHUTDOWN)
-def saveAll():
+def save_all():
global showList
# write all shows
@@ -1356,7 +1353,7 @@ def saveAll():
def restart(soft=True):
if soft:
halt()
- saveAll()
+ save_all()
logger.log(u'Re-initializing all data')
initialize()
else:
@@ -1515,6 +1512,8 @@ def save_config():
new_config[prov_id_uc][prov_id + '_minleech'] = int(torrent_prov.minleech)
if hasattr(torrent_prov, 'freeleech'):
new_config[prov_id_uc][prov_id + '_freeleech'] = int(torrent_prov.freeleech)
+ if hasattr(torrent_prov, 'reject_m2ts'):
+ new_config[prov_id_uc][prov_id + '_reject_m2ts'] = int(torrent_prov.reject_m2ts)
if hasattr(torrent_prov, 'enable_recentsearch'):
new_config[prov_id_uc][prov_id + '_enable_recentsearch'] = int(torrent_prov.enable_recentsearch)
if hasattr(torrent_prov, 'enable_backlog'):
@@ -1799,7 +1798,7 @@ def save_config():
new_config.write()
-def launchBrowser(start_port=None):
+def launch_browser(start_port=None):
if not start_port:
start_port = WEB_PORT
if ENABLE_HTTPS:
diff --git a/sickbeard/autoPostProcesser.py b/sickbeard/auto_post_processer.py
similarity index 98%
rename from sickbeard/autoPostProcesser.py
rename to sickbeard/auto_post_processer.py
index 5406b5ac..e888fb45 100644
--- a/sickbeard/autoPostProcesser.py
+++ b/sickbeard/auto_post_processer.py
@@ -45,4 +45,4 @@ class PostProcesser():
processTV.processDir(sickbeard.TV_DOWNLOAD_DIR)
- self.amActive = False
\ No newline at end of file
+ self.amActive = False
diff --git a/sickbeard/bs4_parser.py b/sickbeard/bs4_parser.py
index bd48f50d..76735e34 100644
--- a/sickbeard/bs4_parser.py
+++ b/sickbeard/bs4_parser.py
@@ -1,4 +1,5 @@
from bs4 import BeautifulSoup
+import re
class BS4Parser:
@@ -12,6 +13,11 @@ class BS4Parser:
kwargs_new[k] = v
+ tag, attr = [x in kwargs_new and kwargs_new.pop(x) or y for (x, y) in [('tag', 'table'), ('attr', '')]]
+ if attr:
+ args = (re.sub(r'(?is).*(<%(tag)s[^>]+%(attr)s[^>]*>.*).*' % {'tag': tag, 'attr': attr},
+ r'\1', args[0]).strip(),) + args[1:]
+
self.soup = BeautifulSoup(*args, **kwargs_new)
def __enter__(self):
diff --git a/sickbeard/clients/rtorrent.py b/sickbeard/clients/rtorrent.py
index a1fc7969..5e8e1fca 100644
--- a/sickbeard/clients/rtorrent.py
+++ b/sickbeard/clients/rtorrent.py
@@ -16,12 +16,9 @@
# You should have received a copy of the GNU General Public License
# along with SickGear. If not, see
-# URL: http://code.google.com/p/sickbeard/
-#
-# This file is part of Sick Beard.
-#
-# Sick Beard 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.
-#
-# Sick Beard 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 Sick Beard. If not, see - tag of the RSS feed
-
- Returns a Quality value obtained from the node's data
+
+ Returns a Quality value obtained from the node's data
"""
- (title, url) = self._get_title_and_url(item) # @UnusedVariable
+ (title, url) = self._title_and_url(item) # @UnusedVariable
quality = Quality.sceneQuality(title, anime)
return quality
- def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _search_provider(self, search_params, search_mode='eponly', epcount=0, age=0):
return []
- def _get_season_search_strings(self, episode):
+ def _season_strings(self, episode):
return []
- def _get_episode_search_strings(self, *args, **kwargs):
+ def _episode_strings(self, *args, **kwargs):
return []
- def _get_title_and_url(self, item):
+ def _title_and_url(self, item):
"""
Retrieves the title and URL data from the item
@@ -267,25 +272,14 @@ class GenericProvider:
"""
title, url = None, None
-
try:
- if isinstance(item, tuple):
- title = item[0]
- url = item[1]
- else:
- if 'title' in item:
- title = item.title
-
- if 'link' in item:
- url = item.link
+ title, url = isinstance(item, tuple) and (item[0], item[1]) or \
+ (item.get('title', None), item.get('link', None))
except Exception:
pass
- if title:
- title = re.sub(r'\s+', '.', u'%s' % title)
-
- if url:
- url = str(url).replace('&', '&')
+ title = title and re.sub(r'\s+', '.', u'%s' % title)
+ url = url and str(url).replace('&', '&')
return title, url
@@ -310,21 +304,21 @@ class GenericProvider:
# found result, search next episode
continue
- # skip if season already searched
- if 1 < len(episodes) and ep_obj.scene_season == searched_scene_season:
- continue
-
- # mark season searched for season pack searches so we can skip later on
- searched_scene_season = ep_obj.scene_season
-
if 'sponly' == search_mode:
- # get season search results
- for curString in self._get_season_search_strings(ep_obj):
- item_list += self._do_search(curString, search_mode, len(episodes))
+ # skip if season already searched
+ if 1 < len(episodes) and searched_scene_season == ep_obj.scene_season:
+ continue
+
+ searched_scene_season = ep_obj.scene_season
+
+ # get season search params
+ search_params = self._season_strings(ep_obj)
else:
- # get single episode search results
- for curString in self._get_episode_search_strings(ep_obj):
- item_list += self._do_search(curString, 'eponly', len(episodes))
+ # get single episode search params
+ search_params = self._episode_strings(ep_obj)
+
+ for cur_param in search_params:
+ item_list += self._search_provider(cur_param, search_mode=search_mode, epcount=len(episodes))
# if we found what we needed already from cache then return results and exit
if len(results) == len(episodes):
@@ -349,18 +343,18 @@ class GenericProvider:
# filter results
cl = []
+ parser = NameParser(False, convert=True)
for item in item_list:
- (title, url) = self._get_title_and_url(item)
+ (title, url) = self._title_and_url(item)
# parse the file name
try:
- parser = NameParser(False, convert=True)
parse_result = parser.parse(title)
except InvalidNameException:
- logger.log(u'Unable to parse the filename ' + title + ' into a valid episode', logger.DEBUG)
+ logger.log(u'Unable to parse the filename %s into a valid episode' % title, logger.DEBUG)
continue
except InvalidShowException:
- logger.log(u'No show name or scene exception matched the parsed filename ' + title, logger.DEBUG)
+ logger.log(u'No match for search criteria in the parsed filename ' + title, logger.DEBUG)
continue
show_obj = parse_result.show
@@ -372,28 +366,28 @@ class GenericProvider:
if not (show_obj.air_by_date or show_obj.is_sports):
if 'sponly' == search_mode:
if len(parse_result.episode_numbers):
- logger.log(u'This is supposed to be a season pack search but the result ' + title
- + u' is not a valid season pack, skipping it', logger.DEBUG)
+ logger.log(u'This is supposed to be a season pack search but the result ' + title +
+ u' is not a valid season pack, skipping it', logger.DEBUG)
add_cache_entry = True
if len(parse_result.episode_numbers)\
- and (parse_result.season_number not in set([ep.season for ep in episodes])
- or not [ep for ep in episodes if ep.scene_episode in parse_result.episode_numbers]):
- logger.log(u'The result ' + title + u' doesn\'t seem to be a valid episode that we are trying'
- + u' to snatch, ignoring', logger.DEBUG)
+ and (parse_result.season_number not in set([ep.season for ep in episodes]) or not [
+ ep for ep in episodes if ep.scene_episode in parse_result.episode_numbers]):
+ logger.log(u'The result ' + title + u' doesn\'t seem to be a valid episode that we are trying' +
+ u' to snatch, ignoring', logger.DEBUG)
add_cache_entry = True
else:
if not len(parse_result.episode_numbers)\
and parse_result.season_number\
and not [ep for ep in episodes
- if ep.season == parse_result.season_number
- and ep.episode in parse_result.episode_numbers]:
- logger.log(u'The result ' + title + u' doesn\'t seem to be a valid season that we are trying'
- + u' to snatch, ignoring', logger.DEBUG)
+ if ep.season == parse_result.season_number and
+ ep.episode in parse_result.episode_numbers]:
+ logger.log(u'The result ' + title + u' doesn\'t seem to be a valid season that we are trying' +
+ u' to snatch, ignoring', logger.DEBUG)
add_cache_entry = True
elif len(parse_result.episode_numbers) and not [ep for ep in episodes if
ep.season == parse_result.season_number and ep.episode in parse_result.episode_numbers]:
- logger.log(u'The result ' + title + ' doesn\'t seem to be a valid episode that we are trying'
- + u' to snatch, ignoring', logger.DEBUG)
+ logger.log(u'The result ' + title + ' doesn\'t seem to be a valid episode that we are trying' +
+ u' to snatch, ignoring', logger.DEBUG)
add_cache_entry = True
if not add_cache_entry:
@@ -402,8 +396,8 @@ class GenericProvider:
actual_episodes = parse_result.episode_numbers
else:
if not parse_result.is_air_by_date:
- logger.log(u'This is supposed to be a date search but the result ' + title
- + u' didn\'t parse as one, skipping it', logger.DEBUG)
+ logger.log(u'This is supposed to be a date search but the result ' + title +
+ u' didn\'t parse as one, skipping it', logger.DEBUG)
add_cache_entry = True
else:
airdate = parse_result.air_date.toordinal()
@@ -412,8 +406,8 @@ class GenericProvider:
[show_obj.indexerid, airdate])
if 1 != len(sql_results):
- logger.log(u'Tried to look up the date for the episode ' + title + ' but the database didn\'t'
- + u' give proper results, skipping it', logger.WARNING)
+ logger.log(u'Tried to look up the date for the episode ' + title + ' but the database didn\'t' +
+ u' give proper results, skipping it', logger.WARNING)
add_cache_entry = True
if not add_cache_entry:
@@ -462,8 +456,8 @@ class GenericProvider:
logger.log(u'Single episode result.', logger.DEBUG)
elif 1 < len(ep_obj):
ep_num = MULTI_EP_RESULT
- logger.log(u'Separating multi-episode result to check for later - result contains episodes: '
- + str(parse_result.episode_numbers), logger.DEBUG)
+ logger.log(u'Separating multi-episode result to check for later - result contains episodes: ' +
+ str(parse_result.episode_numbers), logger.DEBUG)
elif 0 == len(ep_obj):
ep_num = SEASON_RESULT
logger.log(u'Separating full season result to check for later', logger.DEBUG)
@@ -480,7 +474,7 @@ class GenericProvider:
return results
- def find_propers(self, search_date=None):
+ def find_propers(self, search_date=None, **kwargs):
results = self.cache.listPropers(search_date)
@@ -494,16 +488,25 @@ class GenericProvider:
"""
return ''
- @staticmethod
- def _log_result(mode='cache', count=0, url='url missing'):
+ def _log_search(self, mode='Cache', count=0, url='url missing'):
"""
- Simple function to log the result of a search
+ Simple function to log the result of a search types except propers
:param count: count of successfully processed items
:param url: source url of item(s)
"""
- mode = mode.lower()
- logger.log(u'%s in response from %s' % (('No %s items' % mode,
- '%s %s item%s' % (count, mode, maybe_plural(count)))[0 < count], url))
+ if 'Propers' != mode:
+ self.log_result(mode, count, url)
+
+ def log_result(self, mode='Cache', count=0, url='url missing'):
+ """
+ Simple function to log the result of any search
+ :param count: count of successfully processed items
+ :param url: source url of item(s)
+ """
+ str1, thing, str3 = (('', '%s item' % mode.lower(), ''), (' usable', 'proper', ' found'))['Propers' == mode]
+ logger.log(u'%s %s in response from %s' % (('No' + str1, count)[0 < count], (
+ '%s%s%s%s' % (('', 'freeleech ')[getattr(self, 'freeleech', False)], thing, maybe_plural(count), str3)),
+ re.sub('(\s)\s+', r'\1', url)))
def check_auth_cookie(self):
@@ -529,8 +532,34 @@ class GenericProvider:
return False, 'Cookies not correctly formatted key=value pairs e.g. uid=xx;pass=yy)'
+ def has_all_cookies(self, cookies=None, pre=''):
-class NZBProvider(GenericProvider):
+ cookies = cookies or ['uid', 'pass']
+ return False not in ['%s%s' % (pre, item) in self.session.cookies for item in ([cookies], cookies)[isinstance(cookies, list)]]
+
+ def _categories_string(self, mode='Cache', template='c%s=1', delimiter='&'):
+
+ return delimiter.join([('%s', template)[any(template)] % c for c in sorted(self.categories['shows'] + (
+ [], [] if 'anime' not in self.categories else self.categories['anime'])[
+ ('Cache' == mode and helpers.has_anime()) or ((mode in ['Season', 'Episode']) and self.show and self.show.is_anime)])])
+
+ @staticmethod
+ def _bytesizer(size_dim=''):
+
+ try:
+ value = float('.'.join(re.findall('(?i)(\d+)(?:[\.,](\d+))?', size_dim)[0]))
+ except TypeError:
+ return size_dim
+ except IndexError:
+ return None
+ try:
+ value *= 1024 ** ['b', 'k', 'm', 'g', 't'].index(re.findall('(t|g|m|k)[i]?b', size_dim.lower())[0])
+ except IndexError:
+ pass
+ return int(math.ceil(value))
+
+
+class NZBProvider(object, GenericProvider):
def __init__(self, name, supports_backlog=True, anime_only=False):
GenericProvider.__init__(self, name, supports_backlog, anime_only)
@@ -543,7 +572,7 @@ class NZBProvider(GenericProvider):
def maybe_apikey(self):
- if hasattr(self, 'needs_auth'):
+ if hasattr(self, 'needs_auth') and self.needs_auth:
if hasattr(self, 'key') and 0 < len(self.key):
return self.key
if hasattr(self, 'api_key') and 0 < len(self.api_key):
@@ -562,7 +591,7 @@ class NZBProvider(GenericProvider):
return GenericProvider._check_auth(self)
- def _find_propers(self, search_date=None):
+ def find_propers(self, search_date=None, shows=None, anime=None, **kwargs):
cache_results = self.cache.listPropers(search_date)
results = [classes.Proper(x['name'], x['url'], datetime.datetime.fromtimestamp(x['time']), self.show) for x in
@@ -573,11 +602,20 @@ class NZBProvider(GenericProvider):
term_items_found = False
do_search_alt = False
- search_terms = ['.proper.', '.repack.']
- proper_check = re.compile(r'(?i)\b(proper)|(repack)\b')
+ search_terms = []
+ regex = []
+ if shows:
+ search_terms += ['.proper.', '.repack.']
+ regex += ['proper|repack']
+ proper_check = re.compile(r'(?i)(\b%s\b)' % '|'.join(regex))
+ if anime:
+ terms = 'v1|v2|v3|v4|v5'
+ search_terms += [terms]
+ regex += [terms]
+ proper_check = re.compile(r'(?i)(%s)' % '|'.join(regex))
while index < len(search_terms):
- search_params = {'q': search_terms[index]}
+ search_params = {'q': search_terms[index], 'maxage': 4}
if alt_search:
if do_search_alt:
@@ -595,9 +633,9 @@ class NZBProvider(GenericProvider):
else:
index += 1
- for item in self._do_search(search_params, age=4):
+ for item in self._search_provider({'Propers': [search_params]}):
- (title, url) = self._get_title_and_url(item)
+ (title, url) = self._title_and_url(item)
if not proper_check.search(title):
continue
@@ -620,8 +658,13 @@ class NZBProvider(GenericProvider):
return results
+ def cache_data(self, *args, **kwargs):
-class TorrentProvider(GenericProvider):
+ search_params = {'Cache': [{}]}
+ return self._search_provider(search_params)
+
+
+class TorrentProvider(object, GenericProvider):
def __init__(self, name, supports_backlog=True, anime_only=False):
GenericProvider.__init__(self, name, supports_backlog, anime_only)
@@ -639,12 +682,21 @@ class TorrentProvider(GenericProvider):
return self._seed_ratio
+ @staticmethod
+ def _sort_seeders(mode, items):
+
+ mode in ['Season', 'Episode'] and items[mode].sort(key=lambda tup: tup[2], reverse=True)
+
+ def _peers_fail(self, mode, seeders=0, leechers=0):
+
+ return 'Cache' != mode and (seeders < getattr(self, 'minseed', 0) or leechers < getattr(self, 'minleech', 0))
+
def get_quality(self, item, anime=False):
if isinstance(item, tuple):
name = item[0]
elif isinstance(item, dict):
- name, url = self._get_title_and_url(item)
+ name, url = self._title_and_url(item)
else:
name = item.title
return Quality.sceneQuality(name, anime)
@@ -664,51 +716,59 @@ class TorrentProvider(GenericProvider):
Quality.FULLHDBLURAY: '1080p Bluray x264'
}.get(quality, '')
- def _get_season_search_strings(self, ep_obj, detail_only=False, scene=True):
-
- if ep_obj.show.air_by_date or ep_obj.show.is_sports:
- ep_detail = str(ep_obj.airdate).split('-')[0]
- elif ep_obj.show.is_anime:
- ep_detail = ep_obj.scene_absolute_number
- else:
- ep_detail = 'S%02d' % int((ep_obj.season, ep_obj.scene_season)[bool(ep_obj.show.is_scene)])
-
- detail = ({}, {'Season_only': [ep_detail]})[detail_only and not self.show.is_sports and not self.show.is_anime]
- return [dict({'Season': self._build_search_strings(ep_detail, scene)}.items() + detail.items())]
-
- def _get_episode_search_strings(self, ep_obj, add_string='', detail_only=False, scene=True, sep_date=' ', use_or=True):
+ def _season_strings(self, ep_obj, detail_only=False, scene=True, prefix='', **kwargs):
if not ep_obj:
return []
- if self.show.air_by_date or self.show.is_sports:
- ep_detail = str(ep_obj.airdate).replace('-', sep_date)
- if self.show.is_sports:
- month = ep_obj.airdate.strftime('%b')
- ep_detail = ([ep_detail] + [month], '%s|%s' % (ep_detail, month))[use_or]
- elif self.show.is_anime:
- ep_detail = ep_obj.scene_absolute_number
- else:
- season, episode = ((ep_obj.season, ep_obj.episode),
- (ep_obj.scene_season, ep_obj.scene_episode))[bool(ep_obj.show.is_scene)]
- ep_dict = {'seasonnumber': season, 'episodenumber': episode}
- ep_detail = sickbeard.config.naming_ep_type[2] % ep_dict
- append = (add_string, '')[self.show.is_anime]
- detail = ({}, {'Episode_only': [ep_detail]})[detail_only and not self.show.is_sports and not self.show.is_anime]
- return [dict({'Episode': self._build_search_strings(ep_detail, scene, append)}.items() + detail.items())]
+ show = ep_obj.show
+ ep_dict = self._ep_dict(ep_obj)
+ sp_detail = (show.air_by_date or show.is_sports) and str(ep_obj.airdate).split('-')[0] or \
+ (show.is_anime and ep_obj.scene_absolute_number or
+ 'S%(seasonnumber)02d' % ep_dict if 'sp_detail' not in kwargs.keys() else kwargs['sp_detail'](ep_dict))
+ sp_detail = ([sp_detail], sp_detail)[isinstance(sp_detail, list)]
+ detail = ({}, {'Season_only': sp_detail})[detail_only and not self.show.is_sports and not self.show.is_anime]
+ return [dict({'Season': self._build_search_strings(sp_detail, scene, prefix)}.items() + detail.items())]
- def _build_search_strings(self, ep_detail, process_name=True, append=''):
+ def _episode_strings(self, ep_obj, detail_only=False, scene=True, prefix='', sep_date=' ', date_or=False, **kwargs):
+
+ if not ep_obj:
+ return []
+
+ show = ep_obj.show
+ if show.air_by_date or show.is_sports:
+ ep_detail = [str(ep_obj.airdate).replace('-', sep_date)]\
+ if 'date_detail' not in kwargs.keys() else kwargs['date_detail'](ep_obj.airdate)
+ if show.is_sports:
+ month = ep_obj.airdate.strftime('%b')
+ ep_detail = (ep_detail + [month], ['%s|%s' % (x, month) for x in ep_detail])[date_or]
+ elif show.is_anime:
+ ep_detail = ep_obj.scene_absolute_number \
+ if 'ep_detail_anime' not in kwargs.keys() else kwargs['ep_detail_anime'](ep_obj.scene_absolute_number)
+ else:
+ ep_dict = self._ep_dict(ep_obj)
+ ep_detail = sickbeard.config.naming_ep_type[2] % ep_dict \
+ if 'ep_detail' not in kwargs.keys() else kwargs['ep_detail'](ep_dict)
+ ep_detail = ([ep_detail], ep_detail)[isinstance(ep_detail, list)]
+ detail = ({}, {'Episode_only': ep_detail})[detail_only and not show.is_sports and not show.is_anime]
+ return [dict({'Episode': self._build_search_strings(ep_detail, scene, prefix)}.items() + detail.items())]
+
+ @staticmethod
+ def _ep_dict(ep_obj):
+ season, episode = ((ep_obj.season, ep_obj.episode),
+ (ep_obj.scene_season, ep_obj.scene_episode))[bool(ep_obj.show.is_scene)]
+ return {'seasonnumber': season, 'episodenumber': episode}
+
+ def _build_search_strings(self, ep_detail, process_name=True, prefix=''):
"""
Build a list of search strings for querying a provider
:param ep_detail: String of episode detail or List of episode details
:param process_name: Bool Whether to call sanitizeSceneName() on show name
- :param append: String to append to search strings
+ :param prefix: String to insert to search strings
:return: List of search string parameters
"""
- if not isinstance(ep_detail, list):
- ep_detail = [ep_detail]
- if not isinstance(append, list):
- append = [append]
+ ep_detail = ([ep_detail], ep_detail)[isinstance(ep_detail, list)]
+ prefix = ([prefix], prefix)[isinstance(prefix, list)]
search_params = []
crop = re.compile(r'([\.\s])(?:\1)+')
@@ -716,9 +776,71 @@ class TorrentProvider(GenericProvider):
if process_name:
name = helpers.sanitizeSceneName(name)
for detail in ep_detail:
- search_params += [crop.sub(r'\1', '%s %s' % (name, detail) + ('', ' ' + x)[any(x)]) for x in append]
+ search_params += [crop.sub(r'\1', '%s %s%s' % (name, x, detail)) for x in prefix]
return search_params
+ def _authorised(self, logged_in=None, post_params=None, failed_msg=None, url=None, timeout=30):
+
+ maxed_out = (lambda x: re.search(r'(?i)[1-3]((<[^>]+>)|\W)*(attempts|tries|remain)[\W\w]{,40}?(remain|left|attempt)', x))
+ logged_in, failed_msg = [None is not a and a or b for (a, b) in (
+ (logged_in, (lambda x=None: self.has_all_cookies())),
+ (failed_msg, (lambda x='': maxed_out(x) and u'Urgent abort, running low on login attempts. Password flushed to prevent service disruption to %s.' or
+ (re.search(r'(?i)(username|password)((<[^>]+>)|\W)*(or|and|/|\s)((<[^>]+>)|\W)*(password|incorrect)', x) and
+ u'Invalid username or password for %s. Check settings' or
+ u'Failed to authenticate or parse a response from %s, abort provider')))
+ )]
+
+ if logged_in():
+ return True
+
+ if hasattr(self, 'digest'):
+ self.cookies = re.sub(r'(?i)([\s\']+|cookie\s*:)', '', self.digest)
+ success, msg = self._check_cookie()
+ if not success:
+ self.cookies = None
+ logger.log(u'%s: [%s]' % (msg, self.cookies), logger.WARNING)
+ return False
+ elif not self._check_auth():
+ return False
+
+ if isinstance(url, type([])):
+ for i in range(0, len(url)):
+ helpers.getURL(url.pop(), session=self.session)
+
+ if not url:
+ if hasattr(self, 'urls'):
+ url = self.urls.get('login_action')
+ if url:
+ response = helpers.getURL(url, session=self.session)
+ try:
+ action = re.findall('[<]form[\w\W]+?action="([^"]+)', response)[0]
+ url = self.urls['config_provider_home_uri'] + action.lstrip('/')
+ except KeyError:
+ return super(TorrentProvider, self)._authorised()
+ else:
+ url = self.urls.get('login')
+ if not url:
+ return super(TorrentProvider, self)._authorised()
+
+ if hasattr(self, 'username') and hasattr(self, 'password'):
+ creds = dict(username=self.username, password=self.password)
+ if not post_params:
+ post_params = creds.copy()
+ elif self.password not in post_params.values() and isinstance(post_params, type({})):
+ post_params.update(creds)
+
+ response = helpers.getURL(url, post_data=post_params, session=self.session, timeout=timeout)
+ if response:
+ if logged_in(response):
+ return True
+
+ if maxed_out(response) and hasattr(self, 'password'):
+ self.password = None
+ sickbeard.save_config()
+ logger.log(failed_msg(response) % self.name, logger.ERROR)
+
+ return False
+
def _check_auth(self):
if hasattr(self, 'username') and hasattr(self, 'password'):
@@ -742,67 +864,43 @@ class TorrentProvider(GenericProvider):
raise AuthException('%s for %s is empty in config provider options' % (setting, self.name))
- def _find_propers(self, search_date=datetime.datetime.today(), search_terms=None):
+ def find_propers(self, **kwargs):
"""
Search for releases of type PROPER
- :param search_date: Filter search on episodes since this date
- :param search_terms: String or list of strings that qualify PROPER release types
:return: list of Proper objects
"""
results = []
- my_db = db.DBConnection()
- sql_results = my_db.select(
- 'SELECT s.show_name, e.showid, e.season, e.episode, e.status, e.airdate FROM tv_episodes AS e' +
- ' INNER JOIN tv_shows AS s ON (e.showid = s.indexer_id)' +
- ' WHERE e.airdate >= ' + str(search_date.toordinal()) +
- ' AND (e.status IN (%s)' % ','.join([str(x) for x in Quality.DOWNLOADED]) +
- ' OR (e.status IN (%s)))' % ','.join([str(x) for x in Quality.SNATCHED])
- )
-
- if not sql_results:
- return results
-
- clean_term = re.compile(r'(?i)[^a-z\|\.]+')
- for sqlshow in sql_results:
- showid, season, episode = [int(sqlshow[item]) for item in ('showid', 'season', 'episode')]
-
- self.show = helpers.findCertainShow(sickbeard.showList, showid)
- if not self.show:
- continue
-
- cur_ep = self.show.getEpisode(season, episode)
-
+ search_terms = getattr(self, 'proper_search_terms', ['proper', 'repack'])
+ if not isinstance(search_terms, list):
if None is search_terms:
- search_terms = ['proper', 'repack']
- elif not isinstance(search_terms, list):
- if '' == search_terms:
- search_terms = 'proper|repack'
- search_terms = [search_terms]
+ search_terms = 'proper|repack'
+ search_terms = [search_terms]
- for proper_term in search_terms:
- proper_check = re.compile(r'(?i)(?:%s)' % clean_term.sub('', proper_term))
+ items = self._search_provider({'Propers': search_terms})
- search_string = self._get_episode_search_strings(cur_ep, add_string=proper_term)
- for item in self._do_search(search_string[0]):
- title, url = self._get_title_and_url(item)
- if not proper_check.search(title):
- continue
- results.append(classes.Proper(title, url, datetime.datetime.today(), self.show))
+ clean_term = re.compile(r'(?i)[^a-z1-9\|\.]+')
+ for proper_term in search_terms:
+ proper_check = re.compile(r'(?i)(?:%s)' % clean_term.sub('', proper_term))
+ for item in items:
+ title, url = self._title_and_url(item)
+ if proper_check.search(title):
+ results.append(classes.Proper(title, url, datetime.datetime.today(),
+ helpers.findCertainShow(sickbeard.showList, None)))
return results
@staticmethod
def _has_no_results(*html):
- return re.search(r'(?i)<(?:h\d|strong)[^>]*>(?:'
- + 'your\ssearch\sdid\snot\smatch|'
- + 'nothing\sfound|'
- + 'no\storrents\sfound|'
- + '.*?there\sare\sno\sresults|'
- + '.*?no\shits\.\sTry\sadding'
- + ')', html[0])
+ return re.search(r'(?i)<(?:b|h\d|strong)[^>]*>(?:' +
+ 'your\ssearch\sdid\snot\smatch|' +
+ 'nothing\sfound|' +
+ 'no\storrents\sfound|' +
+ '.*?there\sare\sno\sresults|' +
+ '.*?no\shits\.\sTry\sadding' +
+ ')', html[0])
- def get_cache_data(self, *args, **kwargs):
+ def cache_data(self, *args, **kwargs):
search_params = {'Cache': ['']}
- return self._do_search(search_params)
+ return self._search_provider(search_params)
diff --git a/sickbeard/providers/gftracker.py b/sickbeard/providers/gftracker.py
index 09d3e4e1..bc49bfb3 100644
--- a/sickbeard/providers/gftracker.py
+++ b/sickbeard/providers/gftracker.py
@@ -16,13 +16,13 @@
# along with SickGear. If not, see
%s ' % self.segment.prettyName())
+ ui.notifications.message('No downloads found',
+ u'Could not find a download for %s ' % self.segment.prettyName())
- logger.log(u'Unable to find a download for: [' + self.segment.prettyName() + ']')
+ logger.log(u'Unable to find a download for: [%s]' % self.segment.prettyName())
except Exception:
logger.log(traceback.format_exc(), logger.DEBUG)
-
+
finally:
- ### Keep a list with the 100 last executed searches
+ # Keep a list with the 100 last executed searches
fifo(MANUAL_SEARCH_HISTORY, self, MANUAL_SEARCH_HISTORY_SIZE)
if self.success is None:
@@ -371,7 +371,7 @@ class BacklogQueueItem(generic_queue.QueueItem):
def __init__(self, show, segment, standard_backlog=False, limited_backlog=False, forced=False):
generic_queue.QueueItem.__init__(self, 'Backlog', BACKLOG_SEARCH)
self.priority = generic_queue.QueuePriorities.LOW
- self.name = 'BACKLOG-' + str(show.indexerid)
+ self.name = 'BACKLOG-%s' % show.indexerid
self.success = None
self.show = show
self.segment = segment
@@ -383,19 +383,19 @@ class BacklogQueueItem(generic_queue.QueueItem):
generic_queue.QueueItem.run(self)
try:
- logger.log('Beginning backlog search for: [' + self.show.name + ']')
- searchResult = search.searchProviders(self.show, self.segment, False)
+ logger.log(u'Beginning backlog search for: [%s]' % self.show.name)
+ search_result = search.search_providers(self.show, self.segment, False)
- if searchResult:
- for result in searchResult:
+ if search_result:
+ for result in search_result:
# just use the first result for now
- logger.log(u'Downloading ' + result.name + ' from ' + result.provider.name)
- search.snatchEpisode(result)
+ logger.log(u'Downloading %s from %s' % (result.name, result.provider.name))
+ search.snatch_episode(result)
# give the CPU a break
time.sleep(common.cpu_presets[sickbeard.CPU_PRESET])
else:
- logger.log(u'No needed episodes found during backlog search for: [' + self.show.name + ']')
+ logger.log(u'No needed episodes found during backlog search for: [%s]' % self.show.name)
except Exception:
logger.log(traceback.format_exc(), logger.DEBUG)
@@ -407,7 +407,7 @@ class FailedQueueItem(generic_queue.QueueItem):
def __init__(self, show, segment):
generic_queue.QueueItem.__init__(self, 'Retry', FAILED_SEARCH)
self.priority = generic_queue.QueuePriorities.HIGH
- self.name = 'RETRY-' + str(show.indexerid)
+ self.name = 'RETRY-%s' % show.indexerid
self.show = show
self.segment = segment
self.success = None
@@ -416,48 +416,49 @@ class FailedQueueItem(generic_queue.QueueItem):
def run(self):
generic_queue.QueueItem.run(self)
self.started = True
-
+
try:
for epObj in self.segment:
-
- logger.log(u'Marking episode as bad: [' + epObj.prettyName() + ']')
-
+
+ logger.log(u'Marking episode as bad: [%s]' % epObj.prettyName())
+
failed_history.markFailed(epObj)
-
+
(release, provider) = failed_history.findRelease(epObj)
if release:
failed_history.logFailed(release)
history.logFailed(epObj, release, provider)
-
+
failed_history.revertEpisode(epObj)
- logger.log('Beginning failed download search for: [' + epObj.prettyName() + ']')
+ logger.log(u'Beginning failed download search for: []' % epObj.prettyName())
- searchResult = search.searchProviders(self.show, self.segment, True)
+ search_result = search.search_providers(self.show, self.segment, True)
- if searchResult:
- for result in searchResult:
+ if search_result:
+ for result in search_result:
# just use the first result for now
- logger.log(u'Downloading ' + result.name + ' from ' + result.provider.name)
- search.snatchEpisode(result)
+ logger.log(u'Downloading %s from %s' % (result.name, result.provider.name))
+ search.snatch_episode(result)
# give the CPU a break
time.sleep(common.cpu_presets[sickbeard.CPU_PRESET])
else:
pass
- #logger.log(u"No valid episode found to retry for: [" + self.segment.prettyName() + "]")
+ # logger.log(u'No valid episode found to retry for: [%s]' % self.segment.prettyName())
except Exception:
logger.log(traceback.format_exc(), logger.DEBUG)
-
+
finally:
- ### Keep a list with the 100 last executed searches
+ # Keep a list with the 100 last executed searches
fifo(MANUAL_SEARCH_HISTORY, self, MANUAL_SEARCH_HISTORY_SIZE)
if self.success is None:
self.success = False
self.finish()
-
-def fifo(myList, item, maxSize = 100):
- if len(myList) >= maxSize:
- myList.pop(0)
- myList.append(item)
+
+
+def fifo(my_list, item, max_size=100):
+ if len(my_list) >= max_size:
+ my_list.pop(0)
+ my_list.append(item)
diff --git a/sickbeard/searchRecent.py b/sickbeard/search_recent.py
similarity index 97%
rename from sickbeard/searchRecent.py
rename to sickbeard/search_recent.py
index 38e32210..3b344a77 100644
--- a/sickbeard/searchRecent.py
+++ b/sickbeard/search_recent.py
@@ -19,7 +19,6 @@
from __future__ import with_statement
import threading
-
import sickbeard
@@ -35,4 +34,4 @@ class RecentSearcher():
recentsearch_queue_item = sickbeard.search_queue.RecentSearchQueueItem()
sickbeard.searchQueueScheduler.action.add_item(recentsearch_queue_item)
- self.amActive = False
\ No newline at end of file
+ self.amActive = False
diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py
index b3372a7a..52e6a051 100644
--- a/sickbeard/show_name_helpers.py
+++ b/sickbeard/show_name_helpers.py
@@ -29,56 +29,101 @@ from sickbeard import logger
from sickbeard import db
from sickbeard import encodingKludge as ek
from name_parser.parser import NameParser, InvalidNameException, InvalidShowException
-from lib.unidecode import unidecode
-from sickbeard.blackandwhitelist import BlackAndWhiteList
-def filterBadReleases(name, parse=True):
+def pass_wordlist_checks(name, parse=True):
"""
- Filters out non-english and just all-around stupid releases by comparing them
- to the resultFilters contents.
-
+ Filters out non-english and just all-around stupid releases by comparing
+ the word list contents at boundaries or the end of name.
+
name: the release name to check
-
+
Returns: True if the release name is OK, False if it's bad.
"""
- try:
- if parse:
+ if parse:
+ err_msg = u'Unable to parse the filename %s into a valid ' % name
+ try:
NameParser().parse(name)
- except InvalidNameException:
- logger.log(u"Unable to parse the filename " + name + " into a valid episode", logger.DEBUG)
- return False
- except InvalidShowException:
- logger.log(u"Unable to parse the filename " + name + " into a valid show", logger.DEBUG)
- return False
+ except InvalidNameException:
+ logger.log(err_msg + 'episode', logger.DEBUG)
+ return False
+ except InvalidShowException:
+ logger.log(err_msg + 'show', logger.DEBUG)
+ return False
- resultFilters = ['sub(bed|ed|pack|s)', '(dk|fin|heb|kor|nor|nordic|pl|swe)sub(bed|ed|s)?',
- '(dir|sample|sub|nfo)fix', 'sample', '(dvd)?extras',
- 'dub(bed)?']
+ word_list = ['sub(bed|ed|pack|s)', '(dk|fin|heb|kor|nor|nordic|pl|swe)sub(bed|ed|s)?',
+ '(dir|sample|sub|nfo)fix', 'sample', '(dvd)?extras',
+ 'dub(bed)?']
# if any of the bad strings are in the name then say no
if sickbeard.IGNORE_WORDS:
- resultFilters.extend(sickbeard.IGNORE_WORDS.split(','))
- filters = [re.compile('(^|[\W_])%s($|[\W_])' % re.escape(filter.strip()), re.I) for filter in resultFilters]
- for regfilter in filters:
- if regfilter.search(name):
- logger.log(u"Invalid scene release: " + name + " contained: " + regfilter.pattern + ", ignoring it",
- logger.DEBUG)
- return False
+ word_list = ','.join([sickbeard.IGNORE_WORDS] + word_list)
+
+ result = contains_any(name, word_list)
+ if None is not result and result:
+ logger.log(u'Ignored: %s for containing ignore word' % name, logger.DEBUG)
+ return False
# if any of the good strings aren't in the name then say no
- if sickbeard.REQUIRE_WORDS:
- require_words = sickbeard.REQUIRE_WORDS.split(',')
- filters = [re.compile('(^|[\W_])%s($|[\W_])' % re.escape(filter.strip()), re.I) for filter in require_words]
- for regfilter in filters:
- if not regfilter.search(name):
- logger.log(u"Invalid scene release: " + name + " didn't contain: " + regfilter.pattern + ", ignoring it",
- logger.DEBUG)
- return False
+ result = not_contains_any(name, sickbeard.REQUIRE_WORDS)
+ if None is not result and result:
+ logger.log(u'Ignored: %s for not containing required word match' % name, logger.DEBUG)
+ return False
return True
+def not_contains_any(subject, lookup_words, **kwargs):
+
+ return contains_any(subject, lookup_words, invert=True, **kwargs)
+
+def contains_any(subject, lookup_words, invert=False, **kwargs):
+ """
+ Check if subject does or does not contain a match from a list or string of regular expression lookup words
+
+ word: word to test existence of
+ lookup_words: List or comma separated string of words to search
+ re_prefix: insert string to all lookup words
+ re_suffix: append string to all lookup words
+ invert: invert function logic "contains any" into "does not contain any"
+
+ Returns: None if no checking was done. True for first match found, or if invert is False,
+ then True for first pattern that does not match, or False
+ """
+ compiled_words = compile_word_list(lookup_words, **kwargs)
+ if subject and compiled_words:
+ for rc_filter in compiled_words:
+ match = rc_filter.search(subject)
+ if (match and not invert) or (not match and invert):
+ msg = match and not invert and 'Found match' or ''
+ msg = not match and invert and 'No match found' or msg
+ logger.log(u'%s from pattern: %s in text: %s ' % (msg, rc_filter.pattern, subject), logger.DEBUG)
+ return True
+ return False
+ return None
+
+def compile_word_list(lookup_words, re_prefix='(^|[\W_])', re_suffix='($|[\W_])'):
+
+ result = []
+ if lookup_words:
+ search_raw = isinstance(lookup_words, list)
+ if not search_raw:
+ search_raw = not lookup_words.startswith('regex:')
+ lookup_words = lookup_words[(6, 0)[search_raw]:].split(',')
+ lookup_words = [x.strip() for x in lookup_words]
+ for word in [x for x in lookup_words if x]:
+ try:
+ # !0 == regex and subject = s / 'what\'s the "time"' / what\'s\ the\ \"time\"
+ subject = search_raw and re.escape(word) or re.sub(r'([\" \'])', r'\\\1', word)
+ result.append(re.compile('(?i)%s%s%s' % (re_prefix, subject, re_suffix)))
+ except Exception as e:
+ logger.log(u'Failure to compile filter expression: %s ... Reason: %s' % (word, e.message), logger.DEBUG)
+
+ diff = len(lookup_words) - len(result)
+ if diff:
+ logger.log(u'From %s expressions, %s was discarded during compilation' % (len(lookup_words), diff), logger.DEBUG)
+
+ return result
def makeSceneShowSearchStrings(show, season=-1):
showNames = allPossibleShowNames(show, season=season)
@@ -195,9 +240,9 @@ def allPossibleShowNames(show, season=-1):
"""
Figures out every possible variation of the name for a particular show. Includes TVDB name, TVRage name,
country codes on the end, eg. "Show Name (AU)", and any scene exception names.
-
+
show: a TVShow object that we should get the names of
-
+
Returns: a list of all the possible show names
"""
@@ -256,13 +301,13 @@ def determineReleaseName(dir_name=None, nzb_name=None):
if len(results) == 1:
found_file = ek.ek(os.path.basename, results[0])
found_file = found_file.rpartition('.')[0]
- if filterBadReleases(found_file):
+ if pass_wordlist_checks(found_file):
logger.log(u"Release name (" + found_file + ") found from file (" + results[0] + ")")
return found_file.rpartition('.')[0]
# If that fails, we try the folder
folder = ek.ek(os.path.basename, dir_name)
- if filterBadReleases(folder):
+ if pass_wordlist_checks(folder):
# NOTE: Multiple failed downloads will change the folder name.
# (e.g., appending #s)
# Should we handle that?
diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py
index e7631745..4bb0d76b 100644
--- a/sickbeard/show_queue.py
+++ b/sickbeard/show_queue.py
@@ -139,7 +139,7 @@ class ShowQueue(generic_queue.GenericQueue):
if ((not after_update and self.isBeingUpdated(show)) or self.isInUpdateQueue(show)) and not force:
logger.log(
- u'A refresh was attempted but there is already an update queued or in progress. Since updates do a refresh at the end anyway I\'m skipping this request.',
+ u'Skipping this refresh as there is already an update queued or in progress and a refresh is done at the end of an update anyway.',
logger.DEBUG)
return
@@ -449,7 +449,7 @@ class QueueItemAdd(ShowQueueItem):
# if started with WANTED eps then run the backlog
if WANTED == self.default_status or items_wanted:
logger.log(u'Launching backlog for this show since episodes are WANTED')
- sickbeard.backlogSearchScheduler.action.searchBacklog([self.show]) #@UndefinedVariable
+ sickbeard.backlogSearchScheduler.action.search_backlog([self.show]) #@UndefinedVariable
ui.notifications.message('Show added/search', 'Adding and searching for episodes of' + msg)
else:
ui.notifications.message('Show added', 'Adding' + msg)
@@ -655,4 +655,4 @@ class QueueItemForceUpdateWeb(QueueItemUpdate):
def __init__(self, show=None, scheduled_update=False):
ShowQueueItem.__init__(self, ShowQueueActions.FORCEUPDATE, show, scheduled_update)
self.force = True
- self.force_web = True
\ No newline at end of file
+ self.force_web = True
diff --git a/sickbeard/showUpdater.py b/sickbeard/show_updater.py
similarity index 100%
rename from sickbeard/showUpdater.py
rename to sickbeard/show_updater.py
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 3eef6a2e..dbdb5d10 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -2156,14 +2156,14 @@ class TVEpisode(object):
def us(name):
return re.sub('[ -]', '_', name)
- def release_name(show, name):
+ def release_name(name, is_anime=False):
if name:
- name = helpers.remove_non_release_groups(helpers.remove_extension(name), show.anime)
+ name = helpers.remove_non_release_groups(helpers.remove_extension(name), is_anime)
return name
def release_group(show, name):
if name:
- name = helpers.remove_non_release_groups(helpers.remove_extension(name), show.anime)
+ name = helpers.remove_non_release_groups(helpers.remove_extension(name), show.is_anime)
else:
return ""
@@ -2205,7 +2205,7 @@ class TVEpisode(object):
'%0XE': '%02d' % self.scene_episode,
'%AB': '%(#)03d' % {'#': self.absolute_number},
'%XAB': '%(#)03d' % {'#': self.scene_absolute_number},
- '%RN': release_name(self.show, self.release_name),
+ '%RN': release_name(self.release_name, self.show.is_anime),
'%RG': release_group(self.show, self.release_name),
'%AD': str(self.airdate).replace('-', ' '),
'%A.D': str(self.airdate).replace('-', '.'),
diff --git a/sickbeard/tvcache.py b/sickbeard/tvcache.py
index 3711fd6a..b9857b25 100644
--- a/sickbeard/tvcache.py
+++ b/sickbeard/tvcache.py
@@ -50,7 +50,7 @@ class TVCache:
self.provider = provider
self.providerID = self.provider.get_id()
self.providerDB = None
- self.minTime = 10
+ self.update_freq = 10
def get_db(self):
return CacheDBConnection(self.providerID)
@@ -60,11 +60,11 @@ class TVCache:
myDB = self.get_db()
myDB.action('DELETE FROM provider_cache WHERE provider = ?', [self.providerID])
- def _get_title_and_url(self, item):
+ def _title_and_url(self, item):
# override this in the provider if recent search has a different data layout to backlog searches
- return self.provider._get_title_and_url(item)
+ return self.provider._title_and_url(item)
- def _getRSSData(self):
+ def _cache_data(self):
data = None
return data
@@ -83,7 +83,7 @@ class TVCache:
if self.shouldUpdate():
# as long as the http request worked we count this as an update
- data = self._getRSSData()
+ data = self._cache_data()
if not data:
return []
@@ -96,7 +96,7 @@ class TVCache:
# parse data
cl = []
for item in data:
- title, url = self._get_title_and_url(item)
+ title, url = self._title_and_url(item)
ci = self._parseItem(title, url)
if ci is not None:
cl.append(ci)
@@ -182,9 +182,9 @@ class TVCache:
def shouldUpdate(self):
# if we've updated recently then skip the update
- if datetime.datetime.today() - self.lastUpdate < datetime.timedelta(minutes=self.minTime):
+ if datetime.datetime.today() - self.lastUpdate < datetime.timedelta(minutes=self.update_freq):
logger.log(u'Last update was too soon, using old cache: today()-' + str(self.lastUpdate) + '<' + str(
- datetime.timedelta(minutes=self.minTime)), logger.DEBUG)
+ datetime.timedelta(minutes=self.update_freq)), logger.DEBUG)
return False
return True
@@ -255,11 +255,11 @@ class TVCache:
else:
return []
- def listPropers(self, date=None, delimiter='.'):
+ def listPropers(self, date=None):
myDB = self.get_db()
sql = "SELECT * FROM provider_cache WHERE name LIKE '%.PROPER.%' OR name LIKE '%.REPACK.%' AND provider = ?"
- if date != None:
+ if date:
sql += ' AND time >= ' + str(int(time.mktime(date.timetuple())))
return filter(lambda x: x['indexerid'] != 0, myDB.select(sql, [self.providerID]))
@@ -291,7 +291,7 @@ class TVCache:
for curResult in sqlResults:
# skip non-tv crap
- if not show_name_helpers.filterBadReleases(curResult['name'], parse=False):
+ if not show_name_helpers.pass_wordlist_checks(curResult['name'], parse=False):
continue
# get the show object, or if it's not one of our shows then ignore it
diff --git a/sickbeard/versionChecker.py b/sickbeard/version_checker.py
similarity index 97%
rename from sickbeard/versionChecker.py
rename to sickbeard/version_checker.py
index 98e21f34..2be5aa4a 100644
--- a/sickbeard/versionChecker.py
+++ b/sickbeard/version_checker.py
@@ -276,9 +276,9 @@ class GitUpdateManager(UpdateManager):
branch = branch_info.strip().replace('refs/heads/', '', 1)
if branch:
return branch
-
+
return ""
-
+
def _check_github_for_update(self):
"""
Uses git commands to check if there is a newer version that the provided
@@ -459,7 +459,7 @@ class SourceUpdateManager(UpdateManager):
return "master"
else:
return sickbeard.CUR_COMMIT_BRANCH
-
+
def need_update(self):
# need this to run first to set self._newest_commit_hash
try:
@@ -622,7 +622,7 @@ class SourceUpdateManager(UpdateManager):
sickbeard.CUR_COMMIT_HASH = self._newest_commit_hash
sickbeard.CUR_COMMIT_BRANCH = self.branch
-
+
except Exception as e:
logger.log(u"Error while trying to update: " + ex(e), logger.ERROR)
logger.log(u"Traceback: " + traceback.format_exc(), logger.DEBUG)
@@ -639,4 +639,4 @@ class SourceUpdateManager(UpdateManager):
def list_remote_pulls(self):
# we don't care about testers that don't use git
- return []
\ No newline at end of file
+ return []
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 61d71985..ab0b7fac 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -49,7 +49,7 @@ from sickbeard.scene_numbering import get_scene_numbering, set_scene_numbering,
from sickbeard.name_cache import buildNameCache
from sickbeard.browser import foldersAtPath
from sickbeard.blackandwhitelist import BlackAndWhiteList, short_group_names
-from sickbeard.searchBacklog import FULL_BACKLOG, LIMITED_BACKLOG
+from sickbeard.search_backlog import FULL_BACKLOG, LIMITED_BACKLOG
from tornado import gen
from tornado.web import RequestHandler, StaticFileHandler, authenticated
from lib import adba
@@ -3061,7 +3061,7 @@ class Manage(MainHandler):
show_obj = helpers.findCertainShow(sickbeard.showList, int(indexer_id))
if show_obj:
- sickbeard.backlogSearchScheduler.action.searchBacklog([show_obj]) # @UndefinedVariable
+ sickbeard.backlogSearchScheduler.action.search_backlog([show_obj]) # @UndefinedVariable
self.redirect('/manage/backlogOverview/')
@@ -3909,6 +3909,12 @@ class ConfigSearch(Config):
t = PageTemplate(headers=self.request.headers, file='config_search.tmpl')
t.submenu = self.ConfigMenu
+ t.using_rls_ignore_words = [(show.indexerid, show.name)
+ for show in sickbeard.showList if show.rls_ignore_words.strip()]
+ t.using_rls_ignore_words.sort(lambda x, y: cmp(x[1], y[1]), reverse=False)
+ t.using_rls_require_words = [(show.indexerid, show.name)
+ for show in sickbeard.showList if show.rls_require_words.strip()]
+ t.using_rls_require_words.sort(lambda x, y: cmp(x[1], y[1]), reverse=False)
return t.respond()
def saveSearch(self, use_nzbs=None, use_torrents=None, nzb_dir=None, sab_username=None, sab_password=None,
@@ -4556,6 +4562,13 @@ class ConfigProviders(Config):
except:
curTorrentProvider.freeleech = 0
+ if hasattr(curTorrentProvider, 'reject_m2ts'):
+ try:
+ curTorrentProvider.reject_m2ts = config.checkbox_to_value(
+ kwargs[curTorrentProvider.get_id() + '_reject_m2ts'])
+ except:
+ curTorrentProvider.reject_m2ts = 0
+
if hasattr(curTorrentProvider, 'search_mode'):
try:
curTorrentProvider.search_mode = str(kwargs[curTorrentProvider.get_id() + '_search_mode']).strip()
diff --git a/tests/all_tests.py b/tests/all_tests.py
index f791910d..34eb3dff 100644
--- a/tests/all_tests.py
+++ b/tests/all_tests.py
@@ -24,7 +24,7 @@ if __name__ == '__main__':
import unittest
import sys
- test_file_strings = [ x for x in glob.glob('*_tests.py') if not x in __file__]
+ test_file_strings = [x for x in glob.glob('*_tests.py') if x not in __file__]
module_strings = [file_string[0:len(file_string) - 3] for file_string in test_file_strings]
suites = [unittest.defaultTestLoader.loadTestsFromName(file_string) for file_string in module_strings]
testSuite = unittest.TestSuite(suites)
diff --git a/tests/ignore_and_require_words_tests.py b/tests/ignore_and_require_words_tests.py
new file mode 100644
index 00000000..0e86fe9a
--- /dev/null
+++ b/tests/ignore_and_require_words_tests.py
@@ -0,0 +1,111 @@
+import os.path
+import sys
+import unittest
+
+import sickbeard
+from sickbeard import show_name_helpers
+
+sys.path.insert(1, os.path.abspath('..'))
+
+
+class TestCase(unittest.TestCase):
+
+ cases_pass_wordlist_checks = [
+ ('[GroupName].Show.Name.-.%02d.[null]', '', '', True),
+
+ ('[GroupName].Show.Name.-.%02d.[ignore]', '', 'required', False),
+ ('[GroupName].Show.Name.-.%02d.[required]', '', 'required', True),
+ ('[GroupName].Show.Name.-.%02d.[blahblah]', 'not_ignored', 'GroupName', True),
+ ('[GroupName].Show.Name.-.%02d.[blahblah]', 'not_ignored', '[GroupName]', True),
+ ('[GroupName].Show.Name.-.%02d.[blahblah]', 'not_ignored', 'Show.Name', True),
+ ('[GroupName].Show.Name.-.%02d.[required]', 'not_ignored', 'required', True),
+ ('[GroupName].Show.Name.-.%02d.[required]', '[not_ignored]', '[required]', True),
+
+ ('[GroupName].Show.Name.-.%02d.[ignore]', '[ignore]', '', False),
+ ('[GroupName].Show.Name.-.%02d.[required]', '[GroupName]', 'required', False),
+ ('[GroupName].Show.Name.-.%02d.[required]', 'GroupName', 'required', False),
+ ('[GroupName].Show.Name.-.%02d.[ignore]', 'ignore', 'GroupName', False),
+ ('[GroupName].Show.Name.-.%02d.[required]', 'Show.Name', 'required', False),
+
+ ('[GroupName].Show.Name.-.%02d.[ignore]', 'regex: no_ignore', '', True),
+ ('[GroupName].Show.Name.-.%02d.[480p]', 'ignore', 'regex: \d?\d80p', True),
+ ('[GroupName].Show.Name.-.%02d.[480p]', 'ignore', 'regex: \[\d?\d80p\]', True),
+ ('[GroupName].Show.Name.-.%02d.[ignore]', 'regex: ignore', '', False),
+ ('[GroupName].Show.Name.-.%02d.[ignore]', 'regex: \[ignore\]', '', False),
+ ('[GroupName].Show.Name.-.%02d.[ignore]', 'regex: ignore', 'required', False),
+
+ # The following test is True because a boundary is added to each regex not overridden with the prefix param
+ ('[GroupName].Show.ONEONE.-.%02d.[required]', 'regex: (one(two)?)', '', True),
+ ('[GroupName].Show.ONETWO.-.%02d.[required]', 'regex: ((one)?two)', 'required', False),
+ ('[GroupName].Show.TWO.-.%02d.[required]', 'regex: ((one)?two)', 'required', False),
+ ]
+
+ cases_contains = [
+ ('[GroupName].Show.Name.-.%02d.[illegal_regex]', 'regex:??illegal_regex', False),
+ ('[GroupName].Show.Name.-.%02d.[480p]', 'regex:(480|1080)p', True),
+ ('[GroupName].Show.Name.-.%02d.[contains]', 'regex:\[contains\]', True),
+ ('[GroupName].Show.Name.-.%02d.[contains]', '[contains]', True),
+ ('[GroupName].Show.Name.-.%02d.[contains]', 'contains', True),
+ ('[GroupName].Show.Name.-.%02d.[contains]', '[not_contains]', False),
+ ('[GroupName].Show.Name.-.%02d.[null]', '', False)
+ ]
+
+ cases_not_contains = [
+ ('[GroupName].Show.Name.-.%02d.[480p]', 'regex:(480|1080)p', False),
+ ('[GroupName].Show.Name.-.%02d.[contains]', 'regex:\[contains\]', False),
+ ('[GroupName].Show.Name.-.%02d.[contains]', '[contains]', False),
+ ('[GroupName].Show.Name.-.%02d.[contains]', 'contains', False),
+ ('[GroupName].Show.Name.-.%02d.[not_contains]', '[blah_blah]', True),
+ ('[GroupName].Show.Name.-.%02d.[null]', '', False)
+ ]
+
+ def test_pass_wordlist_checks(self):
+ # default:[] or copy in a test case tuple to debug in isolation
+ isolated = []
+
+ test_cases = (self.cases_pass_wordlist_checks, isolated)[len(isolated)]
+ for case_num, (name, ignore_list, require_list, expected_result) in enumerate(test_cases):
+ name = (name, name % case_num)['%02d' in name]
+ sickbeard.IGNORE_WORDS = ignore_list
+ sickbeard.REQUIRE_WORDS = require_list
+ self.assertEqual(expected_result, show_name_helpers.pass_wordlist_checks(name, False),
+ 'Expected %s with test: "%s" with ignore: "%s", require: "%s"' %
+ (expected_result, name, ignore_list, require_list))
+
+ def test_contains_any(self):
+ # default:[] or copy in a test case tuple to debug in isolation
+ isolated = []
+
+ test_cases = (self.cases_contains, isolated)[len(isolated)]
+ for case_num, (name, csv_words, expected_result) in enumerate(test_cases):
+ name = (name, name % case_num)['%02d' in name]
+ self.assertEqual(expected_result, self.call_contains_any(name, csv_words),
+ 'Expected %s test: "%s" with csv_words: "%s"' %
+ (expected_result, name, csv_words))
+
+ @staticmethod
+ def call_contains_any(name, csv_words):
+ re_extras = dict(re_prefix='.*', re_suffix='.*')
+ match = show_name_helpers.contains_any(name, csv_words, **re_extras)
+ return None is not match and match
+
+ def test_not_contains_any(self):
+ # default:[] or copy in a test case tuple to debug in isolation
+ isolated = []
+
+ test_cases = (self.cases_not_contains, isolated)[len(isolated)]
+ for case_num, (name, csv_words, expected_result) in enumerate(test_cases):
+ name = (name, name % case_num)['%02d' in name]
+ self.assertEqual(expected_result, self.call_not_contains_any(name, csv_words),
+ 'Expected %s test: "%s" with csv_words:"%s"' %
+ (expected_result, name, csv_words))
+
+ @staticmethod
+ def call_not_contains_any(name, csv_words):
+ re_extras = dict(re_prefix='.*', re_suffix='.*')
+ match = show_name_helpers.not_contains_any(name, csv_words, **re_extras)
+ return None is not match and match
+
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/tests/scene_helpers_tests.py b/tests/scene_helpers_tests.py
index ce9cb586..6f1c1b7e 100644
--- a/tests/scene_helpers_tests.py
+++ b/tests/scene_helpers_tests.py
@@ -23,8 +23,8 @@ class SceneTests(test.SickbeardTestDBCase):
result = show_name_helpers.allPossibleShowNames(s)
self.assertTrue(len(set(expected).intersection(set(result))) == len(expected))
- def _test_filterBadReleases(self, name, expected):
- result = show_name_helpers.filterBadReleases(name)
+ def _test_pass_wordlist_checks(self, name, expected):
+ result = show_name_helpers.pass_wordlist_checks(name)
self.assertEqual(result, expected)
def test_allPossibleShowNames(self):
@@ -40,12 +40,12 @@ class SceneTests(test.SickbeardTestDBCase):
self._test_allPossibleShowNames('Show Name Full Country Name', expected=['Show Name Full Country Name', 'Show Name (FCN)'])
self._test_allPossibleShowNames('Show Name (Full Country Name)', expected=['Show Name (Full Country Name)', 'Show Name (FCN)'])
- def test_filterBadReleases(self):
- self._test_filterBadReleases('Show.S02.German.Stuff-Grp', False)
- self._test_filterBadReleases('Show.S02.Some.Stuff-Core2HD', False)
- self._test_filterBadReleases('Show.S02.Some.German.Stuff-Grp', False)
- # self._test_filterBadReleases('German.Show.S02.Some.Stuff-Grp', True)
- self._test_filterBadReleases('Show.S02.This.Is.German', False)
+ def test_pass_wordlist_checks(self):
+ self._test_pass_wordlist_checks('Show.S02.German.Stuff-Grp', False)
+ self._test_pass_wordlist_checks('Show.S02.Some.Stuff-Core2HD', False)
+ self._test_pass_wordlist_checks('Show.S02.Some.German.Stuff-Grp', False)
+ # self._test_pass_wordlist_checks('German.Show.S02.Some.Stuff-Grp', True)
+ self._test_pass_wordlist_checks('Show.S02.This.Is.German', False)
class SceneExceptionTestCase(test.SickbeardTestDBCase):
diff --git a/tests/snatch_tests.py b/tests/snatch_tests.py
index 9b82986a..3a2db54e 100644
--- a/tests/snatch_tests.py
+++ b/tests/snatch_tests.py
@@ -82,7 +82,7 @@ def test_generator(tvdbdid, show_name, curData, forceSearch):
episode.status = c.WANTED
episode.saveToDB()
- bestResult = search.searchProviders(show, episode.season, episode.episode, forceSearch)
+ bestResult = search.search_providers(show, episode.season, episode.episode, forceSearch)
if not bestResult:
self.assertEqual(curData['b'], bestResult)
self.assertEqual(curData['b'], bestResult.name) #first is expected, second is choosen one