One up

Conflicts:
	version.py

Desktop.py

@@ -0,0 +1,231 @@
+from esky.util import appdir_from_executable #@UnresolvedImport
+from threading import Thread
+from version import VERSION
+from wx.lib.softwareupdate import SoftwareUpdate
+import os
+import sys
+import time
+import webbrowser
+import wx
+
+# Include proper dirs
+if hasattr(sys, 'frozen'):
+    import libs
+    base_path = os.path.dirname(os.path.dirname(os.path.abspath(libs.__file__)))
+else:
+    base_path = os.path.dirname(os.path.abspath(__file__))
+
+lib_dir = os.path.join(base_path, 'libs')
+
+sys.path.insert(0, base_path)
+sys.path.insert(0, lib_dir)
+
+from couchpotato.environment import Env
+
+class TaskBarIcon(wx.TaskBarIcon):
+
+    TBMENU_OPEN = wx.NewId()
+    TBMENU_SETTINGS = wx.NewId()
+    TBMENU_EXIT = wx.ID_EXIT
+
+    closed = False
+    menu = False
+    enabled = False
+
+    def __init__(self, frame):
+        wx.TaskBarIcon.__init__(self)
+        self.frame = frame
+
+        icon = wx.Icon('icon.png', wx.BITMAP_TYPE_PNG)
+        self.SetIcon(icon)
+
+        self.Bind(wx.EVT_TASKBAR_LEFT_UP, self.OnTaskBarClick)
+        self.Bind(wx.EVT_TASKBAR_RIGHT_UP, self.OnTaskBarClick)
+
+        self.Bind(wx.EVT_MENU, self.onOpen, id = self.TBMENU_OPEN)
+        self.Bind(wx.EVT_MENU, self.onSettings, id = self.TBMENU_SETTINGS)
+        self.Bind(wx.EVT_MENU, self.onTaskBarClose, id = self.TBMENU_EXIT)
+
+    def OnTaskBarClick(self, evt):
+        menu = self.CreatePopupMenu()
+        self.PopupMenu(menu)
+        menu.Destroy()
+
+    def enable(self):
+        self.enabled = True
+
+        if self.menu:
+            self.open_menu.Enable(True)
+            self.setting_menu.Enable(True)
+
+            self.open_menu.SetText('Open')
+
+    def CreatePopupMenu(self):
+
+        if not self.menu:
+            self.menu = wx.Menu()
+            self.open_menu = self.menu.Append(self.TBMENU_OPEN, 'Open')
+            self.setting_menu = self.menu.Append(self.TBMENU_SETTINGS, 'About')
+            self.exit_menu = self.menu.Append(self.TBMENU_EXIT, 'Quit')
+
+            if not self.enabled:
+                self.open_menu.Enable(False)
+                self.setting_menu.Enable(False)
+
+                self.open_menu.SetText('Loading...')
+
+        return self.menu
+
+    def onOpen(self, event):
+        url = self.frame.parent.getSetting('base_url')
+        webbrowser.open(url)
+
+    def onSettings(self, event):
+        url = self.frame.parent.getSetting('base_url') + 'settings/about/'
+        webbrowser.open(url)
+
+    def onTaskBarClose(self, evt):
+        if self.closed:
+            return
+
+        self.closed = True
+
+        self.RemoveIcon()
+        wx.CallAfter(self.frame.Close)
+
+
+    def makeIcon(self, img):
+        if "wxMSW" in wx.PlatformInfo:
+            img = img.Scale(16, 16)
+        elif "wxGTK" in wx.PlatformInfo:
+            img = img.Scale(22, 22)
+
+        icon = wx.IconFromBitmap(img.CopyFromBitmap())
+        return icon
+
+
+class MainFrame(wx.Frame):
+
+    def __init__(self, parent):
+        wx.Frame.__init__(self, None, style = wx.FRAME_NO_TASKBAR)
+
+        self.parent = parent
+        self.tbicon = TaskBarIcon(self)
+
+
+class WorkerThread(Thread):
+
+    def __init__(self, desktop):
+        Thread.__init__(self)
+        self.daemon = True
+        self._desktop = desktop
+
+        self.start()
+
+    def run(self):
+
+        # Get options via arg
+        from couchpotato.runner import getOptions
+        args = ['--quiet']
+        self.options = getOptions(base_path, args)
+
+        # Load settings
+        settings = Env.get('settings')
+        settings.setFile(self.options.config_file)
+
+        # Create data dir if needed
+        self.data_dir = os.path.expanduser(Env.setting('data_dir'))
+        if self.data_dir == '':
+            from couchpotato.core.helpers.variable import getDataDir
+            self.data_dir = getDataDir()
+
+        if not os.path.isdir(self.data_dir):
+            os.makedirs(self.data_dir)
+
+        # Create logging dir
+        self.log_dir = os.path.join(self.data_dir, 'logs');
+        if not os.path.isdir(self.log_dir):
+            os.mkdir(self.log_dir)
+
+        try:
+            from couchpotato.runner import runCouchPotato
+            runCouchPotato(self.options, base_path, args, data_dir = self.data_dir, log_dir = self.log_dir, Env = Env, desktop = self._desktop)
+        except:
+            pass
+
+        self._desktop.frame.Close()
+
+
+class CouchPotatoApp(wx.App, SoftwareUpdate):
+
+    settings = {}
+    events = {}
+    restart = False
+    closing = False
+
+    def OnInit(self):
+
+        # Updater
+        base_url = 'https://api.couchpota.to/updates/%s'
+        self.InitUpdates(base_url % VERSION + '/', 'https://couchpota.to/updates/%s' % 'changelog.html',
+                         icon = wx.Icon('icon.png'))
+
+        self.frame = MainFrame(self)
+        self.frame.Bind(wx.EVT_CLOSE, self.onClose)
+
+        # CouchPotato thread
+        self.worker = WorkerThread(self)
+
+        return True
+
+    def onAppLoad(self):
+        self.frame.tbicon.enable()
+
+    def setSettings(self, settings = {}):
+        self.settings = settings
+
+    def getSetting(self, name):
+        return self.settings.get(name)
+
+    def addEvents(self, events = {}):
+        for name in events.iterkeys():
+            self.events[name] = events[name]
+
+    def onClose(self, event):
+
+        if not self.closing:
+            self.closing = True
+            self.frame.tbicon.onTaskBarClose(event)
+
+            onClose = self.events.get('onClose')
+            onClose(event)
+
+    def afterShutdown(self, restart = False):
+        self.frame.Destroy()
+        self.restart = restart
+        self.ExitMainLoop()
+
+
+if __name__ == '__main__':
+
+    app = CouchPotatoApp(redirect = False)
+    app.MainLoop()
+
+    time.sleep(1)
+
+    if app.restart:
+
+        def appexe_from_executable(exepath):
+            appdir = appdir_from_executable(exepath)
+            exename = os.path.basename(exepath)
+
+            if sys.platform == "darwin":
+                if os.path.isdir(os.path.join(appdir, "Contents", "MacOS")):
+                    return os.path.join(appdir, "Contents", "MacOS", exename)
+
+            return os.path.join(appdir, exename)
+
+        exe = appexe_from_executable(sys.executable)
+        os.chdir(os.path.dirname(exe))
+
+        os.execv(exe, [exe] + sys.argv[1:])

README.md

@@ -1,4 +1,4 @@
-CouchPotato
+CouchPotato Server
 =====
 
 CouchPotato (CP) is an automatic NZB and torrent downloader. You can keep a "movies I want"-list and it will search for NZBs/torrents of these movies every X hours.
@@ -7,7 +7,7 @@ Once a movie is found, it will send it to SABnzbd or download the torrent to a s
 
 ## Running from Source
 
-CouchPotatoServer can be run from source. This will use *git* as updater, so make sure that is installed.
+CouchPotatoServer can be run from source. This will use *git* as updater, so make sure that is installed also.
 
 Windows, see [the CP forum](http://couchpota.to/forum/showthread.php?tid=14) for more details:
 
@@ -40,7 +40,7 @@ Linux (ubuntu / debian):
 * Make it executable. `sudo chmod +x /etc/init.d/couchpotato`
 * Add it to defaults. `sudo update-rc.d couchpotato defaults`
 * Open your browser and go to: `http://localhost:5050/`
-
+ 
 
 FreeBSD :
 
@@ -56,7 +56,7 @@ FreeBSD :
 * Run `git clone https://github.com/RuudBurger/CouchPotatoServer.git`
 * Then run `sudo python CouchPotatoServer/CouchPotato.py` to start for the first time
 * To run on boot copy the init script. `sudo cp CouchPotatoServer/init/freebsd /etc/rc.d/couchpotato`
-* Change the paths inside the init script. `sudo vim /etc/rc.d/couchpotato`
+* Change the paths inside the init script. `sudo vim /etc/init.d/couchpotato`
 * Make init script executable. `sudo chmod +x /etc/rc.d/couchpotato`
 * Add init to startup. `sudo echo 'couchpotato_enable="YES"' >> /etc/rc.conf`
 * Open your browser and go to: `http://server:5050/`

contributing.md

@@ -1,36 +1,25 @@
-# Contributing to CouchPotatoServer
+## Got a issue/feature request or submitting a pull request?
 
-1. [Contributing](#contributing)
-2. [Submitting an Issue](#issues)
-3. [Submitting a Pull Request](#pull-requests)
+Make sure you think of the following things:
 
-## Contributing
-Thank you for your interest in contributing to CouchPotato. There are several ways to help out, even if you've never worked on an open source project before.
-If you've found a bug or want to request a feature, you can report it by [posting an issue](https://github.com/RuudBurger/CouchPotatoServer/issues/new) - be sure to read the [guidelines](#issues) first!
-If you want to contribute your own work, please read the [guidelines](#pull-requests) for submitting a pull request.
-Lastly, for anything related to CouchPotato, feel free to stop by the [forum](http://couchpota.to/forum/) or the [#couchpotato](http://webchat.freenode.net/?channels=couchpotato) IRC channel at irc.freenode.net.
-
-## Issues
-Issues are intended for reporting bugs and weird behaviour or suggesting improvements to CouchPotatoServer.
-Before you submit an issue, please go through the following checklist:
- * Search through existing issues (*including closed issues!*) first: you might be able to get your answer there.
- * Double check your issue manually, because it could be an external issue. 
- * Post logs with your issue: Without seeing what is going on, the developers can't reproduce the error.
- * Check the logs yourself before submitting them. Obvious errors like permission or HTTP errors are often not related to CouchPotato.
- * What movie and quality are you searching for?
- * What are your settings for the specific problem?
- * What providers are you using? (While your logs include these, scanning through hundreds of lines of logs isn't our hobby)
- * Post the logs from the *config* directory, please do not copy paste the UI. Use pastebin to store these logs!
+## Issue
+ * Search through the existing (and closed) issues first, see if you can get your answer there.
+ * Double check the result manually, because it could be an external issue. 
+ * Post logs! Without seeing what is going on, I can't reproduce the error.
+ * Also check the logs before submitting, obvious errors like permission or http errors are often not related to CP.
+ * What is the movie + quality you are searching for?
+ * What are you're settings for the specific problem?
+ * What providers are you using? (While you're logs include these, scanning through hundred of lines of log isn't our hobby)
+ * Post the logs from config directory, please do not copy paste the UI. Use pastebin to store these logs!
  * Give a short step by step of how to reproduce the error.
- * What hardware / OS are you using and what are its limitations? For example: NAS can be slow and maybe have a different version of python installed then when you use CP on OSX or Windows.
- * Your issue might be marked with the "can't reproduce" tag. Don't ask why your issue was closed if it says so in the tag.
- * If you're running on a NAS (QNAP, Austor etc..) with pre-made packages, make sure these are set up to use our source repository (RuudBurger/CouchPotatoServer) and nothing else!!
- 
-The more relevant information you can provide, the more likely it is the issue will be resolved rather than closed.
+ * What hardware / OS are you using and what are the limits? NAS can be slow and maybe have a different python installed then when you use CP on OSX or Windows for example.
+ * I will mark issues with the "can't reproduce" tag. Don't go asking "why closed" if it clearly says the issue in the tag ;)
+ * If you're running on a NAS (QNAP, Austor etc..) with pre-made packages, make sure these are setup to use our source repo (RuudBurger/CouchPotatoServer) and nothing else!!
 
-## Pull Requests
-Pull requests are intended for contributing code or documentation to the project. Before you submit a pull request, consider the following:
- * Make sure your pull request is made for the *develop* branch (or relevant feature branch).
+## Pull Request
+ * Make sure you're pull request is made for develop branch (or relevant feature branch)
  * Have you tested your PR? If not, why?
- * Does your PR have any limitations we should know of?
- * Is your PR up-to-date with the branch you're trying to push into?
+ * Are there any limitations of your PR we should know of?
+ * Make sure to keep you're PR up-to-date with the branch you're trying to push into.
+
+**If we don't get enough info, the chance of the issue getting closed is a lot bigger ;)**

couchpotato/__init__.py

@@ -15,7 +15,6 @@ log = CPLog(__name__)
 views = {}
 template_loader = template.Loader(os.path.join(os.path.dirname(__file__), 'templates'))
 
-
 class BaseHandler(RequestHandler):
 
     def get_current_user(self):
@@ -49,8 +48,8 @@ def addView(route, func, static = False):
     views[route] = func
 
 
-def get_db():
-    return Env.get('db')
+def get_session():
+    return Env.getSession()
 
 
 # Web view
@@ -72,16 +71,8 @@ def apiDocs():
 addView('docs', apiDocs)
 
 
-# Database debug manager
-def databaseManage():
-    return template_loader.load('database.html').generate(fireEvent = fireEvent, Env = Env)
-
-addView('database', databaseManage)
-
-
 # Make non basic auth option to get api key
 class KeyHandler(RequestHandler):
-
     def get(self, *args, **kwargs):
         api_key = None
 

couchpotato/api.py

@@ -1,16 +1,14 @@
-from functools import wraps
-from threading import Thread
-import json
-import threading
-import traceback
-import urllib
-
 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
 
 log = CPLog(__name__)
 
@@ -95,7 +93,6 @@ class ApiHandler(RequestHandler):
 
             # Split array arguments
             kwargs = getParams(kwargs)
-            kwargs['_request'] = self
 
             # Remove t random string
             try: del kwargs['t']
@@ -130,8 +127,6 @@ class ApiHandler(RequestHandler):
 
         api_locks[route].release()
 
-    post = get
-
 
 def addApiView(route, func, static = False, docs = None, **kwargs):
 

couchpotato/core/_base/_core/__init__.py

@@ -0,0 +1,101 @@
+from .main import Core
+from uuid import uuid4
+
+
+def start():
+    return Core()
+
+config = [{
+    'name': 'core',
+    'order': 1,
+    'groups': [
+        {
+            'tab': 'general',
+            'name': 'basics',
+            'description': 'Needs restart before changes take effect.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'username',
+                    'default': '',
+                },
+                {
+                    'name': 'password',
+                    'default': '',
+                    'type': 'password',
+                },
+                {
+                    'name': 'port',
+                    'default': 5050,
+                    'type': 'int',
+                    'description': 'The port I should listen to.',
+                },
+                {
+                    'name': 'ssl_cert',
+                    'description': 'Path to SSL server.crt',
+                    'advanced': True,
+                },
+                {
+                    'name': 'ssl_key',
+                    'description': 'Path to SSL server.key',
+                    'advanced': True,
+                },
+                {
+                    'name': 'launch_browser',
+                    'default': True,
+                    'type': 'bool',
+                    'description': 'Launch the browser when I start.',
+                    'wizard': True,
+                },
+            ],
+        },
+        {
+            'tab': 'general',
+            'name': 'advanced',
+            'description': "For those who know what they're doing",
+            'advanced': True,
+            'options': [
+                {
+                    'name': 'api_key',
+                    'default': uuid4().hex,
+                    'readonly': 1,
+                    'description': 'Let 3rd party app do stuff. <a target="_self" href="../../docs/">Docs</a>',
+                },
+                {
+                    'name': 'debug',
+                    'default': 0,
+                    'type': 'bool',
+                    'description': 'Enable debugging.',
+                },
+                {
+                    'name': 'development',
+                    'default': 0,
+                    'type': 'bool',
+                    'description': 'Enable this if you\'re developing, and NOT in any other case, thanks.',
+                },
+                {
+                    'name': 'data_dir',
+                    'type': 'directory',
+                    'description': 'Where cache/logs/etc are stored. Keep empty for defaults.',
+                },
+                {
+                    'name': 'url_base',
+                    'default': '',
+                    'description': 'When using mod_proxy use this to append the url with this.',
+                },
+                {
+                    'name': 'permission_folder',
+                    'default': '0755',
+                    'label': 'Folder CHMOD',
+                    'description': 'Can be either decimal (493) or octal (leading zero: 0755)',
+                },
+                {
+                    'name': 'permission_file',
+                    'default': '0755',
+                    'label': 'File CHMOD',
+                    'description': 'Same as Folder CHMOD but for files',
+                },
+            ],
+        },
+    ],
+}]

couchpotato/core/_base/_core/main.py

@@ -1,3 +1,10 @@
+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
@@ -6,19 +13,8 @@ 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'
-
 
 class Core(Plugin):
 
@@ -51,7 +47,6 @@ class Core(Plugin):
         addEvent('app.api_url', self.createApiUrl)
         addEvent('app.version', self.version)
         addEvent('app.load', self.checkDataDir)
-        addEvent('app.load', self.cleanUpFolders)
 
         addEvent('setting.save.core.password', self.md5Password)
         addEvent('setting.save.core.api_key', self.checkApikey)
@@ -76,9 +71,6 @@ class Core(Plugin):
 
         return True
 
-    def cleanUpFolders(self):
-        self.deleteEmptyFolder(Env.get('app_dir'), show_error = False)
-
     def available(self, **kwargs):
         return {
             'success': True
@@ -189,104 +181,8 @@ class Core(Plugin):
     def signalHandler(self):
         if Env.get('daemonized'): return
 
-        def signal_handler(*args, **kwargs):
+        def signal_handler(signal, frame):
             fireEvent('app.shutdown', single = True)
 
         signal.signal(signal.SIGINT, signal_handler)
         signal.signal(signal.SIGTERM, signal_handler)
-
-
-config = [{
-    'name': 'core',
-    'order': 1,
-    'groups': [
-        {
-            'tab': 'general',
-            'name': 'basics',
-            'description': 'Needs restart before changes take effect.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'username',
-                    'default': '',
-                },
-                {
-                    'name': 'password',
-                    'default': '',
-                    'type': 'password',
-                },
-                {
-                    'name': 'port',
-                    'default': 5050,
-                    'type': 'int',
-                    'description': 'The port I should listen to.',
-                },
-                {
-                    'name': 'ssl_cert',
-                    'description': 'Path to SSL server.crt',
-                    'advanced': True,
-                },
-                {
-                    'name': 'ssl_key',
-                    'description': 'Path to SSL server.key',
-                    'advanced': True,
-                },
-                {
-                    'name': 'launch_browser',
-                    'default': True,
-                    'type': 'bool',
-                    'description': 'Launch the browser when I start.',
-                    'wizard': True,
-                },
-            ],
-        },
-        {
-            'tab': 'general',
-            'name': 'advanced',
-            'description': "For those who know what they're doing",
-            'advanced': True,
-            'options': [
-                {
-                    'name': 'api_key',
-                    'default': uuid4().hex,
-                    'readonly': 1,
-                    'description': 'Let 3rd party app do stuff. <a target="_self" href="../../docs/">Docs</a>',
-                },
-                {
-                    'name': 'debug',
-                    'default': 0,
-                    'type': 'bool',
-                    'description': 'Enable debugging.',
-                },
-                {
-                    'name': 'development',
-                    'default': 0,
-                    'type': 'bool',
-                    'description': 'Enable this if you\'re developing, and NOT in any other case, thanks.',
-                },
-                {
-                    'name': 'data_dir',
-                    'type': 'directory',
-                    'description': 'Where cache/logs/etc are stored. Keep empty for defaults.',
-                },
-                {
-                    'name': 'url_base',
-                    'default': '',
-                    'description': 'When using mod_proxy use this to append the url with this.',
-                },
-                {
-                    'name': 'permission_folder',
-                    'default': '0755',
-                    'label': 'Folder CHMOD',
-                    'description': 'Can be either decimal (493) or octal (leading zero: 0755)',
-                },
-                {
-                    'name': 'permission_file',
-                    'default': '0755',
-                    'label': 'File CHMOD',
-                    'description': 'Same as Folder CHMOD but for files',
-                },
-            ],
-        },
-    ],
-}]

couchpotato/core/_base/clientscript/__init__.py

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

couchpotato/core/_base/clientscript/main.py

@@ -1,7 +1,3 @@
-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
@@ -11,12 +7,12 @@ 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__)
 
-autoload = 'ClientScript'
-
 
 class ClientScript(Plugin):
 
@@ -49,17 +45,21 @@ class ClientScript(Plugin):
             'scripts/block/footer.js',
             'scripts/block/menu.js',
             'scripts/page/home.js',
+            'scripts/page/wanted.js',
             'scripts/page/settings.js',
             'scripts/page/about.js',
+            'scripts/page/manage.js',
+            'scripts/misc/downloaders.js',
         ],
     }
 
+
     urls = {'style': {}, 'script': {}}
     minified = {'style': {}, 'script': {}}
     paths = {'style': {}, 'script': {}}
     comment = {
-        'style': '/*** %s:%d ***/\n',
-        'script': '// %s:%d\n'
+       'style': '/*** %s:%d ***/\n',
+       'script': '// %s:%d\n'
     }
 
     html = {
@@ -91,6 +91,7 @@ class ClientScript(Plugin):
                 else:
                     self.registerStyle(core_url, file_path, position = 'front')
 
+
     def minify(self):
 
         # Create cache dir
@@ -124,7 +125,7 @@ class ClientScript(Plugin):
                 data = cssmin(data)
                 data = data.replace('../images/', '../static/images/')
                 data = data.replace('../fonts/', '../static/fonts/')
-                data = data.replace('../../static/', '../static/')  # Replace inside plugins
+                data = data.replace('../../static/', '../static/') # Replace inside plugins
 
             raw.append({'file': file_path, 'date': int(os.path.getmtime(file_path)), 'data': data})
 
@@ -187,7 +188,6 @@ class ClientScript(Plugin):
 
     prefix_properties = ['border-radius', 'transform', 'transition', 'box-shadow']
     prefix_tags = ['ms', 'moz', 'webkit']
-
     def prefix(self, data):
 
         trimmed_data = re.sub('(\t|\n|\r)+', '', data)

couchpotato/core/_base/desktop/__init__.py

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

couchpotato/core/_base/desktop/main.py

@@ -5,9 +5,6 @@ from couchpotato.environment import Env
 
 log = CPLog(__name__)
 
-autoload = 'Desktop'
-
-
 if Env.get('desktop'):
 
     class Desktop(Plugin):

couchpotato/core/_base/downloader/__init__.py

@@ -1,20 +0,0 @@
-from .main import Downloader
-
-
-def autoload():
-    return Downloader()
-
-
-config = [{
-    'name': 'download_providers',
-    'groups': [
-        {
-            'label': 'Downloaders',
-            'description': 'You can select different downloaders for each type (usenet / torrent)',
-            'type': 'list',
-            'name': 'download_providers',
-            'tab': 'downloaders',
-            'options': [],
-        },
-    ],
-}]

couchpotato/core/_base/scheduler/__init__.py

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

couchpotato/core/_base/scheduler/main.py

@@ -5,8 +5,6 @@ from couchpotato.core.plugins.base import Plugin
 
 log = CPLog(__name__)
 
-autoload = 'Scheduler'
-
 
 class Scheduler(Plugin):
 
@@ -68,8 +66,6 @@ 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,10 +1,9 @@
-import os
-
 from .main import Updater
 from couchpotato.environment import Env
+import os
 
 
-def autoload():
+def start():
     return Updater()
 
 config = [{

couchpotato/core/_base/updater/main.py

@@ -1,33 +1,28 @@
-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 datetime import datetime
 from dateutil.parser import parse
 from git.repository import LocalRepository
-from scandir import scandir
+import json
+import os
+import shutil
+import tarfile
+import time
+import traceback
 import version
+import zipfile
 from six.moves import filter
 
-
 log = CPLog(__name__)
 
 
 class Updater(Plugin):
 
     available_notified = False
-    _lock = RLock()
 
     def __init__(self):
 
@@ -105,17 +100,7 @@ class Updater(Plugin):
         return False
 
     def info(self, **kwargs):
-        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
+        return self.updater.info()
 
     def checkView(self, **kwargs):
         return {
@@ -142,10 +127,6 @@ class Updater(Plugin):
             'success': success
         }
 
-    def doShutdown(self):
-        self.updater.deletePyc(show_logs = False)
-        return super(Updater, self).doShutdown()
-
 
 class BaseUpdater(Plugin):
 
@@ -163,15 +144,12 @@ class BaseUpdater(Plugin):
         pass
 
     def info(self):
-
-        current_version = self.getVersion()
-
         return {
             'last_check': self.last_check,
             'update_version': self.update_version,
-            'version': current_version,
+            'version': self.getVersion(),
             'repo_name': '%s/%s' % (self.repo_user, self.repo_name),
-            'branch': current_version.get('branch', self.branch),
+            'branch': self.branch,
         }
 
     def getVersion(self):
@@ -180,9 +158,9 @@ class BaseUpdater(Plugin):
     def check(self):
         pass
 
-    def deletePyc(self, only_excess = True, show_logs = True):
+    def deletePyc(self, only_excess = True):
 
-        for root, dirs, files in scandir.walk(ss(Env.get('app_dir'))):
+        for root, dirs, files in os.walk(ss(Env.get('app_dir'))):
 
             pyc_files = filter(lambda filename: filename.endswith('.pyc'), files)
             py_files = set(filter(lambda filename: filename.endswith('.py'), files))
@@ -190,7 +168,7 @@ class BaseUpdater(Plugin):
 
             for excess_pyc_file in excess_pyc_files:
                 full_path = os.path.join(root, excess_pyc_file)
-                if show_logs: log.debug('Removing old PYC file: %s', full_path)
+                log.debug('Removing old PYC file: %s', full_path)
                 try:
                     os.remove(full_path)
                 except:
@@ -216,6 +194,9 @@ class GitUpdater(BaseUpdater):
             log.info('Updating to latest version')
             self.repo.pull()
 
+            # Delete leftover .pyc files
+            self.deletePyc()
+
             return True
         except:
             log.error('Failed updating via GIT: %s', traceback.format_exc())
@@ -231,11 +212,10 @@ 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.repo.getCurrentBranch().name or self.branch, output.hash[:8], datetime.fromtimestamp(output.getDate())),
+                    'repr': 'git:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, 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)
@@ -328,11 +308,11 @@ class SourceUpdater(BaseUpdater):
         # Get list of files we want to overwrite
         self.deletePyc()
         existing_files = []
-        for root, subfiles, filenames in scandir.walk(app_dir):
+        for root, subfiles, filenames in os.walk(app_dir):
             for filename in filenames:
                 existing_files.append(os.path.join(root, filename))
 
-        for root, subfiles, filenames in scandir.walk(path):
+        for root, subfiles, filenames in os.walk(path):
             for filename in filenames:
                 fromfile = os.path.join(root, filename)
                 tofile = os.path.join(app_dir, fromfile.replace(path + os.path.sep, ''))

couchpotato/core/_base/updater/static/updater.js

@@ -5,7 +5,7 @@ var UpdaterBase = new Class({
 	initialize: function(){
 		var self = this;
 
-		App.addEvent('load', self.info.bind(self, 2000));
+		App.addEvent('load', self.info.bind(self, 2000))
 		App.addEvent('unload', function(){
 			if(self.timer)
 				clearTimeout(self.timer);
@@ -66,7 +66,7 @@ var UpdaterBase = new Class({
 
 		var changelog = 'https://github.com/'+data.repo_name+'/compare/'+data.version.hash+'...'+data.branch;
 		if(data.update_version.changelog)
-			changelog = data.update_version.changelog + '#' + data.version.hash+'...'+data.update_version.hash;
+			changelog = data.update_version.changelog + '#' + data.version.hash+'...'+data.update_version.hash
 
 		self.message = new Element('div.message.update').adopt(
 			new Element('span', {

couchpotato/core/database.py

@@ -1,482 +0,0 @@
-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, tryInt
-
-
-log = CPLog(__name__)
-
-
-class Database(object):
-
-    indexes = []
-    db = None
-
-    def __init__(self):
-
-        addApiView('database.list_documents', self.listDocuments)
-        addApiView('database.reindex', self.reindex)
-        addApiView('database.compact', self.compact)
-        addApiView('database.document.update', self.updateDocument)
-        addApiView('database.document.delete', self.deleteDocument)
-
-        addEvent('database.setup_index', self.setupIndex)
-        addEvent('app.migrate', self.migrate)
-
-    def getDB(self):
-
-        if not self.db:
-            from couchpotato import get_db
-            self.db = get_db()
-
-        return self.db
-
-    def setupIndex(self, index_name, klass):
-
-        self.indexes.append(index_name)
-
-        db = self.getDB()
-
-        # Category index
-        index_instance = klass(db.path, index_name)
-        try:
-            db.add_index(index_instance)
-            db.reindex_index(index_name)
-        except:
-            previous = db.indexes_names[index_name]
-            previous_version = previous._version
-            current_version = klass._version
-
-            # Only edit index if versions are different
-            if previous_version < current_version:
-                log.debug('Index "%s" already exists, updating and reindexing', index_name)
-                db.destroy_index(previous)
-                db.add_index(index_instance)
-                db.reindex_index(index_name)
-
-    def deleteDocument(self, **kwargs):
-
-        db = self.getDB()
-
-        try:
-
-            document_id = kwargs.get('_request').get_argument('id')
-            document = db.get('id', document_id)
-            db.delete(document)
-
-            return {
-                'success': True
-            }
-        except:
-            return {
-                'success': False,
-                'error': traceback.format_exc()
-            }
-
-    def updateDocument(self, **kwargs):
-
-        db = self.getDB()
-
-        try:
-
-            document = json.loads(kwargs.get('_request').get_argument('document'))
-            d = db.update(document)
-            document.update(d)
-
-            return {
-                'success': True,
-                'document': document
-            }
-        except:
-            return {
-                'success': False,
-                'error': traceback.format_exc()
-            }
-
-    def listDocuments(self, **kwargs):
-        db = self.getDB()
-
-        results = {
-            'unknown': []
-        }
-
-        for document in db.all('id'):
-            key = document.get('_t', 'unknown')
-
-            if kwargs.get('show') and key != kwargs.get('show'):
-                continue
-
-            if not results.get(key):
-                results[key] = []
-            results[key].append(document)
-
-        return results
-
-    def reindex(self, **kwargs):
-
-        success = True
-        try:
-            db = self.getDB()
-            db.reindex()
-        except:
-            log.error('Failed index: %s', traceback.format_exc())
-            success = False
-
-        return {
-            'success': success
-        }
-
-    def compact(self, **kwargs):
-
-        success = True
-        try:
-            db = self.getDB()
-            db.compact()
-        except:
-            log.error('Failed compact: %s', traceback.format_exc())
-            success = False
-
-        return {
-            'success': success
-        }
-
-    def migrate(self):
-
-        from couchpotato import Env
-        old_db = os.path.join(Env.get('data_dir'), 'couchpotato.db')
-        if not os.path.isfile(old_db): return
-
-        log.info('=' * 30)
-        log.info('Migrating database, hold on..')
-        time.sleep(1)
-
-        if os.path.isfile(old_db):
-
-            migrate_start = time.time()
-
-            import sqlite3
-            conn = sqlite3.connect(old_db)
-
-            migrate_list = {
-                'category': ['id', 'label', 'order', 'required', 'preferred', 'ignored', 'destination'],
-                'profile': ['id', 'label', 'order', 'core', 'hide'],
-                'profiletype': ['id', 'order', 'finish', 'wait_for', 'quality_id', 'profile_id'],
-                'quality': ['id', 'identifier', 'order', 'size_min', 'size_max'],
-                'movie': ['id', 'last_edit', 'library_id', 'status_id', 'profile_id', 'category_id'],
-                'library': ['id', 'identifier', 'info'],
-                'librarytitle': ['id', 'title', 'default', 'libraries_id'],
-                'library_files__file_library': ['library_id', 'file_id'],
-                'release': ['id', 'identifier', 'movie_id', 'status_id', 'quality_id', 'last_edit'],
-                'releaseinfo': ['id', 'identifier', 'value', 'release_id'],
-                'release_files__file_release': ['release_id', 'file_id'],
-                'status': ['id', 'identifier'],
-                'properties': ['id', 'identifier', 'value'],
-                'file': ['id', 'path', 'type_id'],
-                'filetype': ['identifier', 'id']
-            }
-
-            migrate_data = {}
-
-            c = conn.cursor()
-
-            for ml in migrate_list:
-                migrate_data[ml] = {}
-                rows = migrate_list[ml]
-
-                try:
-                    c.execute('SELECT %s FROM `%s`' % ('`' + '`,`'.join(rows) + '`', ml))
-                except:
-                    # ignore faulty destination_id database
-                    if ml == 'category':
-                        migrate_data[ml] = {}
-                    else:
-                        raise
-
-                for p in c.fetchall():
-                    columns = {}
-                    for row in migrate_list[ml]:
-                        columns[row] = p[rows.index(row)]
-
-                    if not migrate_data[ml].get(p[0]):
-                        migrate_data[ml][p[0]] = columns
-                    else:
-                        if not isinstance(migrate_data[ml][p[0]], list):
-                            migrate_data[ml][p[0]] = [migrate_data[ml][p[0]]]
-                        migrate_data[ml][p[0]].append(columns)
-
-            conn.close()
-
-            log.info('Getting data took %s', time.time() - migrate_start)
-
-            db = self.getDB()
-
-            # Use properties
-            properties = migrate_data['properties']
-            log.info('Importing %s properties', len(properties))
-            for x in properties:
-                property = properties[x]
-                Env.prop(property.get('identifier'), property.get('value'))
-
-            # Categories
-            categories = migrate_data.get('category', [])
-            log.info('Importing %s categories', len(categories))
-            category_link = {}
-            for x in categories:
-                c = categories[x]
-
-                new_c = db.insert({
-                    '_t': 'category',
-                    'order': c.get('order', 999),
-                    'label': toUnicode(c.get('label', '')),
-                    'ignored': toUnicode(c.get('ignored', '')),
-                    'preferred': toUnicode(c.get('preferred', '')),
-                    'required': toUnicode(c.get('required', '')),
-                    'destination': toUnicode(c.get('destination', '')),
-                })
-
-                category_link[x] = new_c.get('_id')
-
-            # Profiles
-            log.info('Importing profiles')
-            new_profiles = db.all('profile', with_doc = True)
-            new_profiles_by_label = {}
-            for x in new_profiles:
-
-                # Remove default non core profiles
-                if not x['doc'].get('core'):
-                    db.delete(x['doc'])
-                else:
-                    new_profiles_by_label[x['doc']['label']] = x['_id']
-
-            profiles = migrate_data['profile']
-            profile_link = {}
-            for x in profiles:
-                p = profiles[x]
-
-                exists = new_profiles_by_label.get(p.get('label'))
-
-                # Update existing with order only
-                if exists and p.get('core'):
-                    profile = db.get('id', exists)
-                    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')
-                else:
-
-                    new_profile = {
-                        '_t': 'profile',
-                        'label': p.get('label'),
-                        'order': int(p.get('order', 999)),
-                        'core': p.get('core', False),
-                        'qualities': [],
-                        'wait_for': [],
-                        'finish': []
-                    }
-
-                    types = migrate_data['profiletype']
-                    for profile_type in types:
-                        p_type = types[profile_type]
-                        if types[profile_type]['profile_id'] == p['id']:
-                            new_profile['finish'].append(p_type['finish'])
-                            new_profile['wait_for'].append(p_type['wait_for'])
-                            new_profile['qualities'].append(migrate_data['quality'][p_type['quality_id']]['identifier'])
-
-                    new_profile.update(db.insert(new_profile))
-
-                    profile_link[x] = new_profile.get('_id')
-
-            # Qualities
-            log.info('Importing quality sizes')
-            new_qualities = db.all('quality', with_doc = True)
-            new_qualities_by_identifier = {}
-            for x in new_qualities:
-                new_qualities_by_identifier[x['doc']['identifier']] = x['_id']
-
-            qualities = migrate_data['quality']
-            quality_link = {}
-            for x in qualities:
-                q = qualities[x]
-                q_id = new_qualities_by_identifier[q.get('identifier')]
-
-                quality = db.get('id', q_id)
-                quality['order'] = q.get('order')
-                quality['size_min'] = tryInt(q.get('size_min'))
-                quality['size_max'] = tryInt(q.get('size_max'))
-                db.update(quality)
-
-                quality_link[x] = quality
-
-            # Titles
-            titles = migrate_data['librarytitle']
-            titles_by_library = {}
-            for x in titles:
-                title = titles[x]
-                if title.get('default'):
-                    titles_by_library[title.get('libraries_id')] = title.get('title')
-
-            # Releases
-            releaseinfos = migrate_data['releaseinfo']
-            for x in releaseinfos:
-                info = releaseinfos[x]
-
-                # Skip if release doesn't exist for this info
-                if not migrate_data['release'].get(info.get('release_id')):
-                    continue
-
-                if not migrate_data['release'][info.get('release_id')].get('info'):
-                    migrate_data['release'][info.get('release_id')]['info'] = {}
-
-                migrate_data['release'][info.get('release_id')]['info'][info.get('identifier')] = info.get('value')
-
-            releases = migrate_data['release']
-            releases_by_media = {}
-            for x in releases:
-                release = releases[x]
-                if not releases_by_media.get(release.get('movie_id')):
-                    releases_by_media[release.get('movie_id')] = []
-
-                releases_by_media[release.get('movie_id')].append(release)
-
-            # Type ids
-            types = migrate_data['filetype']
-            type_by_id = {}
-            for t in types:
-                type = types[t]
-                type_by_id[type.get('id')] = type
-
-            # Media
-            log.info('Importing %s media items', len(migrate_data['movie']))
-            statuses = migrate_data['status']
-            libraries = migrate_data['library']
-            library_files = migrate_data['library_files__file_library']
-            releases_files = migrate_data['release_files__file_release']
-            all_files = migrate_data['file']
-            poster_type = migrate_data['filetype']['poster']
-            medias = migrate_data['movie']
-            for x in medias:
-                m = medias[x]
-
-                status = statuses.get(m['status_id']).get('identifier')
-                l = libraries[m['library_id']]
-
-                # Only migrate wanted movies, Skip if no identifier present
-                if not getImdb(l.get('identifier')): continue
-
-                profile_id = profile_link.get(m['profile_id'])
-                category_id = category_link.get(m['category_id'])
-                title = titles_by_library.get(m['library_id'])
-                releases = releases_by_media.get(x, [])
-                info = json.loads(l.get('info', ''))
-
-                files = library_files.get(m['library_id'], [])
-                if not isinstance(files, list):
-                    files = [files]
-
-                added_media = fireEvent('movie.add', {
-                    'info': info,
-                    'identifier': l.get('identifier'),
-                    'profile_id': profile_id,
-                    'category_id': category_id,
-                    'title': title
-                }, force_readd = False, search_after = False, update_after = False, notify_after = False, status = status, single = True)
-
-                if not added_media:
-                    log.error('Failed adding media %s: %s', (l.get('identifier'), info))
-                    continue
-
-                added_media['files'] = added_media.get('files', {})
-                for f in files:
-                    ffile = all_files[f.get('file_id')]
-
-                    # Only migrate posters
-                    if ffile.get('type_id') == poster_type.get('id'):
-                        if ffile.get('path') not in added_media['files'].get('image_poster', []) and os.path.isfile(ffile.get('path')):
-                            added_media['files']['image_poster'] = [ffile.get('path')]
-                            break
-
-                if 'image_poster' in added_media['files']:
-                    db.update(added_media)
-
-                for rel in releases:
-
-                    empty_info = False
-                    if not rel.get('info'):
-                        empty_info = True
-                        rel['info'] = {}
-
-                    quality = quality_link[rel.get('quality_id')]
-                    release_status = statuses.get(rel.get('status_id')).get('identifier')
-
-                    if rel['info'].get('download_id'):
-                        status_support = rel['info'].get('download_status_support', False) in [True, 'true', 'True']
-                        rel['info']['download_info'] = {
-                            'id': rel['info'].get('download_id'),
-                            'downloader': rel['info'].get('download_downloader'),
-                            'status_support': status_support,
-                        }
-
-                    # Add status to keys
-                    rel['info']['status'] = release_status
-                    if not empty_info:
-                        fireEvent('release.create_from_search', [rel['info']], added_media, quality, single = True)
-                    else:
-                        release = {
-                            '_t': 'release',
-                            'identifier': rel.get('identifier'),
-                            'media_id': added_media.get('_id'),
-                            'quality': quality.get('identifier'),
-                            'status': release_status,
-                            'last_edit': int(time.time()),
-                            'files': {}
-                        }
-
-                        # Add downloader info if provided
-                        try:
-                            release['download_info'] = rel['info']['download_info']
-                            del rel['download_info']
-                        except:
-                            pass
-
-                        # Add files
-                        release_files = releases_files.get(rel.get('id'), [])
-                        if not isinstance(release_files, list):
-                            release_files = [release_files]
-
-                        if len(release_files) == 0:
-                            continue
-
-                        for f in release_files:
-                            rfile = all_files[f.get('file_id')]
-                            file_type = type_by_id.get(rfile.get('type_id')).get('identifier')
-
-                            if not release['files'].get(file_type):
-                                release['files'][file_type] = []
-
-                            release['files'][file_type].append(rfile.get('path'))
-
-                        try:
-                            rls = db.get('release_identifier', rel.get('identifier'), with_doc = True)['doc']
-                            rls.update(release)
-                            db.update(rls)
-                        except:
-                            db.insert(release)
-
-            log.info('Total migration took %s', time.time() - migrate_start)
-            log.info('=' * 30)
-
-            # rename old database
-            log.info('Renaming old database to %s ', old_db + '.old')
-            os.rename(old_db, old_db + '.old')
-
-            if os.path.isfile(old_db + '-wal'):
-                os.rename(old_db + '-wal', old_db + '-wal.old')
-            if os.path.isfile(old_db + '-shm'):
-                os.rename(old_db + '-shm', old_db + '-shm.old')

couchpotato/core/downloaders/__init__.py

@@ -0,0 +1,13 @@
+config = [{
+    'name': 'download_providers',
+    'groups': [
+        {
+            'label': 'Downloaders',
+            'description': 'You can select different downloaders for each type (usenet / torrent)',
+            'type': 'list',
+            'name': 'download_providers',
+            'tab': 'downloaders',
+            'options': [],
+        },
+    ],
+}]

couchpotato/core/downloaders/base.py

@@ -1,24 +1,16 @@
 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.media._base.providers.base import Provider
-from couchpotato.core.plugins.base import Plugin
-
+from couchpotato.core.providers.base import Provider
+import random
+import re
 
 log = CPLog(__name__)
 
 
-## This is here to load the static files
-class Downloader(Plugin):
-    pass
-
-
-class DownloaderBase(Provider):
+class Downloader(Provider):
 
     protocol = []
     http_time_between_calls = 0
@@ -30,21 +22,17 @@ class DownloaderBase(Provider):
     ]
 
     torrent_trackers = [
-        'udp://tracker.istole.it:80/announce',
-        'http://tracker.istole.it/announce',
-        'udp://fr33domtracker.h33t.com:3310/announce',
         'http://tracker.publicbt.com/announce',
-        'udp://tracker.publicbt.com:80/announce',
+        'udp://tracker.istole.it:80/announce',
+        'udp://fr33domtracker.h33t.com:3310/announce',
+        'http://tracker.istole.it/announce',
         'http://tracker.ccc.de/announce',
+        'udp://tracker.publicbt.com:80/announce',
         'udp://tracker.ccc.de:80/announce',
         'http://exodus.desync.com/announce',
         'http://exodus.desync.com:6969/announce',
         'http://tracker.publichd.eu/announce',
-        'udp://tracker.publichd.eu:80/announce',
         'http://tracker.openbittorrent.com/announce',
-        'udp://tracker.openbittorrent.com/announce',
-        'udp://tracker.openbittorrent.com:80/announce',
-        'udp://open.demonii.com:1337/announce',
     ]
 
     def __init__(self):
@@ -168,11 +156,11 @@ class DownloaderBase(Provider):
         if not data: data = {}
 
         d_manual = self.conf('manual', default = False)
-        return super(DownloaderBase, self).isEnabled() and \
+        return super(Downloader, self).isEnabled() and \
             (d_manual and manual or d_manual is False) and \
             (not data or self.isCorrectProtocol(data.get('protocol')))
 
-    def _test(self, **kwargs):
+    def _test(self):
         t = self.test()
         if isinstance(t, tuple):
             return {'success': t[0], 'msg': t[1]}
@@ -194,7 +182,6 @@ class DownloaderBase(Provider):
     def pause(self, release_download, pause):
         return
 
-
 class ReleaseDownloadList(list):
 
     provider = None
@@ -221,7 +208,7 @@ class ReleaseDownloadList(list):
             'status': 'busy',
             'downloader': self.provider.getName(),
             'folder': '',
-            'files': [],
+            'files': '',
         }
 
         return mergeDicts(defaults, result)

couchpotato/core/downloaders/blackhole/__init__.py

@@ -0,0 +1,56 @@
+from .main import Blackhole
+from couchpotato.core.helpers.variable import getDownloadDir
+
+
+def start():
+    return Blackhole()
+
+config = [{
+    'name': 'blackhole',
+    'order': 30,
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'blackhole',
+            'label': 'Black hole',
+            'description': 'Download the NZB/Torrent to a specific folder. <em>Note: Seeding and copying/linking features do <strong>not</strong> work with Black hole</em>.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': True,
+                    'type': 'enabler',
+                    'radio_group': 'nzb,torrent',
+                },
+                {
+                    'name': 'directory',
+                    'type': 'directory',
+                    'description': 'Directory where the .nzb (or .torrent) file is saved to.',
+                    'default': getDownloadDir()
+                },
+                {
+                    'name': 'use_for',
+                    'label': 'Use for',
+                    'default': 'both',
+                    'type': 'dropdown',
+                    'values': [('usenet & torrents', 'both'), ('usenet', 'nzb'), ('torrent', 'torrent')],
+                },
+                {
+                    'name': 'create_subdir',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Create a sub directory when saving the .nzb (or .torrent).',
+                },
+                {
+                    'name': 'manual',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/blackhole/main.py

@@ -1,20 +1,15 @@
 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._base.downloader.main import DownloaderBase
-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'
 
-
-class Blackhole(DownloaderBase):
+class Blackhole(Downloader):
 
     protocol = ['nzb', 'torrent', 'torrent_magnet']
     status_support = False
@@ -105,54 +100,3 @@ class Blackhole(DownloaderBase):
 
         return super(Blackhole, self).isEnabled(manual, data) and \
             ((self.conf('use_for') in for_protocol))
-
-
-config = [{
-    'name': 'blackhole',
-    'order': 30,
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'blackhole',
-            'label': 'Black hole',
-            'description': 'Download the NZB/Torrent to a specific folder. <em>Note: Seeding and copying/linking features do <strong>not</strong> work with Black hole</em>.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': True,
-                    'type': 'enabler',
-                    'radio_group': 'nzb,torrent',
-                },
-                {
-                    'name': 'directory',
-                    'type': 'directory',
-                    'description': 'Directory where the .nzb (or .torrent) file is saved to.',
-                    'default': getDownloadDir()
-                },
-                {
-                    'name': 'use_for',
-                    'label': 'Use for',
-                    'default': 'both',
-                    'type': 'dropdown',
-                    'values': [('usenet & torrents', 'both'), ('usenet', 'nzb'), ('torrent', 'torrent')],
-                },
-                {
-                    'name': 'create_subdir',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Create a sub directory when saving the .nzb (or .torrent).',
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/deluge/__init__.py

@@ -0,0 +1,91 @@
+from .main import Deluge
+
+
+def start():
+    return Deluge()
+
+config = [{
+    'name': 'deluge',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'deluge',
+            'label': 'Deluge',
+            'description': 'Use <a href="http://www.deluge-torrent.org/" target="_blank">Deluge</a> to download torrents.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'torrent',
+                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:58846',
+                    'description': 'Hostname with port. Usually <strong>localhost:58846</strong>',
+                },
+                {
+                    'name': 'username',
+                },
+                {
+                    'name': 'password',
+                    'type': 'password',
+                },
+                {
+                    'name': 'directory',
+                    'type': 'directory',
+                    'description': 'Download to this directory. Keep empty for default Deluge download directory.',
+                },
+                {
+                    'name': 'completed_directory',
+                    'type': 'directory',
+                    'description': 'Move completed torrent to this directory. Keep empty for default Deluge options.',
+                    'advanced': True,
+                },
+                {
+                    'name': 'label',
+                    'description': 'Label to add to torrents in the Deluge UI.',
+                },
+                {
+                    'name': 'remove_complete',
+                    'label': 'Remove torrent',
+                    'type': 'bool',
+                    'default': True,
+                    'advanced': True,
+                    'description': 'Remove the torrent from Deluge after it has finished seeding.',
+                },
+                {
+                    'name': 'delete_files',
+                    'label': 'Remove files',
+                    'default': True,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also remove the leftover files.',
+                },
+                {
+                    'name': 'paused',
+                    'type': 'bool',
+                    'advanced': True,
+                    'default': False,
+                    'description': 'Add the torrent paused.',
+                },
+                {
+                    'name': 'manual',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+                {
+                    'name': 'delete_failed',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/deluge/main.py

@@ -1,24 +1,20 @@
 from base64 import b64encode, b16encode, b32decode
+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
 
-from bencode import bencode as benc, bdecode
-from couchpotato.core._base.downloader.main import DownloaderBase, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import isInt, sp
-from couchpotato.core.helpers.variable import tryFloat, cleanHost
-from couchpotato.core.logger import CPLog
-from synchronousdeluge import DelugeClient
-
-
 log = CPLog(__name__)
 
-autoload = 'Deluge'
 
-
-class Deluge(DownloaderBase):
+class Deluge(Downloader):
 
     protocol = ['torrent', 'torrent_magnet']
     log = CPLog(__name__)
@@ -147,7 +143,7 @@ class Deluge(DownloaderBase):
                 'seed_ratio': torrent['ratio'],
                 'timeleft': str(timedelta(seconds = torrent['eta'])),
                 'folder': sp(download_dir if len(torrent_files) == 1 else os.path.join(download_dir, torrent['name'])),
-                'files': torrent_files,
+                'files': '|'.join(torrent_files),
             })
 
         return release_downloads
@@ -295,90 +291,3 @@ class DelugeRPC(object):
             return torrent_hash
 
         return False
-
-
-config = [{
-    'name': 'deluge',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'deluge',
-            'label': 'Deluge',
-            'description': 'Use <a href="http://www.deluge-torrent.org/" target="_blank">Deluge</a> to download torrents.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'torrent',
-                },
-                {
-                    'name': 'host',
-                    'default': 'localhost:58846',
-                    'description': 'Hostname with port. Usually <strong>localhost:58846</strong>',
-                },
-                {
-                    'name': 'username',
-                },
-                {
-                    'name': 'password',
-                    'type': 'password',
-                },
-                {
-                    'name': 'directory',
-                    'type': 'directory',
-                    'description': 'Download to this directory. Keep empty for default Deluge download directory.',
-                },
-                {
-                    'name': 'completed_directory',
-                    'type': 'directory',
-                    'description': 'Move completed torrent to this directory. Keep empty for default Deluge options.',
-                    'advanced': True,
-                },
-                {
-                    'name': 'label',
-                    'description': 'Label to add to torrents in the Deluge UI.',
-                },
-                {
-                    'name': 'remove_complete',
-                    'label': 'Remove torrent',
-                    'type': 'bool',
-                    'default': True,
-                    'advanced': True,
-                    'description': 'Remove the torrent from Deluge after it has finished seeding.',
-                },
-                {
-                    'name': 'delete_files',
-                    'label': 'Remove files',
-                    'default': True,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Also remove the leftover files.',
-                },
-                {
-                    'name': 'paused',
-                    'type': 'bool',
-                    'advanced': True,
-                    'default': False,
-                    'description': 'Add the torrent paused.',
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-                {
-                    'name': 'delete_failed',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Delete a release after the download has failed.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/nzbget/__init__.py

@@ -0,0 +1,77 @@
+from .main import NZBGet
+
+
+def start():
+    return NZBGet()
+
+config = [{
+    'name': 'nzbget',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'nzbget',
+            'label': 'NZBGet',
+            'description': 'Use <a href="http://nzbget.sourceforge.net/Main_Page" target="_blank">NZBGet</a> to download NZBs.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'nzb',
+                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:6789',
+                    'description': 'Hostname with port. Usually <strong>localhost:6789</strong>',
+                },
+                {
+                    'name': 'ssl',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Use HyperText Transfer Protocol Secure, or <strong>https</strong>',
+                },
+                {
+                    'name': 'username',
+                    'default': 'nzbget',
+                    'advanced': True,
+                    'description': 'Set a different username to connect. Default: nzbget',
+                },
+                {
+                    'name': 'password',
+                    'type': 'password',
+                    'description': 'Default NZBGet password is <i>tegbzn6789</i>',
+                },
+                {
+                    'name': 'category',
+                    'default': 'Movies',
+                    'description': 'The category CP places the nzb in. Like <strong>movies</strong> or <strong>couchpotato</strong>',
+                },
+                {
+                    'name': 'priority',
+                    'advanced': True,
+                    'default': '0',
+                    'type': 'dropdown',
+                    'values': [('Very Low', -100), ('Low', -50), ('Normal', 0), ('High', 50), ('Very High', 100)],
+                    'description': 'Only change this if you are using NZBget 9.0 or higher',
+                },
+                {
+                    'name': 'manual',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+                {
+                    'name': 'delete_failed',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/nzbget/main.py

@@ -1,4 +1,8 @@
 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
@@ -6,18 +10,10 @@ import socket
 import traceback
 import xmlrpclib
 
-from couchpotato.core._base.downloader.main import DownloaderBase, 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'
 
-
-class NZBGet(DownloaderBase):
+class NZBGet(Downloader):
 
     protocol = ['nzb']
     rpc = 'xmlrpc'
@@ -146,7 +142,7 @@ class NZBGet(DownloaderBase):
                     'timeleft': timeleft,
                 })
 
-        for nzb in queue:  # 'Parameters' is not passed in rpc.postqueue
+        for nzb in queue: # 'Parameters' is not passed in rpc.postqueue
             if nzb['NZBID'] in ids:
                 log.debug('Found %s in NZBGet postprocessing queue', nzb['NZBFilename'])
                 release_downloads.append({
@@ -218,76 +214,3 @@ class NZBGet(DownloaderBase):
     def getRPC(self):
         url = cleanHost(host = self.conf('host'), ssl = self.conf('ssl'), username = self.conf('username'), password = self.conf('password')) + self.rpc
         return xmlrpclib.ServerProxy(url)
-
-
-config = [{
-    'name': 'nzbget',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'nzbget',
-            'label': 'NZBGet',
-            'description': 'Use <a href="http://nzbget.sourceforge.net/Main_Page" target="_blank">NZBGet</a> to download NZBs.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'nzb',
-                },
-                {
-                    'name': 'host',
-                    'default': 'localhost:6789',
-                    'description': 'Hostname with port. Usually <strong>localhost:6789</strong>',
-                },
-                {
-                    'name': 'ssl',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Use HyperText Transfer Protocol Secure, or <strong>https</strong>',
-                },
-                {
-                    'name': 'username',
-                    'default': 'nzbget',
-                    'advanced': True,
-                    'description': 'Set a different username to connect. Default: nzbget',
-                },
-                {
-                    'name': 'password',
-                    'type': 'password',
-                    'description': 'Default NZBGet password is <i>tegbzn6789</i>',
-                },
-                {
-                    'name': 'category',
-                    'default': 'Movies',
-                    'description': 'The category CP places the nzb in. Like <strong>movies</strong> or <strong>couchpotato</strong>',
-                },
-                {
-                    'name': 'priority',
-                    'advanced': True,
-                    'default': '0',
-                    'type': 'dropdown',
-                    'values': [('Very Low', -100), ('Low', -50), ('Normal', 0), ('High', 50), ('Very High', 100)],
-                    'description': 'Only change this if you are using NZBget 9.0 or higher',
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-                {
-                    'name': 'delete_failed',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Delete a release after the download has failed.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/nzbvortex/__init__.py

@@ -0,0 +1,57 @@
+from .main import NZBVortex
+
+
+def start():
+    return NZBVortex()
+
+config = [{
+    'name': 'nzbvortex',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'nzbvortex',
+            'label': 'NZBVortex',
+            'description': 'Use <a href="http://www.nzbvortex.com/landing/" target="_blank">NZBVortex</a> to download NZBs.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'nzb',
+                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:4321',
+                    'description': 'Hostname with port. Usually <strong>localhost:4321</strong>',
+                },
+                {
+                    'name': 'ssl',
+                    'default': 1,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Use HyperText Transfer Protocol Secure, or <strong>https</strong>',
+                },
+                {
+                    'name': 'api_key',
+                    'label': 'Api Key',
+                },
+                {
+                    'name': 'manual',
+                    'default': False,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+                {
+                    'name': 'delete_failed',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/nzbvortex/main.py

@@ -1,4 +1,8 @@
 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
@@ -12,18 +16,10 @@ import time
 import traceback
 import urllib2
 
-from couchpotato.core._base.downloader.main import DownloaderBase, 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'
 
-
-class NZBVortex(DownloaderBase):
+class NZBVortex(Downloader):
 
     protocol = ['nzb']
     api_level = None
@@ -190,56 +186,3 @@ class HTTPSConnection(httplib.HTTPSConnection):
 class HTTPSHandler(urllib2.HTTPSHandler):
     def https_open(self, req):
         return self.do_open(HTTPSConnection, req)
-
-
-config = [{
-    'name': 'nzbvortex',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'nzbvortex',
-            'label': 'NZBVortex',
-            'description': 'Use <a href="http://www.nzbvortex.com/landing/" target="_blank">NZBVortex</a> to download NZBs.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'nzb',
-                },
-                {
-                    'name': 'host',
-                    'default': 'localhost:4321',
-                    'description': 'Hostname with port. Usually <strong>localhost:4321</strong>',
-                },
-                {
-                    'name': 'ssl',
-                    'default': 1,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Use HyperText Transfer Protocol Secure, or <strong>https</strong>',
-                },
-                {
-                    'name': 'api_key',
-                    'label': 'Api Key',
-                },
-                {
-                    'name': 'manual',
-                    'default': False,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-                {
-                    'name': 'delete_failed',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Delete a release after the download has failed.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/pneumatic/__init__.py

@@ -0,0 +1,38 @@
+from .main import Pneumatic
+
+
+def start():
+    return Pneumatic()
+
+config = [{
+    'name': 'pneumatic',
+    'order': 30,
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'pneumatic',
+            'label': 'Pneumatic',
+            'description': 'Use <a href="http://forum.xbmc.org/showthread.php?tid=97657" target="_blank">Pneumatic</a> to download .strm files.',
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                },
+                {
+                    'name': 'directory',
+                    'type': 'directory',
+                    'description': 'Directory where the .strm file is saved to.',
+                },
+                {
+                    'name': 'manual',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/pneumatic/main.py

@@ -1,18 +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
 import os
 import traceback
 
-from couchpotato.core._base.downloader.main import DownloaderBase
-from couchpotato.core.helpers.encoding import sp
-from couchpotato.core.logger import CPLog
-
-
 log = CPLog(__name__)
 
-autoload = 'Pneumatic'
 
-
-class Pneumatic(DownloaderBase):
+class Pneumatic(Downloader):
 
     protocol = ['nzb']
     strm_syntax = 'plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb=%s&nzbname=%s'
@@ -75,37 +71,3 @@ class Pneumatic(DownloaderBase):
                 return True
 
         return False
-
-
-config = [{
-    'name': 'pneumatic',
-    'order': 30,
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'pneumatic',
-            'label': 'Pneumatic',
-            'description': 'Use <a href="http://forum.xbmc.org/showthread.php?tid=97657" target="_blank">Pneumatic</a> to download .strm files.',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                },
-                {
-                    'name': 'directory',
-                    'type': 'directory',
-                    'description': 'Directory where the .strm file is saved to.',
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/qbittorrent_.py

@@ -1,245 +0,0 @@
-from base64 import b16encode, b32decode
-from hashlib import sha1
-import os
-
-from bencode import bencode, bdecode
-from couchpotato.core._base.downloader.main import DownloaderBase, ReleaseDownloadList
-from couchpotato.core.helpers.encoding import sp
-from couchpotato.core.helpers.variable import cleanHost
-from couchpotato.core.logger import CPLog
-from qbittorrent.client import QBittorrentClient
-
-
-log = CPLog(__name__)
-
-autoload = 'qBittorrent'
-
-
-class qBittorrent(DownloaderBase):
-
-    protocol = ['torrent', 'torrent_magnet']
-    qb = None
-
-    def __init__(self):
-        super(qBittorrent, self).__init__()
-
-    def connect(self):
-        if self.qb is not None:
-            return self.qb
-
-        url = cleanHost(self.conf('host'), protocol = True, ssl = False)
-
-        if self.conf('username') and self.conf('password'):
-            self.qb = QBittorrentClient(
-                url,
-                username = self.conf('username'),
-                password = self.conf('password')
-            )
-        else:
-            self.qb = QBittorrentClient(url)
-
-        return self.qb
-
-    def test(self):
-        if self.connect():
-            return True
-
-        return False
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        log.debug('Sending "%s" to qBittorrent.', (data.get('name')))
-
-        if not self.connect():
-            return False
-
-        if not filedata and data.get('protocol') == 'torrent':
-            log.error('Failed sending torrent, no data')
-            return False
-
-
-        if data.get('protocol') == 'torrent_magnet':
-            filedata = self.magnetToTorrent(data.get('url'))
-
-            if filedata is False:
-                return False
-
-            data['protocol'] = 'torrent'
-
-        info = bdecode(filedata)["info"]
-        torrent_hash = sha1(bencode(info)).hexdigest()
-
-        # Convert base 32 to hex
-        if len(torrent_hash) == 32:
-            torrent_hash = b16encode(b32decode(torrent_hash))
-
-        # Send request to qBittorrent
-        try:
-            self.qb.add_file(filedata)
-
-            return self.downloadReturnId(torrent_hash)
-        except Exception as e:
-            log.error('Failed to send torrent to qBittorrent: %s', e)
-            return False
-
-    def getTorrentStatus(self, torrent):
-
-        if torrent.state in ('uploading', 'queuedUP', 'stalledUP'):
-            return 'seeding'
-
-        if torrent.progress == 1:
-            return 'completed'
-
-        return 'busy'
-
-    def getAllDownloadStatus(self, ids):
-        log.debug('Checking qBittorrent download status.')
-
-        if not self.connect():
-            return []
-
-        try:
-            torrents = self.qb.get_torrents()
-
-            release_downloads = ReleaseDownloadList(self)
-
-            for torrent in torrents:
-                if torrent.hash in ids:
-                    torrent.update_general() # get extra info
-                    torrent_filelist = torrent.get_files()
-
-                    torrent_files = []
-                    torrent_dir = os.path.join(torrent.save_path, torrent.name)
-
-                    if os.path.isdir(torrent_dir):
-                        torrent.save_path = torrent_dir
-
-                    if len(torrent_filelist) > 1 and os.path.isdir(torrent_dir): # multi file torrent, path.isdir check makes sure we're not in the root download folder
-                        for root, _, files in os.walk(torrent.save_path):
-                            for f in files:
-                                torrent_files.append(sp(os.path.join(root, f)))
-
-                    else: # multi or single file placed directly in torrent.save_path
-                        for f in torrent_filelist:
-                            file_path = os.path.join(torrent.save_path, f.name)
-                            if os.path.isfile(file_path):
-                                torrent_files.append(sp(file_path))
-
-                    release_downloads.append({
-                        'id': torrent.hash,
-                        'name': torrent.name,
-                        'status': self.getTorrentStatus(torrent),
-                        'seed_ratio': torrent.ratio,
-                        'original_status': torrent.state,
-                        'timeleft': torrent.progress * 100 if torrent.progress else -1, # percentage
-                        'folder': sp(torrent.save_path),
-                        'files': torrent_files
-                    })
-
-            return release_downloads
-
-        except Exception as e:
-            log.error('Failed to get status from qBittorrent: %s', e)
-            return []
-
-    def pause(self, release_download, pause = True):
-        if not self.connect():
-            return False
-
-        torrent = self.qb.get_torrent(release_download['id'])
-        if torrent is None:
-            return False
-
-        if pause:
-            return torrent.pause()
-        return torrent.resume()
-
-    def removeFailed(self, release_download):
-        log.info('%s failed downloading, deleting...', release_download['name'])
-        return self.processComplete(release_download, delete_files = True)
-
-    def processComplete(self, release_download, delete_files):
-        log.debug('Requesting qBittorrent to remove the torrent %s%s.',
-                  (release_download['name'], ' and cleanup the downloaded files' if delete_files else ''))
-
-        if not self.connect():
-            return False
-
-        torrent = self.qb.find_torrent(release_download['id'])
-
-        if torrent is None:
-            return False
-
-        if delete_files:
-            torrent.delete() # deletes torrent with data
-        else:
-            torrent.remove() # just removes the torrent, doesn't delete data
-
-        return True
-
-
-config = [{
-    'name': 'qbittorrent',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'qbittorrent',
-            'label': 'qbittorrent',
-            'description': '',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'torrent',
-                },
-                {
-                    'name': 'host',
-                    'default': 'http://localhost:8080/',
-                    'description': 'RPC Communication URI. Usually <strong>http://localhost:8080/</strong>'
-                },
-                {
-                    'name': 'username',
-                },
-                {
-                    'name': 'password',
-                    'type': 'password',
-                },
-                {
-                    'name': 'remove_complete',
-                    'label': 'Remove torrent',
-                    'default': False,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Remove the torrent after it finishes seeding.',
-                },
-                {
-                    'name': 'delete_files',
-                    'label': 'Remove files',
-                    'default': True,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Also remove the leftover files.',
-                },
-                {
-                    'name': 'paused',
-                    'type': 'bool',
-                    'advanced': True,
-                    'default': False,
-                    'description': 'Add the torrent paused.',
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/rtorrent/__init__.py

@@ -0,0 +1,100 @@
+from .main import rTorrent
+
+
+def start():
+    return rTorrent()
+
+config = [{
+    'name': 'rtorrent',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'rtorrent',
+            'label': 'rTorrent',
+            'description': '',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'torrent',
+                },
+# @RuudBurger: How do I migrate this?
+#                {
+#                    'name': 'url',
+#                    'default': 'http://localhost:80/RPC2',
+#                    'description': 'XML-RPC Endpoint URI. Usually <strong>scgi://localhost:5000</strong> '
+#                                   'or <strong>http://localhost:80/RPC2</strong>'
+#                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:80',
+                    'description': 'RPC Communication URI. Usually <strong>scgi://localhost:5000</strong>, '
+                                   '<strong>httprpc://localhost/rutorrent</strong> or <strong>localhost:80</strong>'
+                },
+                {
+                    'name': 'ssl',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Use HyperText Transfer Protocol Secure, or <strong>https</strong>',
+                },
+                {
+                    'name': 'rpc_url',
+                    'type': 'string',
+                    'default': 'RPC2',
+                    'advanced': True,
+                    'description': 'Change if your RPC mount is at a different path.',
+                },
+                {
+                    'name': 'username',
+                },
+                {
+                    'name': 'password',
+                    'type': 'password',
+                },
+                {
+                    'name': 'label',
+                    'description': 'Label to apply on added torrents.',
+                },
+                {
+                    'name': 'directory',
+                    'type': 'directory',
+                    'description': 'Download to this directory. Keep empty for default rTorrent download directory.',
+                },
+                {
+                    'name': 'remove_complete',
+                    'label': 'Remove torrent',
+                    'default': False,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Remove the torrent after it finishes seeding.',
+                },
+                {
+                    'name': 'delete_files',
+                    'label': 'Remove files',
+                    'default': True,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also remove the leftover files.',
+                },
+                {
+                    'name': 'paused',
+                    'type': 'bool',
+                    'advanced': True,
+                    'default': False,
+                    'description': 'Add the torrent paused.',
+                },
+                {
+                    'name': 'manual',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/rtorrent/main.py

@@ -1,26 +1,21 @@
-from base64 import b16encode, b32decode
-from datetime import timedelta
-from hashlib import sha1
-from urlparse import urlparse
-import os
-
-from couchpotato.core._base.downloader.main import DownloaderBase, ReleaseDownloadList
-
-from couchpotato.core.event import addEvent
+from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
+from couchpotato.core.event import fireEvent, 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 scandir import scandir
-
+from rtorrent.err import MethodError
+from urlparse import urlparse
+import os
 
 log = CPLog(__name__)
 
-autoload = 'rTorrent'
 
-
-class rTorrent(DownloaderBase):
+class rTorrent(Downloader):
 
     protocol = ['torrent', 'torrent_magnet']
     rt = None
@@ -59,29 +54,27 @@ class rTorrent(DownloaderBase):
             return self.rt
 
         url = cleanHost(self.conf('host'), protocol = True, ssl = self.conf('ssl'))
-
-        # Automatically add '+https' to 'httprpc' protocol if SSL is enabled
-        if self.conf('ssl') and url.startswith('httprpc://'):
-            url = url.replace('httprpc://', 'httprpc+https://')
-
         parsed = urlparse(url)
 
         # rpc_url is only used on http/https scgi pass-through
         if parsed.scheme in ['http', 'https']:
             url += self.conf('rpc_url')
 
-        self.rt = RTorrent(
-            url,
-            self.conf('username'),
-            self.conf('password')
-        )
+        if self.conf('username') and self.conf('password'):
+            self.rt = RTorrent(
+                url,
+                self.conf('username'),
+                self.conf('password')
+            )
+        else:
+            self.rt = RTorrent(url)
 
         self.error_msg = ''
         try:
-            self.rt._verify_conn()
+             self.rt._verify_conn()
         except AssertionError as e:
-            self.error_msg = e.message
-            self.rt = None
+             self.error_msg = e.message
+             self.rt = None
 
         return self.rt
 
@@ -94,6 +87,44 @@ class rTorrent(DownloaderBase):
 
         return False
 
+    def updateProviderGroup(self, name, data):
+        if data.get('seed_time'):
+            log.info('seeding time ignored, not supported')
+
+        if not name:
+            return False
+
+        if not self.connect():
+            return False
+
+        views = self.rt.get_views()
+
+        if name not in views:
+            self.rt.create_group(name)
+
+        group = self.rt.get_group(name)
+
+        try:
+            if data.get('seed_ratio'):
+                ratio = int(float(data.get('seed_ratio')) * 100)
+                log.debug('Updating provider ratio to %s, group name: %s', (ratio, name))
+
+                # Explicitly set all group options to ensure it is setup correctly
+                group.set_upload('1M')
+                group.set_min(ratio)
+                group.set_max(ratio)
+                group.set_command('d.stop')
+                group.enable()
+            else:
+                # Reset group action and disable it
+                group.set_command()
+                group.disable()
+        except MethodError as err:
+            log.error('Unable to set group options: %s', err.msg)
+            return False
+
+        return True
+
 
     def download(self, data = None, media = None, filedata = None):
         if not media: media = {}
@@ -104,6 +135,10 @@ class rTorrent(DownloaderBase):
         if not self.connect():
             return False
 
+        group_name = 'cp_' + data.get('provider').lower()
+        if not self.updateProviderGroup(group_name, data):
+            return False
+
         torrent_params = {}
         if self.conf('label'):
             torrent_params['label'] = self.conf('label')
@@ -144,6 +179,9 @@ class rTorrent(DownloaderBase):
             if self.conf('directory'):
                 torrent.set_directory(self.conf('directory'))
 
+            # Set Ratio Group
+            torrent.set_visible(group_name)
+
             # Start torrent
             if not self.conf('paused', default = 0):
                 torrent.start()
@@ -200,7 +238,7 @@ class rTorrent(DownloaderBase):
                         'original_status': torrent.state,
                         'timeleft': str(timedelta(seconds = float(torrent.left_bytes) / torrent.down_rate)) if torrent.down_rate > 0 else -1,
                         'folder': sp(torrent.directory),
-                        'files': torrent_files
+                        'files': '|'.join(torrent_files)
                     })
 
             return release_downloads
@@ -244,7 +282,7 @@ class rTorrent(DownloaderBase):
             if torrent.is_multi_file() and torrent.directory.endswith(torrent.name):
                 # Remove empty directories bottom up
                 try:
-                    for path, _, _ in scandir.walk(torrent.directory, topdown = False):
+                    for path, _, _ in os.walk(torrent.directory, topdown = False):
                         os.rmdir(path)
                 except OSError:
                     log.info('Directory "%s" contains extra files, unable to remove', torrent.directory)
@@ -252,92 +290,3 @@ class rTorrent(DownloaderBase):
         torrent.erase() # just removes the torrent, doesn't delete data
 
         return True
-
-
-config = [{
-    'name': 'rtorrent',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'rtorrent',
-            'label': 'rTorrent',
-            'description': '',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'torrent',
-                },
-                {
-                    'name': 'host',
-                    'default': 'localhost:80',
-                    'description': 'RPC Communication URI. Usually <strong>scgi://localhost:5000</strong>, '
-                                   '<strong>httprpc://localhost/rutorrent</strong> or <strong>localhost:80</strong>'
-                },
-                {
-                    'name': 'ssl',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Use HyperText Transfer Protocol Secure, or <strong>https</strong>',
-                },
-                {
-                    'name': 'rpc_url',
-                    'type': 'string',
-                    'default': 'RPC2',
-                    'advanced': True,
-                    'description': 'Change if your RPC mount is at a different path.',
-                },
-                {
-                    'name': 'username',
-                },
-                {
-                    'name': 'password',
-                    'type': 'password',
-                },
-                {
-                    'name': 'label',
-                    'description': 'Label to apply on added torrents.',
-                },
-                {
-                    'name': 'directory',
-                    'type': 'directory',
-                    'description': 'Download to this directory. Keep empty for default rTorrent download directory.',
-                },
-                {
-                    'name': 'remove_complete',
-                    'label': 'Remove torrent',
-                    'default': False,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Remove the torrent after it finishes seeding.',
-                },
-                {
-                    'name': 'delete_files',
-                    'label': 'Remove files',
-                    'default': True,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Also remove the leftover files.',
-                },
-                {
-                    'name': 'paused',
-                    'type': 'bool',
-                    'advanced': True,
-                    'default': False,
-                    'description': 'Add the torrent paused.',
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/sabnzbd/__init__.py

@@ -0,0 +1,79 @@
+from .main import Sabnzbd
+
+
+def start():
+    return Sabnzbd()
+
+config = [{
+    'name': 'sabnzbd',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'sabnzbd',
+            'label': 'Sabnzbd',
+            'description': 'Use <a href="http://sabnzbd.org/" target="_blank">SABnzbd</a> (0.7+) to download NZBs.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'nzb',
+                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:8080',
+                },
+                {
+                    'name': 'ssl',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Use HyperText Transfer Protocol Secure, or <strong>https</strong>',
+                },
+                {
+                    'name': 'api_key',
+                    'label': 'Api Key',
+                    'description': 'Used for all calls to Sabnzbd.',
+                },
+                {
+                    'name': 'category',
+                    'label': 'Category',
+                    'description': 'The category CP places the nzb in. Like <strong>movies</strong> or <strong>couchpotato</strong>',
+                },
+                {
+                    'name': 'priority',
+                    'label': 'Priority',
+                    'type': 'dropdown',
+                    'default': '0',
+                    'advanced': True,
+                    'values': [('Paused', -2), ('Low', -1), ('Normal', 0), ('High', 1), ('Forced', 2)],
+                    'description': 'Add to the queue with this priority.',
+                },
+                {
+                    'name': 'manual',
+                    'default': False,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+                {
+                    'name': 'remove_complete',
+                    'advanced': True,
+                    'label': 'Remove NZB',
+                    'default': False,
+                    'type': 'bool',
+                    'description': 'Remove the NZB from history after it completed.',
+                },
+                {
+                    'name': 'delete_failed',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/sabnzbd/main.py

@@ -1,22 +1,18 @@
+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._base.downloader.main import DownloaderBase, 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'
 
-
-class Sabnzbd(DownloaderBase):
+class Sabnzbd(Downloader):
 
     protocol = ['nzb']
 
@@ -205,77 +201,3 @@ class Sabnzbd(DownloaderBase):
         else:
             return data
 
-
-config = [{
-    'name': 'sabnzbd',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'sabnzbd',
-            'label': 'Sabnzbd',
-            'description': 'Use <a href="http://sabnzbd.org/" target="_blank">SABnzbd</a> (0.7+) to download NZBs.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'nzb',
-                },
-                {
-                    'name': 'host',
-                    'default': 'localhost:8080',
-                },
-                {
-                    'name': 'ssl',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Use HyperText Transfer Protocol Secure, or <strong>https</strong>',
-                },
-                {
-                    'name': 'api_key',
-                    'label': 'Api Key',
-                    'description': 'Used for all calls to Sabnzbd.',
-                },
-                {
-                    'name': 'category',
-                    'label': 'Category',
-                    'description': 'The category CP places the nzb in. Like <strong>movies</strong> or <strong>couchpotato</strong>',
-                },
-                {
-                    'name': 'priority',
-                    'label': 'Priority',
-                    'type': 'dropdown',
-                    'default': '0',
-                    'advanced': True,
-                    'values': [('Paused', -2), ('Low', -1), ('Normal', 0), ('High', 1), ('Forced', 2)],
-                    'description': 'Add to the queue with this priority.',
-                },
-                {
-                    'name': 'manual',
-                    'default': False,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-                {
-                    'name': 'remove_complete',
-                    'advanced': True,
-                    'label': 'Remove NZB',
-                    'default': False,
-                    'type': 'bool',
-                    'description': 'Remove the NZB from history after it completed.',
-                },
-                {
-                    'name': 'delete_failed',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Delete a release after the download has failed.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/synology/__init__.py

@@ -0,0 +1,53 @@
+from .main import Synology
+
+
+def start():
+    return Synology()
+
+config = [{
+    'name': 'synology',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'synology',
+            'label': 'Synology',
+            'description': 'Use <a href="http://www.synology.com/dsm/home_home_applications_download_station.php" target="_blank">Synology Download Station</a> to download.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'nzb,torrent',
+                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:5000',
+                    'description': 'Hostname with port. Usually <strong>localhost:5000</strong>',
+                },
+                {
+                    'name': 'username',
+                },
+                {
+                    'name': 'password',
+                    'type': 'password',
+                },
+                {
+                    'name': 'use_for',
+                    'label': 'Use for',
+                    'default': 'both',
+                    'type': 'dropdown',
+                    'values': [('usenet & torrents', 'both'), ('usenet', 'nzb'), ('torrent', 'torrent')],
+                },
+                {
+                    'name': 'manual',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/synology/main.py

@@ -1,19 +1,15 @@
-import json
-import traceback
-
-from couchpotato.core._base.downloader.main import DownloaderBase
+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__)
 
-autoload = 'Synology'
 
-
-class Synology(DownloaderBase):
+class Synology(Downloader):
 
     protocol = ['nzb', 'torrent', 'torrent_magnet']
     status_support = False
@@ -33,7 +29,7 @@ class Synology(DownloaderBase):
 
         try:
             # Send request to Synology
-            srpc = SynologyRPC(host[0], host[1], self.conf('username'), self.conf('password'), self.conf('destination'))
+            srpc = SynologyRPC(host[0], host[1], self.conf('username'), self.conf('password'))
             if data['protocol'] == 'torrent_magnet':
                 log.info('Adding torrent URL %s', data['url'])
                 response = srpc.create_task(url = data['url'])
@@ -84,7 +80,7 @@ class SynologyRPC(object):
 
     """SynologyRPC lite library"""
 
-    def __init__(self, host = 'localhost', port = 5000, username = None, password = None, destination = None):
+    def __init__(self, host = 'localhost', port = 5000, username = None, password = None):
 
         super(SynologyRPC, self).__init__()
 
@@ -92,7 +88,6 @@ class SynologyRPC(object):
         self.auth_url = 'http://%s:%s/webapi/auth.cgi' % (host, port)
         self.username = username
         self.password = password
-        self.destination = destination
         self.session_name = 'DownloadStation'
 
     def _login(self):
@@ -145,10 +140,6 @@ class SynologyRPC(object):
                     'version': '1',
                     'method': 'create',
                     '_sid': self.sid}
-
-            if self.destination and len(self.destination) > 0:
-                args['destination'] = self.destination
-
             if url:
                 log.info('Login success, adding torrent URI')
                 args['uri'] = url
@@ -169,57 +160,3 @@ class SynologyRPC(object):
 
     def test(self):
         return bool(self._login())
-
-
-config = [{
-    'name': 'synology',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'synology',
-            'label': 'Synology',
-            'description': 'Use <a href="http://www.synology.com/dsm/home_home_applications_download_station.php" target="_blank">Synology Download Station</a> to download.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'nzb,torrent',
-                },
-                {
-                    'name': 'host',
-                    'default': 'localhost:5000',
-                    'description': 'Hostname with port. Usually <strong>localhost:5000</strong>',
-                },
-                {
-                    'name': 'username',
-                },
-                {
-                    'name': 'password',
-                    'type': 'password',
-                },
-                {
-                    'name': 'destination',
-                    'description': 'Specify <strong>existing</strong> destination share to where your files will be downloaded, usually <strong>Downloads</strong>',
-                    'advanced': True,
-                },
-                {
-                    'name': 'use_for',
-                    'label': 'Use for',
-                    'default': 'both',
-                    'type': 'dropdown',
-                    'values': [('usenet & torrents', 'both'), ('usenet', 'nzb'), ('torrent', 'torrent')],
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/transmission/__init__.py

@@ -0,0 +1,95 @@
+from .main import Transmission
+
+
+def start():
+    return Transmission()
+
+config = [{
+    'name': 'transmission',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'transmission',
+            'label': 'Transmission',
+            'description': 'Use <a href="http://www.transmissionbt.com/" target="_blank">Transmission</a> to download torrents.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'torrent',
+                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:9091',
+                    'description': 'Hostname with port. Usually <strong>localhost:9091</strong>',
+                },
+                {
+                    'name': 'rpc_url',
+                    'type': 'string',
+                    'default': 'transmission',
+                    'advanced': True,
+                    'description': 'Change if you don\'t run Transmission RPC at the default url.',
+                },
+                {
+                    'name': 'username',
+                },
+                {
+                    'name': 'password',
+                    'type': 'password',
+                },
+                {
+                    'name': 'directory',
+                    'type': 'directory',
+                    'description': 'Download to this directory. Keep empty for default Transmission download directory.',
+                },
+                {
+                    'name': 'remove_complete',
+                    'label': 'Remove torrent',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Remove the torrent from Transmission after it finished seeding.',
+                },
+                {
+                    'name': 'delete_files',
+                    'label': 'Remove files',
+                    'default': True,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also remove the leftover files.',
+                },
+                {
+                    'name': 'paused',
+                    'type': 'bool',
+                    'advanced': True,
+                    'default': False,
+                    'description': 'Add the torrent paused.',
+                },
+                {
+                    'name': 'manual',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+                {
+                    'name': 'stalled_as_failed',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Consider a stalled torrent as failed',
+                },
+                {
+                    'name': 'delete_failed',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/transmission/main.py

@@ -1,4 +1,8 @@
 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
@@ -6,18 +10,10 @@ import os.path
 import re
 import urllib2
 
-from couchpotato.core._base.downloader.main import DownloaderBase, 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'
 
-
-class Transmission(DownloaderBase):
+class Transmission(Downloader):
 
     protocol = ['torrent', 'torrent_magnet']
     log = CPLog(__name__)
@@ -141,7 +137,7 @@ class Transmission(DownloaderBase):
                     'seed_ratio': torrent['uploadRatio'],
                     'timeleft': str(timedelta(seconds = torrent['eta'])),
                     'folder': sp(torrent_folder if len(torrent_files) == 1 else os.path.join(torrent_folder, torrent['name'])),
-                    'files': torrent_files
+                    'files': '|'.join(torrent_files)
                 })
 
         return release_downloads
@@ -160,7 +156,6 @@ class Transmission(DownloaderBase):
         log.debug('Requesting Transmission to remove the torrent %s%s.', (release_download['name'], ' and cleanup the downloaded files' if delete_files else ''))
         return self.trpc.remove_torrent(release_download['id'], delete_files)
 
-
 class TransmissionRPC(object):
 
     """TransmissionRPC lite library"""
@@ -256,93 +251,3 @@ class TransmissionRPC(object):
         post_data = {'arguments': {'ids': torrent_id, 'delete-local-data': delete_local_data}, 'method': 'torrent-remove', 'tag': self.tag}
         return self._request(post_data)
 
-
-config = [{
-    'name': 'transmission',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'transmission',
-            'label': 'Transmission',
-            'description': 'Use <a href="http://www.transmissionbt.com/" target="_blank">Transmission</a> to download torrents.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'torrent',
-                },
-                {
-                    'name': 'host',
-                    'default': 'localhost:9091',
-                    'description': 'Hostname with port. Usually <strong>localhost:9091</strong>',
-                },
-                {
-                    'name': 'rpc_url',
-                    'type': 'string',
-                    'default': 'transmission',
-                    'advanced': True,
-                    'description': 'Change if you don\'t run Transmission RPC at the default url.',
-                },
-                {
-                    'name': 'username',
-                },
-                {
-                    'name': 'password',
-                    'type': 'password',
-                },
-                {
-                    'name': 'directory',
-                    'type': 'directory',
-                    'description': 'Download to this directory. Keep empty for default Transmission download directory.',
-                },
-                {
-                    'name': 'remove_complete',
-                    'label': 'Remove torrent',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Remove the torrent from Transmission after it finished seeding.',
-                },
-                {
-                    'name': 'delete_files',
-                    'label': 'Remove files',
-                    'default': True,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Also remove the leftover files.',
-                },
-                {
-                    'name': 'paused',
-                    'type': 'bool',
-                    'advanced': True,
-                    'default': False,
-                    'description': 'Add the torrent paused.',
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-                {
-                    'name': 'stalled_as_failed',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Consider a stalled torrent as failed',
-                },
-                {
-                    'name': 'delete_failed',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Delete a release after the download has failed.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/downloaders/utorrent/__init__.py

@@ -0,0 +1,80 @@
+from .main import uTorrent
+
+
+def start():
+    return uTorrent()
+
+config = [{
+    'name': 'utorrent',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'list': 'download_providers',
+            'name': 'utorrent',
+            'label': 'uTorrent',
+            'description': 'Use <a href="http://www.utorrent.com/" target="_blank">uTorrent</a> (3.0+) to download torrents.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'torrent',
+                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:8000',
+                    'description': 'Port can be found in settings when enabling WebUI.',
+                },
+                {
+                    'name': 'username',
+                },
+                {
+                    'name': 'password',
+                    'type': 'password',
+                },
+                {
+                    'name': 'label',
+                    'description': 'Label to add torrent as.',
+                },
+                {
+                    'name': 'remove_complete',
+                    'label': 'Remove torrent',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Remove the torrent from uTorrent after it finished seeding.',
+                },
+                {
+                    'name': 'delete_files',
+                    'label': 'Remove files',
+                    'default': True,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also remove the leftover files.',
+                },
+                {
+                    'name': 'paused',
+                    'type': 'bool',
+                    'advanced': True,
+                    'default': False,
+                    'description': 'Add the torrent paused.',
+                },
+                {
+                    'name': 'manual',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
+                },
+                {
+                    'name': 'delete_failed',
+                    'default': True,
+                    'advanced': True,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/utorrent/main.py

@@ -1,6 +1,12 @@
 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
@@ -11,32 +17,22 @@ import time
 import urllib
 import urllib2
 
-from bencode import bencode as benc, bdecode
-from couchpotato.core._base.downloader.main import DownloaderBase, 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'
 
-
-class uTorrent(DownloaderBase):
+class uTorrent(Downloader):
 
     protocol = ['torrent', 'torrent_magnet']
     utorrent_api = None
     status_flags = {
-        'STARTED': 1,
-        'CHECKING': 2,
-        'CHECK-START': 4,
-        'CHECKED': 8,
-        'ERROR': 16,
-        'PAUSED': 32,
-        'QUEUED': 64,
-        'LOADED': 128
+        'STARTED'     : 1,
+        'CHECKING'    : 2,
+        'CHECK-START' : 4,
+        'CHECKED'     : 8,
+        'ERROR'       : 16,
+        'PAUSED'      : 32,
+        'QUEUED'      : 64,
+        'LOADED'      : 128
     }
 
     def connect(self):
@@ -184,7 +180,7 @@ class uTorrent(DownloaderBase):
                     'original_status': torrent[1],
                     'timeleft': str(timedelta(seconds = torrent[10])),
                     'folder': sp(torrent[26]),
-                    'files': torrent_files
+                    'files': '|'.join(torrent_files)
                 })
 
         return release_downloads
@@ -344,79 +340,3 @@ class uTorrentAPI(object):
             return False
         response = json.loads(data)
         return int(response.get('build'))
-
-
-config = [{
-    'name': 'utorrent',
-    'groups': [
-        {
-            'tab': 'downloaders',
-            'list': 'download_providers',
-            'name': 'utorrent',
-            'label': 'uTorrent',
-            'description': 'Use <a href="http://www.utorrent.com/" target="_blank">uTorrent</a> (3.0+) to download torrents.',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': 0,
-                    'type': 'enabler',
-                    'radio_group': 'torrent',
-                },
-                {
-                    'name': 'host',
-                    'default': 'localhost:8000',
-                    'description': 'Port can be found in settings when enabling WebUI.',
-                },
-                {
-                    'name': 'username',
-                },
-                {
-                    'name': 'password',
-                    'type': 'password',
-                },
-                {
-                    'name': 'label',
-                    'description': 'Label to add torrent as.',
-                },
-                {
-                    'name': 'remove_complete',
-                    'label': 'Remove torrent',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Remove the torrent from uTorrent after it finished seeding.',
-                },
-                {
-                    'name': 'delete_files',
-                    'label': 'Remove files',
-                    'default': True,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Also remove the leftover files.',
-                },
-                {
-                    'name': 'paused',
-                    'type': 'bool',
-                    'advanced': True,
-                    'default': False,
-                    'description': 'Add the torrent paused.',
-                },
-                {
-                    'name': 'manual',
-                    'default': 0,
-                    'type': 'bool',
-                    'advanced': True,
-                    'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
-                },
-                {
-                    'name': 'delete_failed',
-                    'default': True,
-                    'advanced': True,
-                    'type': 'bool',
-                    'description': 'Delete a release after the download has failed.',
-                },
-            ],
-        }
-    ],
-}]

couchpotato/core/event.py

@@ -1,10 +1,8 @@
-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,14 +1,12 @@
+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__)
 
 
@@ -78,7 +76,7 @@ def sp(path, *args):
     # Replace *NIX ambiguous '//' at the beginning of a path with '/' (crashes guessit)
     path = re.sub('^//', '/', path)
 
-    return toUnicode(path)
+    return path
 
 
 def ek(original, *args):

couchpotato/core/helpers/request.py

@@ -1,8 +1,7 @@
-from urllib import unquote
-import re
-
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import natsortKey
+from urllib import unquote
+import re
 
 
 def getParams(params):
@@ -43,7 +42,6 @@ def getParams(params):
 
     return dictToList(temp)
 
-non_decimal = re.compile(r'[^\d.]+')
 
 def dictToList(params):
 
@@ -54,15 +52,7 @@ def dictToList(params):
                 convert = lambda text: int(text) if text.isdigit() else text.lower()
                 alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)]
                 sorted_keys = sorted(value.keys(), key = alphanum_key)
-
-                all_ints = 0
-                for pnr in sorted_keys:
-                    all_ints += 1 if non_decimal.sub('', pnr) == pnr else 0
-
-                if all_ints == len(sorted_keys):
-                    new_value = [dictToList(value[k]) for k in sorted_keys]
-                else:
-                    new_value = value
+                new_value = [dictToList(value[k]) for k in sorted_keys]
             except:
                 new_value = value
 

couchpotato/core/helpers/rss.py

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

couchpotato/core/helpers/variable.py

@@ -1,3 +1,5 @@
+from couchpotato.core.helpers.encoding import simplifyString, toSafeString, ss
+from couchpotato.core.logger import CPLog
 import collections
 import hashlib
 import os
@@ -6,13 +8,9 @@ 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__)
 
 
@@ -216,7 +214,6 @@ def tryFloat(s):
             return float(s)
     except: return 0
 
-
 def natsortKey(string_):
     """See http://www.codinghorror.com/blog/archives/001018.html"""
     return [int(s) if s.isdigit() else s for s in re.split(r'(\d+)', string_)]
@@ -228,28 +225,26 @@ def toIterable(value):
     return [value]
 
 
-def getIdentifier(media):
-    return media.get('identifier') or media.get('identifiers', {}).get('imdb')
-
-
-def getTitle(media_dict):
+def getTitle(library_dict):
     try:
         try:
-            return media_dict['title']
+            return library_dict['titles'][0]['title']
         except:
             try:
-                return media_dict['titles'][0]
+                for title in library_dict.titles:
+                    if title.default:
+                        return title.title
             except:
                 try:
-                    return media_dict['info']['titles'][0]
+                    return library_dict['info']['titles'][0]
                 except:
-                    try:
-                        return media_dict['media']['info']['titles'][0]
-                    except:
-                        log.error('Could not get title for %s', getIdentifier(media_dict))
-                        return None
+                    log.error('Could not get title for %s', library_dict.identifier)
+                    return None
+
+        log.error('Could not get title for %s', library_dict['identifier'])
+        return None
     except:
-        log.error('Could not get title for library item: %s', media_dict)
+        log.error('Could not get title for library item: %s', library_dict)
         return None
 
 
@@ -294,11 +289,8 @@ def isSubFolder(sub_folder, base_folder):
     # Returns True if sub_folder is the same as or inside base_folder
     return base_folder and sub_folder and ss(os.path.normpath(base_folder).rstrip(os.path.sep) + os.path.sep) in ss(os.path.normpath(sub_folder).rstrip(os.path.sep) + os.path.sep)
 
-
 # From SABNZBD
-re_password = [re.compile(r'(.+){{([^{}]+)}}$'), re.compile(r'(.+)\s+password\s*=\s*(.+)$', re.I)]
-
-
+re_password = [re.compile(r'([^/\\]+)[/\\](.+)'), re.compile(r'(.+){{([^{}]+)}}$'), re.compile(r'(.+)\s+password\s*=\s*(.+)$', re.I)]
 def scanForPassword(name):
     m = None
     for reg in re_password:

couchpotato/core/loader.py

@@ -1,33 +1,31 @@
-import os
-import sys
-import traceback
-
 from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
 from importhelper import import_module
+import os
+import sys
+import traceback
 import six
 
-
 log = CPLog(__name__)
 
 
 class Loader(object):
-
-    def __init__(self):
-        self.plugins = {}
-        self.providers = {}
-        self.modules = {}
-        self.paths = {}
+    plugins = {}
+    providers = {}
+    modules = {}
 
     def preload(self, root = ''):
         core = os.path.join(root, 'couchpotato', 'core')
 
-        self.paths.update({
+        self.paths = {
             'core': (0, 'couchpotato.core._base', os.path.join(core, '_base')),
             'plugin': (1, 'couchpotato.core.plugins', os.path.join(core, 'plugins')),
             'notifications': (20, 'couchpotato.core.notifications', os.path.join(core, 'notifications')),
             'downloaders': (20, 'couchpotato.core.downloaders', os.path.join(core, 'downloaders')),
-        })
+        }
+
+        # Add providers to loader
+        self.addPath(root, ['couchpotato', 'core', 'providers'], 25, recursive = False)
 
         # Add media to loader
         self.addPath(root, ['couchpotato', 'core', 'media'], 25, recursive = True)
@@ -59,10 +57,12 @@ 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('type'), plugin.get('name'))
+                    self.loadPlugins(m, plugin.get('name'))
                 except ImportError as e:
                     # todo:: subclass ImportError for missing requirements.
                     if e.message.lower().startswith("missing"):
@@ -96,19 +96,14 @@ class Loader(object):
             self.addModule(priority, plugin_type, module, os.path.basename(dir_name))
 
         for name in os.listdir(dir_name):
-            path = os.path.join(dir_name, name)
-            ext = os.path.splitext(path)[1]
-            ext_length = len(ext)
-            if name != 'static' and ((os.path.isdir(path) and os.path.isfile(os.path.join(path, '__init__.py')))
-                                     or (os.path.isfile(path) and ext == '.py')):
-                name = name[:-ext_length] if ext_length > 0 else name
+            if os.path.isdir(os.path.join(dir_name, name)) and name != 'static' and os.path.isfile(os.path.join(dir_name, name, '__init__.py')):
                 module_name = '%s.%s' % (module, name)
                 self.addModule(priority, plugin_type, module_name, name)
 
     def loadSettings(self, module, name, save = True):
 
         if not hasattr(module, 'config'):
-            #log.debug('Skip loading settings for plugin %s as it has no config section' % module.__file__)
+            log.debug('Skip loading settings for plugin %s as it has no config section' % module.__file__)
             return False
 
         try:
@@ -124,20 +119,13 @@ class Loader(object):
             log.debug('Failed loading settings for "%s": %s', (name, traceback.format_exc()))
             return False
 
-    def loadPlugins(self, module, type, name):
+    def loadPlugins(self, module, name):
 
-        if not hasattr(module, 'autoload'):
-            #log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
+        if not hasattr(module, 'start'):
+            log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
             return False
         try:
-            # Load single file plugin
-            if isinstance(module.autoload, (str, unicode)):
-                getattr(module, module.autoload)()
-            # Load folder plugin
-            else:
-                module.autoload()
-
-            log.info('Loaded %s: %s', (type, name))
+            module.start()
             return True
         except:
             log.error('Failed loading plugin "%s": %s', (module.__file__, traceback.format_exc()))
@@ -149,9 +137,6 @@ 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,9 +7,6 @@ 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]
@@ -17,14 +14,6 @@ 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))
 
@@ -48,6 +37,7 @@ 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)
@@ -63,8 +53,7 @@ class CPLog(object):
             except Exception as e:
                 self.logger.error('Failed encoding stuff to log "%s": %s' % (msg, e))
 
-        self.setup()
-        if not self.is_develop:
+        if not Env.get('dev'):
 
             for replace in self.replace_private:
                 msg = re.sub('(\?%s=)[^\&]+' % replace, '?%s=xxx' % replace, msg)
@@ -72,7 +61,7 @@ class CPLog(object):
 
             # Replace api key
             try:
-                api_key = self.Env.setting('api_key')
+                api_key = Env.setting('api_key')
                 if api_key:
                     msg = msg.replace(api_key, 'API_KEY')
             except:

couchpotato/core/media/__init__.py

@@ -1,12 +1,8 @@
-import os
 import traceback
-
-from couchpotato import get_db, CPLog
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato import get_session, CPLog
+from couchpotato.core.event import addEvent, fireEventAsync, fireEvent
 from couchpotato.core.plugins.base import Plugin
-import six
-
+from couchpotato.core.settings.model import Media
 
 log = CPLog(__name__)
 
@@ -15,23 +11,35 @@ class MediaBase(Plugin):
 
     _type = None
 
+    default_dict = {
+        'profile': {'types': {'quality': {}}},
+        'releases': {'status': {}, 'quality': {}, 'files': {}, 'info': {}},
+        'library': {'titles': {}, 'files': {}},
+        'files': {},
+        'status': {},
+        'category': {},
+    }
+
     def initType(self):
         addEvent('media.types', self.getType)
 
     def getType(self):
         return self._type
 
-    def createOnComplete(self, media_id):
+    def createOnComplete(self, id):
 
         def onComplete():
             try:
-                db = get_db()
-                media = fireEvent('media.get', media_id, single = True)
-                event_name = '%s.searcher.single' % media.get('type')
+                db = get_session()
+                media = db.query(Media).filter_by(id = id).first()
+                media_dict = media.to_dict(self.default_dict)
+                event_name = '%s.searcher.single' % media.type
 
-                fireEventAsync(event_name, media, on_complete = self.createNotifyFront(media_id))
+                fireEvent(event_name, media_dict, on_complete = self.createNotifyFront(id))
             except:
                 log.error('Failed creating onComplete: %s', traceback.format_exc())
+            finally:
+                db.close()
 
         return onComplete
 
@@ -39,61 +47,15 @@ class MediaBase(Plugin):
 
         def notifyFront():
             try:
-                media = fireEvent('media.get', media_id, single = True)
-                event_name = '%s.update' % media.get('type')
+                db = get_session()
+                media = db.query(Media).filter_by(id = media_id).first()
+                media_dict = media.to_dict(self.default_dict)
+                event_name = '%s.update' % media.type
 
-                fireEvent('notify.frontend', type = event_name, data = media)
+                fireEvent('notify.frontend', type = event_name, data = media_dict)
             except:
                 log.error('Failed creating onComplete: %s', traceback.format_exc())
+            finally:
+                db.close()
 
         return notifyFront
-
-    def getDefaultTitle(self, info, ):
-
-        # Set default title
-        default_title = toUnicode(info.get('title'))
-        titles = info.get('titles', [])
-        counter = 0
-        def_title = None
-        for title in titles:
-            if (len(default_title) == 0 and counter == 0) or len(titles) == 1 or title.lower() == toUnicode(default_title.lower()) or (toUnicode(default_title) == six.u('') and toUnicode(titles[0]) == title):
-                def_title = toUnicode(title)
-                break
-            counter += 1
-
-        if not def_title:
-            def_title = toUnicode(titles[0])
-
-        return def_title or 'UNKNOWN'
-
-    def getPoster(self, image_urls, existing_files):
-        image_type = 'poster'
-
-        # Remove non-existing files
-        file_type = 'image_%s' % image_type
-
-        # Make existing unique
-        unique_files = list(set(existing_files.get(file_type, [])))
-
-        # Remove files that can't be found
-        for ef in unique_files:
-            if not os.path.isfile(ef):
-                unique_files.remove(ef)
-
-        # Replace new files list
-        existing_files[file_type] = unique_files
-        if len(existing_files) == 0:
-            del existing_files[file_type]
-
-        # Loop over type
-        for image in image_urls.get(image_type, []):
-            if not isinstance(image, (str, unicode)):
-                continue
-
-            if file_type not in existing_files or len(existing_files.get(file_type, [])) == 0:
-                file_path = fireEvent('file.download', url = image, single = True)
-                if file_path:
-                    existing_files[file_type] = [file_path]
-                    break
-            else:
-                break

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

@@ -1,7 +1,13 @@
-from .main import Library
+from couchpotato.core.event import addEvent
+from couchpotato.core.plugins.base import Plugin
 
 
-def autoload():
-    return Library()
+class LibraryBase(Plugin):
 
-config = []
+    _type = None
+
+    def initType(self):
+        addEvent('library.types', self.getType)
+
+    def getType(self):
+        return self._type

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

@@ -1,13 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.plugins.base import Plugin
-
-
-class LibraryBase(Plugin):
-
-    _type = None
-
-    def initType(self):
-        addEvent('library.types', self.getType)
-
-    def getType(self):
-        return self._type

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

@@ -1,18 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.media._base.library.base import LibraryBase
-
-
-class Library(LibraryBase):
-    def __init__(self):
-        addEvent('library.title', self.title)
-
-    def title(self, library):
-        return fireEvent(
-            'library.query',
-            library,
-
-            condense = False,
-            include_year = False,
-            include_identifier = False,
-            single = True
-        )

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

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

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

@@ -1,84 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import simplifyString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-
-log = CPLog(__name__)
-
-
-class MatcherBase(Plugin):
-    type = None
-
-    def __init__(self):
-        if self.type:
-            addEvent('%s.matcher.correct' % self.type, self.correct)
-
-    def correct(self, chain, release, media, quality):
-        raise NotImplementedError()
-
-    def flattenInfo(self, info):
-        # Flatten dictionary of matches (chain info)
-        if isinstance(info, dict):
-            return dict([(key, self.flattenInfo(value)) for key, value in info.items()])
-
-        # Flatten matches
-        result = None
-
-        for match in info:
-            if isinstance(match, dict):
-                if result is None:
-                    result = {}
-
-                for key, value in match.items():
-                    if key not in result:
-                        result[key] = []
-
-                    result[key].append(value)
-            else:
-                if result is None:
-                    result = []
-
-                result.append(match)
-
-        return result
-
-    def constructFromRaw(self, match):
-        if not match:
-            return None
-
-        parts = [
-            ''.join([
-                y for y in x[1:] if y
-            ]) for x in match
-        ]
-
-        return ''.join(parts)[:-1].strip()
-
-    def simplifyValue(self, value):
-        if not value:
-            return value
-
-        if isinstance(value, basestring):
-            return simplifyString(value)
-
-        if isinstance(value, list):
-            return [self.simplifyValue(x) for x in value]
-
-        raise ValueError("Unsupported value type")
-
-    def chainMatch(self, chain, group, tags):
-        info = self.flattenInfo(chain.info[group])
-
-        found_tags = []
-        for tag, accepted in tags.items():
-            values = [self.simplifyValue(x) for x in info.get(tag, [None])]
-
-            if any([val in accepted for val in values]):
-                found_tags.append(tag)
-
-        log.debug('tags found: %s, required: %s' % (found_tags, tags.keys()))
-
-        if set(tags.keys()) == set(found_tags):
-            return True
-
-        return all([key in found_tags for key, value in tags.items()])

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

@@ -1,89 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.variable import possibleTitles
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.matcher.base import MatcherBase
-from caper import Caper
-
-log = CPLog(__name__)
-
-
-class Matcher(MatcherBase):
-
-    def __init__(self):
-        super(Matcher, self).__init__()
-
-        self.caper = Caper()
-
-        addEvent('matcher.parse', self.parse)
-        addEvent('matcher.match', self.match)
-
-        addEvent('matcher.flatten_info', self.flattenInfo)
-        addEvent('matcher.construct_from_raw', self.constructFromRaw)
-
-        addEvent('matcher.correct_title', self.correctTitle)
-        addEvent('matcher.correct_quality', self.correctQuality)
-
-    def parse(self, name, parser='scene'):
-        return self.caper.parse(name, parser)
-
-    def match(self, release, media, quality):
-        match = fireEvent('matcher.parse', release['name'], single = True)
-
-        if len(match.chains) < 1:
-            log.info2('Wrong: %s, unable to parse release name (no chains)', release['name'])
-            return False
-
-        for chain in match.chains:
-            if fireEvent('%s.matcher.correct' % media['type'], chain, release, media, quality, single = True):
-                return chain
-
-        return False
-
-    def correctTitle(self, chain, media):
-        root_library = media['library']['root_library']
-
-        if 'show_name' not in chain.info or not len(chain.info['show_name']):
-            log.info('Wrong: missing show name in parsed result')
-            return False
-
-        # Get the lower-case parsed show name from the chain
-        chain_words = [x.lower() for x in chain.info['show_name']]
-
-        # Build a list of possible titles of the media we are searching for
-        titles = root_library['info']['titles']
-
-        # Add year suffix titles (will result in ['<name_one>', '<name_one> <suffix_one>', '<name_two>', ...])
-        suffixes = [None, root_library['info']['year']]
-
-        titles = [
-            title + ((' %s' % suffix) if suffix else '')
-            for title in titles
-            for suffix in suffixes
-        ]
-
-        # Check show titles match
-        # TODO check xem names
-        for title in titles:
-            for valid_words in [x.split(' ') for x in possibleTitles(title)]:
-
-                if valid_words == chain_words:
-                    return True
-
-        return False
-
-    def correctQuality(self, chain, quality, quality_map):
-        if quality['identifier'] not in quality_map:
-            log.info2('Wrong: unknown preferred quality %s', quality['identifier'])
-            return False
-
-        if 'video' not in chain.info:
-            log.info2('Wrong: no video tags found')
-            return False
-
-        video_tags = quality_map[quality['identifier']]
-
-        if not self.chainMatch(chain, 'video', video_tags):
-            log.info2('Wrong: %s tags not in chain', video_tags)
-            return False
-
-        return True

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

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

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

@@ -1,178 +0,0 @@
-from string import ascii_letters
-from hashlib import md5
-
-from CodernityDB.tree_index import MultiTreeBasedIndex, TreeBasedIndex
-from couchpotato.core.helpers.encoding import toUnicode, simplifyString
-
-
-class MediaIndex(MultiTreeBasedIndex):
-    _version = 3
-
-    custom_header = """from CodernityDB.tree_index import MultiTreeBasedIndex"""
-
-    def __init__(self, *args, **kwargs):
-        kwargs['key_format'] = '32s'
-        super(MediaIndex, self).__init__(*args, **kwargs)
-
-    def make_key(self, key):
-        return md5(key).hexdigest()
-
-    def make_key_value(self, data):
-        if data.get('_t') == 'media' and (data.get('identifier') or data.get('identifiers')):
-
-            identifiers = data.get('identifiers', {})
-            if data.get('identifier') and 'imdb' not in identifiers:
-                identifiers['imdb'] = data.get('identifier')
-
-            ids = []
-            for x in identifiers:
-                ids.append(md5('%s-%s' % (x, identifiers[x])).hexdigest())
-
-            return ids, None
-
-
-class MediaStatusIndex(TreeBasedIndex):
-    _version = 1
-
-    def __init__(self, *args, **kwargs):
-        kwargs['key_format'] = '32s'
-        super(MediaStatusIndex, self).__init__(*args, **kwargs)
-
-    def make_key(self, key):
-        return md5(key).hexdigest()
-
-    def make_key_value(self, data):
-        if data.get('_t') == 'media' and data.get('status'):
-            return md5(data.get('status')).hexdigest(), None
-
-
-class MediaTypeIndex(TreeBasedIndex):
-    _version = 1
-
-    def __init__(self, *args, **kwargs):
-        kwargs['key_format'] = '32s'
-        super(MediaTypeIndex, self).__init__(*args, **kwargs)
-
-    def make_key(self, key):
-        return md5(key).hexdigest()
-
-    def make_key_value(self, data):
-        if data.get('_t') == 'media' and data.get('type'):
-            return md5(data.get('type')).hexdigest(), None
-
-
-class TitleSearchIndex(MultiTreeBasedIndex):
-    _version = 1
-
-    custom_header = """from CodernityDB.tree_index import MultiTreeBasedIndex
-from itertools import izip
-from couchpotato.core.helpers.encoding import simplifyString"""
-
-    def __init__(self, *args, **kwargs):
-        kwargs['key_format'] = '32s'
-        super(TitleSearchIndex, self).__init__(*args, **kwargs)
-        self.__l = kwargs.get('w_len', 2)
-
-    def make_key_value(self, data):
-
-        if data.get('_t') == 'media' and len(data.get('title', '')) > 0:
-
-            out = set()
-            title = str(simplifyString(data.get('title').lower()))
-            l = self.__l
-            title_split = title.split()
-
-            for x in range(len(title_split)):
-                combo = ' '.join(title_split[x:])[:32].strip()
-                out.add(combo.rjust(32, '_'))
-                combo_range = max(l, min(len(combo), 32))
-
-                for cx in range(1, combo_range):
-                    ccombo = combo[:-cx].strip()
-                    if len(ccombo) > l:
-                        out.add(ccombo.rjust(32, '_'))
-
-            return out, None
-
-    def make_key(self, key):
-        return key.rjust(32, '_').lower()
-
-
-class TitleIndex(TreeBasedIndex):
-    _version = 2
-
-    custom_header = """from CodernityDB.tree_index import TreeBasedIndex
-from string import ascii_letters
-from couchpotato.core.helpers.encoding import toUnicode, simplifyString"""
-
-    def __init__(self, *args, **kwargs):
-        kwargs['key_format'] = '32s'
-        super(TitleIndex, self).__init__(*args, **kwargs)
-
-    def make_key(self, key):
-        return self.simplify(key)
-
-    def make_key_value(self, data):
-        if data.get('_t') == 'media' and data.get('title') is not None and len(data.get('title')) > 0:
-            return self.simplify(data['title']), None
-
-    def simplify(self, title):
-
-        title = toUnicode(title)
-
-        nr_prefix = '' if title and len(title) > 0 and title[0] in ascii_letters else '#'
-        title = simplifyString(title)
-
-        for prefix in ['the ']:
-            if prefix == title[:len(prefix)]:
-                title = title[len(prefix):]
-                break
-
-        return str(nr_prefix + title).ljust(32, '_')[:32]
-
-
-class StartsWithIndex(TreeBasedIndex):
-    _version = 2
-
-    custom_header = """from CodernityDB.tree_index import TreeBasedIndex
-from string import ascii_letters
-from couchpotato.core.helpers.encoding import toUnicode, simplifyString"""
-
-    def __init__(self, *args, **kwargs):
-        kwargs['key_format'] = '1s'
-        super(StartsWithIndex, self).__init__(*args, **kwargs)
-
-    def make_key(self, key):
-        return self.first(key)
-
-    def make_key_value(self, data):
-        if data.get('_t') == 'media' and data.get('title') is not None:
-            return self.first(data['title']), None
-
-    def first(self, title):
-        title = toUnicode(title)
-        title = simplifyString(title)
-
-        for prefix in ['the ']:
-            if prefix == title[:len(prefix)]:
-                title = title[len(prefix):]
-                break
-
-        return str(title[0] if title and len(title) > 0 and title[0] in ascii_letters else '#').lower()
-
-
-
-class MediaChildrenIndex(TreeBasedIndex):
-    _version = 1
-
-    def __init__(self, *args, **kwargs):
-        kwargs['key_format'] = '32s'
-        super(MediaChildrenIndex, self).__init__(*args, **kwargs)
-
-    def make_key(self, key):
-        return key
-
-    def make_key_value(self, data):
-        if data.get('_t') == 'media' and data.get('parent_id'):
-            return data.get('parent_id'), None
-

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

@@ -1,31 +1,22 @@
 import traceback
-from string import ascii_lowercase
-
-from couchpotato import tryInt, get_db
+from couchpotato import get_session, tryInt
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
 from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import splitString, getImdb, getTitle
+from couchpotato.core.helpers.variable import mergeDicts, splitString, getImdb, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media import MediaBase
-from .index import MediaIndex, MediaStatusIndex, MediaTypeIndex, TitleSearchIndex, TitleIndex, StartsWithIndex, MediaChildrenIndex
-
+from couchpotato.core.settings.model import Library, LibraryTitle, Release, \
+    Media
+from sqlalchemy.orm import joinedload_all
+from sqlalchemy.sql.expression import or_, asc, not_, desc
+from string import ascii_lowercase
 
 log = CPLog(__name__)
 
 
 class MediaPlugin(MediaBase):
 
-    _database = {
-        'media': MediaIndex,
-        'media_search_title': TitleSearchIndex,
-        'media_status': MediaStatusIndex,
-        'media_by_type': MediaTypeIndex,
-        'media_title': TitleIndex,
-        'media_startswith': StartsWithIndex,
-        'media_children': MediaChildrenIndex,
-    }
-
     def __init__(self):
 
         addApiView('media.refresh', self.refresh, docs = {
@@ -69,14 +60,12 @@ class MediaPlugin(MediaBase):
 
         addApiView('media.available_chars', self.charView)
 
-        addEvent('app.load', self.addSingleRefreshView, priority = 100)
-        addEvent('app.load', self.addSingleListView, priority = 100)
-        addEvent('app.load', self.addSingleCharView, priority = 100)
-        addEvent('app.load', self.addSingleDeleteView, priority = 100)
+        addEvent('app.load', self.addSingleRefreshView)
+        addEvent('app.load', self.addSingleListView)
+        addEvent('app.load', self.addSingleCharView)
+        addEvent('app.load', self.addSingleDeleteView)
 
         addEvent('media.get', self.get)
-        addEvent('media.with_status', self.withStatus)
-        addEvent('media.with_identifiers', self.withIdentifiers)
         addEvent('media.list', self.list)
         addEvent('media.delete', self.delete)
         addEvent('media.restatus', self.restatus)
@@ -91,27 +80,29 @@ class MediaPlugin(MediaBase):
             if refresh_handler:
                 handlers.append(refresh_handler)
 
-        fireEvent('notify.frontend', type = 'media.busy', data = {'_id': ids})
+        fireEvent('notify.frontend', type = 'media.busy', data = {'id': [tryInt(x) for x in ids]})
         fireEventAsync('schedule.queue', handlers = handlers)
 
         return {
             'success': True,
         }
 
-    def createRefreshHandler(self, media_id):
+    def createRefreshHandler(self, id):
+        db = get_session()
 
-        try:
-            media = get_db().get('id', media_id)
-            event = '%s.update_info' % media.get('type')
+        media = db.query(Media).filter_by(id = id).first()
+
+        if media:
+
+            default_title = getTitle(media.library)
+            identifier = media.library.identifier
+            event = 'library.update.%s' % media.type
 
             def handler():
-                fireEvent(event, media_id = media_id, on_complete = self.createOnComplete(media_id))
+                fireEvent(event, identifier = identifier, default_title = default_title, on_complete = self.createOnComplete(id))
 
-            if handler:
-                return handler
-
-        except:
-            log.error('Refresh handler for non existing media: %s', traceback.format_exc())
+        if handler:
+            return handler
 
     def addSingleRefreshView(self):
 
@@ -120,25 +111,20 @@ class MediaPlugin(MediaBase):
 
     def get(self, media_id):
 
-        db = get_db()
+        db = get_session()
 
         imdb_id = getImdb(str(media_id))
 
-        media = None
         if imdb_id:
-            media = db.get('media', 'imdb-%s' % imdb_id, with_doc = True)['doc']
+            m = db.query(Media).filter(Media.library.has(identifier = imdb_id)).first()
         else:
-            media = db.get('id', media_id)
+            m = db.query(Media).filter_by(id = media_id).first()
 
-        if media:
+        results = None
+        if m:
+            results = m.to_dict(self.default_dict)
 
-            # Attach category
-            try: media['category'] = db.get('id', media.get('category_id'))
-            except: pass
-
-            media['releases'] = fireEvent('release.for_media', media['_id'], single = True)
-
-        return media
+        return results
 
     def getView(self, id = None, **kwargs):
 
@@ -149,32 +135,9 @@ class MediaPlugin(MediaBase):
             'media': media,
         }
 
-    def withStatus(self, status, with_doc = True):
+    def list(self, types = None, status = None, release_status = None, limit_offset = None, starts_with = None, search = None, order = None):
 
-        db = get_db()
-
-        status = list(status if isinstance(status, (list, tuple)) else [status])
-
-        for s in status:
-            for ms in db.get_many('media_status', s, with_doc = with_doc):
-                yield ms['doc'] if with_doc else ms
-
-    def withIdentifiers(self, identifiers, with_doc = False):
-
-        db = get_db()
-
-        for x in identifiers:
-            try:
-                media = db.get('media', '%s-%s' % (x, identifiers[x]), with_doc = with_doc)
-                return media
-            except:
-                pass
-
-        log.debug('No media found with identifiers: %s', identifiers)
-
-    def list(self, types = None, status = None, release_status = None, status_or = False, limit_offset = None, starts_with = None, search = None):
-
-        db = get_db()
+        db = get_session()
 
         # Make a list from string
         if status and not isinstance(status, (list, tuple)):
@@ -184,90 +147,138 @@ class MediaPlugin(MediaBase):
         if types and not isinstance(types, (list, tuple)):
             types = [types]
 
-        # query media ids
-        if types:
-            all_media_ids = set()
-            for media_type in types:
-                all_media_ids = all_media_ids.union(set([x['_id'] for x in db.get_many('media_by_type', media_type)]))
-        else:
-            all_media_ids = set([x['_id'] for x in db.all('media')])
-
-        media_ids = list(all_media_ids)
-        filter_by = {}
+        # query movie ids
+        q = db.query(Media) \
+            .with_entities(Media.id) \
+            .group_by(Media.id)
 
         # Filter on movie status
         if status and len(status) > 0:
-            filter_by['media_status'] = set()
-            for media_status in fireEvent('media.with_status', status, with_doc = False, single = True):
-                filter_by['media_status'].add(media_status.get('_id'))
+            statuses = fireEvent('status.get', status, single = len(status) > 1)
+            statuses = [s.get('id') for s in statuses]
+
+            q = q.filter(Media.status_id.in_(statuses))
 
         # Filter on release status
         if release_status and len(release_status) > 0:
-            filter_by['release_status'] = set()
-            for release_status in fireEvent('release.with_status', release_status, with_doc = False, single = True):
-                filter_by['release_status'].add(release_status.get('media_id'))
+            q = q.join(Media.releases)
+
+            statuses = fireEvent('status.get', release_status, single = len(release_status) > 1)
+            statuses = [s.get('id') for s in statuses]
+
+            q = q.filter(Release.status_id.in_(statuses))
+
+        # Filter on type
+        if types and len(types) > 0:
+            try: q = q.filter(Media.type.in_(types))
+            except: pass
+
+        # Only join when searching / ordering
+        if starts_with or search or order != 'release_order':
+            q = q.join(Media.library, Library.titles) \
+                .filter(LibraryTitle.default == True)
 
         # Add search filters
+        filter_or = []
         if starts_with:
-            filter_by['starts_with'] = set()
-            starts_with = toUnicode(starts_with.lower())[0]
-            starts_with = starts_with if starts_with in ascii_lowercase else '#'
-            filter_by['starts_with'] = [x['_id'] for x in db.get_many('media_startswith', starts_with)]
+            starts_with = toUnicode(starts_with.lower())
+            if starts_with in ascii_lowercase:
+                filter_or.append(LibraryTitle.simple_title.startswith(starts_with))
+            else:
+                ignore = []
+                for letter in ascii_lowercase:
+                    ignore.append(LibraryTitle.simple_title.startswith(toUnicode(letter)))
+                filter_or.append(not_(or_(*ignore)))
 
-        # Filter with search query
         if search:
-            filter_by['search'] = [x['_id'] for x in db.get_many('media_search_title', search)]
+            filter_or.append(LibraryTitle.simple_title.like('%%' + search + '%%'))
 
-        if status_or and 'media_status' in filter_by and 'release_status' in filter_by:
-            filter_by['status'] = list(filter_by['media_status']) + list(filter_by['release_status'])
-            del filter_by['media_status']
-            del filter_by['release_status']
+        if len(filter_or) > 0:
+            q = q.filter(or_(*filter_or))
 
-        # Filter by combining ids
-        for x in filter_by:
-            media_ids = [n for n in media_ids if n in filter_by[x]]
-
-        total_count = len(media_ids)
+        total_count = q.count()
         if total_count == 0:
             return 0, []
 
-        offset = 0
-        limit = -1
+        if order == 'release_order':
+            q = q.order_by(desc(Release.last_edit))
+        else:
+            q = q.order_by(asc(LibraryTitle.simple_title))
+
         if limit_offset:
             splt = splitString(limit_offset) if isinstance(limit_offset, (str, unicode)) else limit_offset
-            limit = tryInt(splt[0])
-            offset = tryInt(0 if len(splt) is 1 else splt[1])
+            limit = splt[0]
+            offset = 0 if len(splt) is 1 else splt[1]
+            q = q.limit(limit).offset(offset)
 
-        # List movies based on title order
-        medias = []
-        for m in db.all('media_title'):
-            media_id = m['_id']
-            if media_id not in media_ids: continue
-            if offset > 0:
-                offset -= 1
-                continue
+        # Get all media_ids in sorted order
+        media_ids = [m.id for m in q.all()]
 
-            media = fireEvent('media.get', media_id, single = True)
+        # List release statuses
+        releases = db.query(Release) \
+            .filter(Release.movie_id.in_(media_ids)) \
+            .all()
+
+        release_statuses = dict((m, set()) for m in media_ids)
+        releases_count = dict((m, 0) for m in media_ids)
+        for release in releases:
+            release_statuses[release.movie_id].add('%d,%d' % (release.status_id, release.quality_id))
+            releases_count[release.movie_id] += 1
+
+        # Get main movie data
+        q2 = db.query(Media) \
+            .options(joinedload_all('library.titles')) \
+            .options(joinedload_all('library.files')) \
+            .options(joinedload_all('status')) \
+            .options(joinedload_all('files'))
+
+        q2 = q2.filter(Media.id.in_(media_ids))
+
+        results = q2.all()
+
+        # Create dict by movie id
+        movie_dict = {}
+        for movie in results:
+            movie_dict[movie.id] = movie
+
+        # List movies based on media_ids order
+        movies = []
+        for media_id in media_ids:
+
+            releases = []
+            for r in release_statuses.get(media_id):
+                x = splitString(r)
+                releases.append({'status_id': x[0], 'quality_id': x[1]})
 
             # Merge releases with movie dict
-            medias.append(media)
+            movies.append(mergeDicts(movie_dict[media_id].to_dict({
+                'library': {'titles': {}, 'files': {}},
+                'files': {},
+            }), {
+                'releases': releases,
+                'releases_count': releases_count.get(media_id),
+            }))
 
-            # remove from media ids
-            media_ids.remove(media_id)
-            if len(media_ids) == 0 or len(medias) == limit: break
-
-        return total_count, medias
+        return total_count, movies
 
     def listView(self, **kwargs):
 
+        types = splitString(kwargs.get('types'))
+        status = splitString(kwargs.get('status'))
+        release_status = splitString(kwargs.get('release_status'))
+        limit_offset = kwargs.get('limit_offset')
+        starts_with = kwargs.get('starts_with')
+        search = kwargs.get('search')
+        order = kwargs.get('order')
+
         total_movies, movies = self.list(
-            types = splitString(kwargs.get('type')),
-            status = splitString(kwargs.get('status')),
-            release_status = splitString(kwargs.get('release_status')),
-            status_or = kwargs.get('status_or') is not None,
-            limit_offset = kwargs.get('limit_offset'),
-            starts_with = kwargs.get('starts_with'),
-            search = kwargs.get('search')
+            types = types,
+            status = status,
+            release_status = release_status,
+            limit_offset = limit_offset,
+            starts_with = starts_with,
+            search = search,
+            order = order
         )
 
         return {
@@ -281,57 +292,67 @@ class MediaPlugin(MediaBase):
 
         for media_type in fireEvent('media.types', merge = True):
             def tempList(*args, **kwargs):
-                return self.listView(types = media_type, **kwargs)
+                return self.listView(types = media_type, *args, **kwargs)
             addApiView('%s.list' % media_type, tempList)
 
     def availableChars(self, types = None, status = None, release_status = None):
 
-        db = get_db()
+        types = types or []
+        status = status or []
+        release_status = release_status or []
+
+        db = get_session()
 
         # Make a list from string
-        if status and not isinstance(status, (list, tuple)):
+        if not isinstance(status, (list, tuple)):
             status = [status]
         if release_status and not isinstance(release_status, (list, tuple)):
             release_status = [release_status]
         if types and not isinstance(types, (list, tuple)):
             types = [types]
 
-        # query media ids
-        if types:
-            all_media_ids = set()
-            for media_type in types:
-                all_media_ids = all_media_ids.union(set([x['_id'] for x in db.get_many('media_by_type', media_type)]))
-        else:
-            all_media_ids = set([x['_id'] for x in db.all('media')])
-
-        media_ids = all_media_ids
-        filter_by = {}
+        q = db.query(Media)
 
         # Filter on movie status
         if status and len(status) > 0:
-            filter_by['media_status'] = set()
-            for media_status in fireEvent('media.with_status', status, with_doc = False, single = True):
-                filter_by['media_status'].add(media_status.get('_id'))
+            statuses = fireEvent('status.get', status, single = len(release_status) > 1)
+            statuses = [s.get('id') for s in statuses]
+
+            q = q.filter(Media.status_id.in_(statuses))
 
         # Filter on release status
         if release_status and len(release_status) > 0:
-            filter_by['release_status'] = set()
-            for release_status in fireEvent('release.with_status', release_status, with_doc = False, single = True):
-                filter_by['release_status'].add(release_status.get('media_id'))
 
-        # Filter by combining ids
-        for x in filter_by:
-            media_ids = [n for n in media_ids if n in filter_by[x]]
+            statuses = fireEvent('status.get', release_status, single = len(release_status) > 1)
+            statuses = [s.get('id') for s in statuses]
+
+            q = q.join(Media.releases) \
+                .filter(Release.status_id.in_(statuses))
+
+        # Filter on type
+        if types and len(types) > 0:
+            try: q = q.filter(Media.type.in_(types))
+            except: pass
+
+        q = q.join(Library, LibraryTitle) \
+            .with_entities(LibraryTitle.simple_title) \
+            .filter(LibraryTitle.default == True)
+
+        titles = q.all()
 
         chars = set()
-        for x in db.all('media_startswith'):
-            if x['_id'] in media_ids:
-                chars.add(x['key'])
+        for title in titles:
+            try:
+                char = title[0][0]
+                char = char if char in ascii_lowercase else '#'
+                chars.add(str(char))
+            except:
+                log.error('Failed getting title for %s', title.libraries_id)
 
             if len(chars) == 25:
                 break
 
-        return list(chars)
+        return ''.join(sorted(chars))
 
     def charView(self, **kwargs):
 
@@ -350,52 +371,59 @@ class MediaPlugin(MediaBase):
 
         for media_type in fireEvent('media.types', merge = True):
             def tempChar(*args, **kwargs):
-                return self.charView(types = media_type, **kwargs)
+                return self.charView(types = media_type, *args, **kwargs)
             addApiView('%s.available_chars' % media_type, tempChar)
 
     def delete(self, media_id, delete_from = None):
 
         try:
-            db = get_db()
+            db = get_session()
 
-            media = db.get('id', media_id)
+            media = db.query(Media).filter_by(id = media_id).first()
             if media:
                 deleted = False
                 if delete_from == 'all':
                     db.delete(media)
+                    db.commit()
                     deleted = True
                 else:
+                    done_status = fireEvent('status.get', 'done', single = True)
 
-                    media_releases = fireEvent('release.for_media', media['_id'], single = True)
-
-                    total_releases = len(media_releases)
+                    total_releases = len(media.releases)
                     total_deleted = 0
-                    new_media_status = None
-
-                    for release in media_releases:
+                    new_movie_status = None
+                    for release in media.releases:
                         if delete_from in ['wanted', 'snatched', 'late']:
-                            if release.get('status') != 'done':
+                            if release.status_id != done_status.get('id'):
                                 db.delete(release)
                                 total_deleted += 1
-                            new_media_status = 'done'
+                            new_movie_status = 'done'
                         elif delete_from == 'manage':
-                            if release.get('status') == 'done':
+                            if release.status_id == done_status.get('id'):
                                 db.delete(release)
                                 total_deleted += 1
+                            new_movie_status = 'active'
+                    db.commit()
 
-                    if (total_releases == total_deleted and media['status'] != 'active') or (delete_from == 'wanted' and media['status'] == 'active'):
+                    if total_releases == total_deleted:
                         db.delete(media)
+                        db.commit()
                         deleted = True
-                    elif new_media_status:
-                        media['status'] = new_media_status
-                        db.update(media)
+                    elif new_movie_status:
+                        new_status = fireEvent('status.get', new_movie_status, single = True)
+                        media.profile_id = None
+                        media.status_id = new_status.get('id')
+                        db.commit()
                     else:
-                        fireEvent('media.restatus', media.get('_id'), single = True)
+                        fireEvent('media.restatus', media.id, single = True)
 
                 if deleted:
-                    fireEvent('notify.frontend', type = 'media.deleted', data = media)
+                    fireEvent('notify.frontend', type = 'movie.deleted', data = media.to_dict())
         except:
             log.error('Failed deleting media: %s', traceback.format_exc())
+            db.rollback()
+        finally:
+            db.close()
 
         return True
 
@@ -418,34 +446,35 @@ class MediaPlugin(MediaBase):
 
     def restatus(self, media_id):
 
+        active_status, done_status = fireEvent('status.get', ['active', 'done'], single = True)
+
         try:
-            db = get_db()
+            db = get_session()
 
-            m = db.get('id', media_id)
-            previous_status = m['status']
+            m = db.query(Media).filter_by(id = media_id).first()
+            if not m or len(m.library.titles) == 0:
+                log.debug('Can\'t restatus movie, doesn\'t seem to exist.')
+                return False
 
-            log.debug('Changing status for %s', getTitle(m))
-            if not m['profile_id']:
-                m['status'] = 'done'
+            log.debug('Changing status for %s', m.library.titles[0].title)
+            if not m.profile:
+                m.status_id = done_status.get('id')
             else:
                 move_to_wanted = True
 
-                profile = db.get('id', m['profile_id'])
-                media_releases = fireEvent('release.for_media', m['_id'], single = True)
-
-                for q_identifier in profile['qualities']:
-                    index = profile['qualities'].index(q_identifier)
-
-                    for release in media_releases:
-                        if q_identifier == release['quality'] and (release.get('status') == 'done' and profile['finish'][index]):
+                for t in m.profile.types:
+                    for release in m.releases:
+                        if t.quality.identifier is release.quality.identifier and (release.status_id is done_status.get('id') and t.finish):
                             move_to_wanted = False
 
-                m['status'] = 'active' if move_to_wanted else 'done'
+                m.status_id = active_status.get('id') if move_to_wanted else done_status.get('id')
 
-            # Only update when status has changed
-            if previous_status != m['status']:
-                db.update(m)
+            db.commit()
 
             return True
         except:
             log.error('Failed restatus: %s', traceback.format_exc())
+            db.rollback()
+        finally:
+            db.close()
+

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

@@ -1,8 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import Provider
-
-log = CPLog(__name__)
-
-
-class AutomationBase(Provider):
-    pass

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

@@ -1,5 +0,0 @@
-from couchpotato.core.media._base.providers.base import Provider
-
-
-class BaseInfoProvider(Provider):
-    type = 'unknown'

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

@@ -1,8 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-
-log = CPLog(__name__)
-
-
-class MetaDataBase(Plugin):
-    pass

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

@@ -1,125 +0,0 @@
-import re
-import time
-
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt
-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
-
-
-log = CPLog(__name__)
-
-
-class Base(NZBProvider, RSS):
-
-    urls = {
-        'download': 'https://www.nzbindex.com/download/',
-        'search': 'https://www.nzbindex.com/rss/?%s',
-    }
-
-    http_time_between_calls = 1  # Seconds
-
-    def _search(self, media, quality, results):
-
-        nzbs = self.getRSSData(self.urls['search'] % self.buildUrl(media, quality))
-
-        for nzb in nzbs:
-
-            enclosure = self.getElement(nzb, 'enclosure').attrib
-            nzbindex_id = int(self.getTextElement(nzb, "link").split('/')[4])
-
-            title = self.getTextElement(nzb, "title")
-
-            match = fireEvent('matcher.parse', title, parser='usenet', single = True)
-            if not match.chains:
-                log.info('Unable to parse release with title "%s"', title)
-                continue
-
-            # TODO should we consider other lower-weight chains here?
-            info = fireEvent('matcher.flatten_info', match.chains[0].info, single = True)
-
-            release_name = fireEvent('matcher.construct_from_raw', info.get('release_name'), single = True)
-
-            file_name = info.get('detail', {}).get('file_name')
-            file_name = file_name[0] if file_name else None
-
-            title = release_name or file_name
-
-            # Strip extension from parsed title (if one exists)
-            ext_pos = title.rfind('.')
-
-            # Assume extension if smaller than 4 characters
-            # TODO this should probably be done a better way
-            if len(title[ext_pos + 1:]) <= 4:
-                title = title[:ext_pos]
-
-            if not title:
-                log.info('Unable to find release name from match')
-                continue
-
-            try:
-                description = self.getTextElement(nzb, "description")
-            except:
-                description = ''
-
-            def extra_check(item):
-                if '#c20000' in item['description'].lower():
-                    log.info('Wrong: Seems to be passworded: %s', item['name'])
-                    return False
-
-                return True
-
-            results.append({
-                'id': nzbindex_id,
-                'name': title,
-                'age': self.calculateAge(int(time.mktime(parse(self.getTextElement(nzb, "pubDate")).timetuple()))),
-                'size': tryInt(enclosure['length']) / 1024 / 1024,
-                'url': enclosure['url'],
-                'detail_url': enclosure['url'].replace('/download/', '/release/'),
-                'description': description,
-                'get_more_info': self.getMoreInfo,
-                'extra_check': extra_check,
-            })
-
-    def getMoreInfo(self, item):
-        try:
-            if '/nfo/' in item['description'].lower():
-                nfo_url = re.search('href=\"(?P<nfo>.+)\" ', item['description']).group('nfo')
-                full_description = self.getCache('nzbindex.%s' % item['id'], url = nfo_url, cache_timeout = 25920000)
-                html = BeautifulSoup(full_description)
-                item['description'] = toUnicode(html.find('pre', attrs = {'id': 'nfo0'}).text)
-        except:
-            pass
-
-
-config = [{
-    'name': 'nzbindex',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'nzb_providers',
-            'name': 'nzbindex',
-            'description': 'Free provider, less accurate. See <a href="https://www.nzbindex.com/">NZBIndex</a>',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': True,
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 0,
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        },
-    ],
-}]

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

@@ -1,114 +0,0 @@
-import re
-import json
-import traceback
-
-from couchpotato.core.helpers.variable import tryInt, getIdentifier
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'test': 'https://hdbits.org/',
-        'detail': 'https://hdbits.org/details.php?id=%s',
-        'download': 'https://hdbits.org/download.php?id=%s&passkey=%s',
-        'api': 'https://hdbits.org/api/torrents'
-    }
-
-    http_time_between_calls = 1  # Seconds
-
-    def _post_query(self, **params):
-
-        post_data = {
-            'username': self.conf('username'),
-            'passkey': self.conf('passkey')
-        }
-        post_data.update(params)
-
-        try:
-            result = self.getJsonData(self.urls['api'], data = json.dumps(post_data))
-
-            if result:
-                if result['status'] != 0:
-                    log.error('Error searching hdbits: %s' % result['message'])
-                else:
-                    return result['data']
-        except:
-            pass
-
-        return None
-
-    def _search(self, movie, quality, results):
-
-        match = re.match(r'tt(\d{7})', getIdentifier(movie))
-
-        data = self._post_query(imdb = {'id': match.group(1)})
-
-        if data:
-            try:
-                for result in data:
-                    results.append({
-                        'id': result['id'],
-                        'name': result['name'],
-                        'url': self.urls['download'] % (result['id'], self.conf('passkey')),
-                        'detail_url': self.urls['detail'] % result['id'],
-                        'size': tryInt(result['size']) / 1024 / 1024,
-                        'seeders': tryInt(result['seeders']),
-                        'leechers': tryInt(result['leechers'])
-                    })
-            except:
-                log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-
-config = [{
-    'name': 'hdbits',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'HDBits',
-            'description': 'See <a href="http://hdbits.org">HDBits</a>',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-                {
-                    'name': 'username',
-                    'default': '',
-                },
-                {
-                    'name': 'passkey',
-                    'default': '',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'type': 'float',
-                    'default': 1,
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'type': 'int',
-                    'default': 40,
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 0,
-                    'description': 'Starting score for each release found via this provider.',
-                },
-            ],
-        },
-    ],
-}]

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

@@ -1,171 +0,0 @@
-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
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-import six
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'test': 'https://www.iptorrents.com/',
-        'base_url': 'https://www.iptorrents.com',
-        'login': 'https://www.iptorrents.com/torrents/',
-        'login_check': 'https://www.iptorrents.com/inbox.php',
-        'search': 'https://www.iptorrents.com/torrents/?%s%%s&q=%s&qf=ti&p=%%d',
-    }
-
-    http_time_between_calls = 1  # Seconds
-    cat_backup_id = None
-
-    def buildUrl(self, title, media, quality):
-        return self._buildUrl(title.replace(':', ''), quality)
-
-    def _buildUrl(self, query, quality):
-
-        cat_ids = self.getCatId(quality)
-
-        if not cat_ids:
-            log.warning('Unable to find category ids for identifier "%s"', quality.get('identifier'))
-            return None
-
-        return self.urls['search'] % ("&".join(("l%d=" % x) for x in cat_ids), tryUrlencode(query).replace('%', '%%'))
-
-    def _searchOnTitle(self, title, media, quality, results):
-
-        freeleech = '' if not self.conf('freeleech') else '&free=on'
-
-        base_url = self.buildUrl(title, media, quality)
-        if not base_url: return
-
-        pages = 1
-        current_page = 1
-        while current_page <= pages and not self.shuttingDown():
-            data = self.getHTMLData(base_url % (freeleech, current_page))
-
-            if data:
-                html = BeautifulSoup(data)
-
-                try:
-                    page_nav = html.find('span', attrs = {'class': 'page_nav'})
-                    if page_nav:
-                        next_link = page_nav.find("a", text = "Next")
-                        if next_link:
-                            final_page_link = next_link.previous_sibling.previous_sibling
-                            pages = int(final_page_link.string)
-
-                    result_table = html.find('table', attrs = {'class': 'torrents'})
-
-                    if not result_table or 'nothing found!' in data.lower():
-                        return
-
-                    entries = result_table.find_all('tr')
-
-                    for result in entries[1:]:
-
-                        torrent = result.find_all('td')
-                        if len(torrent) <= 1:
-                            break
-
-                        torrent = torrent[1].find('a')
-
-                        torrent_id = torrent['href'].replace('/details.php?id=', '')
-                        torrent_name = six.text_type(torrent.string)
-                        torrent_download_url = self.urls['base_url'] + (result.find_all('td')[3].find('a'))['href'].replace(' ', '.')
-                        torrent_details_url = self.urls['base_url'] + torrent['href']
-                        torrent_size = self.parseSize(result.find_all('td')[5].string)
-                        torrent_seeders = tryInt(result.find('td', attrs = {'class': 'ac t_seeders'}).string)
-                        torrent_leechers = tryInt(result.find('td', attrs = {'class': 'ac t_leechers'}).string)
-
-                        results.append({
-                            'id': torrent_id,
-                            'name': torrent_name,
-                            'url': torrent_download_url,
-                            'detail_url': torrent_details_url,
-                            'size': torrent_size,
-                            'seeders': torrent_seeders,
-                            'leechers': torrent_leechers,
-                        })
-
-                except:
-                    log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-                    break
-
-            current_page += 1
-
-    def getLoginParams(self):
-        return {
-            'username': self.conf('username'),
-            'password': self.conf('password'),
-            'login': 'submit',
-        }
-
-    def loginSuccess(self, output):
-        return 'don\'t have an account' not in output.lower()
-
-    def loginCheckSuccess(self, output):
-        return '/logout.php' in output.lower()
-
-
-config = [{
-    'name': 'iptorrents',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'IPTorrents',
-            'description': 'See <a href="http://www.iptorrents.com">IPTorrents</a>',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-                {
-                    'name': 'username',
-                    'default': '',
-                },
-                {
-                    'name': 'password',
-                    'default': '',
-                    'type': 'password',
-                },
-                {
-                    'name': 'freeleech',
-                    'default': 0,
-                    'type': 'bool',
-                    'description': 'Only search for [FreeLeech] torrents.',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'type': 'float',
-                    'default': 1,
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'type': 'int',
-                    'default': 40,
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 0,
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        },
-    ],
-}]

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

@@ -1,134 +0,0 @@
-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
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'test': 'https://www.sceneaccess.eu/',
-        'login': 'https://www.sceneaccess.eu/login',
-        'login_check': 'https://www.sceneaccess.eu/inbox',
-        'detail': 'https://www.sceneaccess.eu/details?id=%s',
-        'search': 'https://www.sceneaccess.eu/browse?c%d=%d',
-        'archive': 'https://www.sceneaccess.eu/archive?&c%d=%d',
-        'download': 'https://www.sceneaccess.eu/%s',
-    }
-
-    http_time_between_calls = 1  # Seconds
-
-    def _search(self, media, quality, results):
-
-        url = self.buildUrl(media, quality)
-        data = self.getHTMLData(url)
-
-        if data:
-            html = BeautifulSoup(data)
-
-            try:
-                resultsTable = html.find('table', attrs = {'id': 'torrents-table'})
-                if resultsTable is None:
-                    return
-
-                entries = resultsTable.find_all('tr', attrs = {'class': 'tt_row'})
-                for result in entries:
-
-                    link = result.find('td', attrs = {'class': 'ttr_name'}).find('a')
-                    url = result.find('td', attrs = {'class': 'td_dl'}).find('a')
-                    leechers = result.find('td', attrs = {'class': 'ttr_leechers'}).find('a')
-                    torrent_id = link['href'].replace('details?id=', '')
-
-                    results.append({
-                        'id': torrent_id,
-                        'name': link['title'],
-                        'url': self.urls['download'] % url['href'],
-                        'detail_url': self.urls['detail'] % torrent_id,
-                        'size': self.parseSize(result.find('td', attrs = {'class': 'ttr_size'}).contents[0]),
-                        'seeders': tryInt(result.find('td', attrs = {'class': 'ttr_seeders'}).find('a').string),
-                        'leechers': tryInt(leechers.string) if leechers else 0,
-                        'get_more_info': self.getMoreInfo,
-                    })
-
-            except:
-                log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-    def getMoreInfo(self, item):
-        full_description = self.getCache('sceneaccess.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
-        html = BeautifulSoup(full_description)
-        nfo_pre = html.find('div', attrs = {'id': 'details_table'})
-        description = toUnicode(nfo_pre.text) if nfo_pre else ''
-
-        item['description'] = description
-        return item
-
-    # Login
-    def getLoginParams(self):
-        return {
-            'username': self.conf('username'),
-            'password': self.conf('password'),
-            'submit': 'come on in',
-        }
-
-    def loginSuccess(self, output):
-        return '/inbox' in output.lower()
-
-    loginCheckSuccess = loginSuccess
-
-
-config = [{
-    'name': 'sceneaccess',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'SceneAccess',
-            'description': 'See <a href="https://sceneaccess.eu/">SceneAccess</a>',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-                {
-                    'name': 'username',
-                    'default': '',
-                },
-                {
-                    'name': 'password',
-                    'default': '',
-                    'type': 'password',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'type': 'float',
-                    'default': 1,
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'type': 'int',
-                    'default': 40,
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 20,
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        },
-    ],
-}]

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

@@ -1,113 +0,0 @@
-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__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'test': 'http://www.td.af/',
-        'login': 'http://www.td.af/torrents/',
-        'login_check': 'http://www.torrentday.com/userdetails.php',
-        'detail': 'http://www.td.af/details.php?id=%s',
-        'search': 'http://www.td.af/V3/API/API.php',
-        'download': 'http://www.td.af/download.php/%s/%s',
-    }
-
-    http_time_between_calls = 1  # Seconds
-
-    def _search(self, media, quality, results):
-
-        query = self.buildUrl(media)
-
-        data = {
-            '/browse.php?': None,
-            'cata': 'yes',
-            'jxt': 8,
-            'jxw': 'b',
-            'search': query,
-        }
-
-        data = self.getJsonData(self.urls['search'], data = data)
-        try: torrents = data.get('Fs', [])[0].get('Cn', {}).get('torrents', [])
-        except: return
-
-        for torrent in torrents:
-            results.append({
-                'id': torrent['id'],
-                'name': torrent['name'],
-                'url': self.urls['download'] % (torrent['id'], torrent['fname']),
-                'detail_url': self.urls['detail'] % torrent['id'],
-                'size': self.parseSize(torrent.get('size')),
-                'seeders': tryInt(torrent.get('seed')),
-                'leechers': tryInt(torrent.get('leech')),
-            })
-
-    def getLoginParams(self):
-        return {
-            'username': self.conf('username'),
-            'password': self.conf('password'),
-            'submit.x': 18,
-            'submit.y': 11,
-            'submit': 'submit',
-        }
-
-    def loginSuccess(self, output):
-        return 'Password not correct' not in output
-
-    def loginCheckSuccess(self, output):
-        return 'logout.php' in output.lower()
-
-
-config = [{
-    'name': 'torrentday',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'TorrentDay',
-            'description': 'See <a href="http://www.td.af/">TorrentDay</a>',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-                {
-                    'name': 'username',
-                    'default': '',
-                },
-                {
-                    'name': 'password',
-                    'default': '',
-                    'type': 'password',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'type': 'float',
-                    'default': 1,
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'type': 'int',
-                    'default': 40,
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 0,
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        },
-    ],
-}]

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

@@ -1,125 +0,0 @@
-import traceback
-
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-import six
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'test': 'http://www.torrentleech.org/',
-        'login': 'http://www.torrentleech.org/user/account/login/',
-        'login_check': 'http://torrentleech.org/user/messages',
-        'detail': 'http://www.torrentleech.org/torrent/%s',
-        'search': 'http://www.torrentleech.org/torrents/browse/index/query/%s/categories/%d',
-        'download': 'http://www.torrentleech.org%s',
-    }
-
-    http_time_between_calls = 1  # Seconds
-    cat_backup_id = None
-
-    def _search(self, media, quality, results):
-
-        url = self.urls['search'] % self.buildUrl(media, quality)
-
-        data = self.getHTMLData(url)
-
-        if data:
-            html = BeautifulSoup(data)
-
-            try:
-                result_table = html.find('table', attrs = {'id': 'torrenttable'})
-                if not result_table:
-                    return
-
-                entries = result_table.find_all('tr')
-
-                for result in entries[1:]:
-
-                    link = result.find('td', attrs = {'class': 'name'}).find('a')
-                    url = result.find('td', attrs = {'class': 'quickdownload'}).find('a')
-                    details = result.find('td', attrs = {'class': 'name'}).find('a')
-
-                    results.append({
-                        'id': link['href'].replace('/torrent/', ''),
-                        'name': six.text_type(link.string),
-                        'url': self.urls['download'] % url['href'],
-                        'detail_url': self.urls['download'] % details['href'],
-                        'size': self.parseSize(result.find_all('td')[4].string),
-                        'seeders': tryInt(result.find('td', attrs = {'class': 'seeders'}).string),
-                        'leechers': tryInt(result.find('td', attrs = {'class': 'leechers'}).string),
-                    })
-
-            except:
-                log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-
-    def getLoginParams(self):
-        return {
-            'username': self.conf('username'),
-            'password': self.conf('password'),
-            'remember_me': 'on',
-            'login': 'submit',
-        }
-
-    def loginSuccess(self, output):
-        return '/user/account/logout' in output.lower() or 'welcome back' in output.lower()
-
-    loginCheckSuccess = loginSuccess
-
-
-config = [{
-    'name': 'torrentleech',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'TorrentLeech',
-            'description': 'See <a href="http://torrentleech.org">TorrentLeech</a>',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-                {
-                    'name': 'username',
-                    'default': '',
-                },
-                {
-                    'name': 'password',
-                    'default': '',
-                    'type': 'password',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'type': 'float',
-                    'default': 1,
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'type': 'int',
-                    'default': 40,
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 20,
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        },
-    ],
-}]

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

@@ -1,130 +0,0 @@
-import traceback
-
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-import six
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'test': 'https://torrentshack.net/',
-        'login': 'https://torrentshack.net/login.php',
-        'login_check': 'https://torrentshack.net/inbox.php',
-        'detail': 'https://torrentshack.net/torrent/%s',
-        'search': 'https://torrentshack.net/torrents.php?action=advanced&searchstr=%s&scene=%s&filter_cat[%d]=1',
-        'download': 'https://torrentshack.net/%s',
-    }
-
-    http_time_between_calls = 1  # Seconds
-
-    def _search(self, media, quality, results):
-
-        url = self.urls['search'] % self.buildUrl(media, quality)
-        data = self.getHTMLData(url)
-
-        if data:
-            html = BeautifulSoup(data)
-
-            try:
-                result_table = html.find('table', attrs = {'id': 'torrent_table'})
-                if not result_table:
-                    return
-
-                entries = result_table.find_all('tr', attrs = {'class': 'torrent'})
-
-                for result in entries:
-
-                    link = result.find('span', attrs = {'class': 'torrent_name_link'}).parent
-                    url = result.find('td', attrs = {'class': 'torrent_td'}).find('a')
-
-                    results.append({
-                        'id': link['href'].replace('torrents.php?torrentid=', ''),
-                        'name': six.text_type(link.span.string).translate({ord(six.u('\xad')): None}),
-                        'url': self.urls['download'] % url['href'],
-                        'detail_url': self.urls['download'] % link['href'],
-                        'size': self.parseSize(result.find_all('td')[4].string),
-                        'seeders': tryInt(result.find_all('td')[6].string),
-                        'leechers': tryInt(result.find_all('td')[7].string),
-                    })
-
-            except:
-                log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-
-    def getLoginParams(self):
-        return {
-            'username': self.conf('username'),
-            'password': self.conf('password'),
-            'keeplogged': '1',
-            'login': 'Login',
-        }
-
-    def loginSuccess(self, output):
-        return 'logout.php' in output.lower()
-
-    loginCheckSuccess = loginSuccess
-
-    def getSceneOnly(self):
-        return '1' if self.conf('scene_only') else ''
-
-
-config = [{
-    'name': 'torrentshack',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'TorrentShack',
-            'description': 'See <a href="https://www.torrentshack.net/">TorrentShack</a>',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-                {
-                    'name': 'username',
-                    'default': '',
-                },
-                {
-                    'name': 'password',
-                    'default': '',
-                    'type': 'password',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'type': 'float',
-                    'default': 1,
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'type': 'int',
-                    'default': 40,
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'scene_only',
-                    'type': 'bool',
-                    'default': False,
-                    'description': 'Only allow scene releases.'
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 0,
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        },
-    ],
-}]

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

@@ -1,128 +0,0 @@
-import re
-import traceback
-
-from couchpotato.core.helpers.encoding import tryUrlencode
-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._base.providers.torrent.base import TorrentMagnetProvider
-import six
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentMagnetProvider, RSS):
-
-    urls = {
-         'detail': 'https://torrentz.eu/%s',
-         'search': 'https://torrentz.eu/feed?q=%s',
-         'verified_search': 'https://torrentz.eu/feed_verified?q=%s'
-    }
-
-    http_time_between_calls = 0
-
-    def _search(self, media, quality, results):
-
-        search_url = self.urls['verified_search'] if self.conf('verified_only') else self.urls['search']
-
-        # Create search parameters
-        search_params = self.buildUrl(media)
-
-        smin = quality.get('size_min')
-        smax = quality.get('size_max')
-        if smin and smax:
-            search_params += ' size %sm - %sm' % (smin, smax)
-
-        min_seeds = tryInt(self.conf('minimal_seeds'))
-        if min_seeds:
-            search_params += ' seed > %s' % (min_seeds - 1)
-
-        rss_data = self.getRSSData(search_url % search_params)
-
-        if rss_data:
-            try:
-
-                for result in rss_data:
-
-                    name = self.getTextElement(result, 'title')
-                    detail_url = self.getTextElement(result, 'link')
-                    description = self.getTextElement(result, 'description')
-
-                    magnet = splitString(detail_url, '/')[-1]
-                    magnet_url = 'magnet:?xt=urn:btih:%s&dn=%s&tr=%s' % (magnet.upper(), tryUrlencode(name), tryUrlencode('udp://tracker.openbittorrent.com/announce'))
-
-                    reg = re.search('Size: (?P<size>\d+) MB Seeds: (?P<seeds>[\d,]+) Peers: (?P<peers>[\d,]+)', six.text_type(description))
-                    size = reg.group('size')
-                    seeds = reg.group('seeds').replace(',', '')
-                    peers = reg.group('peers').replace(',', '')
-
-                    results.append({
-                        'id': magnet,
-                        'name': six.text_type(name),
-                        'url': magnet_url,
-                        'detail_url': detail_url,
-                        'size': tryInt(size),
-                        'seeders': tryInt(seeds),
-                        'leechers': tryInt(peers),
-                    })
-
-            except:
-                log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-
-config = [{
-    'name': 'torrentz',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'Torrentz',
-            'description': 'Torrentz is a free, fast and powerful meta-search engine. <a href="https://torrentz.eu/">Torrentz</a>',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False
-                },
-                {
-                    'name': 'verified_only',
-                    'type': 'bool',
-                    'default': True,
-                    'advanced': True,
-                    'description': 'Only search verified releases',
-                },
-                {
-                    'name': 'minimal_seeds',
-                    'type': 'int',
-                    'default': 1,
-                    'advanced': True,
-                    'description': 'Only return releases with minimal X seeds',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'type': 'float',
-                    'default': 1,
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'type': 'int',
-                    'default': 40,
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 0,
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        }
-    ]
-}]

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

@@ -1,117 +0,0 @@
-import traceback
-
-from couchpotato.core.helpers.variable import tryInt, getIdentifier
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'test': '%s/api',
-        'search': '%s/api/list.json?keywords=%s&quality=%s',
-        'detail': '%s/api/movie.json?id=%s'
-    }
-
-    http_time_between_calls = 1  # seconds
-
-    proxy_list = [
-        'http://yify.unlocktorrent.com',
-        'http://yify-torrents.com.come.in',
-        'http://yts.re',
-        'http://yts.im'
-        'http://yify-torrents.im',
-    ]
-
-    def search(self, movie, quality):
-
-        if not quality.get('hd', False):
-            return []
-
-        return super(Base, self).search(movie, quality)
-
-    def _search(self, movie, quality, results):
-
-        search_url = self.urls['search'] % (self.getDomain(), getIdentifier(movie), quality['identifier'])
-
-        data = self.getJsonData(search_url)
-
-        if data and data.get('MovieList'):
-            try:
-                for result in data.get('MovieList'):
-
-                    try:
-                        title = result['TorrentUrl'].split('/')[-1][:-8].replace('_', '.').strip('._')
-                        title = title.replace('.-.', '-')
-                        title = title.replace('..', '.')
-                    except:
-                        continue
-
-                    results.append({
-                        'id': result['MovieID'],
-                        'name': title,
-                        'url': result['TorrentMagnetUrl'],
-                        'detail_url': self.urls['detail'] % (self.getDomain(), result['MovieID']),
-                        'size': self.parseSize(result['Size']),
-                        'seeders': tryInt(result['TorrentSeeds']),
-                        'leechers': tryInt(result['TorrentPeers'])
-                    })
-
-            except:
-                log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-    def correctProxy(self, data):
-        data = data.lower()
-        return 'yify' in data and 'yts' in data
-
-
-config = [{
-    'name': 'yify',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'Yify',
-            'description': 'Free provider, less accurate. Small HD movies, encoded by <a href="https://yify-torrents.com/">Yify</a>.',
-            'wizard': False,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False
-                },
-                {
-                    'name': 'domain',
-                    'advanced': True,
-                    'label': 'Proxy server',
-                    'description': 'Domain for requests, keep empty to let CouchPotato pick.',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'type': 'float',
-                    'default': 1,
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'type': 'int',
-                    'default': 40,
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'type': 'int',
-                    'default': 0,
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        }
-    ]
-}]

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

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

couchpotato/core/media/_base/search/static/search.css

@@ -6,11 +6,12 @@
 	top: 0;
 	text-align: right;
 	height: 100%;
+	border-bottom: 4px solid transparent;
 	transition: all .4s cubic-bezier(0.9,0,0.1,1);
 	position: absolute;
 	z-index: 20;
-	border: 0 solid transparent;
-	border-bottom-width: 4px;
+	border: 1px solid transparent;
+	border-width: 0 0 4px;
 }
 	.search_form:hover {
 		border-color: #047792;
@@ -21,19 +22,19 @@
 			right: 44px;
 		}
 	}
-
+	
 	.search_form.focused,
 	.search_form.shown {
 		border-color: #04bce6;
 	}
-
+	
 	.search_form .input {
 		height: 100%;
 		overflow: hidden;
 		width: 45px;
 		transition: all .4s cubic-bezier(0.9,0,0.1,1);
 	}
-
+	
 		.search_form.focused .input,
 		.search_form.shown .input  {
 			width: 380px;
@@ -48,6 +49,7 @@
 				color: #FFF;
 				font-size: 25px;
 				height: 100%;
+				padding: 10px;
 				width: 100%;
 				opacity: 0;
 				padding: 0 40px 0 10px;
@@ -57,23 +59,23 @@
 				.search_form.shown .input input {
 					opacity: 1;
 				}
-
+				
 				.search_form input::-ms-clear {
 				    width : 0;
 					height: 0;
 				}
-
+					
 			@media all and (max-width: 480px) {
 				.search_form .input input {
 					font-size: 15px;
 				}
-
+				
 				.search_form.focused .input,
 				.search_form.shown .input {
 					width: 277px;
 				}
 			}
-
+	
 	.search_form .input a  {
 		position: absolute;
 		top: 0;
@@ -87,7 +89,7 @@
 		font-size: 15px;
 		color: #FFF;
 	}
-
+		
 		.search_form .input a:after {
 			content: "\e03e";
 		}
@@ -95,7 +97,7 @@
 		.search_form.shown.filled .input a:after {
 			content: "\e04e";
 		}
-
+		
 		@media all and (max-width: 480px) {
 			.search_form .input a  {
 				line-height: 44px;
@@ -165,13 +167,13 @@
 				.media_result .options select[name=title] { width: 170px; }
 				.media_result .options select[name=profile] { width: 90px; }
 				.media_result .options select[name=category] { width: 80px; }
-
+				
 				@media all and (max-width: 480px) {
-
+				
 					.media_result .options select[name=title] { width: 90px; }
 					.media_result .options select[name=profile] { width: 50px; }
 					.media_result .options select[name=category] { width: 50px; }
-
+					
 				}
 
 			.media_result .options .button {
@@ -225,14 +227,14 @@
 				right: 7px;
 				vertical-align: middle;
 			}
-
+			
 				.media_result .info h2 {
 					margin: 0;
 					font-weight: normal;
 					font-size: 20px;
 					padding: 0;
 				}
-
+				
 					.search_form .info h2 {
 						position: absolute;
 						width: 100%;
@@ -245,12 +247,12 @@
 					overflow: hidden;
 					white-space: nowrap;
 				}
-
+				
 					.search_form .info h2 .title {
 						position: absolute;
 						width: 88%;
 					}
-
+	
 					.media_result .info h2 .year {
 						padding: 0 5px;
 						text-align: center;
@@ -258,14 +260,14 @@
 						width: 12%;
 						right: 0;
 					}
-
+					
 					@media all and (max-width: 480px) {
-
+					
 						.search_form .info h2 .year {
 							font-size: 12px;
 							margin-top: 7px;
 						}
-
+						
 					}
 
 .search_form .mask,
@@ -275,4 +277,4 @@
 	width: 100%;
 	left: 0;
 	top: 0;
-}
+}

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

@@ -16,7 +16,7 @@ Block.Search = new Class({
 						'keyup': self.keyup.bind(self),
 						'focus': function(){
 							if(focus_timer) clearTimeout(focus_timer);
-							self.el.addClass('focused');
+							self.el.addClass('focused')
 							if(this.get('value'))
 								self.hideResults(false)
 						},
@@ -57,17 +57,17 @@ Block.Search = new Class({
 		(e).preventDefault();
 
 		if(self.last_q === ''){
-			self.input.blur();
+			self.input.blur()
 			self.last_q = null;
 		}
 		else {
 
 			self.last_q = '';
 			self.input.set('value', '');
-			self.input.focus();
+			self.input.focus()
 
-			self.media = {};
-			self.results.empty();
+			self.media = {}
+			self.results.empty()
 			self.el.removeClass('filled')
 
 		}
@@ -92,16 +92,16 @@ Block.Search = new Class({
 		self.hidden = bool;
 	},
 
-	keyup: function(){
+	keyup: function(e){
 		var self = this;
 
-		self.el[self.q() ? 'addClass' : 'removeClass']('filled');
+		self.el[self.q() ? 'addClass' : 'removeClass']('filled')
 
 		if(self.q() != self.last_q){
 			if(self.api_request && self.api_request.isRunning())
 				self.api_request.cancel();
 
-			if(self.autocomplete_timer) clearTimeout(self.autocomplete_timer);
+			if(self.autocomplete_timer) clearTimeout(self.autocomplete_timer)
 			self.autocomplete_timer = self.autocomplete.delay(300, self)
 		}
 
@@ -111,7 +111,7 @@ Block.Search = new Class({
 		var self = this;
 
 		if(!self.q()){
-			self.hideResults(true);
+			self.hideResults(true)
 			return
 		}
 
@@ -139,7 +139,7 @@ Block.Search = new Class({
 			})
 		}
 		else
-			self.fill(q, cache);
+			self.fill(q, cache)
 
 		self.last_q = q;
 
@@ -148,31 +148,31 @@ Block.Search = new Class({
 	fill: function(q, json){
 		var self = this;
 
-		self.cache[q] = json;
+		self.cache[q] = json
 
-		self.media = {};
-		self.results.empty();
-
-		Object.each(json, function(media){
+		self.media = {}
+		self.results.empty()
+		
+		Object.each(json, function(media, type){
 			if(typeOf(media) == 'array'){
 				Object.each(media, function(m){
-
+		
 					var m = new Block.Search[m.type.capitalize() + 'Item'](m);
-					$(m).inject(self.results);
-					self.media[m.imdb || 'r-'+Math.floor(Math.random()*10000)] = m;
-
+					$(m).inject(self.results)
+					self.media[m.imdb || 'r-'+Math.floor(Math.random()*10000)] = m
+		
 					if(q == m.imdb)
 						m.showOptions()
-
+		
 				});
 			}
-		});
+		})
 
 		// Calculate result heights
 		var w = window.getSize(),
 			rc = self.result_container.getCoordinates();
 
-		self.results.setStyle('max-height', (w.y - rc.top - 50) + 'px');
+		self.results.setStyle('max-height', (w.y - rc.top - 50) + 'px')
 		self.mask.fade('out')
 
 	},
@@ -185,4 +185,4 @@ Block.Search = new Class({
 		return this.input.get('value').trim();
 	}
 
-});
+});

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

@@ -1,7 +1,7 @@
 from .main import Searcher
 
 
-def autoload():
+def start():
     return Searcher()
 
 config = [{

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

@@ -1,24 +1,20 @@
-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__)
 
 
 class Searcher(SearcherBase):
 
-    # noinspection PyMissingConstructor
     def __init__(self):
         addEvent('searcher.protocols', self.getSearchProtocols)
         addEvent('searcher.contains_other_quality', self.containsOtherQuality)
-        addEvent('searcher.correct_3d', self.correct3D)
         addEvent('searcher.correct_year', self.correctYear)
         addEvent('searcher.correct_name', self.correctName)
         addEvent('searcher.correct_words', self.correctWords)
@@ -52,7 +48,7 @@ class Searcher(SearcherBase):
         results = []
 
         for search_protocol in protocols:
-            protocol_results = fireEvent('provider.search.%s.%s' % (search_protocol, media.get('type')), media, quality, merge = True)
+            protocol_results = fireEvent('provider.search.%s.%s' % (search_protocol, media['type']), media, quality, merge = True)
             if protocol_results:
                 results += protocol_results
 
@@ -125,17 +121,6 @@ class Searcher(SearcherBase):
 
         return not (found.get(preferred_quality['identifier']) and len(found) == 1)
 
-    def correct3D(self, nzb, preferred_quality = None):
-        if not preferred_quality: preferred_quality = {}
-        if not preferred_quality.get('custom'): return
-
-        threed = preferred_quality['custom'].get('3d')
-
-        # Try guessing via quality tags
-        guess = fireEvent('quality.guess', [nzb.get('name')], single = True)
-
-        return threed == guess.get('is_3d')
-
     def correctYear(self, haystack, year, year_range):
 
         if not isinstance(haystack, (list, tuple, set)):
@@ -196,7 +181,7 @@ class Searcher(SearcherBase):
             req = splitString(req_set, '&')
             req_match += len(list(set(rel_words) & set(req))) == len(req)
 
-        if len(required_words) > 0 and req_match == 0:
+        if len(required_words) > 0  and req_match == 0:
             log.info2('Wrong: Required word missing: %s', rel_name)
             return False
 

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

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

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

@@ -1,16 +1,13 @@
-import os
 import traceback
-import time
-
-from couchpotato import get_db
+from couchpotato import get_session
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
 from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import splitString, getTitle, getImdb, getIdentifier
+from couchpotato.core.helpers.variable import splitString, tryInt, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie import MovieTypeBase
-import six
-
+from couchpotato.core.settings.model import Media
+import time
 
 log = CPLog(__name__)
 
@@ -45,21 +42,16 @@ class MovieBase(MovieTypeBase):
         })
 
         addEvent('movie.add', self.add)
-        addEvent('movie.update_info', self.updateInfo)
-        addEvent('movie.update_release_dates', self.updateReleaseDate)
 
-    def add(self, params = None, force_readd = True, search_after = True, update_after = True, notify_after = True, status = None):
+    def add(self, params = None, force_readd = True, search_after = True, update_library = False, status_id = None):
         if not params: params = {}
 
-        # Make sure it's a correct zero filled imdb id
-        params['identifier'] = getImdb(params.get('identifier', ''))
-
         if not params.get('identifier'):
             msg = 'Can\'t add movie without imdb identifier.'
             log.error(msg)
             fireEvent('notify.frontend', type = 'movie.is_tvshow', message = msg)
             return False
-        elif not params.get('info'):
+        else:
             try:
                 is_movie = fireEvent('movie.is_movie', identifier = params.get('identifier'), single = True)
                 if not is_movie:
@@ -70,125 +62,90 @@ class MovieBase(MovieTypeBase):
             except:
                 pass
 
-        info = params.get('info')
-        if not info or (info and len(info.get('titles', [])) == 0):
-            info = fireEvent('movie.info', merge = True, extended = False, identifier = params.get('identifier'))
+        library = fireEvent('library.add.movie', single = True, attrs = params, update_after = update_library)
 
-        # Set default title
-        default_title = toUnicode(info.get('title'))
-        titles = info.get('titles', [])
-        counter = 0
-        def_title = None
-        for title in titles:
-            if (len(default_title) == 0 and counter == 0) or len(titles) == 1 or title.lower() == toUnicode(default_title.lower()) or (toUnicode(default_title) == six.u('') and toUnicode(titles[0]) == title):
-                def_title = toUnicode(title)
-                break
-            counter += 1
+        # Status
+        status_active, snatched_status, ignored_status, done_status, downloaded_status = \
+            fireEvent('status.get', ['active', 'snatched', 'ignored', 'done', 'downloaded'], single = True)
 
-        if not def_title:
-            def_title = toUnicode(titles[0])
-
-        # Default profile and category
-        default_profile = {}
-        if not params.get('profile_id'):
-            default_profile = fireEvent('profile.default', single = True)
+        default_profile = fireEvent('profile.default', single = True)
         cat_id = params.get('category_id')
 
         try:
-            db = get_db()
-
-            media = {
-                '_t': 'media',
-                'type': 'movie',
-                'title': def_title,
-                'identifiers': {
-                    'imdb': params.get('identifier')
-                },
-                'status': status if status else 'active',
-                'profile_id': params.get('profile_id', default_profile.get('_id')),
-                'category_id': cat_id if cat_id is not None and len(cat_id) > 0 and cat_id != '-1' else None,
-            }
-
-            # Update movie info
-            try: del info['in_wanted']
-            except: pass
-            try: del info['in_library']
-            except: pass
-            media['info'] = info
-
-            new = False
-            try:
-                m = db.get('media', 'imdb-%s' % params.get('identifier'), with_doc = True)['doc']
-            except:
-                new = True
-                m = db.insert(media)
-
-            # Update dict to be usable
-            m.update(media)
-
+            db = get_session()
+            m = db.query(Media).filter_by(library_id = library.get('id')).first()
             added = True
             do_search = False
             search_after = search_after and self.conf('search_on_add', section = 'moviesearcher')
-            onComplete = None
+            if not m:
+                m = Media(
+                    library_id = library.get('id'),
+                    profile_id = params.get('profile_id', default_profile.get('id')),
+                    status_id = status_id if status_id else status_active.get('id'),
+                    category_id = tryInt(cat_id) if cat_id is not None and tryInt(cat_id) > 0 else None,
+                )
+                db.add(m)
+                db.commit()
 
-            if new:
+                onComplete = None
                 if search_after:
-                    onComplete = self.createOnComplete(m['_id'])
+                    onComplete = self.createOnComplete(m.id)
+
+                fireEventAsync('library.update.movie', params.get('identifier'), default_title = params.get('title', ''), on_complete = onComplete)
                 search_after = False
             elif force_readd:
 
                 # Clean snatched history
-                for release in fireEvent('release.for_media', m['_id'], single = True):
-                    if release.get('status') in ['downloaded', 'snatched', 'done']:
+                for release in m.releases:
+                    if release.status_id in [downloaded_status.get('id'), snatched_status.get('id'), done_status.get('id')]:
                         if params.get('ignore_previous', False):
-                            release['status'] = 'ignored'
-                            db.update(release)
+                            release.status_id = ignored_status.get('id')
                         else:
-                            fireEvent('release.delete', release['_id'], single = True)
+                            fireEvent('release.delete', release.id, single = True)
 
-                m['profile_id'] = params.get('profile_id', default_profile.get('id'))
-                m['category_id'] = cat_id if cat_id is not None and len(cat_id) > 0 else (m.get('category_id') or None)
-                m['last_edit'] = int(time.time())
-
-                do_search = True
-                db.update(m)
+                m.profile_id = params.get('profile_id', default_profile.get('id'))
+                m.category_id = tryInt(cat_id) if cat_id is not None and tryInt(cat_id) > 0 else (m.category_id or None)
             else:
-                try: del params['info']
-                except: pass
                 log.debug('Movie already exists, not updating: %s', params)
                 added = False
 
-            # Trigger update info
-            if added and update_after:
-                # Do full update to get images etc
-                fireEventAsync('movie.update_info', m['_id'], default_title = params.get('title'), on_complete = onComplete)
+            if force_readd:
+                m.status_id = status_id if status_id else status_active.get('id')
+                m.last_edit = int(time.time())
+                do_search = True
+
+            db.commit()
 
             # Remove releases
-            for rel in fireEvent('release.for_media', m['_id'], single = True):
-                if rel['status'] is 'available':
+            available_status = fireEvent('status.get', 'available', single = True)
+            for rel in m.releases:
+                if rel.status_id is available_status.get('id'):
                     db.delete(rel)
+                    db.commit()
 
-            movie_dict = fireEvent('media.get', m['_id'], single = True)
+            movie_dict = m.to_dict(self.default_dict)
 
             if do_search and search_after:
-                onComplete = self.createOnComplete(m['_id'])
+                onComplete = self.createOnComplete(m.id)
                 onComplete()
 
-            if added and notify_after:
-
+            if added:
                 if params.get('title'):
                     message = 'Successfully added "%s" to your wanted list.' % params.get('title', '')
                 else:
-                    title = getTitle(m)
+                    title = getTitle(m.library)
                     if title:
                         message = 'Successfully added "%s" to your wanted list.' % title
                     else:
-                        message = 'Successfully added to your wanted list.'
+                        message = 'Succesfully added to your wanted list.'
                 fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = message)
 
             return movie_dict
         except:
-            log.error('Failed adding media: %s', traceback.format_exc())
+            log.error('Failed deleting media: %s', traceback.format_exc())
+            db.rollback()
+        finally:
+            db.close()
 
     def addView(self, **kwargs):
         add_dict = self.add(params = kwargs)
@@ -201,169 +158,50 @@ class MovieBase(MovieTypeBase):
     def edit(self, id = '', **kwargs):
 
         try:
-            db = get_db()
+            db = get_session()
+
+            available_status = fireEvent('status.get', 'available', single = True)
 
             ids = splitString(id)
             for media_id in ids:
 
-                try:
-                    m = db.get('id', media_id)
-                    m['profile_id'] = kwargs.get('profile_id')
+                m = db.query(Media).filter_by(id = media_id).first()
+                if not m:
+                    continue
 
-                    cat_id = kwargs.get('category_id')
-                    if cat_id is not None:
-                        m['category_id'] = cat_id if len(cat_id) > 0 else None
+                m.profile_id = kwargs.get('profile_id')
 
-                    # Remove releases
-                    for rel in fireEvent('release.for_media', m['_id'], single = True):
-                        if rel['status'] is 'available':
-                            db.delete(rel)
+                cat_id = kwargs.get('category_id')
+                if cat_id is not None:
+                    m.category_id = tryInt(cat_id) if tryInt(cat_id) > 0 else None
 
-                    # Default title
-                    if kwargs.get('default_title'):
-                        m['title'] = kwargs.get('default_title')
+                # Remove releases
+                for rel in m.releases:
+                    if rel.status_id is available_status.get('id'):
+                        db.delete(rel)
+                        db.commit()
 
-                    db.update(m)
+                # Default title
+                if kwargs.get('default_title'):
+                    for title in m.library.titles:
+                        title.default = toUnicode(kwargs.get('default_title', '')).lower() == toUnicode(title.title).lower()
 
-                    fireEvent('media.restatus', m['_id'])
+                db.commit()
 
-                    m = db.get('id', media_id)
+                fireEvent('media.restatus', m.id)
 
-                    movie_dict = fireEvent('media.get', m['_id'], single = True)
-                    fireEventAsync('movie.searcher.single', movie_dict, on_complete = self.createNotifyFront(media_id))
-
-                except:
-                    log.error('Can\'t edit non-existing media')
+                movie_dict = m.to_dict(self.default_dict)
+                fireEventAsync('movie.searcher.single', movie_dict, on_complete = self.createNotifyFront(media_id))
 
             return {
                 'success': True,
             }
         except:
-            log.error('Failed editing media: %s', traceback.format_exc())
+            log.error('Failed deleting media: %s', traceback.format_exc())
+            db.rollback()
+        finally:
+            db.close()
 
         return {
             'success': False,
         }
-
-    def updateInfo(self, media_id = None, identifier = None, default_title = None, extended = False):
-        """
-        Update movie information inside media['doc']['info']
-
-        @param media_id: document id
-        @param default_title: default title, if empty, use first one or existing one
-        @param extended: update with extended info (parses more info, actors, images from some info providers)
-        @return: dict, with media
-        """
-
-        if self.shuttingDown():
-            return
-
-        try:
-            db = get_db()
-
-            if media_id:
-                media = db.get('id', media_id)
-            else:
-                media = db.get('media', 'imdb-%s' % identifier, with_doc = True)['doc']
-
-            info = fireEvent('movie.info', merge = True, extended = extended, identifier = getIdentifier(media))
-
-            # Don't need those here
-            try: del info['in_wanted']
-            except: pass
-            try: del info['in_library']
-            except: pass
-
-            if not info or len(info) == 0:
-                log.error('Could not update, no movie info to work with: %s', identifier)
-                return False
-
-            # Update basic info
-            media['info'] = info
-
-            titles = info.get('titles', [])
-            log.debug('Adding titles: %s', titles)
-
-            # Define default title
-            if default_title:
-                def_title = None
-                if default_title:
-                    counter = 0
-                    for title in titles:
-                        if title.lower() == toUnicode(default_title.lower()) or (toUnicode(default_title) == six.u('') and toUnicode(titles[0]) == title):
-                            def_title = toUnicode(title)
-                            break
-                        counter += 1
-
-                if not def_title:
-                    def_title = toUnicode(titles[0])
-
-                media['title'] = def_title
-
-            # Files
-            images = info.get('images', [])
-            media['files'] = media.get('files', {})
-            for image_type in ['poster']:
-
-                # Remove non-existing files
-                file_type = 'image_%s' % image_type
-                existing_files = list(set(media['files'].get(file_type, [])))
-                for ef in media['files'].get(file_type, []):
-                    if not os.path.isfile(ef):
-                        existing_files.remove(ef)
-
-                # Replace new files list
-                media['files'][file_type] = existing_files
-                if len(existing_files) == 0:
-                    del media['files'][file_type]
-
-                # Loop over type
-                for image in images.get(image_type, []):
-                    if not isinstance(image, (str, unicode)):
-                        continue
-
-                    if file_type not in media['files'] or len(media['files'].get(file_type, [])) == 0:
-                        file_path = fireEvent('file.download', url = image, single = True)
-                        if file_path:
-                            media['files'][file_type] = [file_path]
-                            break
-                    else:
-                        break
-
-            db.update(media)
-
-            return media
-        except:
-            log.error('Failed update media: %s', traceback.format_exc())
-
-        return {}
-
-    def updateReleaseDate(self, media_id):
-        """
-        Update release_date (eta) info only
-
-        @param media_id: document id
-        @return: dict, with dates dvd, theater, bluray, expires
-        """
-
-        try:
-            db = get_db()
-
-            media = db.get('id', media_id)
-
-            if not media.get('info'):
-                media = self.updateInfo(media_id)
-                dates = media.get('info', {}).get('release_date')
-            else:
-                dates = media.get('info').get('release_date')
-
-            if dates and (dates.get('expires', 0) < time.time() or dates.get('expires', 0) > time.time() + (604800 * 4)) or not dates:
-                dates = fireEvent('movie.info.release_date', identifier = getIdentifier(media), merge = True)
-                media['info'].update({'release_date': dates})
-                db.update(media)
-
-            return dates
-        except:
-            log.error('Failed updating release dates: %s', traceback.format_exc())
-
-        return {}

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

@@ -26,7 +26,7 @@ var MovieList = new Class({
 		self.filter = self.options.filter || {
 			'starts_with': null,
 			'search': null
-		};
+		}
 
 		self.el = new Element('div.movies').adopt(
 			self.title = self.options.title ? new Element('h2', {
@@ -52,18 +52,18 @@ var MovieList = new Class({
 
 		self.getMovies();
 
-		App.on('movie.added', self.movieAdded.bind(self));
+		App.on('movie.added', self.movieAdded.bind(self))
 		App.on('movie.deleted', self.movieDeleted.bind(self))
 	},
 
 	movieDeleted: function(notification){
 		var self = this;
 
-		if(self.movies_added[notification.data._id]){
+		if(self.movies_added[notification.data.id]){
 			self.movies.each(function(movie){
-				if(movie.get('_id') == notification.data._id){
+				if(movie.get('id') == notification.data.id){
 					movie.destroy();
-					delete self.movies_added[notification.data._id];
+					delete self.movies_added[notification.data.id];
 					self.setCounter(self.counter_count-1);
 					self.total_movies--;
 				}
@@ -77,7 +77,7 @@ var MovieList = new Class({
 		var self = this;
 
 		self.fireEvent('movieAdded', notification);
-		if(self.options.add_new && !self.movies_added[notification.data._id] && notification.data.status == self.options.status){
+		if(self.options.add_new && !self.movies_added[notification.data.id] && notification.data.status.identifier == self.options.status){
 			window.scroll(0,0);
 			self.createMovie(notification.data, 'top');
 			self.setCounter(self.counter_count+1);
@@ -96,7 +96,7 @@ var MovieList = new Class({
 		if(self.options.load_more)
 			self.scrollspy = new ScrollSpy({
 				min: function(){
-					var c = self.load_more.getCoordinates();
+					var c = self.load_more.getCoordinates()
 					return c.top - window.document.getSize().y - 300
 				},
 				onEnter: self.loadMore.bind(self)
@@ -179,15 +179,15 @@ var MovieList = new Class({
 
 		m.fireEvent('injected');
 
-		self.movies.include(m);
-		self.movies_added[movie._id] = true;
+		self.movies.include(m)
+		self.movies_added[movie.id] = true;
 	},
 
 	createNavigation: function(){
 		var self = this;
 		var chars = '#ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-		self.el.addClass('with_navigation');
+		self.el.addClass('with_navigation')
 
 		self.navigation = new Element('div.alph_nav').adopt(
 			self.mass_edit_form = new Element('div.mass_edit_form').adopt(
@@ -242,7 +242,7 @@ var MovieList = new Class({
 							this.addClass(a);
 
 							el.inject(el.getParent(), 'top');
-							el.getSiblings().hide();
+							el.getSiblings().hide()
 							setTimeout(function(){
 								el.getSiblings().setStyle('display', null);
 							}, 100)
@@ -259,8 +259,8 @@ var MovieList = new Class({
 		self.mass_edit_select_class = new Form.Check(self.mass_edit_select);
 		Quality.getActiveProfiles().each(function(profile){
 			new Element('option', {
-				'value': profile.get('_id'),
-				'text': profile.get('label')
+				'value': profile.id ? profile.id : profile.data.id,
+				'text': profile.label ? profile.label : profile.data.label
 			}).inject(self.mass_edit_quality)
 		});
 
@@ -286,9 +286,9 @@ var MovieList = new Class({
 						'status': self.options.status
 					}, self.filter),
 					'onSuccess': function(json){
-						available_chars = json.chars;
+						available_chars = json.chars
 
-						available_chars.each(function(c){
+						json.chars.split('').each(function(c){
 							self.letters[c.capitalize()].addClass('available')
 						})
 
@@ -300,7 +300,7 @@ var MovieList = new Class({
 			self.navigation_alpha = new Element('ul.numbers', {
 				'events': {
 					'click:relay(li.available)': function(e, el){
-						self.activateLetter(el.get('data-letter'));
+						self.activateLetter(el.get('data-letter'))
 						self.getMovies(true)
 					}
 				}
@@ -318,7 +318,7 @@ var MovieList = new Class({
 
 		// All
 		self.letters['all'] = new Element('li.letter_all.available.active', {
-			'text': 'ALL'
+			'text': 'ALL',
 		}).inject(self.navigation_alpha);
 
 		// Chars
@@ -334,7 +334,7 @@ var MovieList = new Class({
 		if (self.options.menu.length > 0)
 			self.options.menu.each(function(menu_item){
 				self.navigation_menu.addLink(menu_item);
-			});
+			})
 		else
 			self.navigation_menu.hide();
 
@@ -347,15 +347,15 @@ var MovieList = new Class({
 			movies = self.movies.length;
 		self.movies.each(function(movie){
 			selected += movie.isSelected() ? 1 : 0
-		});
+		})
 
 		var indeterminate = selected > 0 && selected < movies,
 			checked = selected == movies && selected > 0;
 
-		self.mass_edit_select.set('indeterminate', indeterminate);
+		self.mass_edit_select.set('indeterminate', indeterminate)
 
-		self.mass_edit_select_class[checked ? 'check' : 'uncheck']();
-		self.mass_edit_select_class.element[indeterminate ? 'addClass' : 'removeClass']('indeterminate');
+		self.mass_edit_select_class[checked ? 'check' : 'uncheck']()
+		self.mass_edit_select_class.element[indeterminate ? 'addClass' : 'removeClass']('indeterminate')
 
 		self.mass_edit_selected.set('text', selected);
 	},
@@ -371,7 +371,7 @@ var MovieList = new Class({
 			'events': {
 				'click': function(e){
 					(e).preventDefault();
-					this.set('text', 'Deleting..');
+					this.set('text', 'Deleting..')
 					Api.request('media.delete', {
 						'data': {
 							'id': ids.join(','),
@@ -383,7 +383,7 @@ var MovieList = new Class({
 							var erase_movies = [];
 							self.movies.each(function(movie){
 								if (movie.isSelected()){
-									$(movie).destroy();
+									$(movie).destroy()
 									erase_movies.include(movie);
 								}
 							});
@@ -410,7 +410,7 @@ var MovieList = new Class({
 
 	changeQualitySelected: function(){
 		var self = this;
-		var ids = self.getSelectedMovies();
+		var ids = self.getSelectedMovies()
 
 		Api.request('movie.edit', {
 			'data': {
@@ -423,11 +423,11 @@ var MovieList = new Class({
 
 	refreshSelected: function(){
 		var self = this;
-		var ids = self.getSelectedMovies();
+		var ids = self.getSelectedMovies()
 
 		Api.request('media.refresh', {
 			'data': {
-				'id': ids.join(',')
+				'id': ids.join(','),
 			}
 		});
 	},
@@ -435,10 +435,10 @@ var MovieList = new Class({
 	getSelectedMovies: function(){
 		var self = this;
 
-		var ids = [];
+		var ids = []
 		self.movies.each(function(movie){
 			if (movie.isSelected())
-				ids.include(movie.get('_id'))
+				ids.include(movie.get('id'))
 		});
 
 		return ids
@@ -459,15 +459,15 @@ var MovieList = new Class({
 	reset: function(){
 		var self = this;
 
-		self.movies = [];
+		self.movies = []
 		if(self.mass_edit_select)
-			self.calculateSelected();
+			self.calculateSelected()
 		if(self.navigation_alpha)
-			self.navigation_alpha.getElements('.active').removeClass('active');
+			self.navigation_alpha.getElements('.active').removeClass('active')
 
 		self.offset = 0;
 		if(self.scrollspy){
-			//self.load_more.show();
+			self.load_more.show();
 			self.scrollspy.start();
 		}
 	},
@@ -475,7 +475,7 @@ var MovieList = new Class({
 	activateLetter: function(letter){
 		var self = this;
 
-		self.reset();
+		self.reset()
 
 		self.letters[letter || 'all'].addClass('active');
 		self.filter.starts_with = letter;
@@ -487,7 +487,7 @@ var MovieList = new Class({
 
 		self.el
 			.removeClass(self.current_view+'_list')
-			.addClass(new_view+'_list');
+			.addClass(new_view+'_list')
 
 		self.current_view = new_view;
 		Cookie.write(self.options.identifier+'_view2', new_view, {duration: 1000});
@@ -504,9 +504,9 @@ var MovieList = new Class({
 		if(self.search_timer) clearTimeout(self.search_timer);
 		self.search_timer = (function(){
 			var search_value = self.navigation_search_input.get('value');
-			if (search_value == self.last_search_value) return;
+			if (search_value == self.last_search_value) return
 
-			self.reset();
+			self.reset()
 
 			self.activateLetter();
 			self.filter.search = search_value;
@@ -552,7 +552,7 @@ var MovieList = new Class({
 
 		Api.request(self.options.api_call || 'media.list', {
 			'data': Object.merge({
-				'type': self.options.type || 'movie',
+				'type': 'movie',
 				'status': self.options.status,
 				'limit_offset': self.options.limit ? self.options.limit + ',' + self.offset : null
 			}, self.filter),
@@ -563,7 +563,7 @@ var MovieList = new Class({
 
 				if(self.loader_first){
 					var lf = self.loader_first;
-					self.loader_first.addClass('hide');
+					self.loader_first.addClass('hide')
 					self.loader_first = null;
 					setTimeout(function(){
 						lf.destroy();
@@ -603,10 +603,10 @@ var MovieList = new Class({
 		var is_empty = self.movies.length == 0 && (self.total_movies == 0 || self.total_movies === undefined);
 
 		if(self.title)
-			self.title[is_empty ? 'hide' : 'show']();
+			self.title[is_empty ? 'hide' : 'show']()
 
 		if(self.description)
-			self.description.setStyle('display', [is_empty ? 'none' : '']);
+			self.description.setStyle('display', [is_empty ? 'none' : ''])
 
 		if(is_empty && self.options.on_empty_element){
 			self.options.on_empty_element.inject(self.loader_first || self.title || self.movie_list, 'after');
@@ -629,4 +629,4 @@ var MovieList = new Class({
 		return this.el;
 	}
 
-});
+});

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

@@ -60,6 +60,22 @@ var MovieAction = new Class({
 				'z-index': '1'
 			}
 		}).inject(self.movie, 'top').fade('hide');
+		//self.positionMask();
+	},
+
+	positionMask: function(){
+		var self = this,
+			movie = $(self.movie),
+			s = movie.getSize()
+
+		return;
+
+		return self.mask.setStyles({
+			'width': s.x,
+			'height': s.y
+		}).position({
+			'relativeTo': movie
+		})
 	},
 
 	toElement: function(){
@@ -105,13 +121,13 @@ MA.Release = new Class({
 			}
 		});
 
-		if(!self.movie.data.releases || self.movie.data.releases.length == 0)
-			self.el.hide();
+		if(self.movie.data.releases.length == 0)
+			self.el.hide()
 		else
 			self.showHelper();
 
 		App.on('movie.searcher.ended', function(notification){
-			if(self.movie.data._id != notification.data._id) return;
+			if(self.movie.data.id != notification.data.id) return;
 
 			self.releases = null;
 			if(self.options_container){
@@ -127,7 +143,30 @@ MA.Release = new Class({
 		if(e)
 			(e).preventDefault();
 
-		self.createReleases();
+		if(self.releases)
+			self.createReleases();
+		else {
+
+			self.movie.busy(true);
+
+			Api.request('release.for_movie', {
+				'data': {
+					'id': self.movie.data.id
+				},
+				'onComplete': function(json){
+					self.movie.busy(false, 1);
+
+					if(json && json.releases){
+						self.releases = json.releases;
+						self.createReleases();
+					}
+					else
+						alert('Something went wrong, check the logs.');
+				}
+			});
+
+		}
+
 
 	},
 
@@ -148,102 +187,106 @@ MA.Release = new Class({
 				new Element('span.age', {'text': 'Age'}),
 				new Element('span.score', {'text': 'Score'}),
 				new Element('span.provider', {'text': 'Provider'})
-			).inject(self.release_container);
+			).inject(self.release_container)
 
-			if(self.movie.data.releases)
-				self.movie.data.releases.each(function(release){
+			self.releases.each(function(release){
 
-					var quality = Quality.getQuality(release.quality) || {},
-						info = release.info || {},
-						provider = self.get(release, 'provider') + (info['provider_extra'] ? self.get(release, 'provider_extra') : '');
+				var status = Status.get(release.status_id),
+					quality = Quality.getProfile(release.quality_id) || {},
+					info = release.info,
+					provider = self.get(release, 'provider') + (release.info['provider_extra'] ? self.get(release, 'provider_extra') : '');
+				release.status = status;
 
-					var release_name = self.get(release, 'name');
-					if(release.files && release.files.length > 0){
-						try {
-							var movie_file = release.files.filter(function(file){
-								var type = File.Type.get(file.type_id);
-								return type && type.identifier == 'movie'
-							}).pick();
-							release_name = movie_file.path.split(Api.getOption('path_sep')).getLast();
-						}
-						catch(e){}
+				var release_name = self.get(release, 'name');
+				if(release.files && release.files.length > 0){
+					try {
+						var movie_file = release.files.filter(function(file){
+							var type = File.Type.get(file.type_id);
+							return type && type.identifier == 'movie'
+						}).pick();
+						release_name = movie_file.path.split(Api.getOption('path_sep')).getLast();
 					}
+					catch(e){}
+				}
 
-					// Create release
-					release['el'] = new Element('div', {
-						'class': 'item '+release.status,
-						'id': 'release_'+release._id
-					}).adopt(
-						new Element('span.name', {'text': release_name, 'title': release_name}),
-						new Element('span.status', {'text': release.status, 'class': 'release_status '+release.status}),
-						new Element('span.quality', {'text': quality.label + (release.is_3d ? ' 3D' : '') || 'n/a'}),
-						new Element('span.size', {'text': info['size'] ? Math.floor(self.get(release, 'size')) : 'n/a'}),
-						new Element('span.age', {'text': self.get(release, 'age')}),
-						new Element('span.score', {'text': self.get(release, 'score')}),
-						new Element('span.provider', { 'text': provider, 'title': provider }),
-						info['detail_url'] ? new Element('a.info.icon2', {
-							'href': info['detail_url'],
-							'target': '_blank'
-						}) : new Element('a'),
-						new Element('a.download.icon2', {
-							'events': {
-								'click': function(e){
-									(e).preventDefault();
-									if(!this.hasClass('completed'))
-										self.download(release);
-								}
+				// Create release
+				var item = new Element('div', {
+					'class': 'item '+status.identifier,
+					'id': 'release_'+release.id
+				}).adopt(
+					new Element('span.name', {'text': release_name, 'title': release_name}),
+					new Element('span.status', {'text': status.identifier, 'class': 'release_status '+status.identifier}),
+					new Element('span.quality', {'text': quality.get('label') || 'n/a'}),
+					new Element('span.size', {'text': release.info['size'] ? Math.floor(self.get(release, 'size')) : 'n/a'}),
+					new Element('span.age', {'text': self.get(release, 'age')}),
+					new Element('span.score', {'text': self.get(release, 'score')}),
+					new Element('span.provider', { 'text': provider, 'title': provider }),
+					release.info['detail_url'] ? new Element('a.info.icon2', {
+						'href': release.info['detail_url'],
+						'target': '_blank'
+					}) : new Element('a'),
+					new Element('a.download.icon2', {
+						'events': {
+							'click': function(e){
+								(e).preventDefault();
+								if(!this.hasClass('completed'))
+									self.download(release);
 							}
-						}),
-						new Element('a.delete.icon2', {
-							'events': {
-								'click': function(e){
-									(e).preventDefault();
-									self.ignore(release);
-								}
-							}
-						})
-					).inject(self.release_container);
-
-					if(release.status == 'ignored' || release.status == 'failed' || release.status == 'snatched'){
-						if(!self.last_release || (self.last_release && self.last_release.status != 'snatched' && release.status == 'snatched'))
-							self.last_release = release;
-					}
-					else if(!self.next_release && release.status == 'available'){
-						self.next_release = release;
-					}
-
-					var update_handle = function(notification) {
-						if(notification.data._id != release._id) return;
-
-						var q = self.movie.quality.getElement('.q_' + release.quality),
-							new_status = notification.data.status;
-
-						release.el.set('class', 'item ' + new_status);
-
-						var status_el = release.el.getElement('.release_status');
-						status_el.set('class', 'release_status ' + new_status);
-						status_el.set('text', new_status);
-
-						if(!q && (new_status == 'snatched' || new_status == 'seeding' || new_status == 'done'))
-							q = self.addQuality(release.quality_id);
-
-						if(q && !q.hasClass(new_status)) {
-							q.removeClass(release.status).addClass(new_status);
-							q.set('title', q.get('title').replace(release.status, new_status));
 						}
-					};
+					}),
+					new Element('a.delete.icon2', {
+						'events': {
+							'click': function(e){
+								(e).preventDefault();
+								self.ignore(release);
+							}
+						}
+					})
+				).inject(self.release_container);
+				release['el'] = item;
 
-					App.on('release.update_status', update_handle);
+				if(status.identifier == 'ignored' || status.identifier == 'failed' || status.identifier == 'snatched'){
+					if(!self.last_release || (self.last_release && self.last_release.status.identifier != 'snatched' && status.identifier == 'snatched'))
+						self.last_release = release;
+				}
+				else if(!self.next_release && status.identifier == 'available'){
+					self.next_release = release;
+				}
 
-				});
+				var update_handle = function(notification) {
+					if(notification.data.id != release.id) return;
+
+					var q = self.movie.quality.getElement('.q_id' + release.quality_id),
+						status = Status.get(release.status_id),
+						new_status = Status.get(notification.data.status_id);
+
+					release.status_id = new_status.id
+					release.el.set('class', 'item ' + new_status.identifier);
+
+					var status_el = release.el.getElement('.release_status');
+					status_el.set('class', 'release_status ' + new_status.identifier);
+					status_el.set('text', new_status.identifier);
+
+					if(!q && (new_status.identifier == 'snatched' || new_status.identifier == 'seeding' || new_status.identifier == 'done'))
+						var q = self.addQuality(release.quality_id);
+
+					if(new_status && q && !q.hasClass(new_status.identifier)) {
+						q.removeClass(status.identifier).addClass(new_status.identifier);
+						q.set('title', q.get('title').replace(status.label, new_status.label));
+					}
+				}
+
+				App.on('release.update_status', update_handle);
+
+			});
 
 			if(self.last_release)
-				self.release_container.getElements('#release_'+self.last_release._id).addClass('last_release');
+				self.release_container.getElements('#release_'+self.last_release.id).addClass('last_release');
 
 			if(self.next_release)
-				self.release_container.getElements('#release_'+self.next_release._id).addClass('next_release');
+				self.release_container.getElements('#release_'+self.next_release.id).addClass('next_release');
 
-			if(self.next_release || (self.last_release && ['ignored', 'failed'].indexOf(self.last_release.status) === false)){
+			if(self.next_release || (self.last_release && ['ignored', 'failed'].indexOf(self.last_release.status.identifier) === false)){
 
 				self.trynext_container = new Element('div.buttons.try_container').inject(self.release_container, 'top');
 
@@ -298,17 +341,18 @@ MA.Release = new Class({
 		var has_available = false,
 			has_snatched = false;
 
-		if(self.movie.data.releases)
-			self.movie.data.releases.each(function(release){
-				if(has_available && has_snatched) return;
+		self.movie.data.releases.each(function(release){
+			if(has_available && has_snatched) return;
 
-				if(['snatched', 'downloaded', 'seeding'].contains(release.status))
-					has_snatched = true;
+			var status = Status.get(release.status_id);
 
-				if(['available'].contains(release.status))
-					has_available = true;
+			if(['snatched', 'downloaded', 'seeding'].contains(status.identifier))
+				has_snatched = true;
 
-			});
+			if(['available'].contains(status.identifier))
+				has_available = true;
+
+		});
 
 		if(has_available || has_snatched){
 
@@ -341,13 +385,13 @@ MA.Release = new Class({
 	},
 
 	get: function(release, type){
-		return (release.info && release.info[type] !== undefined) ? release.info[type] : 'n/a'
+		return release.info[type] !== undefined ? release.info[type] : 'n/a'
 	},
 
 	download: function(release){
 		var self = this;
 
-		var release_el = self.release_container.getElement('#release_'+release._id),
+		var release_el = self.release_container.getElement('#release_'+release.id),
 			icon = release_el.getElement('.download.icon2');
 
 		if(icon)
@@ -355,7 +399,7 @@ MA.Release = new Class({
 
 		Api.request('release.manual_download', {
 			'data': {
-				'id': release._id
+				'id': release.id
 			},
 			'onComplete': function(json){
 				if(icon)
@@ -374,11 +418,12 @@ MA.Release = new Class({
 	},
 
 	ignore: function(release){
+		var self = this;
 
 		Api.request('release.ignore', {
 			'data': {
-				'id': release._id
-			}
+				'id': release.id
+			},
 		})
 
 	},
@@ -388,7 +433,7 @@ MA.Release = new Class({
 
 		Api.request('media.delete', {
 			'data': {
-				'id': self.movie.get('_id'),
+				'id': self.movie.get('id'),
 				'delete_from': 'wanted'
 			},
 			'onComplete': function(){
@@ -410,7 +455,7 @@ MA.Release = new Class({
 
 		Api.request('movie.searcher.try_next', {
 			'data': {
-				'media_id': self.movie.get('_id')
+				'id': self.movie.get('id')
 			}
 		});
 
@@ -438,7 +483,7 @@ MA.Trailer = new Class({
 	watch: function(offset){
 		var self = this;
 
-		var data_url = 'https://gdata.youtube.com/feeds/videos?vq="{title}" {year} trailer&max-results=1&alt=json-in-script&orderby=relevance&sortorder=descending&format=5&fmt=18';
+		var data_url = 'https://gdata.youtube.com/feeds/videos?vq="{title}" {year} trailer&max-results=1&alt=json-in-script&orderby=relevance&sortorder=descending&format=5&fmt=18'
 		var url = data_url.substitute({
 				'title': encodeURI(self.getTitle()),
 				'year': self.get('year'),
@@ -497,7 +542,7 @@ MA.Trailer = new Class({
 
 						}
 					}
-				};
+				}
 				self.player.addEventListener('onStateChange', change_quality);
 
 			}
@@ -514,7 +559,7 @@ MA.Trailer = new Class({
 		$(self.movie).setStyle('height', null);
 
 		setTimeout(function(){
-			self.container.destroy();
+			self.container.destroy()
 			self.close_button.destroy();
 		}, 1800)
 	}
@@ -565,13 +610,13 @@ MA.Edit = new Class({
 				)
 			).inject(self.movie, 'top');
 
-			Array.each(self.movie.data.info.titles, function(title){
+			Array.each(self.movie.data.library.titles, function(alt){
 				new Element('option', {
-					'text': title
+					'text': alt.title
 				}).inject(self.title_select);
 
-				if(title == self.movie.data.title)
-					self.title_select.set('value', title);
+				if(alt['default'])
+					self.title_select.set('value', alt.title);
 			});
 
 
@@ -584,14 +629,14 @@ MA.Edit = new Class({
 				self.category_select.show();
 				categories.each(function(category){
 
-					var category_id = category.data._id;
+					var category_id = category.data.id;
 
 					new Element('option', {
 						'value': category_id,
 						'text': category.data.label
 					}).inject(self.category_select);
 
-					if(self.movie.category && self.movie.category.data && self.movie.category.data._id == category_id)
+					if(self.movie.category && self.movie.category.data && self.movie.category.data.id == category_id)
 						self.category_select.set('value', category_id);
 
 				});
@@ -604,7 +649,7 @@ MA.Edit = new Class({
 
 			profiles.each(function(profile){
 
-				var profile_id = profile.get('_id');
+				var profile_id = profile.id ? profile.id : profile.data.id;
 
 				new Element('option', {
 					'value': profile_id,
@@ -627,7 +672,7 @@ MA.Edit = new Class({
 
 		Api.request('movie.edit', {
 			'data': {
-				'id': self.movie.get('_id'),
+				'id': self.movie.get('id'),
 				'default_title': self.title_select.get('value'),
 				'profile_id': self.profile_select.get('value'),
 				'category_id': self.category_select.get('value')
@@ -643,7 +688,7 @@ MA.Edit = new Class({
 		self.movie.slide('out');
 	}
 
-});
+})
 
 MA.Refresh = new Class({
 
@@ -667,7 +712,7 @@ MA.Refresh = new Class({
 
 		Api.request('media.refresh', {
 			'data': {
-				'id': self.movie.get('_id')
+				'id': self.movie.get('id')
 			}
 		});
 	}
@@ -681,10 +726,10 @@ MA.Readd = new Class({
 	create: function(){
 		var self = this;
 
-		var movie_done = self.movie.data.status == 'done';
-		if(self.movie.data.releases && !movie_done)
+		var movie_done = Status.get(self.movie.data.status_id).identifier == 'done';
+		if(!movie_done)
 			var snatched = self.movie.data.releases.filter(function(release){
-				return release.status && (release.status == 'snatched' || release.status == 'downloaded' || release.status == 'done');
+				return release.status && (release.status.identifier == 'snatched' || release.status.identifier == 'downloaded' || release.status.identifier == 'done');
 			}).length;
 
 		if(movie_done || snatched && snatched > 0)
@@ -778,7 +823,7 @@ MA.Delete = new Class({
 			function(){
 				Api.request('media.delete', {
 					'data': {
-						'id': self.movie.get('_id'),
+						'id': self.movie.get('id'),
 						'delete_from': self.movie.list.options.identifier
 					},
 					'onComplete': function(){
@@ -807,17 +852,46 @@ MA.Files = new Class({
 	create: function(){
 		var self = this;
 
-		if(self.movie.data.releases && self.movie.data.releases.length > 0)
-			self.el = new Element('a.directory', {
-				'title': 'Available files',
-				'events': {
-					'click': self.show.bind(self)
-				}
-			});
+		self.el = new Element('a.directory', {
+			'title': 'Available files',
+			'events': {
+				'click': self.show.bind(self)
+			}
+		});
 
 	},
 
-	show: function(){
+	show: function(e){
+		var self = this;
+		(e).preventDefault();
+
+		if(self.releases)
+			self.showFiles();
+		else {
+
+			self.movie.busy(true);
+
+			Api.request('release.for_movie', {
+				'data': {
+					'id': self.movie.data.id
+				},
+				'onComplete': function(json){
+					self.movie.busy(false, 1);
+
+					if(json && json.releases){
+						self.releases = json.releases;
+						self.showFiles();
+					}
+					else
+						alert('Something went wrong, check the logs.');
+				}
+			});
+
+		}
+
+	},
+
+	showFiles: function(){
 		var self = this;
 
 		if(!self.options_container){
@@ -828,26 +902,26 @@ MA.Files = new Class({
 			// Header
 			new Element('div.item.head').adopt(
 				new Element('span.name', {'text': 'File'}),
-				new Element('span.type', {'text': 'Type'})
-			).inject(self.files_container);
+				new Element('span.type', {'text': 'Type'}),
+				new Element('span.is_available', {'text': 'Available'})
+			).inject(self.files_container)
 
-			if(self.movie.data.releases)
-				Array.each(self.movie.data.releases, function(release){
-					var rel = new Element('div.release').inject(self.files_container);
+			Array.each(self.releases, function(release){
 
-					Object.each(release.files, function(files, type){
-						Array.each(files, function(file){
-							new Element('div.file.item').adopt(
-								new Element('span.name', {'text': file}),
-								new Element('span.type', {'text': type})
-							).inject(rel)
-						});
-					});
+				var rel = new Element('div.release').inject(self.files_container);
+
+				Array.each(release.files, function(file){
+					new Element('div.file.item').adopt(
+						new Element('span.name', {'text': file.path}),
+						new Element('span.type', {'text': File.Type.get(file.type_id).name}),
+						new Element('span.available', {'text': file.available})
+					).inject(rel)
 				});
+			});
 
 		}
 
 		self.movie.slide('in', self.options_container);
-	}
+	},
 
-});
+});

couchpotato/core/media/movie/_base/static/movie.css

@@ -127,7 +127,6 @@
 			margin: 0;
 			padding: 0;
 			vertical-align: top;
-			line-height: 0;
 		}
 
 			@media all and (max-width: 800px) {
@@ -344,7 +343,6 @@
 					top: auto;
 					right: auto;
 					color: #FFF;
-					line-height: 18px;
 				}
 
 				.touch_enabled .movies.list_list .movie .info .year {
@@ -398,6 +396,7 @@
 
 			.movies .data .quality span {
 				padding: 2px 3px;
+				font-weight: bold;
 				opacity: 0.5;
 				font-size: 10px;
 				height: 16px;
@@ -450,6 +449,7 @@
 			right: 20px;
 			line-height: 0;
 			top: 0;
+			display: block;
 			width: auto;
 			opacity: 0;
 			display: none;
@@ -831,6 +831,7 @@
 		}
 
 	.movies .alph_nav .search input {
+		padding: 6px 5px;
 		width: 100%;
 		height: 44px;
 		display: inline-block;
@@ -838,6 +839,7 @@
 		background: none;
 		color: #444;
 		font-size: 14px;
+		padding: 10px;
 		padding: 0 10px 0 30px;
 		border-bottom: 1px solid rgba(0,0,0,.08);
 	}
@@ -1039,6 +1041,7 @@
 			}
 
 			.movies .progress > div .percentage {
+				font-weight: bold;
 				display: inline-block;
 				text-transform: uppercase;
 				font-weight: normal;

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

@@ -23,46 +23,46 @@ var Movie = new Class({
 	addEvents: function(){
 		var self = this;
 
-		self.global_events = {};
+		self.global_events = {}
 
 		// Do refresh with new data
 		self.global_events['movie.update'] = function(notification){
-			if(self.data._id != notification.data._id) return;
+			if(self.data.id != notification.data.id) return;
 
 			self.busy(false);
 			self.removeView();
 			self.update.delay(2000, self, notification);
-		};
+		}
 		App.on('movie.update', self.global_events['movie.update']);
 
 		// Add spinner on load / search
 		['media.busy', 'movie.searcher.started'].each(function(listener){
 			self.global_events[listener] = function(notification){
-				if(notification.data && (self.data._id == notification.data._id || (typeOf(notification.data._id) == 'array' && notification.data._id.indexOf(self.data._id) > -1)))
+				if(notification.data && (self.data.id == notification.data.id || (typeOf(notification.data.id) == 'array' && notification.data.id.indexOf(self.data.id) > -1)))
 					self.busy(true);
-			};
+			}
 			App.on(listener, self.global_events[listener]);
-		});
+		})
 
 		// Remove spinner
 		self.global_events['movie.searcher.ended'] = function(notification){
-			if(notification.data && self.data._id == notification.data._id)
+			if(notification.data && self.data.id == notification.data.id)
 				self.busy(false)
-		};
+		}
 		App.on('movie.searcher.ended', self.global_events['movie.searcher.ended']);
 
 		// Reload when releases have updated
 		self.global_events['release.update_status'] = function(notification){
-			var data = notification.data;
-			if(data && self.data._id == data.movie_id){
+			var data = notification.data
+			if(data && self.data.id == data.movie_id){
 
 				if(!self.data.releases)
 					self.data.releases = [];
 
-				self.data.releases.push({'quality': data.quality, 'status': data.status});
+				self.data.releases.push({'quality_id': data.quality_id, 'status_id': data.status_id});
 				self.updateReleases();
 			}
-		};
+		}
 
 		App.on('release.update_status', self.global_events['release.update_status']);
 
@@ -73,7 +73,7 @@ var Movie = new Class({
 
 		self.el.destroy();
 		delete self.list.movies_added[self.get('id')];
-		self.list.movies.erase(self);
+		self.list.movies.erase(self)
 
 		self.list.checkIfEmpty();
 
@@ -117,6 +117,18 @@ var Movie = new Class({
 		}).inject(self.el, 'top').fade('hide');
 	},
 
+	positionMask: function(){
+		var self = this,
+			s = self.el.getSize()
+
+		return self.mask.setStyles({
+			'width': s.x,
+			'height': s.y
+		}).position({
+			'relativeTo': self.el
+		})
+	},
+
 	update: function(notification){
 		var self = this;
 
@@ -134,7 +146,8 @@ var Movie = new Class({
 	create: function(){
 		var self = this;
 
-		self.el.addClass('status_'+self.get('status'));
+		var s = Status.get(self.get('status_id'));
+		self.el.addClass('status_'+s.identifier);
 
 		self.el.adopt(
 			self.select_checkbox = new Element('input[type=checkbox].inlay', {
@@ -144,10 +157,7 @@ var Movie = new Class({
 					}
 				}
 			}),
-			self.thumbnail = (self.data.files && self.data.files.image_poster) ? new Element('img', {
-				'class': 'type_image poster',
-				'src': Api.createUrl('file.cache') + self.data.files.image_poster[0].split(Api.getOption('path_sep')).pop()
-			}): null,
+			self.thumbnail = File.Select.single('poster', self.data.library.files),
 			self.data_container = new Element('div.data.inlay.light').adopt(
 				self.info_container = new Element('div.info').adopt(
 					new Element('div.title').adopt(
@@ -155,11 +165,11 @@ var Movie = new Class({
 							'text': self.getTitle() || 'n/a'
 						}),
 						self.year = new Element('div.year', {
-							'text': self.data.info.year || 'n/a'
+							'text': self.data.library.year || 'n/a'
 						})
 					),
 					self.description = new Element('div.description', {
-						'text': self.data.info.plot
+						'text': self.data.library.plot
 					}),
 					self.quality = new Element('div.quality', {
 						'events': {
@@ -175,7 +185,7 @@ var Movie = new Class({
 			)
 		);
 
-		if(!self.thumbnail)
+		if(self.thumbnail.empty)
 			self.el.addClass('no_thumbnail');
 
 		//self.changeView(self.view);
@@ -185,7 +195,7 @@ var Movie = new Class({
 		if(self.profile.data)
 			self.profile.getTypes().each(function(type){
 
-				var q = self.addQuality(type.get('quality'), type.get('3d'));
+				var q = self.addQuality(type.quality_id || type.get('quality_id'));
 				if((type.finish == true || type.get('finish')) && !q.hasClass('finish')){
 					q.addClass('finish');
 					q.set('title', q.get('title') + ' Will finish searching for this movie if this quality is found.')
@@ -197,7 +207,7 @@ var Movie = new Class({
 		self.updateReleases();
 
 		Object.each(self.options.actions, function(action, key){
-			self.action[key.toLowerCase()] = action = new self.options.actions[key](self);
+			self.action[key.toLowerCase()] = action = new self.options.actions[key](self)
 			if(action.el)
 				self.actions.adopt(action)
 		});
@@ -210,27 +220,27 @@ var Movie = new Class({
 
 		self.data.releases.each(function(release){
 
-			var q = self.quality.getElement('.q_'+ release.quality+(release.is_3d ? '.is_3d' : ':not(.is_3d)')),
-				status = release.status;
+			var q = self.quality.getElement('.q_id'+ release.quality_id),
+				status = Status.get(release.status_id);
 
-			if(!q && (status == 'snatched' || status == 'seeding' || status == 'done'))
-				q = self.addQuality(release.quality, release.is_3d || false);
+			if(!q && (status.identifier == 'snatched' || status.identifier == 'seeding' || status.identifier == 'done'))
+				var q = self.addQuality(release.quality_id)
 
-			if (q && !q.hasClass(status)){
-				q.addClass(status);
-				q.set('title', (q.get('title') ? q.get('title') : '') + ' status: '+ status)
+			if (status && q && !q.hasClass(status.identifier)){
+				q.addClass(status.identifier);
+				q.set('title', (q.get('title') ? q.get('title') : '') + ' status: '+ status.label)
 			}
 
 		});
 	},
 
-	addQuality: function(quality, is_3d){
+	addQuality: function(quality_id){
 		var self = this;
 
-		var q = Quality.getQuality(quality);
+		var q = Quality.getQuality(quality_id);
 		return new Element('span', {
-			'text': q.label + (is_3d ? ' 3D' : ''),
-			'class': 'q_'+q.identifier + (is_3d ? ' is_3d' : ''),
+			'text': q.label,
+			'class': 'q_'+q.identifier + ' q_id' + q.id,
 			'title': ''
 		}).inject(self.quality);
 
@@ -239,10 +249,16 @@ var Movie = new Class({
 	getTitle: function(){
 		var self = this;
 
-		if(self.data.title)
-			return self.getUnprefixedTitle(self.data.title);
-		else if(self.data.info.titles.length > 0)
-			return self.getUnprefixedTitle(self.data.info.titles[0]);
+		var titles = self.data.library.titles;
+
+		var title = titles.filter(function(title){
+			return title['default']
+		}).pop()
+
+		if(title)
+			return self.getUnprefixedTitle(title.title)
+		else if(titles.length > 0)
+			return self.getUnprefixedTitle(titles[0].title)
 
 		return 'Unknown movie'
 	},
@@ -263,12 +279,12 @@ var Movie = new Class({
 			self.el.addEvent('outerClick', function(){
 				self.removeView();
 				self.slide('out')
-			});
+			})
 			el.show();
 			self.data_container.addClass('hide_right');
 		}
 		else {
-			self.el.removeEvents('outerClick');
+			self.el.removeEvents('outerClick')
 
 			setTimeout(function(){
 				if(self.el)
@@ -285,7 +301,7 @@ var Movie = new Class({
 		if(self.el)
 			self.el
 				.removeClass(self.view+'_view')
-				.addClass(new_view+'_view');
+				.addClass(new_view+'_view')
 
 		self.view = new_view;
 	},
@@ -297,7 +313,7 @@ var Movie = new Class({
 	},
 
 	get: function(attr){
-		return this.data[attr] || this.data.info[attr]
+		return this.data[attr] || this.data.library[attr]
 	},
 
 	select: function(bool){

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

@@ -41,7 +41,7 @@ Block.Search.MovieItem = new Class({
 					)
 				)
 			)
-		);
+		)
 
 		if(info.titles)
 			info.titles.each(function(title){
@@ -132,19 +132,19 @@ Block.Search.MovieItem = new Class({
 
 		if(!self.options_el.hasClass('set')){
 
-			if(info.in_library){
+			if(self.info.in_library){
 				var in_library = [];
-				(info.in_library.releases || []).each(function(release){
-					in_library.include(release.quality)
+				self.info.in_library.releases.each(function(release){
+					in_library.include(release.quality.label)
 				});
 			}
 
 			self.options_el.grab(
 				new Element('div', {
-					'class': info.in_wanted && info.in_wanted.profile_id || in_library ? 'in_library_wanted' : ''
+					'class': self.info.in_wanted && self.info.in_wanted.profile_id || in_library ? 'in_library_wanted' : ''
 				}).adopt(
-					info.in_wanted && info.in_wanted.profile_id ? new Element('span.in_wanted', {
-						'text': 'Already in wanted list: ' + Quality.getProfile(info.in_wanted.profile_id).get('label')
+					self.info.in_wanted && self.info.in_wanted.profile_id ? new Element('span.in_wanted', {
+						'text': 'Already in wanted list: ' + Quality.getProfile(self.info.in_wanted.profile_id).get('label')
 					}) : (in_library ? new Element('span.in_library', {
 						'text': 'Already in library: ' + in_library.join(', ')
 					}) : null),
@@ -172,7 +172,7 @@ Block.Search.MovieItem = new Class({
 				new Element('option', {
 					'text': alt.title
 				}).inject(self.title_select)
-			});
+			})
 
 
 			// Fill categories
@@ -184,7 +184,7 @@ Block.Search.MovieItem = new Class({
 				self.category_select.show();
 				categories.each(function(category){
 					new Element('option', {
-						'value': category.data._id,
+						'value': category.data.id,
 						'text': category.data.label
 					}).inject(self.category_select);
 				});
@@ -197,8 +197,8 @@ Block.Search.MovieItem = new Class({
 
 			profiles.each(function(profile){
 				new Element('option', {
-					'value': profile.get('_id'),
-					'text': profile.get('label')
+					'value': profile.id ? profile.id : profile.data.id,
+					'text': profile.label ? profile.label : profile.data.label
 				}).inject(self.profile_select)
 			});
 
@@ -215,9 +215,9 @@ Block.Search.MovieItem = new Class({
 	loadingMask: function(){
 		var self = this;
 
-		self.mask = new Element('div.mask').inject(self.el).fade('hide');
+		self.mask = new Element('div.mask').inject(self.el).fade('hide')
 
-		createSpinner(self.mask);
+		createSpinner(self.mask)
 		self.mask.fade('in')
 
 	},

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

@@ -1,34 +0,0 @@
-from .main import Charts
-
-
-def autoload():
-    return Charts()
-
-
-config = [{
-    'name': 'charts',
-    'groups': [
-        {
-            'label': 'Charts',
-            'description': 'Displays selected charts on the home page',
-            'type': 'list',
-            'name': 'charts_providers',
-            'tab': 'display',
-            'options': [
-                {
-                    'name': 'max_items',
-                    'default': 5,
-                    'type': 'int',
-                    'description': 'Maximum number of items displayed from each chart.',
-                },
-                {
-                    'name': 'update_interval',
-                    'default': 12,
-                    'type': 'int',
-                    'advanced': True,
-                    'description': '(hours)',
-                },
-            ],
-        },
-    ],
-}]

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

@@ -1,58 +0,0 @@
-import time
-
-from couchpotato import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent,fireEvent
-from couchpotato.core.plugins.base import Plugin
-
-
-log = CPLog(__name__)
-
-
-class Charts(Plugin):
-
-    update_in_progress = False
-
-    def __init__(self):
-        addApiView('charts.view', self.automationView)
-        addEvent('app.load', self.setCrons)
-
-    def setCrons(self):
-        fireEvent('schedule.interval', 'charts.update_cache', self.updateViewCache, hours = self.conf('update_interval', default = 12))
-
-    def automationView(self, force_update = False, **kwargs):
-
-        if force_update:
-            charts = self.updateViewCache()
-        else:
-            charts = self.getCache('charts_cached')
-            if not charts:
-                charts = self.updateViewCache()
-
-        return {
-            'success': True,
-            'count': len(charts),
-            'charts': charts
-        }
-
-
-    def updateViewCache(self):
-
-        if self.update_in_progress:
-            while self.update_in_progress:
-                time.sleep(1)
-            catched_charts = self.getCache('charts_cached')
-            if catched_charts:
-                return catched_charts
-
-        try:
-            self.update_in_progress = True
-            charts = fireEvent('automation.get_chart_list', merge = True)
-            self.setCache('charts_cached', charts, timeout = 7200 * tryInt(self.conf('update_interval', default = 12)))
-        except:
-            log.error('Failed refreshing charts')
-
-        self.update_in_progress = False
-
-        return charts

couchpotato/core/media/movie/charts/static/charts.css

@@ -1,261 +0,0 @@
-.charts {
-	clear: both;
-	margin-bottom: 30px;
-}
-
-.charts > h2 {
-	height: 40px;
-}
-
-.charts .chart {
-	display: inline-block;
-	width: 50%;
-	vertical-align: top;
-}
-
-.charts .refresh {
-	clear:both;
-	position: relative;
-}
-
-	.charts .refresh .refreshing {
-		display: block;
-		padding: 20px;
-		font-size: 20px;
-		text-align:center;
-	}
-
-	.charts .refresh a {
-		text-align: center;
-		padding: 0;
-		display: none;
-		width: 30px;
-		height: 30px;
-		position: absolute;
-		right: 10px;
-		top: -40px;
-		opacity: .7;
-	}
-
-	.charts .refresh a:hover {
-		opacity: 1;
-	}
-
-.charts p.no_charts_enabled {
-	padding: 0.7em 1em;
-	display: none;
-}
-
-.charts .chart h3 a {
-	color: #fff;
-}
-
-
-.charts .chart .media_result {
-	display: inline-block;
-	width: 100%;
-	height: 150px;
-}
-
-@media all and (max-width: 960px) {
-	.charts .chart {
-		width: 50%;
-	}
-}
-
-@media all and (max-width: 600px) {
-	.charts .chart {
-		width: 100%;
-	}
-}
-
-.charts .chart .media_result .data {
-	left: 150px;
-	background: #4e5969;
-	border: none;
-}
-
-	.charts .chart .media_result .data .info {
-		top: 10px;
-		left: 15px;
-		right: 15px;
-		bottom: 10px;
-		overflow: hidden;
-	}
-
-	.charts .chart .media_result .data .info h2 {
-		white-space: normal;
-		max-height: 120px;
-		font-size: 18px;
-		line-height: 18px;
-	}
-
-	.charts .chart .media_result .data .info .rating,
-	.charts .chart .media_result .data .info .genres,
-	.charts .chart .media_result .data .info .year {
-		position: static;
-		display: block;
-		padding: 0;
-		opacity: .6;
-	}
-
-	.charts .chart .media_result .data .info .year {
-		margin: 10px 0 0;
-	}
-
-	.charts .chart .media_result .data .info .rating {
-		font-size: 20px;
-		float: right;
-		margin-top: -20px;
-	}
-		.charts .chart .media_result .data .info .rating:before {
-			content: "\e031";
-			font-family: 'Elusive-Icons';
-			font-size: 14px;
-			margin: 0 5px 0 0;
-			vertical-align: bottom;
-		}
-
-	.charts .chart .media_result .data .info .genres {
-		font-size: 11px;
-		font-style: italic;
-		text-align: right;
-	}
-
-	.charts .chart .media_result .data .info .plot {
-		display: block;
-		font-size: 11px;
-		overflow: hidden;
-		text-align: justify;
-		height: 100%;
-		z-index: 2;
-		top: 64px;
-		position: absolute;
-		background: #4e5969;
-		cursor: pointer;
-		transition: all .4s ease-in-out;
-		padding: 0 3px 10px 0;
-	}
-		.charts .chart .media_result .data:before {
-			bottom: 0;
-			content: '';
-			display: block;
-			height: 10px;
-			right: 0;
-			left: 0;
-			bottom: 10px;
-			position: absolute;
-			background: linear-gradient(
-				0deg,
-				rgba(78, 89, 105, 1) 0%,
-				rgba(78, 89, 105, 0) 100%
-			);
-			z-index: 3;
-			pointer-events: none;
-		}
-
-		.charts .chart .media_result .data .info .plot.full {
-			top: 0;
-			overflow: auto;
-		}
-
-.charts .chart .media_result .data {
-	cursor: default;
-}
-
-.charts .chart .media_result .options {
-	left: 150px;
-}
-	.charts .chart .media_result .options select[name=title] { width: 100%; }
-	.charts .chart .media_result .options select[name=profile] { width: 100%; }
-	.charts .chart .media_result .options select[name=category] { width: 100%; }
-
-	.charts .chart .media_result .button {
-		position: absolute;
-		margin: 2px 0 0 0;
-		right: 15px;
-		bottom: 15px;
-	}
-
-
-.charts .chart .media_result .thumbnail {
-	width: 100px;
-	position: absolute;
-	left: 50px;
-}
-
-.charts .chart .media_result .chart_number {
-	color: white;
-	position: absolute;
-	top: 0;
-	padding: 10px;
-	font: bold 2em/1em Helvetica, Sans-Serif;
-	width: 50px;
-	height: 100%;
-	text-align: center;
-	border-left: 8px solid transparent;
-}
-
-	.charts .chart .media_result.chart_in_wanted .chart_number {
-		border-color: rgba(0, 255, 40, 0.3);
-	}
-
-	.charts .chart .media_result.chart_in_library .chart_number {
-		border-color: rgba(0, 202, 32, 0.3);
-	}
-
-
-.charts .chart .media_result .actions {
-	position: absolute;
-	top: 10px;
-	right: 10px;
-	display: none;
-	width: 90px;
-}
-	.charts .chart .media_result:hover .actions {
-		display: block;
-	}
-	.charts .chart .media_result:hover h2 .title {
-		opacity: 0;
-	}
-	.charts .chart .media_result .data.open .actions {
-		display: none;
-	}
-
-	.charts .chart .media_result .actions a {
-		margin-left: 10px;
-		vertical-align: middle;
-	}
-
-
-.toggle_menu {
-	height: 50px;
-}
-
-.toggle_menu a {
-	display: block;
-	width: 50%;
-	float: left;
-	color: rgba(255,255,255,.6);
-	border-bottom: 1px solid rgba(255, 255, 255, 0.0666667);
-}
-
-.toggle_menu a:hover {
-	border-color: #047792;
-	border-width: 4px;
-	color: #fff;
-}
-
-.toggle_menu a.active {
-	border-bottom: 4px solid #04bce6;
-	color: #fff;
-}
-
-.toggle_menu a:last-child {
-	float: right;
-}
-
-.toggle_menu h2 {
-	height: 40px;
-}
-

couchpotato/core/media/movie/charts/static/charts.js

@@ -1,170 +0,0 @@
-var Charts = new Class({
-
-	Implements: [Options, Events],
-
-	initialize: function(options){
-		var self = this;
-		self.setOptions(options);
-
-		self.create();
-	},
-
-	create: function(){
-		var self = this;
-
-		self.el = new Element('div.charts').adopt(
-			self.el_no_charts_enabled = new Element('p.no_charts_enabled', {
-				'html': 'Hey, it looks like you have no charts enabled at the moment. If you\'d like some great movie suggestions you can go to <a href="' + App.createUrl('settings/display') + '">settings</a> and turn on some charts of your choice.'
-			}),
-			self.el_refresh_container = new Element('div.refresh').adopt(
-				self.el_refresh_link = new Element('a.refresh.icon2', {
-					'href': '#',
-					'events': {
-						'click': function(e) {
-							e.preventDefault();
-							self.el.getChildren('div.chart').destroy();
-							self.el_refreshing_text.show();
-							self.el_refresh_link.hide();
-							self.api_request = Api.request('charts.view', {
-								'data': { 'force_update': 1 },
-								'onComplete': self.fill.bind(self)
-							});
-						}
-					}
-				}),
-				self.el_refreshing_text = new Element('span.refreshing', {
-					'text': 'Refreshing charts...'
-				})
-			)
-		);
-
-		if( Cookie.read('suggestions_charts_menu_selected') === 'charts')
-			self.el.show();
-		else
-			self.el.hide();
-
-		self.api_request = Api.request('charts.view', {
-			'onComplete': self.fill.bind(self)
-		});
-
-		self.fireEvent.delay(0, self, 'created');
-
-	},
-
-	fill: function(json){
-
-		var self = this;
-
-		self.el_refreshing_text.hide();
-		self.el_refresh_link.show();
-
-		if(!json || json.count == 0){
-			self.el_no_charts_enabled.show();
-		    self.el_refresh_link.show();
-		    self.el_refreshing_text.hide();
-		}
-		else {
-			self.el_no_charts_enabled.hide();
-
-		    json.charts.sort(function(a, b) {
-				return a.order - b.order;
-			});
-
-			Object.each(json.charts, function(chart){
-
-				var c = new Element('div.chart').grab(
-					new Element('h3').grab( new Element('a', {
-						'text': chart.name,
-						'href': chart.url
-					}))
-				);
-
-				var it = 1;
-
-				Object.each(chart.list, function(movie){
-
-					var m = new Block.Search.MovieItem(movie, {
-						'onAdded': function(){
-							self.afterAdded(m, movie)
-						}
-					});
-
-					var in_database_class = movie.in_wanted ? 'chart_in_wanted' : (movie.in_library ? 'chart_in_library' : ''),
-						in_database_title = movie.in_wanted ? 'Movie in wanted list' : (movie.in_library ? 'Movie in library' : '');
-
-					m.el
-						.addClass(in_database_class)
-						.grab(
-							new Element('div.chart_number', {
-								'text': it++,
-								'title': in_database_title
-							})
-						);
-
-					m.data_container.grab(
-						new Element('div.actions').adopt(
-							new Element('a.add.icon2', {
-								'title': 'Add movie with your default quality',
-								'data-add': movie.imdb,
-								'events': {
-									'click': m.showOptions.bind(m)
-								}
-							}),
-							$(new MA.IMDB(m)),
-							$(new MA.Trailer(m, {
-								'height': 150
-							}))
-						)
-					);
-					m.data_container.removeEvents('click');
-
-					var plot = false;
-					if(m.info.plot && m.info.plot.length > 0)
-						plot = m.info.plot;
-
-					// Add rating
-					m.info_container.adopt(
-						m.rating = m.info.rating && m.info.rating.imdb && m.info.rating.imdb.length == 2 && parseFloat(m.info.rating.imdb[0]) > 0  ? new Element('span.rating', {
-							'text': parseFloat(m.info.rating.imdb[0]),
-							'title': parseInt(m.info.rating.imdb[1]) + ' votes'
-						}) : null,
-						m.genre = m.info.genres && m.info.genres.length > 0 ? new Element('span.genres', {
-							'text': m.info.genres.slice(0, 3).join(', ')
-						}) : null,
-						m.plot = plot ? new Element('span.plot', {
-							'text': plot,
-							'events': {
-								'click': function(){
-									this.toggleClass('full')
-								}
-							}
-						}) : null
-					);
-
-					$(m).inject(c);
-
-				});
-
-				c.inject(self.el);
-
-			});
-
-		}
-
-		self.fireEvent('loaded');
-
-	},
-
-	afterAdded: function(m){
-
-		$(m).getElement('div.chart_number')
-			.addClass('chart_in_wanted')
-			.set('title', 'Movie in wanted list');
-
-	},
-
-	toElement: function(){
-		return this.el;
-	}
-
-});

couchpotato/core/media/movie/library.py

@@ -1,29 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.library.base import LibraryBase
-
-
-log = CPLog(__name__)
-
-autoload = 'MovieLibraryPlugin'
-
-
-class MovieLibraryPlugin(LibraryBase):
-
-    def __init__(self):
-        addEvent('library.query', self.query)
-
-    def query(self, media, first = True, include_year = True, **kwargs):
-        if media.get('type') != 'movie':
-            return
-
-        titles = media['info'].get('titles', [])
-
-        # Add year identifier to titles
-        if include_year:
-            titles = [title + (' %s' % str(media['info']['year'])) for title in titles]
-
-        if first:
-            return titles[0] if titles else None
-
-        return titles

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

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

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

@@ -0,0 +1,200 @@
+from couchpotato import get_session
+from couchpotato.core.event import addEvent, fireEventAsync, fireEvent
+from couchpotato.core.helpers.encoding import toUnicode, simplifyString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.library import LibraryBase
+from couchpotato.core.settings.model import Library, LibraryTitle, File
+from string import ascii_letters
+import time
+import traceback
+import six
+
+log = CPLog(__name__)
+
+
+class MovieLibraryPlugin(LibraryBase):
+
+    default_dict = {'titles': {}, 'files': {}}
+
+    def __init__(self):
+        addEvent('library.add.movie', self.add)
+        addEvent('library.update.movie', self.update)
+        addEvent('library.update.movie.release_date', self.updateReleaseDate)
+
+    def add(self, attrs = None, update_after = True):
+        if not attrs: attrs = {}
+
+        primary_provider = attrs.get('primary_provider', 'imdb')
+
+        try:
+            db = get_session()
+
+            l = db.query(Library).filter_by(identifier = attrs.get('identifier')).first()
+            if not l:
+                status = fireEvent('status.get', 'needs_update', single = True)
+                l = Library(
+                    year = attrs.get('year'),
+                    identifier = attrs.get('identifier'),
+                    plot = toUnicode(attrs.get('plot')),
+                    tagline = toUnicode(attrs.get('tagline')),
+                    status_id = status.get('id'),
+                    info = {}
+                )
+
+                title = LibraryTitle(
+                    title = toUnicode(attrs.get('title')),
+                    simple_title = self.simplifyTitle(attrs.get('title')),
+                )
+
+                l.titles.append(title)
+
+                db.add(l)
+                db.commit()
+
+            # Update library info
+            if update_after is not False:
+                handle = fireEventAsync if update_after is 'async' else fireEvent
+                handle('library.update.movie', identifier = l.identifier, default_title = toUnicode(attrs.get('title', '')))
+
+            library_dict = l.to_dict(self.default_dict)
+            return library_dict
+        except:
+            log.error('Failed adding media: %s', traceback.format_exc())
+            db.rollback()
+        finally:
+            db.close()
+
+        return {}
+
+    def update(self, identifier, default_title = '', extended = False):
+
+        if self.shuttingDown():
+            return
+
+        try:
+            db = get_session()
+
+            library = db.query(Library).filter_by(identifier = identifier).first()
+            done_status = fireEvent('status.get', 'done', single = True)
+
+            info = fireEvent('movie.info', merge = True, extended = extended, identifier = identifier)
+
+            # Don't need those here
+            try: del info['in_wanted']
+            except: pass
+            try: del info['in_library']
+            except: pass
+
+            if not info or len(info) == 0:
+                log.error('Could not update, no movie info to work with: %s', identifier)
+                return False
+
+            # Main info
+            library.plot = toUnicode(info.get('plot', ''))
+            library.tagline = toUnicode(info.get('tagline', ''))
+            library.year = info.get('year', 0)
+            library.status_id = done_status.get('id')
+            library.info.update(info)
+            db.commit()
+
+            # Titles
+            [db.delete(title) for title in library.titles]
+            db.commit()
+
+            titles = info.get('titles', [])
+            log.debug('Adding titles: %s', titles)
+            counter = 0
+
+            def_title = None
+            for title in titles:
+                if (len(default_title) == 0 and counter == 0) or len(titles) == 1 or title.lower() == toUnicode(default_title.lower()) or (toUnicode(default_title) == six.u('') and toUnicode(titles[0]) == title):
+                    def_title = toUnicode(title)
+                    break
+                counter += 1
+
+            if not def_title:
+                def_title = toUnicode(titles[0])
+
+            for title in titles:
+                if not title:
+                    continue
+                title = toUnicode(title)
+                t = LibraryTitle(
+                    title = title,
+                    simple_title = self.simplifyTitle(title),
+                    default = title == def_title
+                )
+                library.titles.append(t)
+
+            db.commit()
+
+            # Files
+            images = info.get('images', [])
+            for image_type in ['poster']:
+                for image in images.get(image_type, []):
+                    if not isinstance(image, (str, unicode)):
+                        continue
+
+                    file_path = fireEvent('file.download', url = image, single = True)
+                    if file_path:
+                        file_obj = fireEvent('file.add', path = file_path, type_tuple = ('image', image_type), single = True)
+                        try:
+                            file_obj = db.query(File).filter_by(id = file_obj.get('id')).one()
+                            library.files.append(file_obj)
+                            db.commit()
+
+                            break
+                        except:
+                            log.debug('Failed to attach to library: %s', traceback.format_exc())
+                            db.rollback()
+
+            library_dict = library.to_dict(self.default_dict)
+            return library_dict
+        except:
+            log.error('Failed update media: %s', traceback.format_exc())
+            db.rollback()
+        finally:
+            db.close()
+
+        return {}
+
+    def updateReleaseDate(self, identifier):
+
+        try:
+            db = get_session()
+            library = db.query(Library).filter_by(identifier = identifier).first()
+
+            if not library.info:
+                library_dict = self.update(identifier)
+                dates = library_dict.get('info', {}).get('release_date')
+            else:
+                dates = library.info.get('release_date')
+
+            if dates and (dates.get('expires', 0) < time.time() or dates.get('expires', 0) > time.time() + (604800 * 4)) or not dates:
+                dates = fireEvent('movie.release_date', identifier = identifier, merge = True)
+                library.info.update({'release_date': dates})
+                db.commit()
+
+            return dates
+        except:
+            log.error('Failed updating release dates: %s', traceback.format_exc())
+            db.rollback()
+        finally:
+            db.close()
+
+        return {}
+
+
+    def simplifyTitle(self, title):
+
+        title = toUnicode(title)
+
+        nr_prefix = '' if title[0] in ascii_letters else '#'
+        title = simplifyString(title)
+
+        for prefix in ['the ']:
+            if prefix == title[:len(prefix)]:
+                title = title[len(prefix):]
+                break
+
+        return nr_prefix + title

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

@@ -1,295 +0,0 @@
-import traceback
-import re
-
-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
-
-
-log = CPLog(__name__)
-
-autoload = 'IMDB'
-
-
-class IMDB(MultiProvider):
-
-    def getTypes(self):
-        return [IMDBWatchlist, IMDBAutomation]
-
-
-class IMDBBase(Automation, RSS):
-
-    interval = 1800
-
-    def getInfo(self, imdb_id):
-        return fireEvent('movie.info', identifier = imdb_id, extended = False, merge = True)
-
-
-class IMDBWatchlist(IMDBBase):
-
-    enabled_option = 'automation_enabled'
-
-    def getIMDBids(self):
-
-        movies = []
-
-        watchlist_enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
-        watchlist_urls = splitString(self.conf('automation_urls'))
-
-        index = -1
-        for watchlist_url in watchlist_urls:
-
-            try:
-                # Get list ID
-                ids = re.findall('(?:list/|list_id=)([a-zA-Z0-9\-_]{11})', watchlist_url)
-                if len(ids) == 1:
-                    watchlist_url = 'http://www.imdb.com/list/%s/?view=compact&sort=created:asc' % ids[0]
-                # Try find user id with watchlist
-                else:
-                    userids = re.findall('(ur\d{7,9})', watchlist_url)
-                    if len(userids) == 1:
-                        watchlist_url = 'http://www.imdb.com/user/%s/watchlist?view=compact&sort=created:asc' % userids[0]
-            except:
-                log.error('Failed getting id from watchlist: %s', traceback.format_exc())
-
-            index += 1
-            if not watchlist_enablers[index]:
-                continue
-
-            start = 0
-            while True:
-                try:
-
-                    w_url = '%s&start=%s' % (watchlist_url, start)
-                    log.debug('Started IMDB watchlists: %s', w_url)
-                    html = self.getHTMLData(w_url)
-
-                    try:
-                        split = splitString(html, split_on="<div class=\"list compact\">")[1]
-                        html = splitString(split, split_on="<div class=\"pages\">")[0]
-                    except:
-                        pass
-
-                    imdbs = getImdb(html, multiple = True) if html else []
-
-                    for imdb in imdbs:
-                        if imdb not in movies:
-                            movies.append(imdb)
-
-                        if self.shuttingDown():
-                            break
-
-                    log.debug('Found %s movies on %s', (len(imdbs), w_url))
-
-                    if len(imdbs) < 250:
-                        break
-
-                    start += 250
-
-                except:
-                    log.error('Failed loading IMDB watchlist: %s %s', (watchlist_url, traceback.format_exc()))
-
-        return movies
-
-
-class IMDBAutomation(IMDBBase):
-
-    enabled_option = 'automation_providers_enabled'
-
-    chart_urls = {
-        'theater': 'http://www.imdb.com/movies-in-theaters/',
-        'top250': 'http://www.imdb.com/chart/top',
-        'boxoffice': 'http://www.imdb.com/chart/',
-    }
-    chart_names = {
-        'theater': 'IMDB - Movies in Theaters',
-        'top250': 'IMDB - Top 250 Movies',
-        'boxoffice': 'IMDB - Box Office',
-    }
-    chart_order = {
-        'theater': 2,
-        'top250': 4,
-        'boxoffice': 3,
-    }
-
-    first_table = ['boxoffice']
-
-    def getIMDBids(self):
-
-        movies = []
-
-        for url in self.chart_urls:
-            if self.conf('automation_charts_%s' % url):
-                data = self.getHTMLData(self.chart_urls[url])
-                if data:
-                    html = BeautifulSoup(data)
-
-                    try:
-                        result_div = html.find('div', attrs = {'id': 'main'})
-
-                        try:
-                            if url in self.first_table:
-                                table = result_div.find('table')
-                                result_div = table if table else result_div
-                        except:
-                            pass
-
-                        imdb_ids = getImdb(str(result_div), multiple = True)
-
-                        for imdb_id in imdb_ids:
-                            info = self.getInfo(imdb_id)
-                            if info and self.isMinimalMovie(info):
-                                movies.append(imdb_id)
-
-                            if self.shuttingDown():
-                                break
-
-                    except:
-                        log.error('Failed loading IMDB chart results from %s: %s', (url, traceback.format_exc()))
-
-        return movies
-
-
-    def getChartList(self):
-        # Nearly identical to 'getIMDBids', but we don't care about minimalMovie and return all movie data (not just id)
-        movie_lists = []
-        max_items = int(self.conf('max_items', section='charts', default=5))
-
-        for url in self.chart_urls:
-            if self.conf('chart_display_%s' % url):
-                movie_list = {'name': self.chart_names[url], 'url': self.chart_urls[url], 'order': self.chart_order[url], 'list': []}
-                data = self.getHTMLData(self.chart_urls[url])
-                if data:
-                    html = BeautifulSoup(data)
-
-                    try:
-                        result_div = html.find('div', attrs = {'id': 'main'})
-
-                        try:
-                            if url in self.first_table:
-                                table = result_div.find('table')
-                                result_div = table if table else result_div
-                        except:
-                            pass
-
-                        imdb_ids = getImdb(str(result_div), multiple = True)
-
-                        for imdb_id in imdb_ids[0:max_items]:
-                            info = self.getInfo(imdb_id)
-                            movie_list['list'].append(info)
-
-                            if self.shuttingDown():
-                                break
-                    except:
-                        log.error('Failed loading IMDB chart results from %s: %s', (url, traceback.format_exc()))
-
-                    if movie_list['list']:
-                        movie_lists.append(movie_list)
-
-
-        return movie_lists
-
-
-config = [{
-    'name': 'imdb',
-    'groups': [
-        {
-            'tab': 'automation',
-            'list': 'watchlist_providers',
-            'name': 'imdb_automation_watchlist',
-            'label': 'IMDB',
-            'description': 'From any <strong>public</strong> IMDB watchlists.',
-            'options': [
-                {
-                    'name': 'automation_enabled',
-                    'default': False,
-                    'type': 'enabler',
-                },
-                {
-                    'name': 'automation_urls_use',
-                    'label': 'Use',
-                },
-                {
-                    'name': 'automation_urls',
-                    'label': 'url',
-                    'type': 'combined',
-                    'combine': ['automation_urls_use', 'automation_urls'],
-                },
-            ],
-        },
-        {
-            'tab': 'automation',
-            'list': 'automation_providers',
-            'name': 'imdb_automation_charts',
-            'label': 'IMDB',
-            'description': 'Import movies from IMDB Charts',
-            'options': [
-                {
-                    'name': 'automation_providers_enabled',
-                    'default': False,
-                    'type': 'enabler',
-                },
-                {
-                    'name': 'automation_charts_theater',
-                    'type': 'bool',
-                    'label': 'In Theaters',
-                    'description': 'New Movies <a href="http://www.imdb.com/movies-in-theaters/">In-Theaters</a> chart',
-                    'default': True,
-                },
-                {
-                    'name': 'automation_charts_top250',
-                    'type': 'bool',
-                    'label': 'TOP 250',
-                    'description': 'IMDB <a href="http://www.imdb.com/chart/top/">TOP 250</a> chart',
-                    'default': True,
-                },
-                {
-                    'name': 'automation_charts_boxoffice',
-                    'type': 'bool',
-                    'label': 'Box office TOP 10',
-                    'description': 'IMDB Box office <a href="http://www.imdb.com/chart/">TOP 10</a> chart',
-                    'default': True,
-                },
-            ],
-        },
-        {
-            'tab': 'display',
-            'list': 'charts_providers',
-            'name': 'imdb_charts_display',
-            'label': 'IMDB',
-            'description': 'Display movies from IMDB Charts',
-            'options': [
-                {
-                    'name': 'chart_display_enabled',
-                    'default': True,
-                    'type': 'enabler',
-                },
-                {
-                    'name': 'chart_display_theater',
-                    'type': 'bool',
-                    'label': 'In Theaters',
-                    'description': 'New Movies <a href="http://www.imdb.com/movies-in-theaters/">In-Theaters</a> chart',
-                    'default': False,
-                },
-                {
-                    'name': 'chart_display_top250',
-                    'type': 'bool',
-                    'label': 'TOP 250',
-                    'description': 'IMDB <a href="http://www.imdb.com/chart/top/">TOP 250</a> chart',
-                    'default': False,
-                },
-                {
-                    'name': 'chart_display_boxoffice',
-                    'type': 'bool',
-                    'label': 'Box office TOP 10',
-                    'description': 'IMDB Box office <a href="http://www.imdb.com/chart/">TOP 10</a> chart',
-                    'default': True,
-                },
-            ],
-        },
-    ],
-}]

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

@@ -1,5 +0,0 @@
-from couchpotato.core.media._base.providers.info.base import BaseInfoProvider
-
-
-class MovieProvider(BaseInfoProvider):
-    type = 'movie'

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

@@ -1,27 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import getIdentifier
-from couchpotato.core.logger import CPLog
-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):
-
-    def buildUrl(self, media, quality):
-        query = tryUrlencode({
-            'q': getIdentifier(media),
-            'm': 'n',
-            'max': 400,
-            'adv_age': Env.setting('retention', 'nzb'),
-            'adv_sort': 'date',
-            'adv_col': 'on',
-            'adv_nfo': 'on',
-            'minsize': quality.get('size_min'),
-            'maxsize': quality.get('size_max'),
-        })
-        return query

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

@@ -1,21 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import getIdentifier
-from couchpotato.core.logger import CPLog
-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):
-
-    def buildUrl(self, media, api_key):
-        query = tryUrlencode({
-            't': 'movie',
-            'imdbid': getIdentifier(media).replace('tt', ''),
-            'apikey': api_key,
-            'extended': 1
-        })
-        return query

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

@@ -1,27 +0,0 @@
-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 import Base
-from couchpotato.core.media.movie.providers.base import MovieProvider
-
-log = CPLog(__name__)
-
-autoload = 'NZBClub'
-
-
-class NZBClub(MovieProvider, Base):
-
-    def buildUrl(self, media):
-
-        q = tryUrlencode({
-            'q': '"%s"' % fireEvent('library.query', media, single = True),
-        })
-
-        query = tryUrlencode({
-            'ig': 1,
-            'rpp': 200,
-            'st': 5,
-            'sp': 1,
-            'ns': 1,
-        })
-        return '%s&%s' % (q, query)

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

@@ -1,30 +0,0 @@
-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 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):
-
-    def buildUrl(self, media, quality):
-        title = fireEvent('library.query', media, include_year = False, single = True)
-        year = media['info']['year']
-
-        query = tryUrlencode({
-            'q': '"%s %s" | "%s (%s)"' % (title, year, title, year),
-            'age': Env.setting('retention', 'nzb'),
-            'sort': 'agedesc',
-            'minsize': quality.get('size_min'),
-            'maxsize': quality.get('size_max'),
-            'rating': 1,
-            'max': 250,
-            'more': 1,
-            'complete': 1,
-        })
-        return query

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

@@ -1,11 +0,0 @@
-from couchpotato.core.logger import CPLog
-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,11 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.awesomehd import Base
-from couchpotato.core.media.movie.providers.base import MovieProvider
-
-log = CPLog(__name__)
-
-autoload = 'AwesomeHD'
-
-
-class AwesomeHD(MovieProvider, Base):
-    pass

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

@@ -1,19 +0,0 @@
-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 import Base
-from couchpotato.core.media.movie.providers.base import MovieProvider
-
-log = CPLog(__name__)
-
-autoload = 'BiTHDTV'
-
-
-class BiTHDTV(MovieProvider, Base):
-
-    def buildUrl(self, media):
-        query = tryUrlencode({
-            'search': fireEvent('library.query', media, single = True),
-            'cat': 7  # Movie cat
-        })
-        return query

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

@@ -1,29 +0,0 @@
-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 import Base
-from couchpotato.core.media.movie.providers.base import MovieProvider
-
-log = CPLog(__name__)
-
-autoload = 'Bitsoup'
-
-
-class Bitsoup(MovieProvider, Base):
-    cat_ids = [
-        ([17], ['3d']),
-        ([41], ['720p', '1080p']),
-        ([20], ['dvdr']),
-        ([19], ['brrip', 'dvdrip']),
-    ]
-    cat_backup_id = 0
-
-    def buildUrl(self, media, quality):
-        query = tryUrlencode({
-            'search': '"%s" %s' % (
-                fireEvent('library.query', media, include_year = False, single = True),
-                media['info']['year']
-            ),
-            'cat': self.getCatId(quality)[0],
-        })
-        return query