Merge branch 'refs/heads/nosql2' into nosql

couchpotato/api.py

@@ -1,15 +1,17 @@
-from couchpotato.core.helpers.request import getParams
-from couchpotato.core.logger import CPLog
 from functools import wraps
 from threading import Thread
-from tornado.gen import coroutine
-from tornado.web import RequestHandler, asynchronous
 import json
 import threading
-import tornado
 import traceback
 import urllib
 
+from couchpotato.core.helpers.request import getParams
+from couchpotato.core.logger import CPLog
+from tornado.gen import coroutine
+from tornado.web import RequestHandler, asynchronous
+import tornado
+
+
 log = CPLog(__name__)
 
 

couchpotato/core/_base/_core.py

@@ -1,10 +1,3 @@
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.helpers.variable import cleanHost, md5
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-from tornado.ioloop import IOLoop
 from uuid import uuid4
 import os
 import platform
@@ -13,6 +6,15 @@ import time
 import traceback
 import webbrowser
 
+from couchpotato.api import addApiView
+from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.helpers.variable import cleanHost, md5
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+from tornado.ioloop import IOLoop
+
+
 log = CPLog(__name__)
 
 autoload = 'Core'

couchpotato/core/_base/clientscript.py

@@ -1,3 +1,7 @@
+import os
+import re
+import traceback
+
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import ss
 from couchpotato.core.helpers.variable import tryInt
@@ -7,9 +11,7 @@ from couchpotato.environment import Env
 from minify.cssmin import cssmin
 from minify.jsmin import jsmin
 from tornado.web import StaticFileHandler
-import os
-import re
-import traceback
+
 
 log = CPLog(__name__)
 

couchpotato/core/_base/scheduler.py

@@ -68,6 +68,8 @@ class Scheduler(Plugin):
             'job': self.sched.add_interval_job(handle, hours = hours, minutes = minutes, seconds = seconds)
         }
 
+        return True
+
     def queue(self, handlers = None):
         if not handlers: handlers = []
 

couchpotato/core/_base/updater/__init__.py

@@ -1,6 +1,7 @@
+import os
+
 from .main import Updater
 from couchpotato.environment import Env
-import os
 
 
 def autoload():

couchpotato/core/_base/updater/main.py

@@ -1,29 +1,33 @@
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import ss
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-from datetime import datetime
-from dateutil.parser import parse
-from git.repository import LocalRepository
 import json
 import os
 import shutil
 import tarfile
 import time
 import traceback
+import zipfile
+from datetime import datetime
+from threading import RLock
+
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
+from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+from dateutil.parser import parse
+from git.repository import LocalRepository
 from scandir import scandir
 import version
-import zipfile
 from six.moves import filter
 
+
 log = CPLog(__name__)
 
 
 class Updater(Plugin):
 
     available_notified = False
+    _lock = RLock()
 
     def __init__(self):
 
@@ -101,7 +105,17 @@ class Updater(Plugin):
         return False
 
     def info(self, **kwargs):
-        return self.updater.info()
+        self._lock.acquire()
+
+        info = {}
+        try:
+            info = self.updater.info()
+        except:
+            log.error('Failed getting updater info: %s', traceback.format_exc())
+
+        self._lock.release()
+
+        return info
 
     def checkView(self, **kwargs):
         return {
@@ -145,12 +159,15 @@ class BaseUpdater(Plugin):
         pass
 
     def info(self):
+
+        version = self.getVersion()
+
         return {
             'last_check': self.last_check,
             'update_version': self.update_version,
-            'version': self.getVersion(),
+            'version': version,
             'repo_name': '%s/%s' % (self.repo_user, self.repo_name),
-            'branch': self.branch,
+            'branch': version.get('branch', self.branch),
         }
 
     def getVersion(self):
@@ -213,10 +230,11 @@ class GitUpdater(BaseUpdater):
                 output = self.repo.getHead()  # Yes, please
                 log.debug('Git version output: %s', output.hash)
                 self.version = {
-                    'repr': 'git:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, self.branch, output.hash[:8], datetime.fromtimestamp(output.getDate())),
+                    'repr': 'git:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, self.repo.getCurrentBranch().name or self.branch, output.hash[:8], datetime.fromtimestamp(output.getDate())),
                     'hash': output.hash[:8],
                     'date': output.getDate(),
                     'type': 'git',
+                    'branch': self.repo.getCurrentBranch().name
                 }
             except Exception as e:
                 log.error('Failed using GIT updater, running from source, you need to have GIT installed. %s', e)

couchpotato/core/database.py

@@ -2,11 +2,13 @@ import json
 import os
 import time
 import traceback
+
 from couchpotato import CPLog
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import getImdb
+from couchpotato.core.helpers.variable import getImdb, tryInt
+
 
 log = CPLog(__name__)
 
@@ -221,7 +223,8 @@ class Database(object):
                 # Update existing with order only
                 if exists and p.get('core'):
                     profile = db.get('id', exists)
-                    profile['order'] = p.get('order')
+                    profile['order'] = tryInt(p.get('order'))
+                    profile['hide'] = p.get('hide') in [1, True, 'true', 'True']
                     db.update(profile)
 
                     profile_link[x] = profile.get('_id')

couchpotato/core/downloaders/base.py

@@ -1,11 +1,13 @@
 from base64 import b32decode, b16encode
+import random
+import re
+
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.variable import mergeDicts
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import Provider
-import random
-import re
+from couchpotato.core.media._base.providers.base import Provider
+
 
 log = CPLog(__name__)
 

couchpotato/core/downloaders/blackhole.py

@@ -1,11 +1,14 @@
 from __future__ import with_statement
-from couchpotato.core.downloaders.base import Downloader
-from couchpotato.core.helpers.encoding import sp
-from couchpotato.core.logger import CPLog
-from couchpotato.environment import Env
 import os
 import traceback
 
+from couchpotato.core.downloaders.base import Downloader
+from couchpotato.core.helpers.encoding import sp
+from couchpotato.core.helpers.variable import getDownloadDir
+from couchpotato.core.logger import CPLog
+from couchpotato.environment import Env
+
+
 log = CPLog(__name__)
 
 autoload = 'Blackhole'

couchpotato/core/downloaders/deluge.py

@@ -1,15 +1,17 @@
 from base64 import b64encode, b16encode, b32decode
+from datetime import timedelta
+from hashlib import sha1
+import os.path
+import re
+import traceback
+
 from bencode import bencode as benc, bdecode
 from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
 from couchpotato.core.helpers.encoding import isInt, sp
 from couchpotato.core.helpers.variable import tryFloat, cleanHost
 from couchpotato.core.logger import CPLog
-from datetime import timedelta
-from hashlib import sha1
 from synchronousdeluge import DelugeClient
-import os.path
-import re
-import traceback
+
 
 log = CPLog(__name__)
 

couchpotato/core/downloaders/nzbget.py

@@ -1,8 +1,4 @@
 from base64 import standard_b64encode
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import ss, sp
-from couchpotato.core.helpers.variable import tryInt, md5, cleanHost
-from couchpotato.core.logger import CPLog
 from datetime import timedelta
 import re
 import shutil
@@ -10,6 +6,12 @@ import socket
 import traceback
 import xmlrpclib
 
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import ss, sp
+from couchpotato.core.helpers.variable import tryInt, md5, cleanHost
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 autoload = 'NZBGet'

couchpotato/core/downloaders/nzbvortex.py

@@ -1,8 +1,4 @@
 from base64 import b64encode
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import tryUrlencode, sp
-from couchpotato.core.helpers.variable import cleanHost
-from couchpotato.core.logger import CPLog
 from urllib2 import URLError
 from uuid import uuid4
 import hashlib
@@ -16,6 +12,12 @@ import time
 import traceback
 import urllib2
 
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import tryUrlencode, sp
+from couchpotato.core.helpers.variable import cleanHost
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 autoload = 'NZBVortex'

couchpotato/core/downloaders/pneumatic.py

@@ -1,9 +1,11 @@
 from __future__ import with_statement
+import os
+import traceback
+
 from couchpotato.core.downloaders.base import Downloader
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.logger import CPLog
-import os
-import traceback
+
 
 log = CPLog(__name__)
 

couchpotato/core/downloaders/rtorrent_.py

@@ -1,18 +1,20 @@
+from base64 import b16encode, b32decode
+from datetime import timedelta
+from hashlib import sha1
+from urlparse import urlparse
+import os
+
 from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.helpers.variable import cleanHost, splitString
 from couchpotato.core.logger import CPLog
-from base64 import b16encode, b32decode
 from bencode import bencode, bdecode
-from datetime import timedelta
-from hashlib import sha1
 from rtorrent import RTorrent
 from rtorrent.err import MethodError
-from urlparse import urlparse
-import os
 from scandir import scandir
 
+
 log = CPLog(__name__)
 
 autoload = 'rTorrent'

couchpotato/core/downloaders/sabnzbd.py

@@ -1,14 +1,16 @@
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import tryUrlencode, ss, sp
-from couchpotato.core.helpers.variable import cleanHost, mergeDicts
-from couchpotato.core.logger import CPLog
-from couchpotato.environment import Env
 from datetime import timedelta
 from urllib2 import URLError
 import json
 import os
 import traceback
 
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import tryUrlencode, ss, sp
+from couchpotato.core.helpers.variable import cleanHost, mergeDicts
+from couchpotato.core.logger import CPLog
+from couchpotato.environment import Env
+
+
 log = CPLog(__name__)
 
 autoload = 'Sabnzbd'

couchpotato/core/downloaders/synology.py

@@ -1,10 +1,12 @@
+import json
+import traceback
+
 from couchpotato.core.downloaders.base import Downloader
 from couchpotato.core.helpers.encoding import isInt
 from couchpotato.core.helpers.variable import cleanHost
 from couchpotato.core.logger import CPLog
-import json
 import requests
-import traceback
+
 
 log = CPLog(__name__)
 

couchpotato/core/downloaders/transmission.py

@@ -1,8 +1,4 @@
 from base64 import b64encode
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import isInt, sp
-from couchpotato.core.helpers.variable import tryInt, tryFloat, cleanHost
-from couchpotato.core.logger import CPLog
 from datetime import timedelta
 import httplib
 import json
@@ -10,6 +6,12 @@ import os.path
 import re
 import urllib2
 
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import isInt, sp
+from couchpotato.core.helpers.variable import tryInt, tryFloat, cleanHost
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 autoload = 'Transmission'

couchpotato/core/downloaders/utorrent.py

@@ -1,12 +1,6 @@
 from base64 import b16encode, b32decode
-from bencode import bencode as benc, bdecode
-from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import isInt, ss, sp
-from couchpotato.core.helpers.variable import tryInt, tryFloat, cleanHost
-from couchpotato.core.logger import CPLog
 from datetime import timedelta
 from hashlib import sha1
-from multipartpost import MultipartPostHandler
 import cookielib
 import httplib
 import json
@@ -17,6 +11,14 @@ import time
 import urllib
 import urllib2
 
+from bencode import bencode as benc, bdecode
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.helpers.encoding import isInt, ss, sp
+from couchpotato.core.helpers.variable import tryInt, tryFloat, cleanHost
+from couchpotato.core.logger import CPLog
+from multipartpost import MultipartPostHandler
+
+
 log = CPLog(__name__)
 
 autoload = 'uTorrent'

couchpotato/core/event.py

@@ -1,8 +1,10 @@
+import threading
+import traceback
+
 from axl.axel import Event
 from couchpotato.core.helpers.variable import mergeDicts, natsortKey
 from couchpotato.core.logger import CPLog
-import threading
-import traceback
+
 
 log = CPLog(__name__)
 events = {}

couchpotato/core/helpers/encoding.py

@@ -1,12 +1,14 @@
-from couchpotato.core.logger import CPLog
 from string import ascii_letters, digits
 from urllib import quote_plus
 import os
 import re
 import traceback
 import unicodedata
+
+from couchpotato.core.logger import CPLog
 import six
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/helpers/request.py

@@ -1,8 +1,9 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import natsortKey
 from urllib import unquote
 import re
 
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import natsortKey
+
 
 def getParams(params):
 

couchpotato/core/helpers/rss.py

@@ -1,6 +1,8 @@
-from couchpotato.core.logger import CPLog
 import xml.etree.ElementTree as XMLTree
 
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 

couchpotato/core/helpers/variable.py

@@ -1,5 +1,3 @@
-from couchpotato.core.helpers.encoding import simplifyString, toSafeString, ss
-from couchpotato.core.logger import CPLog
 import collections
 import hashlib
 import os
@@ -8,9 +6,13 @@ import random
 import re
 import string
 import sys
+
+from couchpotato.core.helpers.encoding import simplifyString, toSafeString, ss
+from couchpotato.core.logger import CPLog
 import six
 from six.moves import map, zip, filter
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/loader.py

@@ -1,11 +1,13 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.logger import CPLog
-from importhelper import import_module
 import os
 import sys
 import traceback
+
+from couchpotato.core.event import fireEvent
+from couchpotato.core.logger import CPLog
+from importhelper import import_module
 import six
 
+
 log = CPLog(__name__)
 
 
@@ -54,12 +56,10 @@ class Loader(object):
                     if m is None:
                         continue
 
-                    log.info('Loading %s: %s', (plugin['type'], plugin['name']))
-
                     # Save default settings for plugin/provider
                     did_save += self.loadSettings(m, module_name, save = False)
 
-                    self.loadPlugins(m, plugin.get('name'))
+                    self.loadPlugins(m, plugin.get('type'), plugin.get('name'))
                 except ImportError as e:
                     # todo:: subclass ImportError for missing requirements.
                     if e.message.lower().startswith("missing"):
@@ -121,10 +121,10 @@ class Loader(object):
             log.debug('Failed loading settings for "%s": %s', (name, traceback.format_exc()))
             return False
 
-    def loadPlugins(self, module, name):
+    def loadPlugins(self, module, type, name):
 
         if not hasattr(module, 'autoload'):
-            log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
+            #log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
             return False
         try:
             # Load single file plugin
@@ -133,6 +133,8 @@ class Loader(object):
             # Load folder plugin
             else:
                 module.autoload()
+
+            log.info('Loaded %s: %s', (type, name))
             return True
         except:
             log.error('Failed loading plugin "%s": %s', (module.__file__, traceback.format_exc()))
@@ -144,6 +146,9 @@ class Loader(object):
             self.modules[priority] = {}
 
         module = module.lstrip('.')
+        if plugin_type.startswith('couchpotato_core'):
+            plugin_type = plugin_type[17:]
+
         self.modules[priority][module] = {
             'priority': priority,
             'module': module,

couchpotato/core/logger.py

@@ -7,6 +7,9 @@ class CPLog(object):
     context = ''
     replace_private = ['api', 'apikey', 'api_key', 'password', 'username', 'h', 'uid', 'key', 'passkey']
 
+    Env = None
+    is_develop = False
+
     def __init__(self, context = ''):
         if context.endswith('.main'):
             context = context[:-5]
@@ -14,6 +17,14 @@ class CPLog(object):
         self.context = context
         self.logger = logging.getLogger()
 
+    def setup(self):
+
+        if not self.Env:
+            from couchpotato.environment import Env
+
+            self.Env = Env
+            self.is_develop = Env.get('dev')
+
     def info(self, msg, replace_tuple = ()):
         self.logger.info(self.addContext(msg, replace_tuple))
 
@@ -37,7 +48,6 @@ class CPLog(object):
 
     def safeMessage(self, msg, replace_tuple = ()):
 
-        from couchpotato.environment import Env
         from couchpotato.core.helpers.encoding import ss, toUnicode
 
         msg = ss(msg)
@@ -53,7 +63,8 @@ class CPLog(object):
             except Exception as e:
                 self.logger.error('Failed encoding stuff to log "%s": %s' % (msg, e))
 
-        if not Env.get('dev'):
+        self.setup()
+        if not self.is_develop:
 
             for replace in self.replace_private:
                 msg = re.sub('(\?%s=)[^\&]+' % replace, '?%s=xxx' % replace, msg)
@@ -61,7 +72,7 @@ class CPLog(object):
 
             # Replace api key
             try:
-                api_key = Env.setting('api_key')
+                api_key = self.Env.setting('api_key')
                 if api_key:
                     msg = msg.replace(api_key, 'API_KEY')
             except:

couchpotato/core/media/__init__.py

@@ -1,8 +1,10 @@
 import traceback
+
 from couchpotato import get_db, CPLog
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
 from couchpotato.core.plugins.base import Plugin
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/media/index.py

@@ -1,8 +1,8 @@
-from itertools import izip
 from string import ascii_letters
+from hashlib import md5
+
 from CodernityDB.hash_index import HashIndex
 from CodernityDB.tree_index import MultiTreeBasedIndex, TreeBasedIndex
-from hashlib import md5
 from couchpotato.core.helpers.encoding import toUnicode, simplifyString
 
 

couchpotato/core/media/_base/media/main.py

@@ -1,4 +1,6 @@
 import traceback
+from string import ascii_lowercase
+
 from couchpotato import tryInt, get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
@@ -7,7 +9,7 @@ from couchpotato.core.helpers.variable import splitString, getImdb, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media import MediaBase
 from .index import MediaIMDBIndex, MediaStatusIndex, MediaTypeIndex, TitleSearchIndex, TitleIndex, StartsWithIndex
-from string import ascii_lowercase
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/_base/providers/base.py

@@ -1,10 +1,3 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.encoding import ss
-from couchpotato.core.helpers.variable import tryFloat, mergeDicts, md5, \
-    possibleTitles, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
 from urlparse import urlparse
 import json
 import re
@@ -12,6 +5,15 @@ import time
 import traceback
 import xml.etree.ElementTree as XMLTree
 
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.helpers.variable import tryFloat, mergeDicts, md5, \
+    possibleTitles
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/nzb/base.py

@@ -1,6 +1,7 @@
-from couchpotato.core.media._base.providers.base import YarrProvider
 import time
 
+from couchpotato.core.media._base.providers.base import YarrProvider
+
 
 class NZBProvider(YarrProvider):
 

couchpotato/core/media/_base/providers/nzb/binsearch.py

@@ -1,10 +1,12 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/nzb/newznab.py

@@ -1,3 +1,9 @@
+from urllib2 import HTTPError
+from urlparse import urlparse
+import time
+import traceback
+import urllib2
+
 from couchpotato.core.helpers.encoding import tryUrlencode, toUnicode
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.helpers.variable import cleanHost, splitString, tryInt
@@ -5,11 +11,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 from couchpotato.environment import Env
 from dateutil.parser import parse
-from urllib2 import HTTPError
-from urlparse import urlparse
-import time
-import traceback
-import urllib2
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/_base/providers/nzb/nzbclub.py

@@ -1,3 +1,5 @@
+import time
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.rss import RSS
@@ -5,7 +7,7 @@ from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
-import time
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/_base/providers/nzb/nzbindex.py

@@ -1,3 +1,6 @@
+import re
+import time
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.rss import RSS
@@ -6,8 +9,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
-import re
-import time
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/_base/providers/nzb/omgwtfnzbs.py

@@ -1,3 +1,6 @@
+from urlparse import urlparse, parse_qs
+import time
+
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
 from couchpotato.core.helpers.rss import RSS
@@ -5,8 +8,7 @@ from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.nzb.base import NZBProvider
 from dateutil.parser import parse
-from urlparse import urlparse, parse_qs
-import time
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/_base/providers/torrent/awesomehd.py

@@ -1,10 +1,12 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/base.py

@@ -1,8 +1,10 @@
+import time
+
 from couchpotato.core.helpers.variable import getImdb, md5, cleanHost
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.base import YarrProvider
 from couchpotato.environment import Env
-import time
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/_base/providers/torrent/bithdtv.py

@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/bitsoup.py

@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import simplifyString, tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/hdbits.py

@@ -1,11 +1,12 @@
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-
 import re
 import json
 import traceback
+
+from couchpotato.core.helpers.variable import tryInt
+from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/ilovetorrents.py

@@ -1,11 +1,13 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/iptorrents.py

@@ -1,11 +1,13 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 import six
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/kickasstorrents.py

@@ -1,10 +1,12 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/passthepopcorn.py

@@ -1,15 +1,17 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-from dateutil.parser import parse
 import htmlentitydefs
 import json
 import re
 import time
 import traceback
+
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
+from dateutil.parser import parse
 import six
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/publichd.py

@@ -1,13 +1,15 @@
+from urlparse import parse_qs
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import tryUrlencode, toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-from urlparse import parse_qs
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
 import six
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/sceneaccess.py

@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/thepiratebay.py

@@ -1,12 +1,14 @@
+import re
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import re
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
 import six
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/torrentbytes.py

@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/torrentleech.py

@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 import six
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/torrentpotato.py

@@ -1,11 +1,13 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import splitString, tryInt, tryFloat
-from couchpotato.core.logger import CPLog
 from urlparse import urlparse
 import re
 import traceback
+
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import splitString, tryInt, tryFloat
+from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/torrentshack.py

@@ -1,10 +1,12 @@
+import traceback
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 import six
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/torrent/yify.py

@@ -1,8 +1,10 @@
+import traceback
+
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-import traceback
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
+
 log = CPLog(__name__)
 
 

couchpotato/core/media/_base/providers/userscript/base.py

@@ -1,9 +1,11 @@
+from urlparse import urlparse
+
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import simplifyString
 from couchpotato.core.helpers.variable import getImdb, md5
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-from urlparse import urlparse
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/_base/searcher/main.py

@@ -1,11 +1,13 @@
+import datetime
+import re
+
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import simplifyString
 from couchpotato.core.helpers.variable import splitString, removeEmpty, removeDuplicate
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.searcher.base import SearcherBase
-import datetime
-import re
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/movie/_base/__init__.py

@@ -3,5 +3,3 @@ from .main import MovieBase
 
 def autoload():
     return MovieBase()
-
-config = []

couchpotato/core/media/movie/_base/main.py

@@ -1,5 +1,7 @@
 import os
 import traceback
+import time
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
@@ -7,11 +9,13 @@ from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import splitString, getTitle, getImdb
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie import MovieTypeBase
-import time
 import six
 
+
 log = CPLog(__name__)
 
+autoload = 'MovieBase'
+
 
 class MovieBase(MovieTypeBase):
 

couchpotato/core/media/movie/_base/static/search.js

@@ -134,8 +134,8 @@ Block.Search.MovieItem = new Class({
 
 			if(self.info.in_library){
 				var in_library = [];
-				self.info.in_library.releases.each(function(release){
-					in_library.include(release.quality.label)
+				(self.info.in_library.releases || []).each(function(release){
+					in_library.include(release.quality)
 				});
 			}
 

couchpotato/core/media/movie/providers/automation/base.py

@@ -1,9 +1,11 @@
+import time
+
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.automation.base import AutomationBase
 from couchpotato.environment import Env
 from couchpotato.core.helpers.variable import splitString
-import time
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/movie/providers/automation/imdb.py

@@ -5,7 +5,6 @@ from bs4 import BeautifulSoup
 from couchpotato import fireEvent
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.helpers.variable import getImdb, splitString, tryInt
-
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.base import MultiProvider
 from couchpotato.core.media.movie.providers.automation.base import Automation

couchpotato/core/media/movie/providers/automation/itunes.py

@@ -1,12 +1,14 @@
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import md5, splitString, tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media.movie.providers.automation.base import Automation
 from xml.etree.ElementTree import QName
 import datetime
 import traceback
 import xml.etree.ElementTree as XMLTree
 
+from couchpotato.core.helpers.rss import RSS
+from couchpotato.core.helpers.variable import md5, splitString, tryInt
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+
 log = CPLog(__name__)
 
 autoload = 'ITunes'

couchpotato/core/media/movie/providers/automation/kinepolis.py

@@ -1,7 +1,9 @@
+import datetime
+
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.automation.base import Automation
-import datetime
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/movie/providers/automation/letterboxd.py

@@ -1,8 +1,10 @@
+import re
+
 from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt, splitString, removeEmpty
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.automation.base import Automation
-import re
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/movie/providers/automation/rottentomatoes.py

@@ -1,10 +1,12 @@
+from xml.etree.ElementTree import QName
+import datetime
+import re
+
 from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.helpers.variable import tryInt, splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.automation.base import Automation
-from xml.etree.ElementTree import QName
-import datetime
-import re
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/movie/providers/automation/trakt.py

@@ -1,8 +1,10 @@
+import base64
+
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.variable import sha1
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.automation.base import Automation
-import base64
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/movie/providers/info/_modifier.py

@@ -1,11 +1,13 @@
+import copy
+import traceback
+
 from CodernityDB.database import RecordNotFound
 from couchpotato import get_db
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.variable import mergeDicts, randomString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-import copy
-import traceback
+
 
 log = CPLog(__name__)
 
@@ -104,7 +106,11 @@ class MovieResultModifier(Plugin):
 
                 for release in db.run('release', 'for_media', media.get('_id')):
                     if release.get('status') == 'done':
-                        temp['in_library'] = media
+                        if not temp['in_library']:
+                            temp['in_library'] = media
+                            temp['in_library']['releases'] = []
+
+                        temp['in_library']['releases'].append(release)
         except:
             log.error('Tried getting more info on searched movies: %s', traceback.format_exc())
 

couchpotato/core/media/movie/providers/metadata/base.py

@@ -1,11 +1,13 @@
+import os
+import shutil
+import traceback
+
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.metadata.base import MetaDataBase
 from couchpotato.environment import Env
-import os
-import shutil
-import traceback
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/movie/providers/metadata/wmc.py

@@ -1,6 +1,8 @@
-from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
 import os
 
+from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
+
+
 autoload = 'WindowsMediaCenter'
 
 

couchpotato/core/media/movie/providers/metadata/xbmc.py

@@ -1,13 +1,15 @@
-from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import getTitle
-from couchpotato.core.logger import CPLog
 from xml.etree.ElementTree import Element, SubElement, tostring
 import os
 import re
 import traceback
 import xml.dom.minidom
 
+from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import getTitle
+from couchpotato.core.logger import CPLog
+
+
 log = CPLog(__name__)
 
 autoload = 'XBMC'

couchpotato/core/media/movie/providers/nzb/binsearch.py

@@ -1,11 +1,13 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.nzb.binsearch.main import Base
+from couchpotato.core.media._base.providers.nzb.binsearch import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 from couchpotato.environment import Env
 
 log = CPLog(__name__)
 
+autoload = 'BinSearch'
+
 
 class BinSearch(MovieProvider, Base):
 

couchpotato/core/media/movie/providers/nzb/newznab.py

@@ -1,10 +1,12 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.nzb.newznab.main import Base
+from couchpotato.core.media._base.providers.nzb.newznab import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)
 
+autoload = 'Newznab'
+
 
 class Newznab(MovieProvider, Base):
 

couchpotato/core/media/movie/providers/nzb/nzbclub.py

@@ -1,11 +1,13 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.nzb.nzbclub.main import Base
+from couchpotato.core.media._base.providers.nzb.nzbclub import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)
 
+autoload = 'NZBClub'
+
 
 class NZBClub(MovieProvider, Base):
 

couchpotato/core/media/movie/providers/nzb/nzbindex.py

@@ -1,12 +1,14 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.nzb.nzbindex.main import Base
+from couchpotato.core.media._base.providers.nzb.nzbindex import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 from couchpotato.environment import Env
 
 log = CPLog(__name__)
 
+autoload = 'NzbIndex'
+
 
 class NzbIndex(MovieProvider, Base):
 

couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py

@@ -1,9 +1,11 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.nzb.omgwtfnzbs.main import Base
+from couchpotato.core.media._base.providers.nzb.omgwtfnzbs import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)
 
+autoload = 'OMGWTFNZBs'
+
 
 class OMGWTFNZBs(MovieProvider, Base):
     pass

couchpotato/core/media/movie/providers/torrent/awesomehd.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.awesomehd.main import Base
+from couchpotato.core.media._base.providers.torrent.awesomehd import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/bithdtv.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.bithdtv.main import Base
+from couchpotato.core.media._base.providers.torrent.bithdtv import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/bitsoup.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.bitsoup.main import Base
+from couchpotato.core.media._base.providers.torrent.bitsoup import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/hdbits.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.hdbits.main import Base
+from couchpotato.core.media._base.providers.torrent.hdbits import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/ilovetorrents.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.ilovetorrents.main import Base
+from couchpotato.core.media._base.providers.torrent.ilovetorrents import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/iptorrents.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.iptorrents.main import Base
+from couchpotato.core.media._base.providers.torrent.iptorrents import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/kickasstorrents.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.kickasstorrents.main import Base
+from couchpotato.core.media._base.providers.torrent.kickasstorrents import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/passthepopcorn.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.passthepopcorn.main import Base
+from couchpotato.core.media._base.providers.torrent.passthepopcorn import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/publichd.py

@@ -1,6 +1,6 @@
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.publichd.main import Base
+from couchpotato.core.media._base.providers.torrent.publichd import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/sceneaccess.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.sceneaccess.main import Base
+from couchpotato.core.media._base.providers.torrent.sceneaccess import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/thepiratebay.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.thepiratebay.main import Base
+from couchpotato.core.media._base.providers.torrent.thepiratebay import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentbytes.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.torrentbytes.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentbytes import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentday.py

@@ -1,6 +1,6 @@
 from couchpotato.core.logger import CPLog
 from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.torrent.torrentday.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentday import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentleech.py

@@ -1,6 +1,6 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.torrentleech.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentleech import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentpotato.py

@@ -1,6 +1,6 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.torrentpotato.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentpotato import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/torrentshack.py

@@ -1,7 +1,7 @@
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.torrentshack.main import Base
+from couchpotato.core.media._base.providers.torrent.torrentshack import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/torrent/yify.py

@@ -1,5 +1,5 @@
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.yify.main import Base
+from couchpotato.core.media._base.providers.torrent.yify import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
 
 log = CPLog(__name__)

couchpotato/core/media/movie/providers/trailer/hdtrailers.py

@@ -1,12 +1,14 @@
+from string import digits, ascii_letters
+from urllib2 import HTTPError
+import re
+
 from bs4 import SoupStrainer, BeautifulSoup
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import mergeDicts, getTitle
 from couchpotato.core.logger import CPLog
-from string import digits, ascii_letters
-from urllib2 import HTTPError
-import re
 from couchpotato.core.media.movie.providers.trailer.base import TrailerProvider
 
+
 log = CPLog(__name__)
 
 autoload = 'HDTrailers'

couchpotato/core/media/movie/providers/userscript/allocine.py

@@ -1,7 +1,9 @@
-from couchpotato.core.logger import CPLog
 import traceback
+
+from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 
+
 log = CPLog(__name__)
 
 autoload = 'AlloCine'

couchpotato/core/media/movie/providers/userscript/appletrailers.py

@@ -1,6 +1,8 @@
-from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 import re
 
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
 autoload = 'AppleTrailers'
 
 

couchpotato/core/media/movie/providers/userscript/filmweb.py

@@ -1,6 +1,8 @@
-from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 import re
 
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
 autoload = 'Filmweb'
 
 

couchpotato/core/media/movie/providers/userscript/flickchart.py

@@ -1,7 +1,9 @@
+import traceback
+
 from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
-import traceback
+
 
 log = CPLog(__name__)
 

couchpotato/core/media/movie/providers/userscript/rottentomatoes.py

@@ -1,8 +1,10 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 import re
 import traceback
 
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
 log = CPLog(__name__)
 
 autoload = 'RottenTomatoes'

couchpotato/core/media/movie/providers/userscript/tmdb.py

@@ -1,6 +1,8 @@
+import re
+
 from couchpotato.core.event import fireEvent
 from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
-import re
+
 
 autoload = 'TMDB'
 

couchpotato/core/media/movie/providers/userscript/youteather.py

@@ -1,6 +1,8 @@
-from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
 import re
 
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
 autoload = 'YouTheater'
 
 

couchpotato/core/media/movie/searcher.py

@@ -1,3 +1,9 @@
+from datetime import date
+import random
+import re
+import time
+import traceback
+
 from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
@@ -7,14 +13,12 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.searcher.base import SearcherBase
 from couchpotato.core.media.movie import MovieTypeBase
 from couchpotato.environment import Env
-from datetime import date
-import random
-import re
-import time
-import traceback
+
 
 log = CPLog(__name__)
 
+autoload = 'MovieSearcher'
+
 
 class MovieSearcher(SearcherBase, MovieTypeBase):
 

couchpotato/core/media/movie/suggestion/__init__.py

@@ -1,7 +0,0 @@
-from .main import Suggestion
-
-
-def start():
-    return Suggestion()
-
-config = []