One Up

Conflicts:
	couchpotato/core/plugins/suggestion/main.py

CouchPotato.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from __future__ import print_function
 from logging import handlers
 from os.path import dirname
 import logging
@@ -10,6 +9,7 @@ import socket
 import subprocess
 import sys
 import traceback
+import time
 
 # Root path
 base_path = dirname(os.path.abspath(__file__))
@@ -18,12 +18,7 @@ base_path = dirname(os.path.abspath(__file__))
 sys.path.insert(0, os.path.join(base_path, 'libs'))
 
 from couchpotato.environment import Env
-from couchpotato.core.helpers.variable import getDataDir, removePyc
+from couchpotato.core.helpers.variable import getDataDir
-
-
-# Remove pyc files before dynamic load (sees .pyc files regular .py modules)
-removePyc(base_path)
-
 
 class Loader(object):
 
@@ -33,7 +28,7 @@ class Loader(object):
 
         # Get options via arg
         from couchpotato.runner import getOptions
-        self.options = getOptions(sys.argv[1:])
+        self.options = getOptions(base_path, sys.argv[1:])
 
         # Load settings
         settings = Env.get('settings')
@@ -54,14 +49,14 @@ class Loader(object):
         # Create logging dir
         self.log_dir = os.path.join(self.data_dir, 'logs');
         if not os.path.isdir(self.log_dir):
-            os.makedirs(self.log_dir)
+            os.mkdir(self.log_dir)
 
         # Logging
         from couchpotato.core.logger import CPLog
         self.log = CPLog(__name__)
 
         formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s', '%H:%M:%S')
-        hdlr = handlers.RotatingFileHandler(os.path.join(self.log_dir, 'error.log'), 'a', 500000, 10, encoding = 'utf-8')
+        hdlr = handlers.RotatingFileHandler(os.path.join(self.log_dir, 'error.log'), 'a', 500000, 10)
         hdlr.setLevel(logging.CRITICAL)
         hdlr.setFormatter(formatter)
         self.log.logger.addHandler(hdlr)
@@ -71,11 +66,10 @@ class Loader(object):
         signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))
 
         from couchpotato.core.event import addEvent
-        addEvent('app.do_shutdown', self.setRestart)
+        addEvent('app.after_shutdown', self.afterShutdown)
 
-    def setRestart(self, restart):
+    def afterShutdown(self, restart):
         self.do_restart = restart
-        return True
 
     def onExit(self, signal, frame):
         from couchpotato.core.event import fireEvent
@@ -103,6 +97,7 @@ class Loader(object):
 
             # Release log files and shutdown logger
             logging.shutdown()
+            time.sleep(3)
 
             args = [sys.executable] + [os.path.join(base_path, os.path.basename(__file__))] + sys.argv[1:]
             subprocess.Popen(args)
@@ -137,15 +132,14 @@ if __name__ == '__main__':
         pass
     except SystemExit:
         raise
-    except socket.error as e:
+    except socket.error as (nr, msg):
         # log when socket receives SIGINT, but continue.
         # previous code would have skipped over other types of IO errors too.
-        nr, msg = e
         if nr != 4:
             try:
                 l.log.critical(traceback.format_exc())
             except:
-                print(traceback.format_exc())
+                print traceback.format_exc()
             raise
     except:
         try:
@@ -154,7 +148,7 @@ if __name__ == '__main__':
             if l:
                 l.log.critical(traceback.format_exc())
             else:
-                print(traceback.format_exc())
+                print traceback.format_exc()
         except:
-            print(traceback.format_exc())
+            print traceback.format_exc()
         raise

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://couchpota.to/updates/%s'
+        self.InitUpdates(base_url % VERSION + '/', base_url % '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:
 
@@ -17,9 +17,9 @@ Windows, see [the CP forum](http://couchpota.to/forum/showthread.php?tid=14) for
 * Open up `Git Bash` (or CMD) and go to the folder you want to install CP. Something like Program Files.
 * Run `git clone https://github.com/RuudBurger/CouchPotatoServer.git`.
 * You can now start CP via `CouchPotatoServer\CouchPotato.py` to start
-* Your browser should open up, but if it doesn't go to `http://localhost:5050/`
+* Your browser should open up, but if it doesn't go to: `http://localhost:5050/`
 
-OS X:
+OSx:
 
 * If you're on Leopard (10.5) install Python 2.6+: [Python 2.6.5](http://www.python.org/download/releases/2.6.5/)
 * Install [GIT](http://git-scm.com/)
@@ -27,27 +27,20 @@ OS X:
 * Go to your App folder `cd /Applications`
 * Run `git clone https://github.com/RuudBurger/CouchPotatoServer.git`
 * Then do `python CouchPotatoServer/CouchPotato.py`
-* Your browser should open up, but if it doesn't go to `http://localhost:5050/`
+* Your browser should open up, but if it doesn't go to: `http://localhost:5050/`
 
-Linux:
+Linux (ubuntu / debian):
 
-* (Ubuntu / Debian) Install [GIT](http://git-scm.com/) with `apt-get install git-core`
+* Install [GIT](http://git-scm.com/) with `apt-get install git-core`
-* (Fedora / CentOS) Install [GIT](http://git-scm.com/) with `yum install git`
 * 'cd' to the folder of your choosing.
 * Run `git clone https://github.com/RuudBurger/CouchPotatoServer.git`
 * Then do `python CouchPotatoServer/CouchPotato.py` to start
-* (Ubuntu / Debian) To run on boot copy the init script `sudo cp CouchPotatoServer/init/ubuntu /etc/init.d/couchpotato`
+* To run on boot copy the init script. `sudo cp CouchPotatoServer/init/ubuntu /etc/init.d/couchpotato`
-* (Ubuntu / Debian) Copy the default paths file `sudo cp CouchPotatoServer/init/ubuntu.default /etc/default/couchpotato`
+* Change the paths inside the init script. `sudo nano /etc/init.d/couchpotato`
-* (Ubuntu / Debian) Change the paths inside the default file `sudo nano /etc/default/couchpotato`
+* Make it executable. `sudo chmod +x /etc/init.d/couchpotato`
-* (Ubuntu / Debian) Make it executable `sudo chmod +x /etc/init.d/couchpotato`
+* Add it to defaults. `sudo update-rc.d couchpotato defaults`
-* (Ubuntu / Debian) Add it to defaults `sudo update-rc.d couchpotato defaults`
+* Open your browser and go to: `http://localhost:5050/`
-* (systemd) To run on boot copy the systemd config `sudo cp CouchPotatoServer/init/couchpotato.fedora.service /etc/systemd/system/couchpotato.service`
+ 
-* (systemd) Update the systemd config file with your user and path to CouchPotato.py 
-* (systemd) Enable it at boot with `sudo systemctl enable couchpotato`
-* Open your browser and go to `http://localhost:5050/`
-
-Docker:
-* You can use [razorgirl's Dockerfile](https://github.com/razorgirl/docker-couchpotato) to quickly build your own isolated app container. It's based on the Linux instructions above. For more info about Docker check out the [official website](https://www.docker.com).
 
 FreeBSD :
 
@@ -63,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,40 +1,15 @@
-# Contributing to CouchPotatoServer
+#So you feel like posting a bug, sending me a pull request or just telling me how awesome I am. No problem! 
 
-1. [Contributing](#contributing)
+##Just make sure you think of the following things:
-2. [Submitting an Issue](#issues)
-3. [Submitting a Pull Request](#pull-requests)
 
-## Contributing
+ * Search through the existing (and closed) issues first. See if you can get your answer there.
-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.
+ * Double check the result manually, because it could be an external issue. 
-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!
+ * Post logs! Without seeing what is going on, I can't reproduce the error.
-If you want to contribute your own work, please read the [guidelines](#pull-requests) for submitting a pull request.
+ * What is the movie + quality you are searching for.
-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.
+ * What are you settings for the specific problem.
+ * What providers are you using. (While your logs include these, scanning through hundred of lines of log isn't my hobby).
+ * Give me a short step by step of how to reproduce.
+ * 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 me "why closed" if it clearly says the issue in the tag ;)
 
-## Issues
+**If I don't get enough info, the chance of the issue getting closed is a lot bigger ;)**
-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:
- * **FILL IN ALL THE FIELDS ASKED FOR**
- * **POST MORE THAN A SINGLE LINE LOG**, if you do, you'd better have a easy reproducable bug
- * 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!
- * 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 than when you use CP on OS X 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, Synology etc.) with pre-made packages, make sure these are set up to use our source repository (RuudBurger/CouchPotatoServer) and nothing else!
- * Do not "bump" issues with "Any updates on this" or whatever. Yes I've seen it, you don't have to remind me of it. There will be an update when the code is done or I need information. If you feel the need to do so, you'd better have more info on the issue.
-
-The more relevant information you provide, the more likely that your issue will be resolved.
-If you don't follow any of the checks above, I'll close the issue. If you are wondering why (and ask) I'll block you from posting new issues and the repo.
-
-## 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).
- * Have you tested your PR? If not, why?
- * Does your PR have any limitations I should know of?
- * Is your PR up-to-date with the branch you're trying to push into?

couchpotato/__init__.py

@@ -1,7 +1,3 @@
-import os
-import time
-import traceback
-
 from couchpotato.api import api_docs, api_docs_missing, api
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.variable import md5, tryInt
@@ -9,10 +5,13 @@ from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
 from tornado import template
 from tornado.web import RequestHandler, authenticated
-
+import os
+import time
+import traceback
 
 log = CPLog(__name__)
 
+
 views = {}
 template_loader = template.Loader(os.path.join(os.path.dirname(__file__), 'templates'))
 
@@ -25,10 +24,9 @@ class BaseHandler(RequestHandler):
 
         if username and password:
             return self.get_secure_cookie('user')
-        else:  # Login when no username or password are set
+        else: # Login when no username or password are set
             return True
 
-
 # Main web handler
 class WebHandler(BaseHandler):
 
@@ -45,13 +43,11 @@ class WebHandler(BaseHandler):
             log.error("Failed doing web request '%s': %s", (route, traceback.format_exc()))
             self.write({'success': False, 'error': 'Failed returning results'})
 
-
+def addView(route, func, static = False):
-def addView(route, func):
     views[route] = func
 
-
+def get_session(engine = None):
-def get_db():
+    return Env.getSession(engine)
-    return Env.get('db')
 
 
 # Web view
@@ -59,10 +55,12 @@ def index():
     return template_loader.load('index.html').generate(sep = os.sep, fireEvent = fireEvent, Env = Env)
 addView('', index)
 
-
 # API docs
 def apiDocs():
-    routes = list(api.keys())
+    routes = []
+
+    for route in api.iterkeys():
+        routes.append(route)
 
     if api_docs.get(''):
         del api_docs['']
@@ -72,30 +70,21 @@ 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
+        api = None
 
         try:
             username = Env.setting('username')
             password = Env.setting('password')
 
             if (self.get_argument('u') == md5(username) or not username) and (self.get_argument('p') == password or not password):
-                api_key = Env.setting('api_key')
+                api = Env.setting('api_key')
 
             self.write({
-                'success': api_key is not None,
+                'success': api is not None,
-                'api_key': api_key
+                'api_key': api
             })
         except:
             log.error('Failed doing key request: %s', (traceback.format_exc()))
@@ -113,21 +102,20 @@ class LoginHandler(BaseHandler):
 
     def post(self, *args, **kwargs):
 
-        api_key = None
+        api = None
 
         username = Env.setting('username')
         password = Env.setting('password')
 
         if (self.get_argument('username') == username or not username) and (md5(self.get_argument('password')) == password or not password):
-            api_key = Env.setting('api_key')
+            api = Env.setting('api_key')
 
-        if api_key:
+        if api:
             remember_me = tryInt(self.get_argument('remember_me', default = 0))
-            self.set_secure_cookie('user', api_key, expires_days = 30 if remember_me > 0 else None)
+            self.set_secure_cookie('user', api, expires_days = 30 if remember_me > 0 else None)
 
         self.redirect(Env.get('web_base'))
 
-
 class LogoutHandler(BaseHandler):
 
     def get(self, *args, **kwargs):
@@ -148,3 +136,4 @@ def page_not_found(rh):
 
         rh.set_status(404)
         rh.write('Wrong API key used')
+

couchpotato/api.py

@@ -1,14 +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__)
 
@@ -20,25 +20,15 @@ api_nonblock = {}
 api_docs = {}
 api_docs_missing = []
 
-
 def run_async(func):
     @wraps(func)
     def async_func(*args, **kwargs):
         func_hl = Thread(target = func, args = args, kwargs = kwargs)
         func_hl.start()
+        return func_hl
 
     return async_func
 
-@run_async
-def run_handler(route, kwargs, callback = None):
-    try:
-        res = api[route](**kwargs)
-        callback(res, route)
-    except:
-        log.error('Failed doing api request "%s": %s', (route, traceback.format_exc()))
-        callback({'success': False, 'error': 'Failed returning results'}, route)
-
-
 # NonBlock API handler
 class NonBlockHandler(RequestHandler):
 
@@ -71,7 +61,6 @@ class NonBlockHandler(RequestHandler):
 
         self.stopper = None
 
-
 def addNonBlockApiView(route, func_tuple, docs = None, **kwargs):
     api_nonblock[route] = func_tuple
 
@@ -80,22 +69,16 @@ def addNonBlockApiView(route, func_tuple, docs = None, **kwargs):
     else:
         api_docs_missing.append(route)
 
-
 # Blocking API handler
 class ApiHandler(RequestHandler):
 
-    @asynchronous
+    @coroutine
     def get(self, route, *args, **kwargs):
         route = route.strip('/')
         if not api.get(route):
             self.write('API call doesn\'t seem to exist')
-            self.finish()
             return
 
-        # Create lock if it doesn't exist
-        if route in api_locks and not api_locks.get(route):
-            api_locks[route] = threading.Lock()
-
         api_locks[route].acquire()
 
         try:
@@ -106,53 +89,38 @@ class ApiHandler(RequestHandler):
 
             # Split array arguments
             kwargs = getParams(kwargs)
-            kwargs['_request'] = self
 
             # Remove t random string
             try: del kwargs['t']
             except: pass
 
             # Add async callback handler
-            run_handler(route, kwargs, callback = self.taskFinished)
+            @run_async
+            def run_handler(callback):
+                try:
+                    result = api[route](**kwargs)
+                    callback(result)
+                except:
+                    log.error('Failed doing api request "%s": %s', (route, traceback.format_exc()))
+                    callback({'success': False, 'error': 'Failed returning results'})
+            result = yield tornado.gen.Task(run_handler)
+
+            # Check JSONP callback
+            jsonp_callback = self.get_argument('callback_func', default = None)
+
+            if jsonp_callback:
+                self.write(str(jsonp_callback) + '(' + json.dumps(result) + ')')
+            elif isinstance(result, tuple) and result[0] == 'redirect':
+                self.redirect(result[1])
+            else:
+                self.write(result)
 
         except:
             log.error('Failed doing api request "%s": %s', (route, traceback.format_exc()))
-            try:
+            self.write({'success': False, 'error': 'Failed returning results'})
-                self.write({'success': False, 'error': 'Failed returning results'})
-                self.finish()
-            except:
-                log.error('Failed write error "%s": %s', (route, traceback.format_exc()))
-
-            api_locks[route].release()
-
-    post = get
-
-    def taskFinished(self, result, route):
-
-        if not self.request.connection.stream.closed():
-            try:
-                # Check JSONP callback
-                jsonp_callback = self.get_argument('callback_func', default = None)
-
-                if jsonp_callback:
-                    self.write(str(jsonp_callback) + '(' + json.dumps(result) + ')')
-                    self.set_header("Content-Type", "text/javascript")
-                    self.finish()
-                elif isinstance(result, tuple) and result[0] == 'redirect':
-                    self.redirect(result[1])
-                else:
-                    self.write(result)
-                    self.finish()
-            except UnicodeDecodeError:
-                log.error('Failed proper encode: %s', traceback.format_exc())
-            except:
-                log.debug('Failed doing request, probably already closed: %s', (traceback.format_exc()))
-                try: self.finish({'success': False, 'error': 'Failed returning results'})
-                except: pass
 
         api_locks[route].release()
 
-
 def addApiView(route, func, static = False, docs = None, **kwargs):
 
     if static: func(route)

couchpotato/core/_base/_core/__init__.py

@@ -0,0 +1,100 @@
+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, isSubFolder
-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)
@@ -60,10 +55,6 @@ class Core(Plugin):
         if not Env.get('desktop'):
             self.signalHandler()
 
-        # Set default urlopen timeout
-        import socket
-        socket.setdefaulttimeout(30)
-
     def md5Password(self, value):
         return md5(value) if value else ''
 
@@ -71,15 +62,11 @@ class Core(Plugin):
         return value if value and len(value) > 3 else uuid4().hex
 
     def checkDataDir(self):
-        if isSubFolder(Env.get('data_dir'), Env.get('app_dir')):
+        if Env.get('app_dir') in Env.get('data_dir'):
             log.error('You should NOT use your CouchPotato directory to save your settings in. Files will get overwritten or be deleted.')
 
         return True
 
-    def cleanUpFolders(self):
-        only_clean = ['couchpotato', 'libs', 'init']
-        self.deleteEmptyFolder(Env.get('app_dir'), show_error = False, only_clean = only_clean)
-
     def available(self, **kwargs):
         return {
             'success': True
@@ -91,11 +78,7 @@ class Core(Plugin):
 
         def shutdown():
             self.initShutdown()
-
+        IOLoop.current().add_callback(shutdown)
-        if IOLoop.current()._closing:
-            shutdown()
-        else:
-            IOLoop.current().add_callback(shutdown)
 
         return 'shutdown'
 
@@ -118,7 +101,7 @@ class Core(Plugin):
 
         self.shutdown_started = True
 
-        fireEvent('app.do_shutdown', restart = restart)
+        fireEvent('app.do_shutdown')
         log.debug('Every plugin got shutdown event')
 
         loop = True
@@ -130,7 +113,7 @@ class Core(Plugin):
 
             if len(still_running) == 0:
                 break
-            elif starttime < time.time() - 30:  # Always force break after 30s wait
+            elif starttime < time.time() - 30: # Always force break after 30s wait
                 break
 
             running = list(set(still_running) - set(self.ignore_restart))
@@ -143,11 +126,8 @@ class Core(Plugin):
 
         log.debug('Safe to shutdown/restart')
 
-        loop = IOLoop.current()
-
         try:
-            if not loop._closing:
+            IOLoop.current().stop()
-                loop.stop()
         except RuntimeError:
             pass
         except:
@@ -197,104 +177,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). <a target="_blank" href="http://permissions-calculator.org/">Calculate the correct value</a>',
-                },
-                {
-                    'name': 'permission_file',
-                    'default': '0755',
-                    'label': 'File CHMOD',
-                    'description': 'See Folder CHMOD description, but for files',
-                },
-            ],
-        },
-    ],
-}]

couchpotato/core/_base/clientscript/__init__.py

@@ -0,0 +1,6 @@
+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):
 
@@ -38,8 +34,6 @@ class ClientScript(Plugin):
             'scripts/library/question.js',
             'scripts/library/scrollspy.js',
             'scripts/library/spin.js',
-            'scripts/library/Array.stableSort.js',
-            'scripts/library/async.js',
             'scripts/couchpotato.js',
             'scripts/api.js',
             'scripts/library/history.js',
@@ -49,17 +43,20 @@ 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',
         ],
     }
 
-    urls = {'style': {}, 'script': {}}
+
-    minified = {'style': {}, 'script': {}}
+    urls = {'style': {}, 'script': {}, }
-    paths = {'style': {}, 'script': {}}
+    minified = {'style': {}, 'script': {}, }
+    paths = {'style': {}, 'script': {}, }
     comment = {
-        'style': '/*** %s:%d ***/\n',
+       'style': '/*** %s:%d ***/\n',
-        'script': '// %s:%d\n'
+       'script': '// %s:%d\n'
     }
 
     html = {
@@ -91,6 +88,7 @@ class ClientScript(Plugin):
                 else:
                     self.registerStyle(core_url, file_path, position = 'front')
 
+
     def minify(self):
 
         # Create cache dir
@@ -124,7 +122,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 +185,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,6 @@
+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/downloader/static/downloaders.js

@@ -1,76 +0,0 @@
-var DownloadersBase = new Class({
-
-	Implements: [Events],
-
-	initialize: function(){
-		var self = this;
-
-		// Add test buttons to settings page
-		App.addEvent('loadSettings', self.addTestButtons.bind(self));
-
-	},
-
-	// Downloaders setting tests
-	addTestButtons: function(){
-		var self = this;
-
-		var setting_page = App.getPage('Settings');
-		setting_page.addEvent('create', function(){
-			Object.each(setting_page.tabs.downloaders.groups, self.addTestButton.bind(self))
-		})
-
-	},
-
-	addTestButton: function(fieldset, plugin_name){
-		var self = this,
-			button_name = self.testButtonName(fieldset);
-
-		if(button_name.contains('Downloaders')) return;
-
-		new Element('.ctrlHolder.test_button').adopt(
-			new Element('a.button', {
-				'text': button_name,
-				'events': {
-					'click': function(){
-						var button = fieldset.getElement('.test_button .button');
-							button.set('text', 'Connecting...');
-
-						Api.request('download.'+plugin_name+'.test', {
-							'onComplete': function(json){
-
-								button.set('text', button_name);
-
-								var message;
-								if(json.success){
-									message = new Element('span.success', {
-										'text': 'Connection successful'
-									}).inject(button, 'after')
-								}
-								else {
-									var msg_text = 'Connection failed. Check logs for details.';
-									if(json.hasOwnProperty('msg')) msg_text = json.msg;
-									message = new Element('span.failed', {
-										'text': msg_text
-									}).inject(button, 'after')
-								}
-
-								(function(){
-									message.destroy();
-								}).delay(3000)
-							}
-						});
-					}
-				}
-			})
-		).inject(fieldset);
-
-	},
-
-	testButtonName: function(fieldset){
-		var name = String(fieldset.getElement('h2').innerHTML).substring(0,String(fieldset.getElement('h2').innerHTML).indexOf("<span"));
-		return 'Test '+name;
-	}
-
-});
-
-var Downloaders = new DownloadersBase();

couchpotato/core/_base/scheduler/__init__.py

@@ -0,0 +1,6 @@
+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):
 
@@ -19,7 +17,6 @@ class Scheduler(Plugin):
         addEvent('schedule.cron', self.cron)
         addEvent('schedule.interval', self.interval)
         addEvent('schedule.remove', self.remove)
-        addEvent('schedule.queue', self.queue)
 
         self.sched = Sched(misfire_grace_time = 60)
         self.sched.start()
@@ -33,14 +30,14 @@ class Scheduler(Plugin):
             except:
                 pass
 
-    def doShutdown(self, *args, **kwargs):
+    def doShutdown(self):
+        super(Scheduler, self).doShutdown()
         self.stop()
-        return super(Scheduler, self).doShutdown(*args, **kwargs)
 
     def stop(self):
         if self.started:
             log.debug('Stopping scheduler')
-            self.sched.shutdown(wait = False)
+            self.sched.shutdown()
             log.debug('Scheduler stopped')
         self.started = False
 
@@ -67,16 +64,3 @@ class Scheduler(Plugin):
             'seconds': seconds,
             'job': self.sched.add_interval_job(handle, hours = hours, minutes = minutes, seconds = seconds)
         }
-
-        return True
-
-    def queue(self, handlers = None):
-        if not handlers: handlers = []
-
-        for h in handlers:
-            h()
-
-            if self.shuttingDown():
-                break
-
-        return True

couchpotato/core/_base/updater/__init__.py

@@ -1,10 +1,8 @@
-import os
-
 from .main import Updater
 from couchpotato.environment import Env
+import os
 
-
+def start():
-def autoload():
     return Updater()
 
 config = [{

couchpotato/core/_base/updater/main.py

@@ -1,25 +1,20 @@
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
+from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+from datetime import datetime
+from dateutil.parser import parse
+from git.repository import LocalRepository
 import json
 import os
 import shutil
 import tarfile
 import time
 import traceback
-import zipfile
-from datetime import datetime
-from threading import RLock
-
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import sp
-from couchpotato.core.helpers.variable import removePyc
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-from dateutil.parser import parse
-from git.repository import LocalRepository
 import version
-from six.moves import filter
+import zipfile
-
 
 log = CPLog(__name__)
 
@@ -27,7 +22,6 @@ log = CPLog(__name__)
 class Updater(Plugin):
 
     available_notified = False
-    _lock = RLock()
 
     def __init__(self):
 
@@ -38,7 +32,6 @@ class Updater(Plugin):
         else:
             self.updater = SourceUpdater()
 
-        addEvent('app.load', self.logVersion, priority = 10000)
         addEvent('app.load', self.setCrons)
         addEvent('updater.info', self.info)
 
@@ -60,16 +53,12 @@ class Updater(Plugin):
 
         addEvent('setting.save.updater.enabled.after', self.setCrons)
 
-    def logVersion(self):
-        info = self.info()
-        log.info('=== VERSION %s, using %s ===', (info.get('version', {}).get('repr', 'UNKNOWN'), self.updater.getName()))
-
     def setCrons(self):
 
         fireEvent('schedule.remove', 'updater.check', single = True)
         if self.isEnabled():
             fireEvent('schedule.interval', 'updater.check', self.autoUpdate, hours = 6)
-            self.autoUpdate()  # Check after enabling
+            self.autoUpdate() # Check after enabling
 
     def autoUpdate(self):
         if self.isEnabled() and self.check() and self.conf('automatic') and not self.updater.update_failed:
@@ -105,17 +94,7 @@ class Updater(Plugin):
         return False
 
     def info(self, **kwargs):
-        self._lock.acquire()
+        return self.updater.info()
-
-        info = {}
-        try:
-            info = self.updater.info()
-        except:
-            log.error('Failed getting updater info: %s', traceback.format_exc())
-
-        self._lock.release()
-
-        return info
 
     def checkView(self, **kwargs):
         return {
@@ -142,12 +121,6 @@ class Updater(Plugin):
             'success': success
         }
 
-    def doShutdown(self, *args, **kwargs):
-        if not Env.get('dev') and not Env.get('desktop'):
-            removePyc(Env.get('app_dir'), show_logs = False)
-
-        return super(Updater, self).doShutdown(*args, **kwargs)
-
 
 class BaseUpdater(Plugin):
 
@@ -165,23 +138,42 @@ 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):
-        pass
-
     def check(self):
         pass
 
+    def deletePyc(self, only_excess = True):
+
+        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))
+            excess_pyc_files = filter(lambda pyc_filename: pyc_filename[:-1] not in py_files, pyc_files) if only_excess else pyc_files
+
+            for excess_pyc_file in excess_pyc_files:
+                full_path = os.path.join(root, excess_pyc_file)
+                log.debug('Removing old PYC file: %s', full_path)
+                try:
+                    os.remove(full_path)
+                except:
+                    log.error('Couldn\'t remove %s: %s', (full_path, traceback.format_exc()))
+
+            for dir_name in dirs:
+                full_path = os.path.join(root, dir_name)
+                if len(os.listdir(full_path)) == 0:
+                    try:
+                        os.rmdir(full_path)
+                    except:
+                        log.error('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc()))
+
+
 
 class GitUpdater(BaseUpdater):
 
@@ -191,9 +183,15 @@ class GitUpdater(BaseUpdater):
     def doUpdate(self):
 
         try:
+            log.debug('Stashing local changes')
+            self.repo.saveStash()
+
             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())
@@ -206,16 +204,14 @@ class GitUpdater(BaseUpdater):
 
         if not self.version:
             try:
-                output = self.repo.getHead()  # Yes, please
+                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())),
                     'hash': output.hash[:8],
                     'date': output.getDate(),
                     'type': 'git',
-                    'branch': self.repo.getCurrentBranch().name
                 }
-            except Exception as e:
+            except Exception, e:
                 log.error('Failed using GIT updater, running from source, you need to have GIT installed. %s', e)
                 return 'No GIT'
 
@@ -238,7 +234,7 @@ class GitUpdater(BaseUpdater):
                 local = self.repo.getHead()
                 remote = branch.getHead()
 
-                log.debug('Versions, local:%s, remote:%s', (local.hash[:8], remote.hash[:8]))
+                log.info('Versions, local:%s, remote:%s', (local.hash[:8], remote.hash[:8]))
 
                 if local.getDate() < remote.getDate():
                     self.update_version = {
@@ -251,6 +247,7 @@ class GitUpdater(BaseUpdater):
         return False
 
 
+
 class SourceUpdater(BaseUpdater):
 
     def __init__(self):
@@ -276,9 +273,9 @@ class SourceUpdater(BaseUpdater):
 
             # Extract
             if download_data.get('type') == 'zip':
-                zip_file = zipfile.ZipFile(destination)
+                zip = zipfile.ZipFile(destination)
-                zip_file.extractall(extracted_path)
+                zip.extractall(extracted_path)
-                zip_file.close()
+                zip.close()
             else:
                 tar = tarfile.open(destination)
                 tar.extractall(path = extracted_path)
@@ -300,12 +297,10 @@ class SourceUpdater(BaseUpdater):
         return False
 
     def replaceWith(self, path):
-        path = sp(path)
+        app_dir = ss(Env.get('app_dir'))
-        app_dir = Env.get('app_dir')
-        data_dir = Env.get('data_dir')
 
         # Get list of files we want to overwrite
-        removePyc(app_dir)
+        self.deletePyc()
         existing_files = []
         for root, subfiles, filenames in os.walk(app_dir):
             for filename in filenames:
@@ -334,24 +329,22 @@ class SourceUpdater(BaseUpdater):
                         log.error('Failed overwriting file "%s": %s', (tofile, traceback.format_exc()))
                         return False
 
-        for still_exists in existing_files:
+        if Env.get('app_dir') not in Env.get('data_dir'):
-
+            for still_exists in existing_files:
-            if data_dir in still_exists:
+                try:
-                continue
+                    os.remove(still_exists)
-
+                except:
-            try:
+                    log.error('Failed removing non-used file: %s', traceback.format_exc())
-                os.remove(still_exists)
-            except:
-                log.error('Failed removing non-used file: %s', traceback.format_exc())
 
         return True
 
+
     def removeDir(self, path):
         try:
             if os.path.isdir(path):
                 shutil.rmtree(path)
-        except OSError as inst:
+        except OSError, inst:
-            os.chmod(inst.filename, 0o777)
+            os.chmod(inst.filename, 0777)
             self.removeDir(path)
 
     def getVersion(self):
@@ -365,8 +358,7 @@ class SourceUpdater(BaseUpdater):
                 log.debug('Source version output: %s', output)
                 self.version = output
                 self.version['type'] = 'source'
-                self.version['repr'] = 'source:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, self.branch, output.get('hash', '')[:8], datetime.fromtimestamp(output.get('date', 0)))
+            except Exception, e:
-            except Exception as e:
                 log.error('Failed using source updater. %s', e)
                 return {}
 
@@ -396,7 +388,7 @@ class SourceUpdater(BaseUpdater):
 
             return {
                 'hash': commit['sha'],
-                'date': int(time.mktime(parse(commit['commit']['committer']['date']).timetuple())),
+                'date':  int(time.mktime(parse(commit['commit']['committer']['date']).timetuple())),
             }
         except:
             log.error('Failed getting latest request from github: %s', traceback.format_exc())
@@ -441,7 +433,7 @@ class DesktopUpdater(BaseUpdater):
             if latest and latest != current_version.get('hash'):
                 self.update_version = {
                     'hash': latest,
-                    'date': None,
+                    'date':  None,
                     'changelog': self.desktop._changelogURL,
                 }
 
@@ -453,7 +445,6 @@ class DesktopUpdater(BaseUpdater):
 
     def getVersion(self):
         return {
-            'repr': 'desktop: %s' % self.desktop._esky.active_version,
             'hash': self.desktop._esky.active_version,
             'date': None,
             'type': 'desktop',

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);
@@ -24,7 +24,7 @@ var UpdaterBase = new Class({
 					self.doUpdate();
 				else {
 					App.unBlockPage();
-					App.trigger('message', ['No updates available']);
+					App.fireEvent('message', 'No updates available');
 				}
 			}
 		})
@@ -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,637 +0,0 @@
-import json
-import os
-import time
-import traceback
-from sqlite3 import OperationalError
-
-from CodernityDB.database import RecordNotFound
-from CodernityDB.index import IndexException, IndexNotFoundException, IndexConflict
-from couchpotato import CPLog
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import toUnicode, sp
-from couchpotato.core.helpers.variable import getImdb, tryInt, randomString
-
-
-log = CPLog(__name__)
-
-
-class Database(object):
-
-    indexes = None
-    db = None
-
-    def __init__(self):
-
-        self.indexes = {}
-
-        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.after', self.startup_compact)
-        addEvent('database.setup_index', self.setupIndex)
-        addEvent('database.delete_corrupted', self.deleteCorrupted)
-
-        addEvent('app.migrate', self.migrate)
-        addEvent('app.after_shutdown', self.close)
-
-    def getDB(self):
-
-        if not self.db:
-            from couchpotato import get_db
-            self.db = get_db()
-
-        return self.db
-
-    def close(self, **kwargs):
-        self.getDB().close()
-
-    def setupIndex(self, index_name, klass):
-
-        self.indexes[index_name] = klass
-
-        db = self.getDB()
-
-        # Category index
-        index_instance = klass(db.path, index_name)
-        try:
-
-            # Make sure store and bucket don't exist
-            exists = []
-            for x in ['buck', 'stor']:
-                full_path = os.path.join(db.path, '%s_%s' % (index_name, x))
-                if os.path.exists(full_path):
-                    exists.append(full_path)
-
-            if index_name not in db.indexes_names:
-
-                # Remove existing buckets if index isn't there
-                for x in exists:
-                    os.unlink(x)
-
-                # Add index (will restore buckets)
-                db.add_index(index_instance)
-                db.reindex_index(index_name)
-            else:
-                # Previous info
-                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)
-
-        except:
-            log.error('Failed adding index %s: %s', (index_name, traceback.format_exc()))
-
-    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 deleteCorrupted(self, _id, traceback_error = ''):
-
-        db = self.getDB()
-
-        try:
-            log.debug('Deleted corrupted document "%s": %s', (_id, traceback_error))
-            corrupted = db.get('id', _id, with_storage = False)
-            db._delete_id_index(corrupted.get('_id'), corrupted.get('_rev'), None)
-        except:
-            log.debug('Failed deleting corrupted: %s', traceback.format_exc())
-
-    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, try_repair = True, **kwargs):
-
-        success = False
-        db = self.getDB()
-
-        # Removing left over compact files
-        db_path = sp(db.path)
-        for f in os.listdir(sp(db.path)):
-            for x in ['_compact_buck', '_compact_stor']:
-                if f[-len(x):] == x:
-                    os.unlink(os.path.join(db_path, f))
-
-        try:
-            start = time.time()
-            size = float(db.get_db_details().get('size', 0))
-            log.debug('Compacting database, current size: %sMB', round(size/1048576, 2))
-
-            db.compact()
-            new_size = float(db.get_db_details().get('size', 0))
-            log.debug('Done compacting database in %ss, new size: %sMB, saved: %sMB', (round(time.time()-start, 2), round(new_size/1048576, 2), round((size-new_size)/1048576, 2)))
-            success = True
-        except (IndexException, AttributeError):
-            if try_repair:
-                log.error('Something wrong with indexes, trying repair')
-
-                # Remove all indexes
-                old_indexes = self.indexes.keys()
-                for index_name in old_indexes:
-                    try:
-                        db.destroy_index(index_name)
-                    except IndexNotFoundException:
-                        pass
-                    except:
-                        log.error('Failed removing old index %s', index_name)
-
-                # Add them again
-                for index_name in self.indexes:
-                    klass = self.indexes[index_name]
-
-                    # Category index
-                    index_instance = klass(db.path, index_name)
-                    try:
-                        db.add_index(index_instance)
-                        db.reindex_index(index_name)
-                    except IndexConflict:
-                        pass
-                    except:
-                        log.error('Failed adding index %s', index_name)
-                        raise
-
-                self.compact(try_repair = False)
-            else:
-                log.error('Failed compact: %s', traceback.format_exc())
-
-        except:
-            log.error('Failed compact: %s', traceback.format_exc())
-
-        return {
-            'success': success
-        }
-
-    # Compact on start
-    def startup_compact(self):
-        from couchpotato import Env
-
-        db = self.getDB()
-
-        # Try fix for migration failures on desktop
-        if Env.get('desktop'):
-            try:
-                list(db.all('profile', with_doc = True))
-            except RecordNotFound:
-
-                failed_location = '%s_failed' % db.path
-                old_db = os.path.join(Env.get('data_dir'), 'couchpotato.db.old')
-
-                if not os.path.isdir(failed_location) and os.path.isfile(old_db):
-                    log.error('Corrupt database, trying migrate again')
-                    db.close()
-
-                    # Rename database folder
-                    os.rename(db.path, '%s_failed' % db.path)
-
-                    # Rename .old database to try another migrate
-                    os.rename(old_db, old_db[:-4])
-
-                    fireEventAsync('app.restart')
-                else:
-                    log.error('Migration failed and couldn\'t recover database. Please report on GitHub, with this message.')
-                    db.reindex()
-
-                return
-
-        # Check size and compact if needed
-        size = db.get_db_details().get('size')
-        prop_name = 'last_db_compact'
-        last_check = int(Env.prop(prop_name, default = 0))
-
-        if size > 26214400 and last_check < time.time()-604800: # 25MB / 7 days
-            self.compact()
-            Env.prop(prop_name, value = int(time.time()))
-
-    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 = {}
-            rename_old = False
-
-            try:
-
-                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:
-                            rename_old = True
-                            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()
-                if not db.opened:
-                    return
-
-                # 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']:
-                                if p_type['quality_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'])
-
-                        if len(new_profile['qualities']) > 0:
-                            new_profile.update(db.insert(new_profile))
-                            profile_link[x] = new_profile.get('_id')
-                        else:
-                            log.error('Corrupt profile list for "%s", using default.', p.get('label'))
-
-                # 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.get(m['library_id'])
-
-                    # Only migrate wanted movies, Skip if no identifier present
-                    if not l or 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.get(rel.get('quality_id'))
-                        if not quality:
-                            continue
-
-                        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.get(f.get('file_id'))
-                                if not rfile:
-                                    continue
-
-                                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 = True
-
-            except OperationalError:
-                log.error('Migrating from faulty database, probably a (too) old version: %s', traceback.format_exc())
-            except:
-                log.error('Migration failed: %s', traceback.format_exc())
-
-
-            # rename old database
-            if rename_old:
-                random = randomString()
-                log.info('Renaming old database to %s ', '%s.%s_old' % (old_db, random))
-                os.rename(old_db, '%s.%s_old' % (old_db, random))
-
-                if os.path.isfile(old_db + '-wal'):
-                    os.rename(old_db + '-wal', '%s-wal.%s_old' % (old_db, random))
-                if os.path.isfile(old_db + '-shm'):
-                    os.rename(old_db + '-shm', '%s-shm.%s_old' % (old_db, random))

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,51 +1,36 @@
 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.providers.base import Provider
-from couchpotato.core.plugins.base import Plugin
+import random
-
+import re
 
 log = CPLog(__name__)
 
 
-## This is here to load the static files
+class Downloader(Provider):
-class Downloader(Plugin):
-    pass
-
-
-class DownloaderBase(Provider):
 
     protocol = []
     http_time_between_calls = 0
-    status_support = True
 
     torrent_sources = [
-        'https://zoink.it/torrent/%s.torrent',
         'http://torrage.com/torrent/%s.torrent',
         'https://torcache.net/torrent/%s.torrent',
     ]
 
     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):
@@ -56,7 +41,6 @@ class DownloaderBase(Provider):
         addEvent('download.remove_failed', self._removeFailed)
         addEvent('download.pause', self._pause)
         addEvent('download.process_complete', self._processComplete)
-        addApiView('download.%s.test' % self.getName().lower(), self._test)
 
     def getEnabledProtocol(self):
         for download_protocol in self.protocol:
@@ -65,61 +49,53 @@ class DownloaderBase(Provider):
 
         return []
 
-    def _download(self, data = None, media = None, manual = False, filedata = None):
+    def _download(self, data = None, movie = None, manual = False, filedata = None):
-        if not media: media = {}
+        if not movie: movie = {}
         if not data: data = {}
 
         if self.isDisabled(manual, data):
             return
-        return self.download(data = data, media = media, filedata = filedata)
+        return self.download(data = data, movie = movie, filedata = filedata)
 
-    def download(self, *args, **kwargs):
+    def _getAllDownloadStatus(self):
-        return False
-
-    def _getAllDownloadStatus(self, download_ids):
         if self.isDisabled(manual = True, data = {}):
             return
 
-        ids = [download_id['id'] for download_id in download_ids if download_id['downloader'] == self.getName()]
+        return self.getAllDownloadStatus()
 
-        if ids:
+    def getAllDownloadStatus(self):
-            return self.getAllDownloadStatus(ids)
+        return
-        else:
-            return
 
-    def getAllDownloadStatus(self, ids):
+    def _removeFailed(self, item):
-        return []
-
-    def _removeFailed(self, release_download):
         if self.isDisabled(manual = True, data = {}):
             return
 
-        if release_download and release_download.get('downloader') == self.getName():
+        if item and item.get('downloader') == self.getName():
             if self.conf('delete_failed'):
-                return self.removeFailed(release_download)
+                return self.removeFailed(item)
 
             return False
         return
 
-    def removeFailed(self, release_download):
+    def removeFailed(self, item):
         return
 
-    def _processComplete(self, release_download):
+    def _processComplete(self, item):
         if self.isDisabled(manual = True, data = {}):
             return
 
-        if release_download and release_download.get('downloader') == self.getName():
+        if item and item.get('downloader') == self.getName():
             if self.conf('remove_complete', default = False):
-                return self.processComplete(release_download = release_download, delete_files = self.conf('delete_files', default = False))
+                return self.processComplete(item = item, delete_files = self.conf('delete_files', default = False))
 
             return False
         return
 
-    def processComplete(self, release_download, delete_files):
+    def processComplete(self, item, delete_files):
         return
 
-    def isCorrectProtocol(self, protocol):
+    def isCorrectProtocol(self, item_protocol):
-        is_correct = protocol in self.protocol
+        is_correct = item_protocol in self.protocol
 
         if not is_correct:
             log.debug("Downloader doesn't support this protocol")
@@ -152,7 +128,6 @@ class DownloaderBase(Provider):
     def downloadReturnId(self, download_id):
         return {
             'downloader': self.getName(),
-            'status_support': self.status_support,
             'id': download_id
         }
 
@@ -172,34 +147,24 @@ 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 _pause(self, item, pause = True):
-        t = self.test()
-        if isinstance(t, tuple):
-            return {'success': t[0], 'msg': t[1]}
-        return {'success': t}
-
-    def test(self):
-        return False
-
-    def _pause(self, release_download, pause = True):
         if self.isDisabled(manual = True, data = {}):
             return
 
-        if release_download and release_download.get('downloader') == self.getName():
+        if item and item.get('downloader') == self.getName():
-            self.pause(release_download, pause)
+            self.pause(item, pause)
             return True
 
         return False
 
-    def pause(self, release_download, pause):
+    def pause(self, item, pause):
         return
 
-
+class StatusList(list):
-class ReleaseDownloadList(list):
 
     provider = None
 
@@ -208,7 +173,7 @@ class ReleaseDownloadList(list):
         self.provider = provider
         self.kwargs = kwargs
 
-        super(ReleaseDownloadList, self).__init__()
+        super(StatusList, self).__init__()
 
     def extend(self, results):
         for r in results:
@@ -216,7 +181,7 @@ class ReleaseDownloadList(list):
 
     def append(self, result):
         new_result = self.fillResult(result)
-        super(ReleaseDownloadList, self).append(new_result)
+        super(StatusList, self).append(new_result)
 
     def fillResult(self, result):
 
@@ -225,7 +190,6 @@ class ReleaseDownloadList(list):
             'status': 'busy',
             'downloader': self.provider.getName(),
             'folder': '',
-            'files': [],
         }
 
         return mergeDicts(defaults, result)

couchpotato/core/downloaders/blackhole.py

@@ -1,158 +0,0 @@
-from __future__ import with_statement
-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):
-
-    protocol = ['nzb', 'torrent', 'torrent_magnet']
-    status_support = False
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        directory = self.conf('directory')
-        if not directory or not os.path.isdir(directory):
-            log.error('No directory set for blackhole %s download.', data.get('protocol'))
-        else:
-            try:
-                if not filedata or len(filedata) < 50:
-                    try:
-                        if data.get('protocol') == 'torrent_magnet':
-                            filedata = self.magnetToTorrent(data.get('url'))
-                            data['protocol'] = 'torrent'
-                    except:
-                        log.error('Failed download torrent via magnet url: %s', traceback.format_exc())
-
-                    if not filedata or len(filedata) < 50:
-                        log.error('No nzb/torrent available: %s', data.get('url'))
-                        return False
-
-                file_name = self.createFileName(data, filedata, media)
-                full_path = os.path.join(directory, file_name)
-
-                if self.conf('create_subdir'):
-                    try:
-                        new_path = os.path.splitext(full_path)[0]
-                        if not os.path.exists(new_path):
-                            os.makedirs(new_path)
-                            full_path = os.path.join(new_path, file_name)
-                    except:
-                        log.error('Couldnt create sub dir, reverting to old one: %s', full_path)
-
-                try:
-                    if not os.path.isfile(full_path):
-                        log.info('Downloading %s to %s.', (data.get('protocol'), full_path))
-                        with open(full_path, 'wb') as f:
-                            f.write(filedata)
-                        os.chmod(full_path, Env.getPermission('file'))
-                        return self.downloadReturnId('')
-                    else:
-                        log.info('File %s already exists.', full_path)
-                        return self.downloadReturnId('')
-
-                except:
-                    log.error('Failed to download to blackhole %s', traceback.format_exc())
-                    pass
-
-            except:
-                log.info('Failed to download file %s: %s', (data.get('name'), traceback.format_exc()))
-                return False
-
-        return False
-
-    def test(self):
-        directory = self.conf('directory')
-        if directory and os.path.isdir(directory):
-
-            test_file = sp(os.path.join(directory, 'couchpotato_test.txt'))
-
-            # Check if folder is writable
-            self.createFile(test_file, 'This is a test file')
-            if os.path.isfile(test_file):
-                os.remove(test_file)
-                return True
-
-        return False
-
-    def getEnabledProtocol(self):
-        if self.conf('use_for') == 'both':
-            return super(Blackhole, self).getEnabledProtocol()
-        elif self.conf('use_for') == 'torrent':
-            return ['torrent', 'torrent_magnet']
-        else:
-            return ['nzb']
-
-    def isEnabled(self, manual = False, data = None):
-        if not data: data = {}
-        for_protocol = ['both']
-        if data and 'torrent' in data.get('protocol'):
-            for_protocol.append('torrent')
-        elif data:
-            for_protocol.append(data.get('protocol'))
-
-        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/blackhole/__init__.py

@@ -0,0 +1,48 @@
+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.',
+            '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': '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

@@ -0,0 +1,76 @@
+from __future__ import with_statement
+from couchpotato.core.downloaders.base import Downloader
+from couchpotato.core.logger import CPLog
+from couchpotato.environment import Env
+import os
+import traceback
+
+log = CPLog(__name__)
+
+
+class Blackhole(Downloader):
+
+    protocol = ['nzb', 'torrent', 'torrent_magnet']
+
+    def download(self, data = None, movie = None, filedata = None):
+        if not movie: movie = {}
+        if not data: data = {}
+
+        directory = self.conf('directory')
+        if not directory or not os.path.isdir(directory):
+            log.error('No directory set for blackhole %s download.', data.get('protocol'))
+        else:
+            try:
+                if not filedata or len(filedata) < 50:
+                    try:
+                        if data.get('protocol') == 'torrent_magnet':
+                            filedata = self.magnetToTorrent(data.get('url'))
+                            data['protocol'] = 'torrent'
+                    except:
+                        log.error('Failed download torrent via magnet url: %s', traceback.format_exc())
+
+                    if not filedata or len(filedata) < 50:
+                        log.error('No nzb/torrent available: %s', data.get('url'))
+                        return False
+
+                fullPath = os.path.join(directory, self.createFileName(data, filedata, movie))
+
+                try:
+                    if not os.path.isfile(fullPath):
+                        log.info('Downloading %s to %s.', (data.get('protocol'), fullPath))
+                        with open(fullPath, 'wb') as f:
+                            f.write(filedata)
+                        os.chmod(fullPath, Env.getPermission('file'))
+                        return True
+                    else:
+                        log.info('File %s already exists.', fullPath)
+                        return True
+
+                except:
+                    log.error('Failed to download to blackhole %s', traceback.format_exc())
+                    pass
+
+            except:
+                log.info('Failed to download file %s: %s', (data.get('name'), traceback.format_exc()))
+                return False
+
+        return False
+
+    def getEnabledProtocol(self):
+        if self.conf('use_for') == 'both':
+            return super(Blackhole, self).getEnabledProtocol()
+        elif self.conf('use_for') == 'torrent':
+            return ['torrent', 'torrent_magnet']
+        else:
+            return ['nzb']
+
+    def isEnabled(self, manual = False, data = None):
+        if not data: data = {}
+        for_protocol = ['both']
+        if data and 'torrent' in data.get('protocol'):
+            for_protocol.append('torrent')
+        elif data:
+            for_protocol.append(data.get('protocol'))
+
+        return super(Blackhole, self).isEnabled(manual, data) and \
+            ((self.conf('use_for') in for_protocol))

couchpotato/core/downloaders/deluge.py

@@ -1,384 +0,0 @@
-from base64 import b64encode, b16encode, b32decode
-from datetime import timedelta
-from hashlib import sha1
-import os.path
-import re
-import traceback
-
-from bencode import bencode as benc, bdecode
-from couchpotato.core._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):
-
-    protocol = ['torrent', 'torrent_magnet']
-    log = CPLog(__name__)
-    drpc = None
-
-    def connect(self, reconnect = False):
-        # Load host from config and split out port.
-        host = cleanHost(self.conf('host'), protocol = False).split(':')
-        if not isInt(host[1]):
-            log.error('Config properties are not filled in correctly, port is missing.')
-            return False
-
-        if not self.drpc or reconnect:
-            self.drpc = DelugeRPC(host[0], port = host[1], username = self.conf('username'), password = self.conf('password'))
-
-        return self.drpc
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        log.info('Sending "%s" (%s) to Deluge.', (data.get('name'), data.get('protocol')))
-
-        if not self.connect():
-            return False
-
-        if not filedata and data.get('protocol') == 'torrent':
-            log.error('Failed sending torrent, no data')
-            return False
-
-        # Set parameters for Deluge
-        options = {
-            'add_paused': self.conf('paused', default = 0),
-            'label': self.conf('label')
-        }
-
-        if self.conf('directory'):
-            if os.path.isdir(self.conf('directory')):
-                options['download_location'] = self.conf('directory')
-            else:
-                log.error('Download directory from Deluge settings: %s doesn\'t exist', self.conf('directory'))
-
-        if self.conf('completed_directory'):
-            if os.path.isdir(self.conf('completed_directory')):
-                options['move_completed'] = 1
-                options['move_completed_path'] = self.conf('completed_directory')
-            else:
-                log.error('Download directory from Deluge settings: %s doesn\'t exist', self.conf('directory'))
-
-        if data.get('seed_ratio'):
-            options['stop_at_ratio'] = 1
-            options['stop_ratio'] = tryFloat(data.get('seed_ratio'))
-
-#        Deluge only has seed time as a global option. Might be added in
-#        in a future API release.
-#        if data.get('seed_time'):
-
-        # Send request to Deluge
-        if data.get('protocol') == 'torrent_magnet':
-            remote_torrent = self.drpc.add_torrent_magnet(data.get('url'), options)
-        else:
-            filename = self.createFileName(data, filedata, media)
-            remote_torrent = self.drpc.add_torrent_file(filename, filedata, options)
-
-        if not remote_torrent:
-            log.error('Failed sending torrent to Deluge')
-            return False
-
-        log.info('Torrent sent to Deluge successfully.')
-        return self.downloadReturnId(remote_torrent)
-
-    def test(self):
-        if self.connect(True) and self.drpc.test():
-            return True
-        return False
-
-    def getAllDownloadStatus(self, ids):
-
-        log.debug('Checking Deluge download status.')
-
-        if not self.connect():
-            return []
-
-        release_downloads = ReleaseDownloadList(self)
-
-        queue = self.drpc.get_alltorrents(ids)
-
-        if not queue:
-            log.debug('Nothing in queue or error')
-            return []
-
-        for torrent_id in queue:
-            torrent = queue[torrent_id]
-
-            if not 'hash' in torrent:
-                # When given a list of ids, deluge will return an empty item for a non-existant torrent.
-                continue
-
-            log.debug('name=%s / id=%s / save_path=%s / move_on_completed=%s / move_completed_path=%s / hash=%s / progress=%s / state=%s / eta=%s / ratio=%s / stop_ratio=%s / is_seed=%s / is_finished=%s / paused=%s', (torrent['name'], torrent['hash'], torrent['save_path'], torrent['move_on_completed'], torrent['move_completed_path'], torrent['hash'], torrent['progress'], torrent['state'], torrent['eta'], torrent['ratio'], torrent['stop_ratio'], torrent['is_seed'], torrent['is_finished'], torrent['paused']))
-
-            # Deluge has no easy way to work out if a torrent is stalled or failing.
-            #status = 'failed'
-            status = 'busy'
-            if torrent['is_seed'] and tryFloat(torrent['ratio']) < tryFloat(torrent['stop_ratio']):
-                # We have torrent['seeding_time'] to work out what the seeding time is, but we do not
-                # have access to the downloader seed_time, as with deluge we have no way to pass it
-                # when the torrent is added. So Deluge will only look at the ratio.
-                # See above comment in download().
-                status = 'seeding'
-            elif torrent['is_seed'] and torrent['is_finished'] and torrent['paused'] and torrent['state'] == 'Paused':
-                status = 'completed'
-
-            download_dir = sp(torrent['save_path'])
-            if torrent['move_on_completed']:
-                download_dir = torrent['move_completed_path']
-
-            torrent_files = []
-            for file_item in torrent['files']:
-                torrent_files.append(sp(os.path.join(download_dir, file_item['path'])))
-
-            release_downloads.append({
-                'id': torrent['hash'],
-                'name': torrent['name'],
-                'status': status,
-                'original_status': torrent['state'],
-                '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,
-            })
-
-        return release_downloads
-
-    def pause(self, release_download, pause = True):
-        if pause:
-            return self.drpc.pause_torrent([release_download['id']])
-        else:
-            return self.drpc.resume_torrent([release_download['id']])
-
-    def removeFailed(self, release_download):
-        log.info('%s failed downloading, deleting...', release_download['name'])
-        return self.drpc.remove_torrent(release_download['id'], True)
-
-    def processComplete(self, release_download, delete_files = False):
-        log.debug('Requesting Deluge to remove the torrent %s%s.', (release_download['name'], ' and cleanup the downloaded files' if delete_files else ''))
-        return self.drpc.remove_torrent(release_download['id'], remove_local_data = delete_files)
-
-
-class DelugeRPC(object):
-
-    host = 'localhost'
-    port = 58846
-    username = None
-    password = None
-    client = None
-
-    def __init__(self, host = 'localhost', port = 58846, username = None, password = None):
-        super(DelugeRPC, self).__init__()
-
-        self.host = host
-        self.port = port
-        self.username = username
-        self.password = password
-
-    def connect(self):
-        self.client = DelugeClient()
-        self.client.connect(self.host, int(self.port), self.username, self.password)
-
-    def test(self):
-        try:
-            self.connect()
-        except:
-            return False
-        return True
-
-    def add_torrent_magnet(self, torrent, options):
-        torrent_id = False
-        try:
-            self.connect()
-            torrent_id = self.client.core.add_torrent_magnet(torrent, options).get()
-            if not torrent_id:
-                torrent_id = self._check_torrent(True, torrent)
-
-            if torrent_id and options['label']:
-                self.client.label.set_torrent(torrent_id, options['label']).get()
-        except Exception as err:
-            log.error('Failed to add torrent magnet %s: %s %s', (torrent, err, traceback.format_exc()))
-        finally:
-            if self.client:
-                self.disconnect()
-
-        return torrent_id
-
-    def add_torrent_file(self, filename, torrent, options):
-        torrent_id = False
-        try:
-            self.connect()
-            torrent_id = self.client.core.add_torrent_file(filename, b64encode(torrent), options).get()
-            if not torrent_id:
-                torrent_id = self._check_torrent(False, torrent)
-
-            if torrent_id and options['label']:
-                self.client.label.set_torrent(torrent_id, options['label']).get()
-        except Exception as err:
-            log.error('Failed to add torrent file %s: %s %s', (filename, err, traceback.format_exc()))
-        finally:
-            if self.client:
-                self.disconnect()
-
-        return torrent_id
-
-    def get_alltorrents(self, ids):
-        ret = False
-        try:
-            self.connect()
-            ret = self.client.core.get_torrents_status({'id': ids}, ('name', 'hash', 'save_path', 'move_completed_path', 'progress', 'state', 'eta', 'ratio', 'stop_ratio', 'is_seed', 'is_finished', 'paused', 'move_on_completed', 'files')).get()
-        except Exception as err:
-            log.error('Failed to get all torrents: %s %s', (err, traceback.format_exc()))
-        finally:
-            if self.client:
-                self.disconnect()
-        return ret
-
-    def pause_torrent(self, torrent_ids):
-        try:
-            self.connect()
-            self.client.core.pause_torrent(torrent_ids).get()
-        except Exception as err:
-            log.error('Failed to pause torrent: %s %s', (err, traceback.format_exc()))
-        finally:
-            if self.client:
-                self.disconnect()
-
-    def resume_torrent(self, torrent_ids):
-        try:
-            self.connect()
-            self.client.core.resume_torrent(torrent_ids).get()
-        except Exception as err:
-            log.error('Failed to resume torrent: %s %s', (err, traceback.format_exc()))
-        finally:
-            if self.client:
-                self.disconnect()
-
-    def remove_torrent(self, torrent_id, remove_local_data):
-        ret = False
-        try:
-            self.connect()
-            ret = self.client.core.remove_torrent(torrent_id, remove_local_data).get()
-        except Exception as err:
-            log.error('Failed to remove torrent: %s %s', (err, traceback.format_exc()))
-        finally:
-            if self.client:
-                self.disconnect()
-        return ret
-
-    def disconnect(self):
-        self.client.disconnect()
-
-    def _check_torrent(self, magnet, torrent):
-        # Torrent not added, check if it already existed.
-        if magnet:
-            torrent_hash = re.findall('urn:btih:([\w]{32,40})', torrent)[0]
-        else:
-            info = bdecode(torrent)["info"]
-            torrent_hash = sha1(benc(info)).hexdigest()
-
-        # Convert base 32 to hex
-        if len(torrent_hash) == 32:
-            torrent_hash = b16encode(b32decode(torrent_hash))
-
-        torrent_hash = torrent_hash.lower()
-        torrent_check = self.client.core.get_torrent_status(torrent_hash, {}).get()
-        if torrent_check['hash']:
-            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/deluge/__init__.py

@@ -0,0 +1,90 @@
+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

@@ -0,0 +1,244 @@
+from base64 import b64encode
+from couchpotato.core.downloaders.base import Downloader, StatusList
+from couchpotato.core.helpers.encoding import isInt, ss
+from couchpotato.core.helpers.variable import tryFloat
+from couchpotato.core.logger import CPLog
+from couchpotato.environment import Env
+from datetime import timedelta
+from synchronousdeluge import DelugeClient
+import os.path
+import traceback
+
+log = CPLog(__name__)
+
+
+class Deluge(Downloader):
+
+    protocol = ['torrent', 'torrent_magnet']
+    log = CPLog(__name__)
+    drpc = None
+
+    def connect(self):
+        # Load host from config and split out port.
+        host = self.conf('host').split(':')
+        if not isInt(host[1]):
+            log.error('Config properties are not filled in correctly, port is missing.')
+            return False
+
+        if not self.drpc:
+            self.drpc = DelugeRPC(host[0], port = host[1], username = self.conf('username'), password = self.conf('password'))
+
+        return self.drpc
+
+    def download(self, data, movie, filedata = None):
+        log.info('Sending "%s" (%s) to Deluge.', (data.get('name'), data.get('protocol')))
+
+        if not self.connect():
+            return False
+
+        if not filedata and data.get('protocol') == 'torrent':
+            log.error('Failed sending torrent, no data')
+            return False
+
+        # Set parameters for Deluge
+        options = {
+            'add_paused': self.conf('paused', default = 0),
+            'label': self.conf('label')
+        }
+
+        if self.conf('directory'):
+            if os.path.isdir(self.conf('directory')):
+                options['download_location'] = self.conf('directory')
+            else:
+                log.error('Download directory from Deluge settings: %s doesn\'t exist', self.conf('directory'))
+
+        if self.conf('completed_directory'):
+            if os.path.isdir(self.conf('completed_directory')):
+                options['move_completed'] = 1
+                options['move_completed_path'] = self.conf('completed_directory')
+            else:
+                log.error('Download directory from Deluge settings: %s doesn\'t exist', self.conf('directory'))
+
+        if data.get('seed_ratio'):
+            options['stop_at_ratio'] = 1
+            options['stop_ratio'] = tryFloat(data.get('seed_ratio'))
+
+#        Deluge only has seed time as a global option. Might be added in
+#        in a future API release.
+#        if data.get('seed_time'):
+
+        # Send request to Deluge
+        if data.get('protocol') == 'torrent_magnet':
+            remote_torrent = self.drpc.add_torrent_magnet(data.get('url'), options)
+        else:
+            filename = self.createFileName(data, filedata, movie)
+            remote_torrent = self.drpc.add_torrent_file(filename, b64encode(filedata), options)
+
+        if not remote_torrent:
+            log.error('Failed sending torrent to Deluge')
+            return False
+
+        log.info('Torrent sent to Deluge successfully.')
+        return self.downloadReturnId(remote_torrent)
+
+    def getAllDownloadStatus(self):
+
+        log.debug('Checking Deluge download status.')
+
+        if not os.path.isdir(Env.setting('from', 'renamer')):
+            log.error('Renamer "from" folder doesn\'t to exist.')
+            return
+
+        if not self.connect():
+            return False
+
+        statuses = StatusList(self)
+
+        queue = self.drpc.get_alltorrents()
+
+        if not queue:
+            log.debug('Nothing in queue or error')
+            return False
+
+        for torrent_id in queue:
+            item = queue[torrent_id]
+            log.debug('name=%s / id=%s / save_path=%s / move_completed_path=%s / hash=%s / progress=%s / state=%s / eta=%s / ratio=%s / stop_ratio=%s / is_seed=%s / is_finished=%s / paused=%s', (item['name'], item['hash'], item['save_path'], item['move_completed_path'], item['hash'], item['progress'], item['state'], item['eta'], item['ratio'], item['stop_ratio'], item['is_seed'], item['is_finished'], item['paused']))
+
+            # Deluge has no easy way to work out if a torrent is stalled or failing.
+            #status = 'failed'
+            status = 'busy'
+            if item['is_seed'] and tryFloat(item['ratio']) < tryFloat(item['stop_ratio']):
+                # We have item['seeding_time'] to work out what the seeding time is, but we do not
+                # have access to the downloader seed_time, as with deluge we have no way to pass it
+                # when the torrent is added. So Deluge will only look at the ratio.
+                # See above comment in download().
+                status = 'seeding'
+            elif item['is_seed'] and item['is_finished'] and item['paused'] and item['state'] == 'Paused':
+                status = 'completed'
+
+            download_dir = item['save_path']
+            if item['move_on_completed']:
+                download_dir = item['move_completed_path']
+
+            statuses.append({
+                'id': item['hash'],
+                'name': item['name'],
+                'status': status,
+                'original_status': item['state'],
+                'seed_ratio': item['ratio'],
+                'timeleft': str(timedelta(seconds = item['eta'])),
+                'folder': ss(os.path.join(download_dir, item['name'])),
+            })
+
+        return statuses
+
+    def pause(self, item, pause = True):
+        if pause:
+            return self.drpc.pause_torrent([item['id']])
+        else:
+            return self.drpc.resume_torrent([item['id']])
+
+    def removeFailed(self, item):
+        log.info('%s failed downloading, deleting...', item['name'])
+        return self.drpc.remove_torrent(item['id'], True)
+
+    def processComplete(self, item, delete_files = False):
+        log.debug('Requesting Deluge to remove the torrent %s%s.', (item['name'], ' and cleanup the downloaded files' if delete_files else ''))
+        return self.drpc.remove_torrent(item['id'], remove_local_data = delete_files)
+
+class DelugeRPC(object):
+
+    host = 'localhost'
+    port = 58846
+    username = None
+    password = None
+    client = None
+
+    def __init__(self, host = 'localhost', port = 58846, username = None, password = None):
+        super(DelugeRPC, self).__init__()
+
+        self.host = host
+        self.port = port
+        self.username = username
+        self.password = password
+
+    def connect(self):
+        self.client = DelugeClient()
+        self.client.connect(self.host, int(self.port), self.username, self.password)
+
+    def add_torrent_magnet(self, torrent, options):
+        torrent_id = False
+        try:
+            self.connect()
+            torrent_id = self.client.core.add_torrent_magnet(torrent, options).get()
+            if options['label']:
+                self.client.label.set_torrent(torrent_id, options['label']).get()
+        except Exception, err:
+            log.error('Failed to add torrent magnet %s: %s %s', (torrent, err, traceback.format_exc()))
+        finally:
+            if self.client:
+                self.disconnect()
+
+        return torrent_id
+
+    def add_torrent_file(self, filename, torrent, options):
+        torrent_id = False
+        try:
+            self.connect()
+            torrent_id = self.client.core.add_torrent_file(filename, torrent, options).get()
+            if options['label']:
+                self.client.label.set_torrent(torrent_id, options['label']).get()
+        except Exception, err:
+            log.error('Failed to add torrent file %s: %s %s', (filename, err, traceback.format_exc()))
+        finally:
+            if self.client:
+                self.disconnect()
+
+        return torrent_id
+
+    def get_alltorrents(self):
+        ret = False
+        try:
+            self.connect()
+            ret = self.client.core.get_torrents_status({}, {}).get()
+        except Exception, err:
+            log.error('Failed to get all torrents: %s %s', (err, traceback.format_exc()))
+        finally:
+            if self.client:
+                self.disconnect()
+        return ret
+
+    def pause_torrent(self, torrent_ids):
+        try:
+            self.connect()
+            self.client.core.pause_torrent(torrent_ids).get()
+        except Exception, err:
+            log.error('Failed to pause torrent: %s %s', (err, traceback.format_exc()))
+        finally:
+            if self.client:
+                self.disconnect()
+
+    def resume_torrent(self, torrent_ids):
+        try:
+            self.connect()
+            self.client.core.resume_torrent(torrent_ids).get()
+        except Exception, err:
+            log.error('Failed to resume torrent: %s %s', (err, traceback.format_exc()))
+        finally:
+            if self.client:
+                self.disconnect()
+
+    def remove_torrent(self, torrent_id, remove_local_data):
+        ret = False
+        try:
+            self.connect()
+            ret = self.client.core.remove_torrent(torrent_id, remove_local_data).get()
+        except Exception, err:
+            log.error('Failed to remove torrent: %s %s', (err, traceback.format_exc()))
+        finally:
+            if self.client:
+                self.disconnect()
+        return ret
+
+    def disconnect(self):
+        self.client.disconnect()

couchpotato/core/downloaders/nzbget.py

@@ -1,293 +0,0 @@
-from base64 import standard_b64encode
-from datetime import timedelta
-import re
-import shutil
-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):
-
-    protocol = ['nzb']
-    rpc = 'xmlrpc'
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        if not filedata:
-            log.error('Unable to get NZB file: %s', traceback.format_exc())
-            return False
-
-        log.info('Sending "%s" to NZBGet.', data.get('name'))
-
-        nzb_name = ss('%s.nzb' % self.createNzbName(data, media))
-
-        rpc = self.getRPC()
-
-        try:
-            if rpc.writelog('INFO', 'CouchPotato connected to drop off %s.' % nzb_name):
-                log.debug('Successfully connected to NZBGet')
-            else:
-                log.info('Successfully connected to NZBGet, but unable to send a message')
-        except socket.error:
-            log.error('NZBGet is not responding. Please ensure that NZBGet is running and host setting is correct.')
-            return False
-        except xmlrpclib.ProtocolError as e:
-            if e.errcode == 401:
-                log.error('Password is incorrect.')
-            else:
-                log.error('Protocol Error: %s', e)
-            return False
-
-        if re.search(r"^0", rpc.version()):
-            xml_response = rpc.append(nzb_name, self.conf('category'), False, standard_b64encode(filedata.strip()))
-        else:
-            xml_response = rpc.append(nzb_name, self.conf('category'), tryInt(self.conf('priority')), False, standard_b64encode(filedata.strip()))
-
-        if xml_response:
-            log.info('NZB sent successfully to NZBGet')
-            nzb_id = md5(data['url'])  # about as unique as they come ;)
-            couchpotato_id = "couchpotato=" + nzb_id
-            groups = rpc.listgroups()
-            file_id = [item['LastID'] for item in groups if item['NZBFilename'] == nzb_name]
-            confirmed = rpc.editqueue("GroupSetParameter", 0, couchpotato_id, file_id)
-            if confirmed:
-                log.debug('couchpotato parameter set in nzbget download')
-            return self.downloadReturnId(nzb_id)
-        else:
-            log.error('NZBGet could not add %s to the queue.', nzb_name)
-            return False
-
-    def test(self):
-        rpc = self.getRPC()
-
-        try:
-            if rpc.writelog('INFO', 'CouchPotato connected to test connection'):
-                log.debug('Successfully connected to NZBGet')
-            else:
-                log.info('Successfully connected to NZBGet, but unable to send a message')
-        except socket.error:
-            log.error('NZBGet is not responding. Please ensure that NZBGet is running and host setting is correct.')
-            return False
-        except xmlrpclib.ProtocolError as e:
-            if e.errcode == 401:
-                log.error('Password is incorrect.')
-            else:
-                log.error('Protocol Error: %s', e)
-            return False
-
-        return True
-
-    def getAllDownloadStatus(self, ids):
-
-        log.debug('Checking NZBGet download status.')
-
-        rpc = self.getRPC()
-
-        try:
-            if rpc.writelog('INFO', 'CouchPotato connected to check status'):
-                log.debug('Successfully connected to NZBGet')
-            else:
-                log.info('Successfully connected to NZBGet, but unable to send a message')
-        except socket.error:
-            log.error('NZBGet is not responding. Please ensure that NZBGet is running and host setting is correct.')
-            return []
-        except xmlrpclib.ProtocolError as e:
-            if e.errcode == 401:
-                log.error('Password is incorrect.')
-            else:
-                log.error('Protocol Error: %s', e)
-            return []
-
-        # Get NZBGet data
-        try:
-            status = rpc.status()
-            groups = rpc.listgroups()
-            queue = rpc.postqueue(0)
-            history = rpc.history()
-        except:
-            log.error('Failed getting data: %s', traceback.format_exc(1))
-            return []
-
-        release_downloads = ReleaseDownloadList(self)
-
-        for nzb in groups:
-            try:
-                nzb_id = [param['Value'] for param in nzb['Parameters'] if param['Name'] == 'couchpotato'][0]
-            except:
-                nzb_id = nzb['NZBID']
-
-            if nzb_id in ids:
-                log.debug('Found %s in NZBGet download queue', nzb['NZBFilename'])
-                timeleft = -1
-                try:
-                    if nzb['ActiveDownloads'] > 0 and nzb['DownloadRate'] > 0 and not (status['DownloadPaused'] or status['Download2Paused']):
-                        timeleft = str(timedelta(seconds = nzb['RemainingSizeMB'] / status['DownloadRate'] * 2 ^ 20))
-                except:
-                    pass
-
-                release_downloads.append({
-                    'id': nzb_id,
-                    'name': nzb['NZBFilename'],
-                    'original_status': 'DOWNLOADING' if nzb['ActiveDownloads'] > 0 else 'QUEUED',
-                    # Seems to have no native API function for time left. This will return the time left after NZBGet started downloading this item
-                    'timeleft': timeleft,
-                })
-
-        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({
-                    'id': nzb['NZBID'],
-                    'name': nzb['NZBFilename'],
-                    'original_status': nzb['Stage'],
-                    'timeleft': str(timedelta(seconds = 0)) if not status['PostPaused'] else -1,
-                })
-
-        for nzb in history:
-            try:
-                nzb_id = [param['Value'] for param in nzb['Parameters'] if param['Name'] == 'couchpotato'][0]
-            except:
-                nzb_id = nzb['NZBID']
-
-            if nzb_id in ids:
-                log.debug('Found %s in NZBGet history. ParStatus: %s, ScriptStatus: %s, Log: %s', (nzb['NZBFilename'] , nzb['ParStatus'], nzb['ScriptStatus'] , nzb['Log']))
-                release_downloads.append({
-                    'id': nzb_id,
-                    'name': nzb['NZBFilename'],
-                    'status': 'completed' if nzb['ParStatus'] in ['SUCCESS', 'NONE'] and nzb['ScriptStatus'] in ['SUCCESS', 'NONE'] else 'failed',
-                    'original_status': nzb['ParStatus'] + ', ' + nzb['ScriptStatus'],
-                    'timeleft': str(timedelta(seconds = 0)),
-                    'folder': sp(nzb['DestDir'])
-                })
-
-        return release_downloads
-
-    def removeFailed(self, release_download):
-
-        log.info('%s failed downloading, deleting...', release_download['name'])
-
-        rpc = self.getRPC()
-
-        try:
-            if rpc.writelog('INFO', 'CouchPotato connected to delete some history'):
-                log.debug('Successfully connected to NZBGet')
-            else:
-                log.info('Successfully connected to NZBGet, but unable to send a message')
-        except socket.error:
-            log.error('NZBGet is not responding. Please ensure that NZBGet is running and host setting is correct.')
-            return False
-        except xmlrpclib.ProtocolError as e:
-            if e.errcode == 401:
-                log.error('Password is incorrect.')
-            else:
-                log.error('Protocol Error: %s', e)
-            return False
-
-        try:
-            history = rpc.history()
-            nzb_id = None
-            path = None
-
-            for hist in history:
-                for param in hist['Parameters']:
-                    if param['Name'] == 'couchpotato' and param['Value'] == release_download['id']:
-                        nzb_id = hist['ID']
-                        path = hist['DestDir']
-
-            if nzb_id and path and rpc.editqueue('HistoryDelete', 0, "", [tryInt(nzb_id)]):
-                shutil.rmtree(path, True)
-        except:
-            log.error('Failed deleting: %s', traceback.format_exc(0))
-            return False
-
-        return True
-
-    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/nzbget/__init__.py

@@ -0,0 +1,68 @@
+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.',
+            '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': '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

@@ -0,0 +1,192 @@
+from base64 import standard_b64encode
+from couchpotato.core.downloaders.base import Downloader, StatusList
+from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.helpers.variable import tryInt, md5
+from couchpotato.core.logger import CPLog
+from datetime import timedelta
+import re
+import shutil
+import socket
+import traceback
+import xmlrpclib
+
+log = CPLog(__name__)
+
+
+class NZBGet(Downloader):
+
+    protocol = ['nzb']
+
+    url = 'http://%(username)s:%(password)s@%(host)s/xmlrpc'
+
+    def download(self, data = None, movie = None, filedata = None):
+        if not movie: movie = {}
+        if not data: data = {}
+
+        if not filedata:
+            log.error('Unable to get NZB file: %s', traceback.format_exc())
+            return False
+
+        log.info('Sending "%s" to NZBGet.', data.get('name'))
+
+        url = self.url % {'host': self.conf('host'), 'username': self.conf('username'), 'password': self.conf('password')}
+        nzb_name = ss('%s.nzb' % self.createNzbName(data, movie))
+
+        rpc = xmlrpclib.ServerProxy(url)
+        try:
+            if rpc.writelog('INFO', 'CouchPotato connected to drop off %s.' % nzb_name):
+                log.debug('Successfully connected to NZBGet')
+            else:
+                log.info('Successfully connected to NZBGet, but unable to send a message')
+        except socket.error:
+            log.error('NZBGet is not responding. Please ensure that NZBGet is running and host setting is correct.')
+            return False
+        except xmlrpclib.ProtocolError, e:
+            if e.errcode == 401:
+                log.error('Password is incorrect.')
+            else:
+                log.error('Protocol Error: %s', e)
+            return False
+
+        if re.search(r"^0", rpc.version()):
+            xml_response = rpc.append(nzb_name, self.conf('category'), False, standard_b64encode(filedata.strip()))
+        else:
+            xml_response = rpc.append(nzb_name, self.conf('category'), tryInt(self.conf('priority')), False, standard_b64encode(filedata.strip()))
+
+        if xml_response:
+            log.info('NZB sent successfully to NZBGet')
+            nzb_id = md5(data['url']) # about as unique as they come ;)
+            couchpotato_id = "couchpotato=" + nzb_id
+            groups = rpc.listgroups()
+            file_id = [item['LastID'] for item in groups if item['NZBFilename'] == nzb_name]
+            confirmed = rpc.editqueue("GroupSetParameter", 0, couchpotato_id, file_id)
+            if confirmed:
+                log.debug('couchpotato parameter set in nzbget download')
+            return self.downloadReturnId(nzb_id)
+        else:
+            log.error('NZBGet could not add %s to the queue.', nzb_name)
+            return False
+
+    def getAllDownloadStatus(self):
+
+        log.debug('Checking NZBGet download status.')
+
+        url = self.url % {'host': self.conf('host'), 'username': self.conf('username'), 'password': self.conf('password')}
+
+        rpc = xmlrpclib.ServerProxy(url)
+        try:
+            if rpc.writelog('INFO', 'CouchPotato connected to check status'):
+                log.debug('Successfully connected to NZBGet')
+            else:
+                log.info('Successfully connected to NZBGet, but unable to send a message')
+        except socket.error:
+            log.error('NZBGet is not responding. Please ensure that NZBGet is running and host setting is correct.')
+            return False
+        except xmlrpclib.ProtocolError, e:
+            if e.errcode == 401:
+                log.error('Password is incorrect.')
+            else:
+                log.error('Protocol Error: %s', e)
+            return False
+
+        # Get NZBGet data
+        try:
+            status = rpc.status()
+            groups = rpc.listgroups()
+            queue = rpc.postqueue(0)
+            history = rpc.history()
+        except:
+            log.error('Failed getting data: %s', traceback.format_exc(1))
+            return False
+
+        statuses = StatusList(self)
+
+        for item in groups:
+            log.debug('Found %s in NZBGet download queue', item['NZBFilename'])
+            try:
+                nzb_id = [param['Value'] for param in item['Parameters'] if param['Name'] == 'couchpotato'][0]
+            except:
+                nzb_id = item['NZBID']
+
+
+            timeleft = -1
+            try:
+                if item['ActiveDownloads'] > 0 and item['DownloadRate'] > 0 and not (status['DownloadPaused'] or status['Download2Paused']):
+                    timeleft = str(timedelta(seconds = item['RemainingSizeMB'] / status['DownloadRate'] * 2 ^ 20))
+            except:
+                pass
+
+            statuses.append({
+                'id': nzb_id,
+                'name': item['NZBFilename'],
+                'original_status': 'DOWNLOADING' if item['ActiveDownloads'] > 0 else 'QUEUED',
+                # Seems to have no native API function for time left. This will return the time left after NZBGet started downloading this item
+                'timeleft': timeleft,
+            })
+
+        for item in queue: # 'Parameters' is not passed in rpc.postqueue
+            log.debug('Found %s in NZBGet postprocessing queue', item['NZBFilename'])
+            statuses.append({
+                'id': item['NZBID'],
+                'name': item['NZBFilename'],
+                'original_status': item['Stage'],
+                'timeleft': str(timedelta(seconds = 0)) if not status['PostPaused'] else -1,
+            })
+
+        for item in history:
+            log.debug('Found %s in NZBGet history. ParStatus: %s, ScriptStatus: %s, Log: %s', (item['NZBFilename'] , item['ParStatus'], item['ScriptStatus'] , item['Log']))
+            try:
+                nzb_id = [param['Value'] for param in item['Parameters'] if param['Name'] == 'couchpotato'][0]
+            except:
+                nzb_id = item['NZBID']
+            statuses.append({
+                'id': nzb_id,
+                'name': item['NZBFilename'],
+                'status': 'completed' if item['ParStatus'] in ['SUCCESS','NONE'] and item['ScriptStatus'] in ['SUCCESS','NONE'] else 'failed',
+                'original_status': item['ParStatus'] + ', ' + item['ScriptStatus'],
+                'timeleft': str(timedelta(seconds = 0)),
+                'folder': ss(item['DestDir'])
+            })
+
+        return statuses
+
+    def removeFailed(self, item):
+
+        log.info('%s failed downloading, deleting...', item['name'])
+
+        url = self.url % {'host': self.conf('host'), 'username': self.conf('username'), 'password': self.conf('password')}
+
+        rpc = xmlrpclib.ServerProxy(url)
+        try:
+            if rpc.writelog('INFO', 'CouchPotato connected to delete some history'):
+                log.debug('Successfully connected to NZBGet')
+            else:
+                log.info('Successfully connected to NZBGet, but unable to send a message')
+        except socket.error:
+            log.error('NZBGet is not responding. Please ensure that NZBGet is running and host setting is correct.')
+            return False
+        except xmlrpclib.ProtocolError, e:
+            if e.errcode == 401:
+                log.error('Password is incorrect.')
+            else:
+                log.error('Protocol Error: %s', e)
+            return False
+
+        try:
+            history = rpc.history()
+            nzb_id = None
+            path = None
+
+            for hist in history:
+                for param in hist['Parameters']:
+                    if param['Name'] == 'couchpotato' and param['Value'] == item['id']:
+                        nzb_id = hist['ID']
+                        path = hist['DestDir'] 
+
+            if nzb_id and path and rpc.editqueue('HistoryDelete', 0, "", [tryInt(nzb_id)]):
+                shutil.rmtree(path, True)
+        except:
+            log.error('Failed deleting: %s', traceback.format_exc(0))
+            return False
+
+        return True

couchpotato/core/downloaders/nzbvortex.py

@@ -1,220 +0,0 @@
-from base64 import b64encode
-import os
-from uuid import uuid4
-import hashlib
-import traceback
-
-from requests import HTTPError
-
-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):
-
-    protocol = ['nzb']
-    api_level = None
-    session_id = None
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        # Send the nzb
-        try:
-            nzb_filename = self.createFileName(data, filedata, media, unique_tag = True)
-            response = self.call('nzb/add', files = {'file': (nzb_filename, filedata, 'application/octet-stream')}, parameters = {
-                'name': nzb_filename,
-                'groupname': self.conf('group')
-            })
-
-            if response and response.get('result', '').lower() == 'ok':
-                return self.downloadReturnId(nzb_filename)
-
-            log.error('Something went wrong sending the NZB file. Response: %s', response)
-            return False
-        except:
-            log.error('Something went wrong sending the NZB file: %s', traceback.format_exc())
-            return False
-
-    def test(self):
-        try:
-            login_result = self.login()
-        except:
-            return False
-
-        return login_result
-
-    def getAllDownloadStatus(self, ids):
-
-        raw_statuses = self.call('nzb')
-
-        release_downloads = ReleaseDownloadList(self)
-        for nzb in raw_statuses.get('nzbs', []):
-            nzb_id = os.path.basename(nzb['nzbFileName'])
-            if nzb_id in ids:
-
-                # Check status
-                status = 'busy'
-                if nzb['state'] == 20:
-                    status = 'completed'
-                elif nzb['state'] in [21, 22, 24]:
-                    status = 'failed'
-
-                release_downloads.append({
-                    'temp_id': nzb['id'],
-                    'id': nzb_id,
-                    'name': nzb['uiTitle'],
-                    'status': status,
-                    'original_status': nzb['state'],
-                    'timeleft': -1,
-                    'folder': sp(nzb['destinationPath']),
-                })
-
-        return release_downloads
-
-    def removeFailed(self, release_download):
-
-        log.info('%s failed downloading, deleting...', release_download['name'])
-
-        try:
-            self.call('nzb/%s/cancel' % release_download['temp_id'])
-        except:
-            log.error('Failed deleting: %s', traceback.format_exc(0))
-            return False
-
-        return True
-
-    def login(self):
-
-        nonce = self.call('auth/nonce', auth = False).get('authNonce')
-        cnonce = uuid4().hex
-        hashed = b64encode(hashlib.sha256('%s:%s:%s' % (nonce, cnonce, self.conf('api_key'))).digest())
-
-        params = {
-            'nonce': nonce,
-            'cnonce': cnonce,
-            'hash': hashed
-        }
-
-        login_data = self.call('auth/login', parameters = params, auth = False)
-
-        # Save for later
-        if login_data.get('loginResult') == 'successful':
-            self.session_id = login_data.get('sessionID')
-            return True
-
-        log.error('Login failed, please check you api-key')
-        return False
-
-    def call(self, call, parameters = None, is_repeat = False, auth = True, *args, **kwargs):
-
-        # Login first
-        if not parameters: parameters = {}
-        if not self.session_id and auth:
-            self.login()
-
-        # Always add session id to request
-        if self.session_id:
-            parameters['sessionid'] = self.session_id
-
-        params = tryUrlencode(parameters)
-
-        url = cleanHost(self.conf('host')) + 'api/' + call
-
-        try:
-            data = self.getJsonData('%s%s' % (url, '?' + params if params else ''), *args, cache_timeout = 0, show_error = False, **kwargs)
-
-            if data:
-                return data
-        except HTTPError as e:
-            sc = e.response.status_code
-            if sc == 403:
-                # Try login and do again
-                if not is_repeat:
-                    self.login()
-                    return self.call(call, parameters = parameters, is_repeat = True, **kwargs)
-
-            log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-        except:
-            log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-
-        return {}
-
-    def getApiLevel(self):
-
-        if not self.api_level:
-
-            try:
-                data = self.call('app/apilevel', auth = False)
-                self.api_level = float(data.get('apilevel'))
-            except HTTPError as e:
-                sc = e.response.status_code
-                if sc == 403:
-                    log.error('This version of NZBVortex isn\'t supported. Please update to 2.8.6 or higher')
-                else:
-                    log.error('NZBVortex doesn\'t seem to be running or maybe the remote option isn\'t enabled yet: %s', traceback.format_exc(1))
-
-        return self.api_level
-
-    def isEnabled(self, manual = False, data = None):
-        if not data: data = {}
-        return super(NZBVortex, self).isEnabled(manual, data) and self.getApiLevel()
-
-
-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': 'https://localhost:4321',
-                    'description': 'Hostname with port. Usually <strong>https://localhost:4321</strong>',
-                },
-                {
-                    'name': 'api_key',
-                    'label': 'Api Key',
-                },
-                {
-                    'name': 'group',
-                    'label': 'Group',
-                    'description': 'The group CP places the nzb in. Make sure to create it in NZBVortex.',
-                },
-                {
-                    '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/__init__.py

@@ -0,0 +1,48 @@
+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': 'https://localhost:4321',
+                },
+                {
+                    '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

@@ -0,0 +1,178 @@
+from base64 import b64encode
+from couchpotato.core.downloaders.base import Downloader, StatusList
+from couchpotato.core.helpers.encoding import tryUrlencode, ss
+from couchpotato.core.helpers.variable import cleanHost
+from couchpotato.core.logger import CPLog
+from urllib2 import URLError
+from uuid import uuid4
+import hashlib
+import httplib
+import json
+import socket
+import ssl
+import sys
+import traceback
+import urllib2
+
+log = CPLog(__name__)
+
+
+class NZBVortex(Downloader):
+
+    protocol = ['nzb']
+    api_level = None
+    session_id = None
+
+    def download(self, data = None, movie = None, filedata = None):
+        if not movie: movie = {}
+        if not data: data = {}
+
+        # Send the nzb
+        try:
+            nzb_filename = self.createFileName(data, filedata, movie)
+            self.call('nzb/add', params = {'file': (ss(nzb_filename), filedata)}, multipart = True)
+
+            raw_statuses = self.call('nzb')
+            nzb_id = [item['id'] for item in raw_statuses.get('nzbs', []) if item['name'] == nzb_filename][0]
+            return self.downloadReturnId(nzb_id)
+        except:
+            log.error('Something went wrong sending the NZB file: %s', traceback.format_exc())
+            return False
+
+    def getAllDownloadStatus(self):
+
+        raw_statuses = self.call('nzb')
+
+        statuses = StatusList(self)
+        for item in raw_statuses.get('nzbs', []):
+
+            # Check status
+            status = 'busy'
+            if item['state'] == 20:
+                status = 'completed'
+            elif item['state'] in [21, 22, 24]:
+                status = 'failed'
+
+            statuses.append({
+                'id': item['id'],
+                'name': item['uiTitle'],
+                'status': status,
+                'original_status': item['state'],
+                'timeleft':-1,
+                'folder': ss(item['destinationPath']),
+            })
+
+        return statuses
+
+    def removeFailed(self, item):
+
+        log.info('%s failed downloading, deleting...', item['name'])
+
+        try:
+            self.call('nzb/%s/cancel' % item['id'])
+        except:
+            log.error('Failed deleting: %s', traceback.format_exc(0))
+            return False
+
+        return True
+
+    def login(self):
+
+        nonce = self.call('auth/nonce', auth = False).get('authNonce')
+        cnonce = uuid4().hex
+        hashed = b64encode(hashlib.sha256('%s:%s:%s' % (nonce, cnonce, self.conf('api_key'))).digest())
+
+        params = {
+            'nonce': nonce,
+            'cnonce': cnonce,
+            'hash': hashed
+        }
+
+        login_data = self.call('auth/login', parameters = params, auth = False)
+
+        # Save for later
+        if login_data.get('loginResult') == 'successful':
+            self.session_id = login_data.get('sessionID')
+            return True
+
+        log.error('Login failed, please check you api-key')
+        return False
+
+
+    def call(self, call, parameters = None, repeat = False, auth = True, *args, **kwargs):
+
+        # Login first
+        if not parameters: parameters = {}
+        if not self.session_id and auth:
+            self.login()
+
+        # Always add session id to request
+        if self.session_id:
+            parameters['sessionid'] = self.session_id
+
+        params = tryUrlencode(parameters)
+
+        url = cleanHost(self.conf('host')) + 'api/' + call
+        url_opener = urllib2.build_opener(HTTPSHandler())
+
+        try:
+            data = self.urlopen('%s?%s' % (url, params), opener = url_opener, *args, **kwargs)
+
+            if data:
+                return json.loads(data)
+        except URLError, e:
+            if hasattr(e, 'code') and e.code == 403:
+                # Try login and do again
+                if not repeat:
+                    self.login()
+                    return self.call(call, parameters = parameters, repeat = True, **kwargs)
+
+            log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
+        except:
+            log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
+
+        return {}
+
+    def getApiLevel(self):
+
+        if not self.api_level:
+
+            url = cleanHost(self.conf('host')) + 'api/app/apilevel'
+            url_opener = urllib2.build_opener(HTTPSHandler())
+
+            try:
+                data = self.urlopen(url, opener = url_opener, show_error = False)
+                self.api_level = float(json.loads(data).get('apilevel'))
+            except URLError, e:
+                if hasattr(e, 'code') and e.code == 403:
+                    log.error('This version of NZBVortex isn\'t supported. Please update to 2.8.6 or higher')
+                else:
+                    log.error('NZBVortex doesn\'t seem to be running or maybe the remote option isn\'t enabled yet: %s', traceback.format_exc(1))
+
+        return self.api_level
+
+    def isEnabled(self, manual = False, data = None):
+        if not data: data = {}
+        return super(NZBVortex, self).isEnabled(manual, data) and self.getApiLevel()
+
+
+class HTTPSConnection(httplib.HTTPSConnection):
+    def __init__(self, *args, **kwargs):
+        httplib.HTTPSConnection.__init__(self, *args, **kwargs)
+
+    def connect(self):
+        sock = socket.create_connection((self.host, self.port), self.timeout)
+        if sys.version_info < (2, 6, 7):
+            if hasattr(self, '_tunnel_host'):
+                self.sock = sock
+                self._tunnel()
+        else:
+            if self._tunnel_host:
+                self.sock = sock
+                self._tunnel()
+
+        self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file, ssl_version = ssl.PROTOCOL_TLSv1)
+
+class HTTPSHandler(urllib2.HTTPSHandler):
+    def https_open(self, req):
+        return self.do_open(HTTPSConnection, req)

couchpotato/core/downloaders/pneumatic.py

@@ -1,111 +0,0 @@
-from __future__ import with_statement
-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):
-
-    protocol = ['nzb']
-    strm_syntax = 'plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb=%s&nzbname=%s'
-    status_support = False
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        directory = self.conf('directory')
-        if not directory or not os.path.isdir(directory):
-            log.error('No directory set for .strm downloads.')
-        else:
-            try:
-                if not filedata or len(filedata) < 50:
-                    log.error('No nzb available!')
-                    return False
-
-                full_path = os.path.join(directory, self.createFileName(data, filedata, media))
-
-                try:
-                    if not os.path.isfile(full_path):
-                        log.info('Downloading %s to %s.', (data.get('protocol'), full_path))
-                        with open(full_path, 'wb') as f:
-                            f.write(filedata)
-
-                        nzb_name = self.createNzbName(data, media)
-                        strm_path = os.path.join(directory, nzb_name)
-
-                        strm_file = open(strm_path + '.strm', 'wb')
-                        strmContent = self.strm_syntax % (full_path, nzb_name)
-                        strm_file.write(strmContent)
-                        strm_file.close()
-
-                        return self.downloadReturnId('')
-
-                    else:
-                        log.info('File %s already exists.', full_path)
-                        return self.downloadReturnId('')
-
-                except:
-                    log.error('Failed to download .strm: %s', traceback.format_exc())
-                    pass
-
-            except:
-                log.info('Failed to download file %s: %s', (data.get('name'), traceback.format_exc()))
-                return False
-        return False
-
-    def test(self):
-        directory = self.conf('directory')
-        if directory and os.path.isdir(directory):
-
-            test_file = sp(os.path.join(directory, 'couchpotato_test.txt'))
-
-            # Check if folder is writable
-            self.createFile(test_file, 'This is a test file')
-            if os.path.isfile(test_file):
-                os.remove(test_file)
-                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/pneumatic/__init__.py

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,57 @@
+from __future__ import with_statement
+from couchpotato.core.downloaders.base import Downloader
+from couchpotato.core.logger import CPLog
+import os
+import traceback
+
+log = CPLog(__name__)
+
+
+class Pneumatic(Downloader):
+
+    protocol = ['nzb']
+    strm_syntax = 'plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb=%s&nzbname=%s'
+
+    def download(self, data = None, movie = None, filedata = None):
+        if not movie: movie = {}
+        if not data: data = {}
+
+        directory = self.conf('directory')
+        if not directory or not os.path.isdir(directory):
+            log.error('No directory set for .strm downloads.')
+        else:
+            try:
+                if not filedata or len(filedata) < 50:
+                    log.error('No nzb available!')
+                    return False
+
+                fullPath = os.path.join(directory, self.createFileName(data, filedata, movie))
+
+                try:
+                    if not os.path.isfile(fullPath):
+                        log.info('Downloading %s to %s.', (data.get('protocol'), fullPath))
+                        with open(fullPath, 'wb') as f:
+                            f.write(filedata)
+
+                        nzb_name = self.createNzbName(data, movie)
+                        strm_path = os.path.join(directory, nzb_name)
+
+                        strm_file = open(strm_path + '.strm', 'wb')
+                        strmContent = self.strm_syntax % (fullPath, nzb_name)
+                        strm_file.write(strmContent)
+                        strm_file.close()
+
+                        return True
+
+                    else:
+                        log.info('File %s already exists.', fullPath)
+                        return True
+
+                except:
+                    log.error('Failed to download .strm: %s', traceback.format_exc())
+                    pass
+
+            except:
+                log.info('Failed to download file %s: %s', (data.get('name'), traceback.format_exc()))
+                return False
+        return False

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,71 @@
+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',
+                },
+                {
+                    'name': 'url',
+                    'default': 'http://localhost:80/RPC2',
+                },
+                {
+                    'name': 'username',
+                },
+                {
+                    'name': 'password',
+                    'type': 'password',
+                },
+                {
+                    'name': 'label',
+                    'description': 'Label to apply on added torrents.',
+                },
+                {
+                    '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

@@ -0,0 +1,201 @@
+from base64 import b16encode, b32decode
+from bencode import bencode, bdecode
+from couchpotato.core.downloaders.base import Downloader, StatusList
+from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.logger import CPLog
+from datetime import timedelta
+from hashlib import sha1
+from rtorrent import RTorrent
+from rtorrent.err import MethodError
+import shutil
+
+log = CPLog(__name__)
+
+
+class rTorrent(Downloader):
+
+    protocol = ['torrent', 'torrent_magnet']
+    rt = None
+
+    def connect(self):
+        # Already connected?
+        if self.rt is not None:
+            return self.rt
+
+        # Ensure url is set
+        if not self.conf('url'):
+            log.error('Config properties are not filled in correctly, url is missing.')
+            return False
+
+        if self.conf('username') and self.conf('password'):
+            self.rt = RTorrent(
+                self.conf('url'),
+                self.conf('username'),
+                self.conf('password')
+            )
+        else:
+            self.rt = RTorrent(self.conf('url'))
+
+        return self.rt
+
+    def _update_provider_group(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, err:
+            log.error('Unable to set group options: %s', err.message)
+            return False
+
+        return True
+
+
+    def download(self, data, movie, filedata = None):
+        log.debug('Sending "%s" to rTorrent.', (data.get('name')))
+
+        if not self.connect():
+            return False
+
+        group_name = 'cp_' + data.get('provider').lower()
+        if not self._update_provider_group(group_name, data):
+            return False
+
+        torrent_params = {}
+        if self.conf('label'):
+            torrent_params['label'] = self.conf('label')
+
+        if not filedata and data.get('protocol') == 'torrent':
+            log.error('Failed sending torrent, no data')
+            return False
+
+        # Try download magnet torrents
+        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().upper()
+
+        # Convert base 32 to hex
+        if len(torrent_hash) == 32:
+            torrent_hash = b16encode(b32decode(torrent_hash))
+
+        # Send request to rTorrent
+        try:
+            # Send torrent to rTorrent
+            torrent = self.rt.load_torrent(filedata)
+
+            # Set label
+            if self.conf('label'):
+                torrent.set_custom(1, self.conf('label'))
+
+            # Set Ratio Group
+            torrent.set_visible(group_name)
+
+            # Start torrent
+            if not self.conf('paused', default = 0):
+                torrent.start()
+
+            return self.downloadReturnId(torrent_hash)
+        except Exception, err:
+            log.error('Failed to send torrent to rTorrent: %s', err)
+            return False
+
+    def getAllDownloadStatus(self):
+        log.debug('Checking rTorrent download status.')
+
+        if not self.connect():
+            return False
+
+        try:
+            torrents = self.rt.get_torrents()
+
+            statuses = StatusList(self)
+
+            for item in torrents:
+                status = 'busy'
+                if item.complete:
+                    if item.active:
+                        status = 'seeding'
+                    else:
+                        status = 'completed'
+
+                statuses.append({
+                    'id': item.info_hash,
+                    'name': item.name,
+                    'status': status,
+                    'seed_ratio': item.ratio,
+                    'original_status': item.state,
+                    'timeleft': str(timedelta(seconds = float(item.left_bytes) / item.down_rate)) if item.down_rate > 0 else -1,
+                    'folder': ss(item.directory)
+                })
+
+            return statuses
+
+        except Exception, err:
+            log.error('Failed to get status from rTorrent: %s', err)
+            return False
+
+    def pause(self, download_info, pause = True):
+        if not self.connect():
+            return False
+
+        torrent = self.rt.find_torrent(download_info['id'])
+        if torrent is None:
+            return False
+
+        if pause:
+            return torrent.pause()
+        return torrent.resume()
+
+    def removeFailed(self, item):
+        log.info('%s failed downloading, deleting...', item['name'])
+        return self.processComplete(item, delete_files = True)
+
+    def processComplete(self, item, delete_files):
+        log.debug('Requesting rTorrent to remove the torrent %s%s.',
+                  (item['name'], ' and cleanup the downloaded files' if delete_files else ''))
+        if not self.connect():
+            return False
+
+        torrent = self.rt.find_torrent(item['id'])
+        if torrent is None:
+            return False
+
+        torrent.erase() # just removes the torrent, doesn't delete data
+
+        if delete_files:
+            shutil.rmtree(item['folder'], True)
+
+        return True

couchpotato/core/downloaders/rtorrent_.py

@@ -1,335 +0,0 @@
-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.helpers.encoding import sp
-from couchpotato.core.helpers.variable import cleanHost, splitString
-from couchpotato.core.logger import CPLog
-from bencode import bencode, bdecode
-from rtorrent import RTorrent
-
-
-log = CPLog(__name__)
-
-autoload = 'rTorrent'
-
-
-class rTorrent(DownloaderBase):
-
-    protocol = ['torrent', 'torrent_magnet']
-    rt = None
-    error_msg = ''
-
-    # Migration url to host options
-    def __init__(self):
-        super(rTorrent, self).__init__()
-
-        addEvent('app.load', self.migrate)
-        addEvent('setting.save.rtorrent.*.after', self.settingsChanged)
-
-    def migrate(self):
-
-        url = self.conf('url')
-        if url:
-            host_split = splitString(url.split('://')[-1], split_on = '/')
-
-            self.conf('ssl', value = url.startswith('https'))
-            self.conf('host', value = host_split[0].strip())
-            self.conf('rpc_url', value = '/'.join(host_split[1:]))
-
-            self.deleteConf('url')
-
-    def settingsChanged(self):
-        # Reset active connection if settings have changed
-        if self.rt:
-            log.debug('Settings have changed, closing active connection')
-
-        self.rt = None
-        return True
-
-    def connect(self, reconnect = False):
-        # Already connected?
-        if not reconnect and self.rt is not None:
-            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')
-        )
-
-        self.error_msg = ''
-        try:
-            self.rt._verify_conn()
-        except AssertionError as e:
-            self.error_msg = e.message
-            self.rt = None
-
-        return self.rt
-
-    def test(self):
-        if self.connect(True):
-            return True
-
-        if self.error_msg:
-            return False, 'Connection failed: ' + self.error_msg
-
-        return False
-
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        log.debug('Sending "%s" to rTorrent.', (data.get('name')))
-
-        if not self.connect():
-            return False
-
-        torrent_params = {}
-        if self.conf('label'):
-            torrent_params['label'] = self.conf('label')
-
-        if not filedata and data.get('protocol') == 'torrent':
-            log.error('Failed sending torrent, no data')
-            return False
-
-        # Try download magnet torrents
-        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().upper()
-
-        # Convert base 32 to hex
-        if len(torrent_hash) == 32:
-            torrent_hash = b16encode(b32decode(torrent_hash))
-
-        # Send request to rTorrent
-        try:
-            # Send torrent to rTorrent
-            torrent = self.rt.load_torrent(filedata, verify_retries=10)
-
-            if not torrent:
-                log.error('Unable to find the torrent, did it fail to load?')
-                return False
-
-            # Set label
-            if self.conf('label'):
-                torrent.set_custom(1, self.conf('label'))
-
-            if self.conf('directory'):
-                torrent.set_directory(self.conf('directory'))
-
-            # Start torrent
-            if not self.conf('paused', default = 0):
-                torrent.start()
-
-            return self.downloadReturnId(torrent_hash)
-        except Exception as err:
-            log.error('Failed to send torrent to rTorrent: %s', err)
-            return False
-
-    def getTorrentStatus(self, torrent):
-        if not torrent.complete:
-            return 'busy'
-
-        if torrent.open:
-            return 'seeding'
-
-        return 'completed'
-
-    def getAllDownloadStatus(self, ids):
-        log.debug('Checking rTorrent download status.')
-
-        if not self.connect():
-            return []
-
-        try:
-            torrents = self.rt.get_torrents()
-
-            release_downloads = ReleaseDownloadList(self)
-
-            for torrent in torrents:
-                if torrent.info_hash in ids:
-                    torrent_directory = os.path.normpath(torrent.directory)
-                    torrent_files = []
-
-                    for file in torrent.get_files():
-                        if not os.path.normpath(file.path).startswith(torrent_directory):
-                            file_path = os.path.join(torrent_directory, file.path.lstrip('/'))
-                        else:
-                            file_path = file.path
-
-                        torrent_files.append(sp(file_path))
-
-                    release_downloads.append({
-                        'id': torrent.info_hash,
-                        'name': torrent.name,
-                        'status': self.getTorrentStatus(torrent),
-                        'seed_ratio': torrent.ratio,
-                        '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
-                    })
-
-            return release_downloads
-
-        except Exception as err:
-            log.error('Failed to get status from rTorrent: %s', err)
-            return []
-
-    def pause(self, release_download, pause = True):
-        if not self.connect():
-            return False
-
-        torrent = self.rt.find_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 rTorrent 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.rt.find_torrent(release_download['id'])
-
-        if torrent is None:
-            return False
-
-        if delete_files:
-            for file_item in torrent.get_files(): # will only delete files, not dir/sub-dir
-                os.unlink(os.path.join(torrent.directory, file_item.path))
-
-            if torrent.is_multi_file() and torrent.directory.endswith(torrent.name):
-                # Remove empty directories bottom up
-                try:
-                    for path, _, _ in os.walk(sp(torrent.directory), topdown = False):
-                        os.rmdir(path)
-                except OSError:
-                    log.info('Directory "%s" contains extra files, unable to remove', torrent.directory)
-
-        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.py

@@ -1,281 +0,0 @@
-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):
-
-    protocol = ['nzb']
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        log.info('Sending "%s" to SABnzbd.', data.get('name'))
-
-        req_params = {
-            'cat': self.conf('category'),
-            'mode': 'addurl',
-            'nzbname': self.createNzbName(data, media),
-            'priority': self.conf('priority'),
-        }
-
-        nzb_filename = None
-        if filedata:
-            if len(filedata) < 50:
-                log.error('No proper nzb available: %s', filedata)
-                return False
-
-            # If it's a .rar, it adds the .rar extension, otherwise it stays .nzb
-            nzb_filename = self.createFileName(data, filedata, media)
-            req_params['mode'] = 'addfile'
-        else:
-            req_params['name'] = data.get('url')
-
-        try:
-            if nzb_filename and req_params.get('mode') is 'addfile':
-                sab_data = self.call(req_params, files = {'nzbfile': (ss(nzb_filename), filedata)})
-            else:
-                sab_data = self.call(req_params)
-        except URLError:
-            log.error('Failed sending release, probably wrong HOST: %s', traceback.format_exc(0))
-            return False
-        except:
-            log.error('Failed sending release, use API key, NOT the NZB key: %s', traceback.format_exc(0))
-            return False
-
-        log.debug('Result from SAB: %s', sab_data)
-        if sab_data.get('status') and not sab_data.get('error'):
-            log.info('NZB sent to SAB successfully.')
-            if filedata:
-                return self.downloadReturnId(sab_data.get('nzo_ids')[0])
-            else:
-                return True
-        else:
-            log.error('Error getting data from SABNZBd: %s', sab_data)
-            return False
-
-    def test(self):
-        try:
-            sab_data = self.call({
-                'mode': 'version',
-            })
-            v = sab_data.split('.')
-            if int(v[0]) == 0 and int(v[1]) < 7:
-                return False, 'Your Sabnzbd client is too old, please update to newest version.'
-
-            # the version check will work even with wrong api key, so we need the next check as well
-            sab_data = self.call({
-                'mode': 'qstatus',
-            })
-            if not sab_data:
-                return False
-        except:
-            return False
-
-        return True
-
-    def getAllDownloadStatus(self, ids):
-
-        log.debug('Checking SABnzbd download status.')
-
-        # Go through Queue
-        try:
-            queue = self.call({
-                'mode': 'queue',
-            })
-        except:
-            log.error('Failed getting queue: %s', traceback.format_exc(1))
-            return []
-
-        # Go through history items
-        try:
-            history = self.call({
-                'mode': 'history',
-                'limit': 15,
-            })
-        except:
-            log.error('Failed getting history json: %s', traceback.format_exc(1))
-            return []
-
-        release_downloads = ReleaseDownloadList(self)
-
-        # Get busy releases
-        for nzb in queue.get('slots', []):
-            if nzb['nzo_id'] in ids:
-                status = 'busy'
-                if 'ENCRYPTED / ' in nzb['filename']:
-                    status = 'failed'
-
-                release_downloads.append({
-                    'id': nzb['nzo_id'],
-                    'name': nzb['filename'],
-                    'status': status,
-                    'original_status': nzb['status'],
-                    'timeleft': nzb['timeleft'] if not queue['paused'] else -1,
-                })
-
-        # Get old releases
-        for nzb in history.get('slots', []):
-            if nzb['nzo_id'] in ids:
-                status = 'busy'
-                if nzb['status'] == 'Failed' or (nzb['status'] == 'Completed' and nzb['fail_message'].strip()):
-                    status = 'failed'
-                elif nzb['status'] == 'Completed':
-                    status = 'completed'
-
-                release_downloads.append({
-                    'id': nzb['nzo_id'],
-                    'name': nzb['name'],
-                    'status': status,
-                    'original_status': nzb['status'],
-                    'timeleft': str(timedelta(seconds = 0)),
-                    'folder': sp(os.path.dirname(nzb['storage']) if os.path.isfile(nzb['storage']) else nzb['storage']),
-                })
-
-        return release_downloads
-
-    def removeFailed(self, release_download):
-
-        log.info('%s failed downloading, deleting...', release_download['name'])
-
-        try:
-            self.call({
-                'mode': 'queue',
-                'name': 'delete',
-                'del_files': '1',
-                'value': release_download['id']
-            }, use_json = False)
-            self.call({
-                'mode': 'history',
-                'name': 'delete',
-                'del_files': '1',
-                'value': release_download['id']
-            }, use_json = False)
-        except:
-            log.error('Failed deleting: %s', traceback.format_exc(0))
-            return False
-
-        return True
-
-    def processComplete(self, release_download, delete_files = False):
-        log.debug('Requesting SabNZBd to remove the NZB %s.', release_download['name'])
-
-        try:
-            self.call({
-                'mode': 'history',
-                'name': 'delete',
-                'del_files': '0',
-                'value': release_download['id']
-            }, use_json = False)
-        except:
-            log.error('Failed removing: %s', traceback.format_exc(0))
-            return False
-
-        return True
-
-    def call(self, request_params, use_json = True, **kwargs):
-
-        url = cleanHost(self.conf('host'), ssl = self.conf('ssl')) + 'api?' + tryUrlencode(mergeDicts(request_params, {
-            'apikey': self.conf('api_key'),
-            'output': 'json'
-        }))
-
-        data = self.urlopen(url, timeout = 60, show_error = False, headers = {'User-Agent': Env.getIdentifier()}, **kwargs)
-        if use_json:
-            d = json.loads(data)
-            if d.get('error'):
-                log.error('Error getting data from SABNZBd: %s', d.get('error'))
-                return {}
-
-            return d.get(request_params['mode']) or d
-        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/sabnzbd/__init__.py

@@ -0,0 +1,71 @@
+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': '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

@@ -0,0 +1,170 @@
+from couchpotato.core.downloaders.base import Downloader, StatusList
+from couchpotato.core.helpers.encoding import tryUrlencode, ss
+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 traceback
+
+log = CPLog(__name__)
+
+
+class Sabnzbd(Downloader):
+
+    protocol = ['nzb']
+
+    def download(self, data = None, movie = None, filedata = None):
+        if not movie: movie = {}
+        if not data: data = {}
+
+        log.info('Sending "%s" to SABnzbd.', data.get('name'))
+
+        req_params = {
+            'cat': self.conf('category'),
+            'mode': 'addurl',
+            'nzbname': self.createNzbName(data, movie),
+            'priority': self.conf('priority'),
+        }
+
+        nzb_filename = None
+        if filedata:
+            if len(filedata) < 50:
+                log.error('No proper nzb available: %s', filedata)
+                return False
+
+            # If it's a .rar, it adds the .rar extension, otherwise it stays .nzb
+            nzb_filename = self.createFileName(data, filedata, movie)
+            req_params['mode'] = 'addfile'
+        else:
+            req_params['name'] = data.get('url')
+
+        try:
+            if nzb_filename and req_params.get('mode') is 'addfile':
+                sab_data = self.call(req_params, params = {'nzbfile': (ss(nzb_filename), filedata)}, multipart = True)
+            else:
+                sab_data = self.call(req_params)
+        except URLError:
+            log.error('Failed sending release, probably wrong HOST: %s', traceback.format_exc(0))
+            return False
+        except:
+            log.error('Failed sending release, use API key, NOT the NZB key: %s', traceback.format_exc(0))
+            return False
+
+        log.debug('Result from SAB: %s', sab_data)
+        if sab_data.get('status') and not sab_data.get('error'):
+            log.info('NZB sent to SAB successfully.')
+            if filedata:
+                return self.downloadReturnId(sab_data.get('nzo_ids')[0])
+            else:
+                return True
+        else:
+            log.error('Error getting data from SABNZBd: %s', sab_data)
+            return False
+
+    def getAllDownloadStatus(self):
+
+        log.debug('Checking SABnzbd download status.')
+
+        # Go through Queue
+        try:
+            queue = self.call({
+                'mode': 'queue',
+            })
+        except:
+            log.error('Failed getting queue: %s', traceback.format_exc(1))
+            return False
+
+        # Go through history items
+        try:
+            history = self.call({
+                'mode': 'history',
+                'limit': 15,
+            })
+        except:
+            log.error('Failed getting history json: %s', traceback.format_exc(1))
+            return False
+
+        statuses = StatusList(self)
+
+        # Get busy releases
+        for item in queue.get('slots', []):
+            statuses.append({
+                'id': item['nzo_id'],
+                'name': item['filename'],
+                'original_status': item['status'],
+                'timeleft': item['timeleft'] if not queue['paused'] else -1,
+            })
+
+        # Get old releases
+        for item in history.get('slots', []):
+
+            status = 'busy'
+            if item['status'] == 'Failed' or (item['status'] == 'Completed' and item['fail_message'].strip()):
+                status = 'failed'
+            elif item['status'] == 'Completed':
+                status = 'completed'
+
+            statuses.append({
+                'id': item['nzo_id'],
+                'name': item['name'],
+                'status': status,
+                'original_status': item['status'],
+                'timeleft': str(timedelta(seconds = 0)),
+                'folder': ss(item['storage']),
+            })
+
+        return statuses
+
+    def removeFailed(self, item):
+
+        log.info('%s failed downloading, deleting...', item['name'])
+
+        try:
+            self.call({
+                'mode': 'history',
+                'name': 'delete',
+                'del_files': '1',
+                'value': item['id']
+            }, use_json = False)
+        except:
+            log.error('Failed deleting: %s', traceback.format_exc(0))
+            return False
+
+        return True
+
+    def processComplete(self, item, delete_files = False):
+        log.debug('Requesting SabNZBd to remove the NZB %s.', item['name'])
+
+        try:
+            self.call({
+                'mode': 'history',
+                'name': 'delete',
+                'del_files': '0',
+                'value': item['id']
+            }, use_json = False)
+        except:
+            log.error('Failed removing: %s', traceback.format_exc(0))
+            return False
+
+        return True
+
+    def call(self, request_params, use_json = True, **kwargs):
+
+        url = cleanHost(self.conf('host')) + 'api?' + tryUrlencode(mergeDicts(request_params, {
+           'apikey': self.conf('api_key'),
+           'output': 'json'
+        }))
+
+        data = self.urlopen(url, timeout = 60, show_error = False, headers = {'User-Agent': Env.getIdentifier()}, **kwargs)
+        if use_json:
+            d = json.loads(data)
+            if d.get('error'):
+                log.error('Error getting data from SABNZBd: %s', d.get('error'))
+                return {}
+
+            return d.get(request_params['mode']) or d
+        else:
+            return data
+

couchpotato/core/downloaders/synology/__init__.py

@@ -0,0 +1,52 @@
+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,63 +1,47 @@
-import json
+from couchpotato.core.downloaders.base import Downloader
-import traceback
-
-from couchpotato.core._base.downloader.main import DownloaderBase
 from couchpotato.core.helpers.encoding import isInt
-from couchpotato.core.helpers.variable import cleanHost
 from couchpotato.core.logger import CPLog
+import json
 import requests
 
-
 log = CPLog(__name__)
 
-autoload = 'Synology'
 
-
+class Synology(Downloader):
-class Synology(DownloaderBase):
 
     protocol = ['nzb', 'torrent', 'torrent_magnet']
-    status_support = False
+    log = CPLog(__name__)
 
-    def download(self, data = None, media = None, filedata = None):
+    def download(self, data = None, movie = None, filedata = None):
-        if not media: media = {}
+        if not movie: movie = {}
         if not data: data = {}
 
         response = False
         log.error('Sending "%s" (%s) to Synology.', (data['name'], data['protocol']))
 
         # Load host from config and split out port.
-        host = cleanHost(self.conf('host'), protocol = False).split(':')
+        host = self.conf('host').split(':')
         if not isInt(host[1]):
             log.error('Config properties are not filled in correctly, port is missing.')
             return False
 
         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'])
             elif data['protocol'] in ['nzb', 'torrent']:
                 log.info('Adding %s' % data['protocol'])
                 if not filedata:
-                    log.error('No %s data found', data['protocol'])
+                    log.error('No %s data found' % data['protocol'])
                 else:
                     filename = data['name'] + '.' + data['protocol']
                     response = srpc.create_task(filename = filename, filedata = filedata)
-        except:
+        except Exception, err:
-            log.error('Exception while adding torrent: %s', traceback.format_exc())
+            log.error('Exception while adding torrent: %s', err)
         finally:
-            return self.downloadReturnId('') if response else False
+            return response
-
-    def test(self):
-        host = cleanHost(self.conf('host'), protocol = False).split(':')
-        try:
-            srpc = SynologyRPC(host[0], host[1], self.conf('username'), self.conf('password'))
-            test_result = srpc.test()
-        except:
-            return False
-
-        return test_result
 
     def getEnabledProtocol(self):
         if self.conf('use_for') == 'both':
@@ -79,21 +63,18 @@ class Synology(DownloaderBase):
         return super(Synology, self).isEnabled(manual, data) and\
                ((self.conf('use_for') in for_protocol))
 
-
 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__()
 
         self.download_url = 'http://%s:%s/webapi/DownloadStation/task.cgi' % (host, port)
         self.auth_url = 'http://%s:%s/webapi/auth.cgi' % (host, port)
-        self.sid = None
         self.username = username
         self.password = password
-        self.destination = destination
         self.session_name = 'DownloadStation'
 
     def _login(self):
@@ -124,11 +105,11 @@ class SynologyRPC(object):
             if response['success']:
                 log.info('Synology action successfull')
             return response
-        except requests.ConnectionError as err:
+        except requests.ConnectionError, err:
             log.error('Synology connection error, check your config %s', err)
-        except requests.HTTPError as err:
+        except requests.HTTPError, err:
             log.error('SynologyRPC HTTPError: %s', err)
-        except Exception as err:
+        except Exception, err:
             log.error('Exception: %s', err)
         finally:
             return response
@@ -146,10 +127,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
@@ -167,60 +144,3 @@ class SynologyRPC(object):
             self._logout()
 
         return result
-
-    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.py

@@ -1,346 +0,0 @@
-from base64 import b64encode
-from datetime import timedelta
-import httplib
-import json
-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):
-
-    protocol = ['torrent', 'torrent_magnet']
-    log = CPLog(__name__)
-    trpc = None
-
-    def connect(self):
-        # Load host from config and split out port.
-        host = cleanHost(self.conf('host')).rstrip('/').rsplit(':', 1)
-        if not isInt(host[1]):
-            log.error('Config properties are not filled in correctly, port is missing.')
-            return False
-
-        self.trpc = TransmissionRPC(host[0], port = host[1], rpc_url = self.conf('rpc_url').strip('/ '), username = self.conf('username'), password = self.conf('password'))
-        return self.trpc
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        log.info('Sending "%s" (%s) to Transmission.', (data.get('name'), data.get('protocol')))
-
-        if not self.connect():
-            return False
-
-        if not filedata and data.get('protocol') == 'torrent':
-            log.error('Failed sending torrent, no data')
-            return False
-
-        # Set parameters for adding torrent
-        params = {
-            'paused': self.conf('paused', default = False)
-        }
-
-        if self.conf('directory'):
-            if os.path.isdir(self.conf('directory')):
-                params['download-dir'] = self.conf('directory')
-            else:
-                log.error('Download directory from Transmission settings: %s doesn\'t exist', self.conf('directory'))
-
-        # Change parameters of torrent
-        torrent_params = {}
-        if data.get('seed_ratio'):
-            torrent_params['seedRatioLimit'] = tryFloat(data.get('seed_ratio'))
-            torrent_params['seedRatioMode'] = 1
-
-        if data.get('seed_time'):
-            torrent_params['seedIdleLimit'] = tryInt(data.get('seed_time')) * 60
-            torrent_params['seedIdleMode'] = 1
-
-        # Send request to Transmission
-        if data.get('protocol') == 'torrent_magnet':
-            remote_torrent = self.trpc.add_torrent_uri(data.get('url'), arguments = params)
-            torrent_params['trackerAdd'] = self.torrent_trackers
-        else:
-            remote_torrent = self.trpc.add_torrent_file(b64encode(filedata), arguments = params)
-
-        if not remote_torrent:
-            log.error('Failed sending torrent to Transmission')
-            return False
-
-        # Change settings of added torrents
-        if torrent_params:
-            self.trpc.set_torrent(remote_torrent['torrent-added']['hashString'], torrent_params)
-
-        log.info('Torrent sent to Transmission successfully.')
-        return self.downloadReturnId(remote_torrent['torrent-added']['hashString'])
-
-    def test(self):
-        if self.connect() and self.trpc.get_session():
-            return True
-        return False
-
-    def getAllDownloadStatus(self, ids):
-
-        log.debug('Checking Transmission download status.')
-
-        if not self.connect():
-            return []
-
-        release_downloads = ReleaseDownloadList(self)
-
-        return_params = {
-            'fields': ['id', 'name', 'hashString', 'percentDone', 'status', 'eta', 'isStalled', 'isFinished', 'downloadDir', 'uploadRatio', 'secondsSeeding', 'seedIdleLimit', 'files']
-        }
-
-        session = self.trpc.get_session()
-        queue = self.trpc.get_alltorrents(return_params)
-        if not (queue and queue.get('torrents')):
-            log.debug('Nothing in queue or error')
-            return []
-
-        for torrent in queue['torrents']:
-            if torrent['hashString'] in ids:
-                log.debug('name=%s / id=%s / downloadDir=%s / hashString=%s / percentDone=%s / status=%s / isStalled=%s / eta=%s / uploadRatio=%s / isFinished=%s / incomplete-dir-enabled=%s / incomplete-dir=%s',
-                          (torrent['name'], torrent['id'], torrent['downloadDir'], torrent['hashString'], torrent['percentDone'], torrent['status'], torrent.get('isStalled', 'N/A'), torrent['eta'], torrent['uploadRatio'], torrent['isFinished'], session['incomplete-dir-enabled'], session['incomplete-dir']))
-
-                status = 'busy'
-                if torrent.get('isStalled') and not torrent['percentDone'] == 1 and self.conf('stalled_as_failed'):
-                    status = 'failed'
-                elif torrent['status'] == 0 and torrent['percentDone'] == 1:
-                    status = 'completed'
-                elif torrent['status'] in [5, 6]:
-                    status = 'seeding'
-
-                if session['incomplete-dir-enabled'] and status == 'busy':
-                    torrent_folder = session['incomplete-dir']
-                else:
-                    torrent_folder = torrent['downloadDir']
-
-                torrent_files = []
-                for file_item in torrent['files']:
-                    torrent_files.append(sp(os.path.join(torrent_folder, file_item['name'])))
-
-                release_downloads.append({
-                    'id': torrent['hashString'],
-                    'name': torrent['name'],
-                    'status': status,
-                    'original_status': torrent['status'],
-                    '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
-                })
-
-        return release_downloads
-
-    def pause(self, release_download, pause = True):
-        if pause:
-            return self.trpc.stop_torrent(release_download['id'])
-        else:
-            return self.trpc.start_torrent(release_download['id'])
-
-    def removeFailed(self, release_download):
-        log.info('%s failed downloading, deleting...', release_download['name'])
-        return self.trpc.remove_torrent(release_download['id'], True)
-
-    def processComplete(self, release_download, delete_files = False):
-        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"""
-    def __init__(self, host = 'http://localhost', port = 9091, rpc_url = 'transmission', username = None, password = None):
-
-        super(TransmissionRPC, self).__init__()
-
-        self.url = host + ':' + str(port) + '/' + rpc_url + '/rpc'
-        self.tag = 0
-        self.session_id = 0
-        self.session = {}
-        if username and password:
-            password_manager = urllib2.HTTPPasswordMgrWithDefaultRealm()
-            password_manager.add_password(realm = 'Transmission', uri = self.url, user = username, passwd = password)
-            opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(password_manager))
-            opener.addheaders = [('User-agent', 'couchpotato-transmission-client/1.0')]
-            urllib2.install_opener(opener)
-        elif username or password:
-            log.debug('User or password missing, not using authentication.')
-        self.session = self.get_session()
-
-    def _request(self, ojson):
-        self.tag += 1
-        headers = {'x-transmission-session-id': str(self.session_id)}
-        request = urllib2.Request(self.url, json.dumps(ojson).encode('utf-8'), headers)
-        try:
-            open_request = urllib2.urlopen(request)
-            response = json.loads(open_request.read())
-            log.debug('request: %s', json.dumps(ojson))
-            log.debug('response: %s', json.dumps(response))
-            if response['result'] == 'success':
-                log.debug('Transmission action successful')
-                return response['arguments']
-            else:
-                log.debug('Unknown failure sending command to Transmission. Return text is: %s', response['result'])
-                return False
-        except httplib.InvalidURL as err:
-            log.error('Invalid Transmission host, check your config %s', err)
-            return False
-        except urllib2.HTTPError as err:
-            if err.code == 401:
-                log.error('Invalid Transmission Username or Password, check your config')
-                return False
-            elif err.code == 409:
-                msg = str(err.read())
-                try:
-                    self.session_id = \
-                        re.search('X-Transmission-Session-Id:\s*(\w+)', msg).group(1)
-                    log.debug('X-Transmission-Session-Id: %s', self.session_id)
-
-                    # #resend request with the updated header
-
-                    return self._request(ojson)
-                except:
-                    log.error('Unable to get Transmission Session-Id %s', err)
-            else:
-                log.error('TransmissionRPC HTTPError: %s', err)
-        except urllib2.URLError as err:
-            log.error('Unable to connect to Transmission %s', err)
-
-    def get_session(self):
-        post_data = {'method': 'session-get', 'tag': self.tag}
-        return self._request(post_data)
-
-    def add_torrent_uri(self, torrent, arguments):
-        arguments['filename'] = torrent
-        post_data = {'arguments': arguments, 'method': 'torrent-add', 'tag': self.tag}
-        return self._request(post_data)
-
-    def add_torrent_file(self, torrent, arguments):
-        arguments['metainfo'] = torrent
-        post_data = {'arguments': arguments, 'method': 'torrent-add', 'tag': self.tag}
-        return self._request(post_data)
-
-    def set_torrent(self, torrent_id, arguments):
-        arguments['ids'] = torrent_id
-        post_data = {'arguments': arguments, 'method': 'torrent-set', 'tag': self.tag}
-        return self._request(post_data)
-
-    def get_alltorrents(self, arguments):
-        post_data = {'arguments': arguments, 'method': 'torrent-get', 'tag': self.tag}
-        return self._request(post_data)
-
-    def stop_torrent(self, torrent_id):
-        post_data = {'arguments': {'ids': torrent_id}, 'method': 'torrent-stop', 'tag': self.tag}
-        return self._request(post_data)
-
-    def start_torrent(self, torrent_id):
-        post_data = {'arguments': {'ids': torrent_id}, 'method': 'torrent-start', 'tag': self.tag}
-        return self._request(post_data)
-
-    def remove_torrent(self, torrent_id, delete_local_data):
-        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': 'http://localhost:9091',
-                    'description': 'Hostname with port. Usually <strong>http://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/__init__.py

@@ -0,0 +1,94 @@
+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

@@ -0,0 +1,239 @@
+from base64 import b64encode
+from couchpotato.core.downloaders.base import Downloader, StatusList
+from couchpotato.core.helpers.encoding import isInt, ss
+from couchpotato.core.helpers.variable import tryInt, tryFloat
+from couchpotato.core.logger import CPLog
+from couchpotato.environment import Env
+from datetime import timedelta
+import httplib
+import json
+import os.path
+import re
+import urllib2
+
+log = CPLog(__name__)
+
+
+class Transmission(Downloader):
+
+    protocol = ['torrent', 'torrent_magnet']
+    log = CPLog(__name__)
+    trpc = None
+
+    def connect(self):
+        # Load host from config and split out port.
+        host = self.conf('host').split(':')
+        if not isInt(host[1]):
+            log.error('Config properties are not filled in correctly, port is missing.')
+            return False
+
+        if not self.trpc:
+            self.trpc = TransmissionRPC(host[0], port = host[1], rpc_url = self.conf('rpc_url'), username = self.conf('username'), password = self.conf('password'))
+
+        return self.trpc
+
+    def download(self, data, movie, filedata = None):
+
+        log.info('Sending "%s" (%s) to Transmission.', (data.get('name'), data.get('protocol')))
+
+        if not self.connect():
+            return False
+
+        if not filedata and data.get('protocol') == 'torrent':
+            log.error('Failed sending torrent, no data')
+            return False
+
+        # Set parameters for adding torrent
+        params = {
+            'paused': self.conf('paused', default = False)
+        }
+
+        if self.conf('directory'):
+            if os.path.isdir(self.conf('directory')):
+                params['download-dir'] = self.conf('directory')
+            else:
+                log.error('Download directory from Transmission settings: %s doesn\'t exist', self.conf('directory'))
+
+        # Change parameters of torrent
+        torrent_params = {}
+        if data.get('seed_ratio'):
+            torrent_params['seedRatioLimit'] = tryFloat(data.get('seed_ratio'))
+            torrent_params['seedRatioMode'] = 1
+
+        if data.get('seed_time'):
+            torrent_params['seedIdleLimit'] = tryInt(data.get('seed_time')) * 60
+            torrent_params['seedIdleMode'] = 1
+
+        # Send request to Transmission
+        if data.get('protocol') == 'torrent_magnet':
+            remote_torrent = self.trpc.add_torrent_uri(data.get('url'), arguments = params)
+            torrent_params['trackerAdd'] = self.torrent_trackers
+        else:
+            remote_torrent = self.trpc.add_torrent_file(b64encode(filedata), arguments = params)
+
+        if not remote_torrent:
+            log.error('Failed sending torrent to Transmission')
+            return False
+
+        # Change settings of added torrents
+        if torrent_params:
+            self.trpc.set_torrent(remote_torrent['torrent-added']['hashString'], torrent_params)
+
+        log.info('Torrent sent to Transmission successfully.')
+        return self.downloadReturnId(remote_torrent['torrent-added']['hashString'])
+
+    def getAllDownloadStatus(self):
+
+        log.debug('Checking Transmission download status.')
+
+        if not self.connect():
+            return False
+
+        statuses = StatusList(self)
+
+        return_params = {
+            'fields': ['id', 'name', 'hashString', 'percentDone', 'status', 'eta', 'isStalled', 'isFinished', 'downloadDir', 'uploadRatio', 'secondsSeeding', 'seedIdleLimit']
+        }
+
+        queue = self.trpc.get_alltorrents(return_params)
+        if not (queue and queue.get('torrents')):
+            log.debug('Nothing in queue or error')
+            return False
+
+        for item in queue['torrents']:
+            log.debug('name=%s / id=%s / downloadDir=%s / hashString=%s / percentDone=%s / status=%s / eta=%s / uploadRatio=%s / isFinished=%s',
+                (item['name'], item['id'], item['downloadDir'], item['hashString'], item['percentDone'], item['status'], item['eta'], item['uploadRatio'], item['isFinished']))
+
+            if not os.path.isdir(Env.setting('from', 'renamer')):
+                log.error('Renamer "from" folder doesn\'t to exist.')
+                return
+
+            status = 'busy'
+            if item['isStalled'] and self.conf('stalled_as_failed'):
+                status = 'failed'
+            elif item['status'] == 0 and item['percentDone'] == 1:
+                status = 'completed'
+            elif item['status'] in [5, 6]:
+                status = 'seeding'
+
+            statuses.append({
+                'id': item['hashString'],
+                'name': item['name'],
+                'status': status,
+                'original_status': item['status'],
+                'seed_ratio': item['uploadRatio'],
+                'timeleft': str(timedelta(seconds = item['eta'])),
+                'folder': ss(os.path.join(item['downloadDir'], item['name'])),
+            })
+
+        return statuses
+
+    def pause(self, item, pause = True):
+        if pause:
+            return self.trpc.stop_torrent(item['id'])
+        else:
+            return self.trpc.start_torrent(item['id'])
+
+    def removeFailed(self, item):
+        log.info('%s failed downloading, deleting...', item['name'])
+        return self.trpc.remove_torrent(item['hashString'], True)
+
+    def processComplete(self, item, delete_files = False):
+        log.debug('Requesting Transmission to remove the torrent %s%s.', (item['name'], ' and cleanup the downloaded files' if delete_files else ''))
+        return self.trpc.remove_torrent(item['hashString'], delete_files)
+
+class TransmissionRPC(object):
+
+    """TransmissionRPC lite library"""
+    def __init__(self, host = 'localhost', port = 9091, rpc_url = 'transmission', username = None, password = None):
+
+        super(TransmissionRPC, self).__init__()
+
+        self.url = 'http://' + host + ':' + str(port) + '/' + rpc_url + '/rpc'
+        self.tag = 0
+        self.session_id = 0
+        self.session = {}
+        if username and password:
+            password_manager = urllib2.HTTPPasswordMgrWithDefaultRealm()
+            password_manager.add_password(realm = None, uri = self.url, user = username, passwd = password)
+            opener = urllib2.build_opener(urllib2.HTTPBasicAuthHandler(password_manager), urllib2.HTTPDigestAuthHandler(password_manager))
+            opener.addheaders = [('User-agent', 'couchpotato-transmission-client/1.0')]
+            urllib2.install_opener(opener)
+        elif username or password:
+            log.debug('User or password missing, not using authentication.')
+        self.session = self.get_session()
+
+    def _request(self, ojson):
+        self.tag += 1
+        headers = {'x-transmission-session-id': str(self.session_id)}
+        request = urllib2.Request(self.url, json.dumps(ojson).encode('utf-8'), headers)
+        try:
+            open_request = urllib2.urlopen(request)
+            response = json.loads(open_request.read())
+            log.debug('request: %s', json.dumps(ojson))
+            log.debug('response: %s', json.dumps(response))
+            if response['result'] == 'success':
+                log.debug('Transmission action successful')
+                return response['arguments']
+            else:
+                log.debug('Unknown failure sending command to Transmission. Return text is: %s', response['result'])
+                return False
+        except httplib.InvalidURL, err:
+            log.error('Invalid Transmission host, check your config %s', err)
+            return False
+        except urllib2.HTTPError, err:
+            if err.code == 401:
+                log.error('Invalid Transmission Username or Password, check your config')
+                return False
+            elif err.code == 409:
+                msg = str(err.read())
+                try:
+                    self.session_id = \
+                        re.search('X-Transmission-Session-Id:\s*(\w+)', msg).group(1)
+                    log.debug('X-Transmission-Session-Id: %s', self.session_id)
+
+                    # #resend request with the updated header
+
+                    return self._request(ojson)
+                except:
+                    log.error('Unable to get Transmission Session-Id %s', err)
+            else:
+                log.error('TransmissionRPC HTTPError: %s', err)
+        except urllib2.URLError, err:
+            log.error('Unable to connect to Transmission %s', err)
+
+    def get_session(self):
+        post_data = {'method': 'session-get', 'tag': self.tag}
+        return self._request(post_data)
+
+    def add_torrent_uri(self, torrent, arguments):
+        arguments['filename'] = torrent
+        post_data = {'arguments': arguments, 'method': 'torrent-add', 'tag': self.tag}
+        return self._request(post_data)
+
+    def add_torrent_file(self, torrent, arguments):
+        arguments['metainfo'] = torrent
+        post_data = {'arguments': arguments, 'method': 'torrent-add', 'tag': self.tag}
+        return self._request(post_data)
+
+    def set_torrent(self, torrent_id, arguments):
+        arguments['ids'] = torrent_id
+        post_data = {'arguments': arguments, 'method': 'torrent-set', 'tag': self.tag}
+        return self._request(post_data)
+
+    def get_alltorrents(self, arguments):
+        post_data = {'arguments': arguments, 'method': 'torrent-get', 'tag': self.tag}
+        return self._request(post_data)
+
+    def stop_torrent(self, torrent_id):
+        post_data = {'arguments': {'ids': torrent_id}, 'method': 'torrent-stop', 'tag': self.tag}
+        return self._request(post_data)
+
+    def start_torrent(self, torrent_id):
+        post_data = {'arguments': {'ids': torrent_id}, 'method': 'torrent-start', 'tag': self.tag}
+        return self._request(post_data)
+
+    def remove_torrent(self, torrent_id, delete_local_data):
+        post_data = {'arguments': {'ids': torrent_id, 'delete-local-data': delete_local_data}, 'method': 'torrent-remove', 'tag': self.tag}
+        return self._request(post_data)
+

couchpotato/core/downloaders/utorrent.py

@@ -1,421 +0,0 @@
-from base64 import b16encode, b32decode
-from datetime import timedelta
-from hashlib import sha1
-import cookielib
-import httplib
-import json
-import os
-import re
-import stat
-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):
-
-    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
-    }
-
-    def connect(self):
-        # Load host from config and split out port.
-        host = cleanHost(self.conf('host'), protocol = False).split(':')
-        if not isInt(host[1]):
-            log.error('Config properties are not filled in correctly, port is missing.')
-            return False
-
-        self.utorrent_api = uTorrentAPI(host[0], port = host[1], username = self.conf('username'), password = self.conf('password'))
-
-        return self.utorrent_api
-
-    def download(self, data = None, media = None, filedata = None):
-        if not media: media = {}
-        if not data: data = {}
-
-        log.debug("Sending '%s' (%s) to uTorrent.", (data.get('name'), data.get('protocol')))
-
-        if not self.connect():
-            return False
-
-        settings = self.utorrent_api.get_settings()
-        if not settings:
-            return False
-
-        #Fix settings in case they are not set for CPS compatibility
-        new_settings = {}
-        if not (settings.get('seed_prio_limitul') == 0 and settings['seed_prio_limitul_flag']):
-            new_settings['seed_prio_limitul'] = 0
-            new_settings['seed_prio_limitul_flag'] = True
-            log.info('Updated uTorrent settings to set a torrent to complete after it the seeding requirements are met.')
-
-        if settings.get('bt.read_only_on_complete'):  #This doesn't work as this option seems to be not available through the api. Mitigated with removeReadOnly function
-            new_settings['bt.read_only_on_complete'] = False
-            log.info('Updated uTorrent settings to not set the files to read only after completing.')
-
-        if new_settings:
-            self.utorrent_api.set_settings(new_settings)
-
-        torrent_params = {}
-        if self.conf('label'):
-            torrent_params['label'] = self.conf('label')
-
-        if not filedata and data.get('protocol') == 'torrent':
-            log.error('Failed sending torrent, no data')
-            return False
-
-        if data.get('protocol') == 'torrent_magnet':
-            torrent_hash = re.findall('urn:btih:([\w]{32,40})', data.get('url'))[0].upper()
-            torrent_params['trackers'] = '%0D%0A%0D%0A'.join(self.torrent_trackers)
-        else:
-            info = bdecode(filedata)['info']
-            torrent_hash = sha1(benc(info)).hexdigest().upper()
-
-        torrent_filename = self.createFileName(data, filedata, media)
-
-        if data.get('seed_ratio'):
-            torrent_params['seed_override'] = 1
-            torrent_params['seed_ratio'] = tryInt(tryFloat(data['seed_ratio']) * 1000)
-
-        if data.get('seed_time'):
-            torrent_params['seed_override'] = 1
-            torrent_params['seed_time'] = tryInt(data['seed_time']) * 3600
-
-        # Convert base 32 to hex
-        if len(torrent_hash) == 32:
-            torrent_hash = b16encode(b32decode(torrent_hash))
-
-        # Send request to uTorrent
-        if data.get('protocol') == 'torrent_magnet':
-            self.utorrent_api.add_torrent_uri(torrent_filename, data.get('url'))
-        else:
-            self.utorrent_api.add_torrent_file(torrent_filename, filedata)
-
-        # Change settings of added torrent
-        self.utorrent_api.set_torrent(torrent_hash, torrent_params)
-        if self.conf('paused', default = 0):
-            self.utorrent_api.pause_torrent(torrent_hash)
-
-        return self.downloadReturnId(torrent_hash)
-
-    def test(self):
-        if self.connect():
-            build_version = self.utorrent_api.get_build()
-            if not build_version:
-                return False
-            if build_version < 25406:  # This build corresponds to version 3.0.0 stable
-                return False, 'Your uTorrent client is too old, please update to newest version.'
-            return True
-
-        return False
-
-    def getAllDownloadStatus(self, ids):
-
-        log.debug('Checking uTorrent download status.')
-
-        if not self.connect():
-            return []
-
-        release_downloads = ReleaseDownloadList(self)
-
-        data = self.utorrent_api.get_status()
-        if not data:
-            log.error('Error getting data from uTorrent')
-            return []
-
-        queue = json.loads(data)
-        if queue.get('error'):
-            log.error('Error getting data from uTorrent: %s', queue.get('error'))
-            return []
-
-        if not queue.get('torrents'):
-            log.debug('Nothing in queue')
-            return []
-
-        # Get torrents
-        for torrent in queue['torrents']:
-            if torrent[0] in ids:
-
-                #Get files of the torrent
-                torrent_files = []
-                try:
-                    torrent_files = json.loads(self.utorrent_api.get_files(torrent[0]))
-                    torrent_files = [sp(os.path.join(torrent[26], torrent_file[0])) for torrent_file in torrent_files['files'][1]]
-                except:
-                    log.debug('Failed getting files from torrent: %s', torrent[2])
-
-                status = 'busy'
-                if (torrent[1] & self.status_flags['STARTED'] or torrent[1] & self.status_flags['QUEUED']) and torrent[4] == 1000:
-                    status = 'seeding'
-                elif torrent[1] & self.status_flags['ERROR']:
-                    status = 'failed'
-                elif torrent[4] == 1000:
-                    status = 'completed'
-
-                if not status == 'busy':
-                    self.removeReadOnly(torrent_files)
-
-                release_downloads.append({
-                    'id': torrent[0],
-                    'name': torrent[2],
-                    'status': status,
-                    'seed_ratio': float(torrent[7]) / 1000,
-                    'original_status': torrent[1],
-                    'timeleft': str(timedelta(seconds = torrent[10])),
-                    'folder': sp(torrent[26]),
-                    'files': torrent_files
-                })
-
-        return release_downloads
-
-    def pause(self, release_download, pause = True):
-        if not self.connect():
-            return False
-        return self.utorrent_api.pause_torrent(release_download['id'], pause)
-
-    def removeFailed(self, release_download):
-        log.info('%s failed downloading, deleting...', release_download['name'])
-        if not self.connect():
-            return False
-        return self.utorrent_api.remove_torrent(release_download['id'], remove_data = True)
-
-    def processComplete(self, release_download, delete_files = False):
-        log.debug('Requesting uTorrent to remove the torrent %s%s.', (release_download['name'], ' and cleanup the downloaded files' if delete_files else ''))
-        if not self.connect():
-            return False
-        return self.utorrent_api.remove_torrent(release_download['id'], remove_data = delete_files)
-
-    def removeReadOnly(self, files):
-        #Removes all read-on ly flags in a for all files
-        for filepath in files:
-            if os.path.isfile(filepath):
-                #Windows only needs S_IWRITE, but we bitwise-or with current perms to preserve other permission bits on Linux
-                os.chmod(filepath, stat.S_IWRITE | os.stat(filepath).st_mode)
-
-class uTorrentAPI(object):
-
-    def __init__(self, host = 'localhost', port = 8000, username = None, password = None):
-
-        super(uTorrentAPI, self).__init__()
-
-        self.url = 'http://' + str(host) + ':' + str(port) + '/gui/'
-        self.token = ''
-        self.last_time = time.time()
-        cookies = cookielib.CookieJar()
-        self.opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookies), MultipartPostHandler)
-        self.opener.addheaders = [('User-agent', 'couchpotato-utorrent-client/1.0')]
-        if username and password:
-            password_manager = urllib2.HTTPPasswordMgrWithDefaultRealm()
-            password_manager.add_password(realm = None, uri = self.url, user = username, passwd = password)
-            self.opener.add_handler(urllib2.HTTPBasicAuthHandler(password_manager))
-        elif username or password:
-            log.debug('User or password missing, not using authentication.')
-        self.token = self.get_token()
-
-    def _request(self, action, data = None):
-        if time.time() > self.last_time + 1800:
-            self.last_time = time.time()
-            self.token = self.get_token()
-        request = urllib2.Request(self.url + '?token=' + self.token + '&' + action, data)
-        try:
-            open_request = self.opener.open(request)
-            response = open_request.read()
-            if response:
-                return response
-            else:
-                log.debug('Unknown failure sending command to uTorrent. Return text is: %s', response)
-        except httplib.InvalidURL as err:
-            log.error('Invalid uTorrent host, check your config %s', err)
-        except urllib2.HTTPError as err:
-            if err.code == 401:
-                log.error('Invalid uTorrent Username or Password, check your config')
-            else:
-                log.error('uTorrent HTTPError: %s', err)
-        except urllib2.URLError as err:
-            log.error('Unable to connect to uTorrent %s', err)
-        return False
-
-    def get_token(self):
-        request = self.opener.open(self.url + 'token.html')
-        token = re.findall('<div.*?>(.*?)</', request.read())[0]
-        return token
-
-    def add_torrent_uri(self, filename, torrent, add_folder = False):
-        action = 'action=add-url&s=%s' % urllib.quote(torrent)
-        if add_folder:
-            action += '&path=%s' % urllib.quote(filename)
-        return self._request(action)
-
-    def add_torrent_file(self, filename, filedata, add_folder = False):
-        action = 'action=add-file'
-        if add_folder:
-            action += '&path=%s' % urllib.quote(filename)
-        return self._request(action, {'torrent_file': (ss(filename), filedata)})
-
-    def set_torrent(self, hash, params):
-        action = 'action=setprops&hash=%s' % hash
-        for k, v in params.items():
-            action += '&s=%s&v=%s' % (k, v)
-        return self._request(action)
-
-    def pause_torrent(self, hash, pause = True):
-        if pause:
-            action = 'action=pause&hash=%s' % hash
-        else:
-            action = 'action=unpause&hash=%s' % hash
-        return self._request(action)
-
-    def stop_torrent(self, hash):
-        action = 'action=stop&hash=%s' % hash
-        return self._request(action)
-
-    def remove_torrent(self, hash, remove_data = False):
-        if remove_data:
-            action = 'action=removedata&hash=%s' % hash
-        else:
-            action = 'action=remove&hash=%s' % hash
-        return self._request(action)
-
-    def get_status(self):
-        action = 'list=1'
-        return self._request(action)
-
-    def get_settings(self):
-        action = 'action=getsettings'
-        settings_dict = {}
-        try:
-            utorrent_settings = json.loads(self._request(action))
-
-            # Create settings dict
-            for setting in utorrent_settings['settings']:
-                if setting[1] == 0: # int
-                    settings_dict[setting[0]] = int(setting[2] if not setting[2].strip() == '' else '0')
-                elif setting[1] == 1: # bool
-                    settings_dict[setting[0]] = True if setting[2] == 'true' else False
-                elif setting[1] == 2: # string
-                    settings_dict[setting[0]] = setting[2]
-
-            #log.debug('uTorrent settings: %s', settings_dict)
-
-        except Exception as err:
-            log.error('Failed to get settings from uTorrent: %s', err)
-
-        return settings_dict
-
-    def set_settings(self, settings_dict = None):
-        if not settings_dict: settings_dict = {}
-
-        for key in settings_dict:
-            if isinstance(settings_dict[key], bool):
-                settings_dict[key] = 1 if settings_dict[key] else 0
-
-        action = 'action=setsetting' + ''.join(['&s=%s&v=%s' % (key, value) for (key, value) in settings_dict.items()])
-        return self._request(action)
-
-    def get_files(self, hash):
-        action = 'action=getfiles&hash=%s' % hash
-        return self._request(action)
-
-    def get_build(self):
-        data = self._request('')
-        if not data:
-            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/downloaders/utorrent/__init__.py

@@ -0,0 +1,79 @@
+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': 'Hostname with port. Usually <strong>localhost:8000</strong>',
+                },
+                {
+                    '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

@@ -0,0 +1,334 @@
+from base64 import b16encode, b32decode
+from bencode import bencode as benc, bdecode
+from couchpotato.core.downloaders.base import Downloader, StatusList
+from couchpotato.core.helpers.encoding import isInt, ss
+from couchpotato.core.helpers.variable import tryInt, tryFloat
+from couchpotato.core.logger import CPLog
+from datetime import timedelta
+from hashlib import sha1
+from multipartpost import MultipartPostHandler
+import cookielib
+import httplib
+import json
+import os
+import re
+import stat
+import time
+import urllib
+import urllib2
+
+log = CPLog(__name__)
+
+
+class uTorrent(Downloader):
+
+    protocol = ['torrent', 'torrent_magnet']
+    utorrent_api = None
+
+    def connect(self):
+        # Load host from config and split out port.
+        host = self.conf('host').split(':')
+        if not isInt(host[1]):
+            log.error('Config properties are not filled in correctly, port is missing.')
+            return False
+
+        self.utorrent_api = uTorrentAPI(host[0], port = host[1], username = self.conf('username'), password = self.conf('password'))
+
+        return self.utorrent_api
+
+    def download(self, data = None, movie = None, filedata = None):
+        if not movie: movie = {}
+        if not data: data = {}
+
+        log.debug('Sending "%s" (%s) to uTorrent.', (data.get('name'), data.get('protocol')))
+
+        if not self.connect():
+            return False
+
+        settings = self.utorrent_api.get_settings()
+        if not settings:
+            return False
+
+        #Fix settings in case they are not set for CPS compatibility
+        new_settings = {}
+        if not (settings.get('seed_prio_limitul') == 0 and settings['seed_prio_limitul_flag']):
+            new_settings['seed_prio_limitul'] = 0
+            new_settings['seed_prio_limitul_flag'] = True
+            log.info('Updated uTorrent settings to set a torrent to complete after it the seeding requirements are met.')
+
+        if settings.get('bt.read_only_on_complete'): #This doesn't work as this option seems to be not available through the api. Mitigated with removeReadOnly function
+            new_settings['bt.read_only_on_complete'] = False
+            log.info('Updated uTorrent settings to not set the files to read only after completing.')
+
+        if new_settings:
+            self.utorrent_api.set_settings(new_settings)
+
+        torrent_params = {}
+        if self.conf('label'):
+            torrent_params['label'] = self.conf('label')
+
+        if not filedata and data.get('protocol') == 'torrent':
+            log.error('Failed sending torrent, no data')
+            return False
+
+        if data.get('protocol') == 'torrent_magnet':
+            torrent_hash = re.findall('urn:btih:([\w]{32,40})', data.get('url'))[0].upper()
+            torrent_params['trackers'] = '%0D%0A%0D%0A'.join(self.torrent_trackers)
+        else:
+            info = bdecode(filedata)["info"]
+            torrent_hash = sha1(benc(info)).hexdigest().upper()
+        torrent_filename = self.createFileName(data, filedata, movie)
+
+        if data.get('seed_ratio'):
+            torrent_params['seed_override'] = 1
+            torrent_params['seed_ratio'] = tryInt(tryFloat(data['seed_ratio']) * 1000)
+
+        if data.get('seed_time'):
+            torrent_params['seed_override'] = 1
+            torrent_params['seed_time'] = tryInt(data['seed_time']) * 3600
+
+        # Convert base 32 to hex
+        if len(torrent_hash) == 32:
+            torrent_hash = b16encode(b32decode(torrent_hash))
+
+        # Send request to uTorrent
+        if data.get('protocol') == 'torrent_magnet':
+            self.utorrent_api.add_torrent_uri(torrent_filename, data.get('url'))
+        else:
+            self.utorrent_api.add_torrent_file(torrent_filename, filedata)
+
+        # Change settings of added torrent
+        self.utorrent_api.set_torrent(torrent_hash, torrent_params)
+        if self.conf('paused', default = 0):
+            self.utorrent_api.pause_torrent(torrent_hash)
+
+        count = 0
+        while True:
+
+            count += 1
+            # Check if torrent is saved in subfolder of torrent name
+            data = self.utorrent_api.get_files(torrent_hash)
+
+            torrent_files = json.loads(data)
+            if torrent_files.get('error'):
+                log.error('Error getting data from uTorrent: %s', torrent_files.get('error'))
+                return False
+
+            if (torrent_files.get('files') and len(torrent_files['files'][1]) > 0) or count > 60:
+                break
+
+            time.sleep(1)
+
+        # Torrent has only one file, so uTorrent wont create a folder for it
+        if len(torrent_files['files'][1]) == 1:
+            # Remove torrent and try again
+            self.utorrent_api.remove_torrent(torrent_hash, remove_data = True)
+
+            # Send request to uTorrent
+            if data.get('protocol') == 'torrent_magnet':
+                self.utorrent_api.add_torrent_uri(torrent_filename, data.get('url'), add_folder = True)
+            else:
+                self.utorrent_api.add_torrent_file(torrent_filename, filedata, add_folder = True)
+
+            # Change settings of added torrent
+            self.utorrent_api.set_torrent(torrent_hash, torrent_params)
+            if self.conf('paused', default = 0):
+                self.utorrent_api.pause_torrent(torrent_hash)
+
+        return self.downloadReturnId(torrent_hash)
+
+    def getAllDownloadStatus(self):
+
+        log.debug('Checking uTorrent download status.')
+
+        if not self.connect():
+            return False
+
+        statuses = StatusList(self)
+
+        data = self.utorrent_api.get_status()
+        if not data:
+            log.error('Error getting data from uTorrent')
+            return False
+
+        queue = json.loads(data)
+        if queue.get('error'):
+            log.error('Error getting data from uTorrent: %s', queue.get('error'))
+            return False
+
+        if not queue.get('torrents'):
+            log.debug('Nothing in queue')
+            return False
+
+        # Get torrents
+        for item in queue['torrents']:
+
+            # item[21] = Paused | Downloading | Seeding | Finished
+            status = 'busy'
+            if 'Finished' in item[21]:
+                status = 'completed'
+                self.removeReadOnly(item[26])
+            elif 'Seeding' in item[21]:
+                status = 'seeding'
+                self.removeReadOnly(item[26])
+
+            statuses.append({
+                'id': item[0],
+                'name': item[2],
+                'status':  status,
+                'seed_ratio': float(item[7]) / 1000,
+                'original_status': item[1],
+                'timeleft': str(timedelta(seconds = item[10])),
+                'folder': ss(item[26]),
+            })
+
+        return statuses
+
+    def pause(self, item, pause = True):
+        if not self.connect():
+            return False
+        return self.utorrent_api.pause_torrent(item['id'], pause)
+
+    def removeFailed(self, item):
+        log.info('%s failed downloading, deleting...', item['name'])
+        if not self.connect():
+            return False
+        return self.utorrent_api.remove_torrent(item['id'], remove_data = True)
+
+    def processComplete(self, item, delete_files = False):
+        log.debug('Requesting uTorrent to remove the torrent %s%s.', (item['name'], ' and cleanup the downloaded files' if delete_files else ''))
+        if not self.connect():
+            return False
+        return self.utorrent_api.remove_torrent(item['id'], remove_data = delete_files)
+    
+    def removeReadOnly(self, folder):
+        #Removes all read-only flags in a folder
+        if folder and os.path.isdir(folder):
+            for root, folders, filenames in os.walk(folder):
+                for filename in filenames:
+                    os.chmod(os.path.join(root, filename), stat.S_IWRITE)
+
+class uTorrentAPI(object):
+
+    def __init__(self, host = 'localhost', port = 8000, username = None, password = None):
+
+        super(uTorrentAPI, self).__init__()
+
+        self.url = 'http://' + str(host) + ':' + str(port) + '/gui/'
+        self.token = ''
+        self.last_time = time.time()
+        cookies = cookielib.CookieJar()
+        self.opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookies), MultipartPostHandler)
+        self.opener.addheaders = [('User-agent', 'couchpotato-utorrent-client/1.0')]
+        if username and password:
+            password_manager = urllib2.HTTPPasswordMgrWithDefaultRealm()
+            password_manager.add_password(realm = None, uri = self.url, user = username, passwd = password)
+            self.opener.add_handler(urllib2.HTTPBasicAuthHandler(password_manager))
+            self.opener.add_handler(urllib2.HTTPDigestAuthHandler(password_manager))
+        elif username or password:
+            log.debug('User or password missing, not using authentication.')
+        self.token = self.get_token()
+
+    def _request(self, action, data = None):
+        if time.time() > self.last_time + 1800:
+            self.last_time = time.time()
+            self.token = self.get_token()
+        request = urllib2.Request(self.url + "?token=" + self.token + "&" + action, data)
+        try:
+            open_request = self.opener.open(request)
+            response = open_request.read()
+            if response:
+                return response
+            else:
+                log.debug('Unknown failure sending command to uTorrent. Return text is: %s', response)
+        except httplib.InvalidURL, err:
+            log.error('Invalid uTorrent host, check your config %s', err)
+        except urllib2.HTTPError, err:
+            if err.code == 401:
+                log.error('Invalid uTorrent Username or Password, check your config')
+            else:
+                log.error('uTorrent HTTPError: %s', err)
+        except urllib2.URLError, err:
+            log.error('Unable to connect to uTorrent %s', err)
+        return False
+
+    def get_token(self):
+        request = self.opener.open(self.url + "token.html")
+        token = re.findall("<div.*?>(.*?)</", request.read())[0]
+        return token
+
+    def add_torrent_uri(self, filename, torrent, add_folder = False):
+        action = "action=add-url&s=%s" % urllib.quote(torrent)
+        if add_folder:
+            action += "&path=%s" % urllib.quote(filename)
+        return self._request(action)
+
+    def add_torrent_file(self, filename, filedata, add_folder = False):
+        action = "action=add-file"
+        if add_folder:
+            action += "&path=%s" % urllib.quote(filename)
+        return self._request(action, {"torrent_file": (ss(filename), filedata)})
+
+    def set_torrent(self, hash, params):
+        action = "action=setprops&hash=%s" % hash
+        for k, v in params.iteritems():
+            action += "&s=%s&v=%s" % (k, v)
+        return self._request(action)
+
+    def pause_torrent(self, hash, pause = True):
+        if pause:
+            action = "action=pause&hash=%s" % hash
+        else:
+            action = "action=unpause&hash=%s" % hash
+        return self._request(action)
+
+    def stop_torrent(self, hash):
+        action = "action=stop&hash=%s" % hash
+        return self._request(action)
+
+    def remove_torrent(self, hash, remove_data = False):
+        if remove_data:
+            action = "action=removedata&hash=%s" % hash
+        else:
+            action = "action=remove&hash=%s" % hash
+        return self._request(action)
+
+    def get_status(self):
+        action = "list=1"
+        return self._request(action)
+
+    def get_settings(self):
+        action = "action=getsettings"
+        settings_dict = {}
+        try:
+            utorrent_settings = json.loads(self._request(action))
+
+            # Create settings dict
+            for item in utorrent_settings['settings']:
+                if item[1] == 0: # int
+                    settings_dict[item[0]] = int(item[2] if not item[2].strip() == '' else '0')
+                elif item[1] == 1: # bool
+                    settings_dict[item[0]] = True if item[2] == 'true' else False
+                elif item[1] == 2: # string
+                    settings_dict[item[0]] = item[2]
+
+            #log.debug('uTorrent settings: %s', settings_dict)
+
+        except Exception, err:
+            log.error('Failed to get settings from uTorrent: %s', err)
+
+        return settings_dict
+
+    def set_settings(self, settings_dict = None):
+        if not settings_dict: settings_dict = {}
+
+        for key in settings_dict:
+            if isinstance(settings_dict[key], bool):
+                settings_dict[key] = 1 if settings_dict[key] else 0
+
+        action = 'action=setsetting' + ''.join(['&s=%s&v=%s' % (key, value) for (key, value) in settings_dict.items()])
+        return self._request(action)
+
+    def get_files(self, hash):
+        action = "action=getfiles&hash=%s" % hash
+        return self._request(action)

couchpotato/core/event.py

@@ -1,15 +1,12 @@
+from axl.axel import Event
+from couchpotato.core.helpers.variable import mergeDicts, natcmp
+from couchpotato.core.logger import CPLog
 import threading
 import traceback
 
-from axl.axel import Event
-from couchpotato.core.helpers.variable import mergeDicts, natsortKey
-from couchpotato.core.logger import CPLog
-
-
 log = CPLog(__name__)
 events = {}
 
-
 def runHandler(name, handler, *args, **kwargs):
     try:
         return handler(*args, **kwargs)
@@ -17,7 +14,6 @@ def runHandler(name, handler, *args, **kwargs):
         from couchpotato.environment import Env
         log.error('Error in event "%s", that wasn\'t caught: %s%s', (name, traceback.format_exc(), Env.all() if not Env.get('dev') else ''))
 
-
 def addEvent(name, handler, priority = 100):
 
     if not events.get(name):
@@ -31,7 +27,7 @@ def addEvent(name, handler, priority = 100):
             has_parent = hasattr(handler, 'im_self')
             parent = None
             if has_parent:
-                parent = handler.__self__
+                parent = handler.im_self
                 bc = hasattr(parent, 'beforeCall')
                 if bc: parent.beforeCall(handler)
 
@@ -52,19 +48,22 @@ def addEvent(name, handler, priority = 100):
         'priority': priority,
     })
 
+def removeEvent(name, handler):
+    e = events[name]
+    e -= handler
 
 def fireEvent(name, *args, **kwargs):
-    if name not in events: return
+    if not events.has_key(name): return
 
     #log.debug('Firing event %s', name)
     try:
 
         options = {
-            'is_after_event': False,  # Fire after event
+            'is_after_event': False, # Fire after event
-            'on_complete': False,  # onComplete event
+            'on_complete': False, # onComplete event
-            'single': False,  # Return single handler
+            'single': False, # Return single handler
-            'merge': False,  # Merge items
+            'merge': False, # Merge items
-            'in_order': False,  # Fire them in specific order, waits for the other to finish
+            'in_order': False, # Fire them in specific order, waits for the other to finish
         }
 
         # Do options
@@ -90,7 +89,7 @@ def fireEvent(name, *args, **kwargs):
 
         else:
 
-            e = Event(name = name, threads = 10, exc_info = True, traceback = True)
+            e = Event(name = name, threads = 10, exc_info = True, traceback = True, lock = threading.RLock())
 
             for event in events[name]:
                 e.handle(event['handler'], priority = event['priority'])
@@ -102,14 +101,11 @@ def fireEvent(name, *args, **kwargs):
             # Fire
             result = e(*args, **kwargs)
 
-        result_keys = result.keys()
-        result_keys.sort(key = natsortKey)
-
         if options['single'] and not options['merge']:
             results = None
 
             # Loop over results, stop when first not None result is found.
-            for r_key in result_keys:
+            for r_key in sorted(result.iterkeys(), cmp = natcmp):
                 r = result[r_key]
                 if r[0] is True and r[1] is not None:
                     results = r[1]
@@ -121,7 +117,7 @@ def fireEvent(name, *args, **kwargs):
 
         else:
             results = []
-            for r_key in result_keys:
+            for r_key in sorted(result.iterkeys(), cmp = natcmp):
                 r = result[r_key]
                 if r[0] == True and r[1]:
                     results.append(r[1])
@@ -164,21 +160,18 @@ def fireEvent(name, *args, **kwargs):
     except Exception:
         log.error('%s: %s', (name, traceback.format_exc()))
 
-
 def fireEventAsync(*args, **kwargs):
     try:
         t = threading.Thread(target = fireEvent, args = args, kwargs = kwargs)
         t.setDaemon(True)
         t.start()
         return True
-    except Exception as e:
+    except Exception, e:
         log.error('%s: %s', (args[0], e))
 
-
 def errorHandler(error):
     etype, value, tb = error
     log.error(''.join(traceback.format_exception(etype, value, tb)))
 
-
 def getEvent(name):
     return events[name]

couchpotato/core/helpers/encoding.py

@@ -1,44 +1,34 @@
+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 chardet import detect
-from couchpotato.core.logger import CPLog
-import six
-
-
 log = CPLog(__name__)
 
 
 def toSafeString(original):
     valid_chars = "-_.() %s%s" % (ascii_letters, digits)
-    cleaned_filename = unicodedata.normalize('NFKD', toUnicode(original)).encode('ASCII', 'ignore')
+    cleanedFilename = unicodedata.normalize('NFKD', toUnicode(original)).encode('ASCII', 'ignore')
-    valid_string = ''.join(c for c in cleaned_filename if c in valid_chars)
+    valid_string = ''.join(c for c in cleanedFilename if c in valid_chars)
     return ' '.join(valid_string.split())
 
-
 def simplifyString(original):
     string = stripAccents(original.lower())
     string = toSafeString(' '.join(re.split('\W+', string)))
     split = re.split('\W+|_', string.lower())
     return toUnicode(' '.join(split))
 
-
 def toUnicode(original, *args):
     try:
         if isinstance(original, unicode):
             return original
         else:
             try:
-                return six.text_type(original, *args)
+                return unicode(original, *args)
             except:
                 try:
-                    detected = detect(original)
-                    if detected.get('encoding') == 'utf-8':
-                        return original.decode('utf-8')
                     return ek(original, *args)
                 except:
                     raise
@@ -47,57 +37,15 @@ def toUnicode(original, *args):
         ascii_text = str(original).encode('string_escape')
         return toUnicode(ascii_text)
 
-def toUTF8(original):
-    try:
-        if isinstance(original, str) and len(original) > 0:
-            # Try to detect
-            detected = detect(original)
-            return original.decode(detected.get('encoding')).encode('utf-8')
-        else:
-            return original
-    except:
-        #log.error('Failed encoding to UTF8: %s', traceback.format_exc())
-        raise
-
 def ss(original, *args):
 
     u_original = toUnicode(original, *args)
     try:
         from couchpotato.environment import Env
         return u_original.encode(Env.get('encoding'))
-    except Exception as e:
+    except Exception, e:
         log.debug('Failed ss encoding char, force UTF8: %s', e)
-        try:
+        return u_original.encode('UTF-8')
-            return u_original.encode(Env.get('encoding'), 'replace')
-        except:
-            return u_original.encode('utf-8', 'replace')
-
-
-def sp(path, *args):
-
-    # Standardise encoding, normalise case, path and strip trailing '/' or '\'
-    if not path or len(path) == 0:
-        return path
-
-    # convert windows path (from remote box) to *nix path
-    if os.path.sep == '/' and '\\' in path:
-        path = '/' + path.replace(':', '').replace('\\', '/')
-
-    path = os.path.normpath(ss(path, *args))
-
-    # Remove any trailing path separators
-    if path != os.path.sep:
-        path = path.rstrip(os.path.sep)
-
-    # Add a trailing separator in case it is a root folder on windows (crashes guessit)
-    if len(path) == 2 and path[1] == ':':
-        path = path + os.path.sep
-
-    # Replace *NIX ambiguous '//' at the beginning of a path with '/' (crashes guessit)
-    path = re.sub('^//', '/', path)
-
-    return path
-
 
 def ek(original, *args):
     if isinstance(original, (str, unicode)):
@@ -109,7 +57,6 @@ def ek(original, *args):
 
     return original
 
-
 def isInt(value):
     try:
         int(value)
@@ -117,16 +64,14 @@ def isInt(value):
     except ValueError:
         return False
 
-
 def stripAccents(s):
     return ''.join((c for c in unicodedata.normalize('NFD', toUnicode(s)) if unicodedata.category(c) != 'Mn'))
 
-
 def tryUrlencode(s):
-    new = six.u('')
+    new = u''
     if isinstance(s, dict):
-        for key, value in s.items():
+        for key, value in s.iteritems():
-            new += six.u('&%s=%s') % (key, tryUrlencode(value))
+            new += u'&%s=%s' % (key, tryUrlencode(value))
 
         return new[1:]
     else:

couchpotato/core/helpers/path.py

@@ -1,51 +0,0 @@
-import os
-from chardet import detect
-from couchpotato import Env
-
-fs_enc = Env.get('fs_encoding')
-
-
-def list_dir(path, full_path = True):
-    """
-    List directory don't error when it doesn't exist
-    """
-
-    path = unicode_path(path)
-
-    if os.path.isdir(path):
-        for f in os.listdir(path):
-            if full_path:
-                yield join(path, f)
-            else:
-                yield f
-
-
-def join(*args):
-    """
-    Join path, encode properly before joining
-    """
-
-    return os.path.join(*[safe(x) for x in args])
-
-
-def unicode_path(path):
-    """
-    Convert back to unicode
-    :param path: path string
-    """
-
-    if isinstance(path, str):
-        detected = detect(path)
-        print detected
-        path = path.decode(detected.get('encoding'))
-        path = path.decode('unicode_escape')
-
-    return path
-
-
-def safe(path):
-
-    if isinstance(path, unicode):
-        return path.encode('unicode_escape')
-
-    return path

couchpotato/core/helpers/request.py

@@ -1,21 +1,15 @@
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import natcmp
 from urllib import unquote
 import re
 
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import natsortKey
-
 
 def getParams(params):
 
     reg = re.compile('^[a-z0-9_\.]+$')
 
-    # Sort keys
-    param_keys = params.keys()
-    param_keys.sort(key = natsortKey)
-
     temp = {}
-    for param in param_keys:
+    for param, value in sorted(params.iteritems()):
-        value = params[param]
 
         nest = re.split("([\[\]]+)", param)
         if len(nest) > 1:
@@ -43,26 +37,13 @@ def getParams(params):
 
     return dictToList(temp)
 
-non_decimal = re.compile(r'[^\d.]+')
-
 def dictToList(params):
 
     if type(params) is dict:
         new = {}
-        for x, value in params.items():
+        for x, value in params.iteritems():
             try:
-                convert = lambda text: int(text) if text.isdigit() else text.lower()
+                new_value = [dictToList(value[k]) for k in sorted(value.iterkeys(), cmp = natcmp)]
-                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
             except:
                 new_value = value
 

couchpotato/core/helpers/rss.py

@@ -1,11 +1,8 @@
+from couchpotato.core.logger import CPLog
 import xml.etree.ElementTree as XMLTree
 
-from couchpotato.core.logger import CPLog
-
-
 log = CPLog(__name__)
 
-
 class RSS(object):
 
     def getTextElements(self, xml, path):
@@ -49,6 +46,6 @@ class RSS(object):
     def getItems(self, data, path = 'channel/item'):
         try:
             return XMLTree.parse(data).findall(path)
-        except Exception as e:
+        except Exception, e:
             log.error('Error parsing RSS. %s', e)
             return []

couchpotato/core/helpers/variable.py

@@ -1,52 +1,37 @@
-import collections
+from couchpotato.core.helpers.encoding import simplifyString, toSafeString, ss
-import ctypes
+from couchpotato.core.logger import CPLog
 import hashlib
-import os
+import os.path
 import platform
 import random
 import re
 import string
 import sys
-import traceback
-
-from couchpotato.core.helpers.encoding import simplifyString, toSafeString, ss, sp
-from couchpotato.core.logger import CPLog
-import six
-from six.moves import map, zip, filter
-
 
 log = CPLog(__name__)
 
-
-def fnEscape(pattern):
-    return pattern.replace('[', '[[').replace(']', '[]]').replace('[[', '[[]')
-
-
 def link(src, dst):
     if os.name == 'nt':
         import ctypes
-        if ctypes.windll.kernel32.CreateHardLinkW(six.text_type(dst), six.text_type(src), 0) == 0: raise ctypes.WinError()
+        if ctypes.windll.kernel32.CreateHardLinkW(unicode(dst), unicode(src), 0) == 0: raise ctypes.WinError()
     else:
         os.link(src, dst)
 
-
 def symlink(src, dst):
     if os.name == 'nt':
         import ctypes
-        if ctypes.windll.kernel32.CreateSymbolicLinkW(six.text_type(dst), six.text_type(src), 1 if os.path.isdir(src) else 0) in [0, 1280]: raise ctypes.WinError()
+        if ctypes.windll.kernel32.CreateSymbolicLinkW(unicode(dst), unicode(src), 1 if os.path.isdir(src) else 0) in [0, 1280]: raise ctypes.WinError()
     else:
         os.symlink(src, dst)
 
-
 def getUserDir():
     try:
         import pwd
-        os.environ['HOME'] = sp(pwd.getpwuid(os.geteuid()).pw_dir)
+        os.environ['HOME'] = pwd.getpwuid(os.geteuid()).pw_dir
     except:
         pass
 
-    return sp(os.path.expanduser('~'))
+    return os.path.expanduser('~')
-
 
 def getDownloadDir():
     user_dir = getUserDir()
@@ -60,7 +45,6 @@ def getDownloadDir():
 
     return user_dir
 
-
 def getDataDir():
 
     # Windows
@@ -80,10 +64,8 @@ def getDataDir():
     # Linux
     return os.path.join(user_dir, '.couchpotato')
 
-
+def isDict(object):
-def isDict(obj):
+    return isinstance(object, dict)
-    return isinstance(obj, dict)
-
 
 def mergeDicts(a, b, prepend_list = False):
     assert isDict(a), isDict(b)
@@ -105,7 +87,6 @@ def mergeDicts(a, b, prepend_list = False):
                     current_dst[key] = current_src[key]
     return dst
 
-
 def removeListDuplicates(seq):
     checked = []
     for e in seq:
@@ -113,73 +94,35 @@ def removeListDuplicates(seq):
             checked.append(e)
     return checked
 
-
 def flattenList(l):
     if isinstance(l, list):
         return sum(map(flattenList, l))
     else:
         return l
 
-
 def md5(text):
     return hashlib.md5(ss(text)).hexdigest()
 
-
 def sha1(text):
     return hashlib.sha1(text).hexdigest()
 
-
 def isLocalIP(ip):
     ip = ip.lstrip('htps:/')
     regex = '/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1)$/'
     return re.search(regex, ip) is not None or 'localhost' in ip or ip[:4] == '127.'
 
-
 def getExt(filename):
     return os.path.splitext(filename)[1][1:]
 
+def cleanHost(host):
+    if not host.startswith(('http://', 'https://')):
+        host = 'http://' + host
 
-def cleanHost(host, protocol = True, ssl = False, username = None, password = None):
+    host = host.rstrip('/')
-    """Return a cleaned up host with given url options set
+    host += '/'
-
-    Changes protocol to https if ssl is set to True and http if ssl is set to false.
-    >>> cleanHost("localhost:80", ssl=True)
-    'https://localhost:80/'
-    >>> cleanHost("localhost:80", ssl=False)
-    'http://localhost:80/'
-
-    Username and password is managed with the username and password variables
-    >>> cleanHost("localhost:80", username="user", password="passwd")
-    'http://user:passwd@localhost:80/'
-
-    Output without scheme (protocol) can be forced with protocol=False
-    >>> cleanHost("localhost:80", protocol=False)
-    'localhost:80'
-    """
-
-    if not '://' in host and protocol:
-        host = ('https://' if ssl else 'http://') + host
-
-    if not protocol:
-        host = host.split('://', 1)[-1]
-
-    if protocol and username and password:
-        try:
-            auth = re.findall('^(?:.+?//)(.+?):(.+?)@(?:.+)$', host)
-            if auth:
-                log.error('Cleanhost error: auth already defined in url: %s, please remove BasicAuth from url.', host)
-            else:
-                host = host.replace('://', '://%s:%s@' % (username, password), 1)
-        except:
-            pass
-
-    host = host.rstrip('/ ')
-    if protocol:
-        host += '/'
 
     return host
 
-
 def getImdb(txt, check_inside = False, multiple = False):
 
     if not check_inside:
@@ -193,22 +136,18 @@ def getImdb(txt, check_inside = False, multiple = False):
         output.close()
 
     try:
-        ids = re.findall('(tt\d{4,7})', txt)
+        ids = re.findall('(tt\d{7})', txt)
-
         if multiple:
-            return removeDuplicate(['tt%07d' % tryInt(x[2:]) for x in ids]) if len(ids) > 0 else []
+            return list(set(ids)) if len(ids) > 0 else []
-
+        return ids[0]
-        return 'tt%07d' % tryInt(ids[0][2:])
     except IndexError:
         pass
 
     return False
 
-
+def tryInt(s):
-def tryInt(s, default = 0):
     try: return int(s)
-    except: return default
+    except: return 0
-
 
 def tryFloat(s):
     try:
@@ -218,42 +157,33 @@ def tryFloat(s):
             return float(s)
     except: return 0
 
+def natsortKey(s):
+    return map(tryInt, re.findall(r'(\d+|\D+)', s))
 
-def natsortKey(string_):
+def natcmp(a, b):
-    """See http://www.codinghorror.com/blog/archives/001018.html"""
+    return cmp(natsortKey(a), natsortKey(b))
-    return [int(s) if s.isdigit() else s for s in re.split(r'(\d+)', string_)]
 
-
+def getTitle(library_dict):
-def toIterable(value):
-    if isinstance(value, collections.Iterable):
-        return value
-    return [value]
-
-
-def getIdentifier(media):
-    return media.get('identifier') or media.get('identifiers', {}).get('imdb')
-
-
-def getTitle(media_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:
+                    log.error('Could not get title for %s', library_dict.identifier)
-                        return media_dict['media']['info']['titles'][0]
+                    return None
-                    except:
-                        log.error('Could not get title for %s', getIdentifier(media_dict))
-                        return None
-    except:
-        log.error('Could not get title for library item: %s', media_dict)
-        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', library_dict)
+        return None
 
 def possibleTitles(raw_title):
 
@@ -267,146 +197,11 @@ def possibleTitles(raw_title):
     new_title = raw_title.replace('&', 'and')
     titles.append(simplifyString(new_title))
 
-    return removeDuplicate(titles)
+    return list(set(titles))
-
 
 def randomString(size = 8, chars = string.ascii_uppercase + string.digits):
     return ''.join(random.choice(chars) for x in range(size))
 
-
 def splitString(str, split_on = ',', clean = True):
-    l = [x.strip() for x in str.split(split_on)] if str else []
+    list = [x.strip() for x in str.split(split_on)] if str else []
-    return removeEmpty(l) if clean else l
+    return filter(None, list) if clean else list
-
-
-def removeEmpty(l):
-    return list(filter(None, l))
-
-
-def removeDuplicate(l):
-    seen = set()
-    return [x for x in l if x not in seen and not seen.add(x)]
-
-
-def dictIsSubset(a, b):
-    return all([k in b and b[k] == v for k, v in a.items()])
-
-
-# Returns True if sub_folder is the same as or inside base_folder
-def isSubFolder(sub_folder, base_folder):
-    if base_folder and sub_folder:
-        base = sp(os.path.realpath(base_folder)) + os.path.sep
-        subfolder = sp(os.path.realpath(sub_folder)) + os.path.sep
-        return os.path.commonprefix([subfolder, base]) == base
-
-    return False
-
-
-# From SABNZBD
-re_password = [re.compile(r'(.+){{([^{}]+)}}$'), re.compile(r'(.+)\s+password\s*=\s*(.+)$', re.I)]
-
-
-def scanForPassword(name):
-    m = None
-    for reg in re_password:
-        m = reg.search(name)
-        if m: break
-
-    if m:
-        return m.group(1).strip('. '), m.group(2).strip()
-
-
-under_pat = re.compile(r'_([a-z])')
-
-def underscoreToCamel(name):
-    return under_pat.sub(lambda x: x.group(1).upper(), name)
-
-
-def removePyc(folder, only_excess = True, show_logs = True):
-
-    folder = sp(folder)
-
-    for root, dirs, files in os.walk(folder):
-
-        pyc_files = filter(lambda filename: filename.endswith('.pyc'), files)
-        py_files = set(filter(lambda filename: filename.endswith('.py'), files))
-        excess_pyc_files = filter(lambda pyc_filename: pyc_filename[:-1] not in py_files, pyc_files) if only_excess else pyc_files
-
-        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)
-            try:
-                os.remove(full_path)
-            except:
-                log.error('Couldn\'t remove %s: %s', (full_path, traceback.format_exc()))
-
-        for dir_name in dirs:
-            full_path = os.path.join(root, dir_name)
-            if len(os.listdir(full_path)) == 0:
-                try:
-                    os.rmdir(full_path)
-                except:
-                    log.error('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc()))
-
-
-def getFreeSpace(directories):
-
-    single = not isinstance(directories, (tuple, list))
-    if single:
-        directories = [directories]
-
-    free_space = {}
-    for folder in directories:
-
-        size = None
-        if os.path.isdir(folder):
-            if os.name == 'nt':
-                _, total, free = ctypes.c_ulonglong(), ctypes.c_ulonglong(), \
-                                   ctypes.c_ulonglong()
-                if sys.version_info >= (3,) or isinstance(folder, unicode):
-                    fun = ctypes.windll.kernel32.GetDiskFreeSpaceExW #@UndefinedVariable
-                else:
-                    fun = ctypes.windll.kernel32.GetDiskFreeSpaceExA #@UndefinedVariable
-                ret = fun(folder, ctypes.byref(_), ctypes.byref(total), ctypes.byref(free))
-                if ret == 0:
-                    raise ctypes.WinError()
-                return [total.value, free.value]
-            else:
-                s = os.statvfs(folder)
-                size = [s.f_blocks * s.f_frsize / (1024 * 1024), (s.f_bavail * s.f_frsize) / (1024 * 1024)]
-
-        if single: return size
-
-        free_space[folder] = size
-
-    return free_space
-
-
-def getSize(paths):
-
-    single = not isinstance(paths, (tuple, list))
-    if single:
-        paths = [paths]
-
-    total_size = 0
-    for path in paths:
-        path = sp(path)
-
-        if os.path.isdir(path):
-            total_size = 0
-            for dirpath, _, filenames in os.walk(path):
-                for f in filenames:
-                    total_size += os.path.getsize(sp(os.path.join(dirpath, f)))
-
-        elif os.path.isfile(path):
-            total_size += os.path.getsize(path)
-
-    return total_size / 1048576 # MB
-
-
-def find(func, iterable):
-    for item in iterable:
-        if func(item):
-            return item
-
-    return None

couchpotato/core/loader.py

@@ -1,55 +1,53 @@
-import os
-import sys
-import traceback
-
 from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
-from importhelper import import_module
+import glob
-import six
+import os
-
+import traceback
 
 log = CPLog(__name__)
 
 
 class Loader(object):
+    plugins = {}
+    providers = {}
+    modules = {}
 
-    def __init__(self):
+    def addPath(self, root, base_path, priority, recursive = False):
-        self.plugins = {}
+        for filename in os.listdir(os.path.join(root, *base_path)):
-        self.providers = {}
+            path = os.path.join(os.path.join(root, *base_path), filename)
-        self.modules = {}
+            if os.path.isdir(path) and filename[:2] != '__':
-        self.paths = {}
+                if u'__init__.py' in os.listdir(path):
+                    new_base_path = ''.join(s + '.' for s in base_path) + filename
+                    self.paths[new_base_path.replace('.', '_')] = (priority, new_base_path, path)
+
+                if recursive:
+                    self.addPath(root, base_path + [filename], priority, recursive = True)
 
     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)
 
-        # Add custom plugin folder
+        for plugin_type, plugin_tuple in self.paths.iteritems():
-        from couchpotato.environment import Env
-        custom_plugin_dir = os.path.join(Env.get('data_dir'), 'custom_plugins')
-        if os.path.isdir(custom_plugin_dir):
-            sys.path.insert(0, custom_plugin_dir)
-            self.paths['custom_plugins'] = (30, '', custom_plugin_dir)
-
-        # Loop over all paths and add to module list
-        for plugin_type, plugin_tuple in self.paths.items():
             priority, module, dir_name = plugin_tuple
             self.addFromDir(plugin_type, priority, module, dir_name)
 
     def run(self):
         did_save = 0
 
-        for priority in sorted(self.modules):
+        for priority in self.modules:
-            for module_name, plugin in sorted(self.modules[priority].items()):
+            for module_name, plugin in sorted(self.modules[priority].iteritems()):
-
                 # Load module
                 try:
                     if plugin.get('name')[:2] == '__':
@@ -58,11 +56,14 @@ class Loader(object):
                     m = self.loadModule(module_name)
                     if m is None:
                         continue
+                    m = getattr(m, plugin.get('name'))
+
+                    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"):
@@ -77,38 +78,27 @@ class Loader(object):
         if did_save:
             fireEvent('settings.save')
 
-    def addPath(self, root, base_path, priority, recursive = False):
-        root_path = os.path.join(root, *base_path)
-        for filename in os.listdir(root_path):
-            path = os.path.join(root_path, filename)
-            if os.path.isdir(path) and filename[:2] != '__':
-                if six.u('__init__.py') in os.listdir(path):
-                    new_base_path = ''.join(s + '.' for s in base_path) + filename
-                    self.paths[new_base_path.replace('.', '_')] = (priority, new_base_path, path)
-
-                if recursive:
-                    self.addPath(root, base_path + [filename], priority, recursive = True)
-
     def addFromDir(self, plugin_type, priority, module, dir_name):
 
         # Load dir module
-        if module and len(module) > 0:
+        try:
-            self.addModule(priority, plugin_type, module, os.path.basename(dir_name))
+            m = __import__(module)
+            splitted = module.split('.')
+            for sub in splitted[1:]:
+                m = getattr(m, sub)
+        except:
+            raise
 
-        for name in os.listdir(dir_name):
+        for cur_file in glob.glob(os.path.join(dir_name, '*')):
-            path = os.path.join(dir_name, name)
+            name = os.path.basename(cur_file)
-            ext = os.path.splitext(path)[1]
+            if os.path.isdir(os.path.join(dir_name, name)) and name != 'static' and os.path.isfile(os.path.join(cur_file, '__init__.py')):
-            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
                 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 +114,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'):
+        if not hasattr(module, 'start'):
-            #log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
+            log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
             return False
         try:
-            # Load single file plugin
+            module.start()
-            if isinstance(module.autoload, (str, unicode)):
-                getattr(module, module.autoload)()
-            # Load folder plugin
-            else:
-                module.autoload()
-
-            log.info('Loaded %s: %s', (type, name))
             return True
         except:
             log.error('Failed loading plugin "%s": %s', (module.__file__, traceback.format_exc()))
@@ -148,10 +131,6 @@ class Loader(object):
         if not self.modules.get(priority):
             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,
@@ -161,7 +140,11 @@ class Loader(object):
 
     def loadModule(self, name):
         try:
-            return import_module(name)
+            m = __import__(name)
+            splitted = name.split('.')
+            for sub in splitted[1:-1]:
+                m = getattr(m, sub)
+            return m
         except ImportError:
             log.debug('Skip loading module plugin %s: %s', (name, traceback.format_exc()))
             return None

couchpotato/core/logger.py

@@ -1,16 +1,11 @@
 import logging
 import re
-import traceback
-
 
 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]
@@ -18,20 +13,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')
-
-            from couchpotato.core.event import addEvent
-            addEvent('app.after_shutdown', self.close)
-
-    def close(self, *args, **kwargs):
-        logging.shutdown()
-
     def info(self, msg, replace_tuple = ()):
         self.logger.info(self.addContext(msg, replace_tuple))
 
@@ -55,22 +36,23 @@ class CPLog(object):
 
     def safeMessage(self, msg, replace_tuple = ()):
 
-        from couchpotato.core.helpers.encoding import ss, toUTF8
+        from couchpotato.environment import Env
+        from couchpotato.core.helpers.encoding import ss
 
-        msg = toUTF8(msg)
+        msg = ss(msg)
 
         try:
-            if isinstance(replace_tuple, tuple):
+            msg = msg % replace_tuple
-                msg = msg % tuple([toUTF8(x) for x in list(replace_tuple)])
-            elif isinstance(replace_tuple, dict):
-                msg = msg % dict((k, toUTF8(v)) for k, v in replace_tuple.iteritems())
-            else:
-                msg = msg % toUTF8(replace_tuple)
         except:
-            self.logger.error('Failed encoding stuff to log "%s": %s' % (msg, traceback.format_exc()))
+            try:
+                if isinstance(replace_tuple, tuple):
+                    msg = msg % tuple([ss(x) for x in list(replace_tuple)])
+                else:
+                    msg = msg % ss(replace_tuple)
+            except Exception, e:
+                self.logger.error(u'Failed encoding stuff to log "%s": %s' % (msg, e))
 
-        self.setup()
+        if not Env.get('dev'):
-        if not self.is_develop:
 
             for replace in self.replace_private:
                 msg = re.sub('(\?%s=)[^\&]+' % replace, '?%s=xxx' % replace, msg)
@@ -78,10 +60,10 @@ 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:
                 pass
 
-        return toUTF8(msg)
+        return msg

couchpotato/core/media/__init__.py

@@ -1,14 +1,5 @@
-import os
+from couchpotato.core.event import addEvent
-import traceback
-
-from couchpotato import CPLog
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.plugins.base import Plugin
-import six
-
-
-log = CPLog(__name__)
 
 
 class MediaBase(Plugin):
@@ -20,82 +11,3 @@ class MediaBase(Plugin):
 
     def getType(self):
         return self._type
-
-    def createOnComplete(self, media_id):
-
-        def onComplete():
-            try:
-                media = fireEvent('media.get', media_id, single = True)
-                if media:
-                    event_name = '%s.searcher.single' % media.get('type')
-                    fireEventAsync(event_name, media, on_complete = self.createNotifyFront(media_id), manual = True)
-            except:
-                log.error('Failed creating onComplete: %s', traceback.format_exc())
-
-        return onComplete
-
-    def createNotifyFront(self, media_id):
-
-        def notifyFront():
-            try:
-                media = fireEvent('media.get', media_id, single = True)
-                if media:
-                    event_name = '%s.update' % media.get('type')
-                    fireEvent('notify.frontend', type = event_name, data = media)
-            except:
-                log.error('Failed creating onComplete: %s', traceback.format_exc())
-
-        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, media, image_urls):
-        if 'files' not in media:
-            media['files'] = {}
-
-        existing_files = media['files']
-
-        image_type = 'poster'
-        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] = [toUnicode(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():
+class LibraryBase(Plugin):
-    return Library()
 
-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,128 +0,0 @@
-from couchpotato import get_db
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.library.base import LibraryBase
-
-log = CPLog(__name__)
-
-
-class Library(LibraryBase):
-    def __init__(self):
-        addEvent('library.title', self.title)
-        addEvent('library.related', self.related)
-        addEvent('library.tree', self.tree)
-
-        addEvent('library.root', self.root)
-
-        addApiView('library.query', self.queryView)
-        addApiView('library.related', self.relatedView)
-        addApiView('library.tree', self.treeView)
-
-    def queryView(self, media_id, **kwargs):
-        db = get_db()
-        media = db.get('id', media_id)
-
-        return {
-            'result': fireEvent('library.query', media, single = True)
-        }
-
-    def relatedView(self, media_id, **kwargs):
-        db = get_db()
-        media = db.get('id', media_id)
-
-        return {
-            'result': fireEvent('library.related', media, single = True)
-        }
-
-    def treeView(self, media_id, **kwargs):
-        db = get_db()
-        media = db.get('id', media_id)
-
-        return {
-            'result': fireEvent('library.tree', media, single = True)
-        }
-
-    def title(self, library):
-        return fireEvent(
-            'library.query',
-            library,
-
-            condense = False,
-            include_year = False,
-            include_identifier = False,
-            single = True
-        )
-
-    def related(self, media):
-        result = {self.key(media['type']): media}
-
-        db = get_db()
-        cur = media
-
-        while cur and cur.get('parent_id'):
-            cur = db.get('id', cur['parent_id'])
-
-            result[self.key(cur['type'])] = cur
-
-        children = db.get_many('media_children', media['_id'], with_doc = True)
-
-        for item in children:
-            key = self.key(item['doc']['type']) + 's'
-
-            if key not in result:
-                result[key] = []
-
-            result[key].append(item['doc'])
-
-        return result
-
-    def root(self, media):
-        db = get_db()
-        cur = media
-
-        while cur and cur.get('parent_id'):
-            cur = db.get('id', cur['parent_id'])
-
-        return cur
-
-    def tree(self, media = None, media_id = None):
-        db = get_db()
-
-        if media:
-            result = media
-        elif media_id:
-            result = db.get('id', media_id, with_doc = True)
-        else:
-            return None
-
-        # Find children
-        items = db.get_many('media_children', result['_id'], with_doc = True)
-        keys = []
-
-        # Build children arrays
-        for item in items:
-            key = self.key(item['doc']['type']) + 's'
-
-            if key not in result:
-                result[key] = {}
-            elif type(result[key]) is not dict:
-                result[key] = {}
-
-            if key not in keys:
-                keys.append(key)
-
-            result[key][item['_id']] = fireEvent('library.tree', item['doc'], single = True)
-
-        # Unique children
-        for key in keys:
-            result[key] = result[key].values()
-
-        # Include releases
-        result['releases'] = fireEvent('release.for_media', result['_id'], single = True)
-
-        return result
-
-    def key(self, media_type):
-        parts = media_type.split('.')
-        return parts[-1]

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 = fireEvent('library.root', media, single = True)
-
-        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['info']['titles']
-
-        # Add year suffix titles (will result in ['<name_one>', '<name_one> <suffix_one>', '<name_two>', ...])
-        suffixes = [None, root['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 +0,0 @@
-from .main import MediaPlugin
-
-
-def autoload():
-    return MediaPlugin()

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

@@ -1,199 +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 = 4
-
-    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 ', 'an ', 'a ']:
-            if prefix == title[:len(prefix)]:
-                title = title[len(prefix):]
-                break
-
-        return str(nr_prefix + title).ljust(32, ' ')[:32]
-
-
-class StartsWithIndex(TreeBasedIndex):
-    _version = 3
-
-    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 ', 'an ', 'a ']:
-            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
-
-
-class MediaTagIndex(MultiTreeBasedIndex):
-    _version = 2
-
-    custom_header = """from CodernityDB.tree_index import MultiTreeBasedIndex"""
-
-    def __init__(self, *args, **kwargs):
-        kwargs['key_format'] = '32s'
-        super(MediaTagIndex, self).__init__(*args, **kwargs)
-
-    def make_key_value(self, data):
-        if data.get('_t') == 'media' and data.get('tags') and len(data.get('tags', [])) > 0:
-
-            tags = set()
-            for tag in data.get('tags', []):
-                tags.add(self.make_key(tag))
-
-            return list(tags), None
-
-    def make_key(self, key):
-        return md5(key).hexdigest()

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

@@ -1,579 +0,0 @@
-from datetime import timedelta
-import time
-import traceback
-from string import ascii_lowercase
-
-from CodernityDB.database import RecordNotFound, RecordDeleted
-from couchpotato import tryInt, get_db
-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.logger import CPLog
-from couchpotato.core.media import MediaBase
-from .index import MediaIndex, MediaStatusIndex, MediaTypeIndex, TitleSearchIndex, TitleIndex, StartsWithIndex, MediaChildrenIndex, MediaTagIndex
-
-
-log = CPLog(__name__)
-
-
-class MediaPlugin(MediaBase):
-
-    _database = {
-        'media': MediaIndex,
-        'media_search_title': TitleSearchIndex,
-        'media_status': MediaStatusIndex,
-        'media_tag': MediaTagIndex,
-        'media_by_type': MediaTypeIndex,
-        'media_title': TitleIndex,
-        'media_startswith': StartsWithIndex,
-        'media_children': MediaChildrenIndex,
-    }
-
-    def __init__(self):
-
-        addApiView('media.refresh', self.refresh, docs = {
-            'desc': 'Refresh a any media type by ID',
-            'params': {
-                'id': {'desc': 'Movie, Show, Season or Episode ID(s) you want to refresh.', 'type': 'int (comma separated)'},
-            }
-        })
-
-        addApiView('media.list', self.listView, docs = {
-            'desc': 'List media',
-            'params': {
-                'type': {'type': 'string', 'desc': 'Media type to filter on.'},
-                'status': {'type': 'array or csv', 'desc': 'Filter media by status. Example:"active,done"'},
-                'release_status': {'type': 'array or csv', 'desc': 'Filter media by status of its releases. Example:"snatched,available"'},
-                'limit_offset': {'desc': 'Limit and offset the media list. Examples: "50" or "50,30"'},
-                'starts_with': {'desc': 'Starts with these characters. Example: "a" returns all media starting with the letter "a"'},
-                'search': {'desc': 'Search media title'},
-            },
-            'return': {'type': 'object', 'example': """{
-    'success': True,
-    'empty': bool, any media returned or not,
-    'media': array, media found,
-}"""}
-        })
-
-        addApiView('media.get', self.getView, docs = {
-            'desc': 'Get media by id',
-            'params': {
-                'id': {'desc': 'The id of the media'},
-            }
-        })
-
-        addApiView('media.delete', self.deleteView, docs = {
-            'desc': 'Delete a media from the wanted list',
-            'params': {
-                'id': {'desc': 'Media ID(s) you want to delete.', 'type': 'int (comma separated)'},
-                'delete_from': {'desc': 'Delete media from this page', 'type': 'string: all (default), wanted, manage'},
-            }
-        })
-
-        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.cleanupFaults)
-
-        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)
-        addEvent('media.tag', self.tag)
-        addEvent('media.untag', self.unTag)
-
-    # Wrongly tagged media files
-    def cleanupFaults(self):
-        medias = fireEvent('media.with_status', 'ignored', single = True) or []
-
-        db = get_db()
-        for media in medias:
-            try:
-                media['status'] = 'done'
-                db.update(media)
-            except:
-                pass
-
-    def refresh(self, id = '', **kwargs):
-        handlers = []
-        ids = splitString(id)
-
-        for x in ids:
-
-            refresh_handler = self.createRefreshHandler(x)
-            if refresh_handler:
-                handlers.append(refresh_handler)
-
-        fireEvent('notify.frontend', type = 'media.busy', data = {'_id': ids})
-        fireEventAsync('schedule.queue', handlers = handlers)
-
-        return {
-            'success': True,
-        }
-
-    def createRefreshHandler(self, media_id):
-
-        try:
-            media = get_db().get('id', media_id)
-            event = '%s.update' % media.get('type')
-
-            def handler():
-                fireEvent(event, media_id = media_id, on_complete = self.createOnComplete(media_id))
-
-            return handler
-
-        except:
-            log.error('Refresh handler for non existing media: %s', traceback.format_exc())
-
-    def addSingleRefreshView(self):
-
-        for media_type in fireEvent('media.types', merge = True):
-            addApiView('%s.refresh' % media_type, self.refresh)
-
-    def get(self, media_id):
-
-        try:
-            db = get_db()
-
-            imdb_id = getImdb(str(media_id))
-
-            if imdb_id:
-                media = db.get('media', 'imdb-%s' % imdb_id, with_doc = True)['doc']
-            else:
-                media = db.get('id', media_id)
-
-            if media:
-
-                # 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
-
-        except (RecordNotFound, RecordDeleted):
-            log.error('Media with id "%s" not found', media_id)
-        except:
-            raise
-
-    def getView(self, id = None, **kwargs):
-
-        media = self.get(id) if id else None
-
-        return {
-            'success': media is not None,
-            'media': media,
-        }
-
-    def withStatus(self, status, types = None, with_doc = True):
-
-        db = get_db()
-
-        if types and not isinstance(types, (list, tuple)):
-            types = [types]
-
-        status = list(status if isinstance(status, (list, tuple)) else [status])
-
-        for s in status:
-            for ms in db.get_many('media_status', s):
-                if with_doc:
-                    try:
-                        doc = db.get('id', ms['_id'])
-
-                        if types and doc.get('type') not in types:
-                            continue
-
-                        yield doc
-                    except (RecordDeleted, RecordNotFound):
-                        log.debug('Record not found, skipping: %s', ms['_id'])
-                    except (ValueError, EOFError):
-                        fireEvent('database.delete_corrupted', ms.get('_id'), traceback_error = traceback.format_exc(0))
-                else:
-                    yield ms
-
-    def withIdentifiers(self, identifiers, with_doc = False):
-        db = get_db()
-
-        for x in identifiers:
-            try:
-                return db.get('media', '%s-%s' % (x, identifiers[x]), with_doc = with_doc)
-            except:
-                pass
-
-        log.debug('No media found with identifiers: %s', identifiers)
-        return False
-
-    def list(self, types = None, status = None, release_status = None, status_or = False, limit_offset = None, with_tags = None, starts_with = None, search = None):
-
-        db = get_db()
-
-        # Make a list from string
-        if status and 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]
-        if with_tags and not isinstance(with_tags, (list, tuple)):
-            with_tags = [with_tags]
-
-        # 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 = {}
-
-        # 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'))
-
-        # 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'))
-
-        # Add search filters
-        if starts_with:
-            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)]
-
-        # Add tag filter
-        if with_tags:
-            filter_by['with_tags'] = set()
-            for tag in with_tags:
-                for x in db.get_many('media_tag', tag):
-                    filter_by['with_tags'].add(x['_id'])
-
-        # Filter with search query
-        if search:
-            filter_by['search'] = [x['_id'] for x in db.get_many('media_search_title', 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']
-
-        # 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)
-        if total_count == 0:
-            return 0, []
-
-        offset = 0
-        limit = -1
-        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])
-
-        # 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
-
-            media = fireEvent('media.get', media_id, single = True)
-
-            # Skip if no media has been found
-            if not media:
-                continue
-
-            # Merge releases with movie dict
-            medias.append(media)
-
-            # remove from media ids
-            media_ids.remove(media_id)
-            if len(media_ids) == 0 or len(medias) == limit: break
-
-        return total_count, medias
-
-    def listView(self, **kwargs):
-
-        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'),
-            with_tags = splitString(kwargs.get('with_tags')),
-            starts_with = kwargs.get('starts_with'),
-            search = kwargs.get('search')
-        )
-
-        return {
-            'success': True,
-            'empty': len(movies) == 0,
-            'total': total_movies,
-            'movies': movies,
-        }
-
-    def addSingleListView(self):
-
-        for media_type in fireEvent('media.types', merge = True):
-            tempList = lambda *args, **kwargs : self.listView(type = media_type, **kwargs)
-            addApiView('%s.list' % media_type, tempList, docs = {
-                'desc': 'List media',
-                'params': {
-                    'status': {'type': 'array or csv', 'desc': 'Filter ' + media_type + ' by status. Example:"active,done"'},
-                    'release_status': {'type': 'array or csv', 'desc': 'Filter ' + media_type + ' by status of its releases. Example:"snatched,available"'},
-                    'limit_offset': {'desc': 'Limit and offset the ' + media_type + ' list. Examples: "50" or "50,30"'},
-                    'starts_with': {'desc': 'Starts with these characters. Example: "a" returns all ' + media_type + 's starting with the letter "a"'},
-                    'search': {'desc': 'Search ' + media_type + ' title'},
-                },
-                'return': {'type': 'object', 'example': """{
-        'success': True,
-        'empty': bool, any """ + media_type + """s returned or not,
-        'media': array, media found,
-    }"""}
-            })
-
-    def availableChars(self, types = None, status = None, release_status = None):
-
-        db = get_db()
-
-        # Make a list from string
-        if status and 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 = {}
-
-        # 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'))
-
-        # 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]]
-
-        chars = set()
-        for x in db.all('media_startswith'):
-            if x['_id'] in media_ids:
-                chars.add(x['key'])
-
-            if len(chars) == 27:
-                break
-
-        return list(chars)
-
-    def charView(self, **kwargs):
-
-        type = splitString(kwargs.get('type', 'movie'))
-        status = splitString(kwargs.get('status', None))
-        release_status = splitString(kwargs.get('release_status', None))
-        chars = self.availableChars(type, status, release_status)
-
-        return {
-            'success': True,
-            'empty': len(chars) == 0,
-            'chars': chars,
-        }
-
-    def addSingleCharView(self):
-
-        for media_type in fireEvent('media.types', merge = True):
-            tempChar = lambda *args, **kwargs : self.charView(type = media_type, **kwargs)
-            addApiView('%s.available_chars' % media_type, tempChar)
-
-    def delete(self, media_id, delete_from = None):
-
-        try:
-            db = get_db()
-
-            media = db.get('id', media_id)
-            if media:
-                deleted = False
-
-                media_releases = fireEvent('release.for_media', media['_id'], single = True)
-
-                if delete_from == 'all':
-                    # Delete connected releases
-                    for release in media_releases:
-                        db.delete(release)
-
-                    db.delete(media)
-                    deleted = True
-                else:
-
-                    total_releases = len(media_releases)
-                    total_deleted = 0
-                    new_media_status = None
-
-                    for release in media_releases:
-                        if delete_from in ['wanted', 'snatched', 'late']:
-                            if release.get('status') != 'done':
-                                db.delete(release)
-                                total_deleted += 1
-                            new_media_status = 'done'
-                        elif delete_from == 'manage':
-                            if release.get('status') == 'done' or media.get('status') == 'done':
-                                db.delete(release)
-                                total_deleted += 1
-
-                    if (total_releases == total_deleted) or (total_releases == 0 and not new_media_status) or (not new_media_status and delete_from == 'late'):
-                        db.delete(media)
-                        deleted = True
-                    elif new_media_status:
-                        media['status'] = new_media_status
-                        db.update(media)
-
-                        fireEvent('media.untag', media['_id'], 'recent', single = True)
-                    else:
-                        fireEvent('media.restatus', media.get('_id'), single = True)
-
-                if deleted:
-                    fireEvent('notify.frontend', type = 'media.deleted', data = media)
-        except:
-            log.error('Failed deleting media: %s', traceback.format_exc())
-
-        return True
-
-    def deleteView(self, id = '', **kwargs):
-
-        ids = splitString(id)
-        for media_id in ids:
-            self.delete(media_id, delete_from = kwargs.get('delete_from', 'all'))
-
-        return {
-            'success': True,
-        }
-
-    def addSingleDeleteView(self):
-
-        for media_type in fireEvent('media.types', merge = True):
-            tempDelete = lambda *args, **kwargs : self.deleteView(type = media_type, **kwargs)
-            addApiView('%s.delete' % media_type, tempDelete, docs = {
-            'desc': 'Delete a ' + media_type + ' from the wanted list',
-            'params': {
-                'id': {'desc': 'Media ID(s) you want to delete.', 'type': 'int (comma separated)'},
-                'delete_from': {'desc': 'Delete ' + media_type + ' from this page', 'type': 'string: all (default), wanted, manage'},
-            }
-        })
-
-    def restatus(self, media_id, tag_recent = True):
-
-        try:
-            db = get_db()
-
-            m = db.get('id', media_id)
-            previous_status = m['status']
-
-            log.debug('Changing status for %s', getTitle(m))
-            if not m['profile_id']:
-                m['status'] = 'done'
-            else:
-                m['status'] = 'active'
-
-                try:
-                    profile = db.get('id', m['profile_id'])
-                    media_releases = fireEvent('release.for_media', m['_id'], single = True)
-                    done_releases = [release for release in media_releases if release.get('status') == 'done']
-
-                    if done_releases:
-
-                        # Check if we are finished with the media
-                        for release in done_releases:
-                            if fireEvent('quality.isfinish', {'identifier': release['quality'], 'is_3d': release.get('is_3d', False)}, profile, timedelta(seconds = time.time() - release['last_edit']).days, single = True):
-                                m['status'] = 'done'
-                                break
-
-                    elif previous_status == 'done':
-                        m['status'] = 'done'
-
-                except RecordNotFound:
-                    log.debug('Failed restatus, keeping previous: %s', traceback.format_exc())
-                    m['status'] = previous_status
-
-            # Only update when status has changed
-            if previous_status != m['status']:
-                db.update(m)
-
-                # Tag media as recent
-                if tag_recent:
-                    self.tag(media_id, 'recent', update_edited = True)
-
-            return m['status']
-        except:
-            log.error('Failed restatus: %s', traceback.format_exc())
-
-    def tag(self, media_id, tag, update_edited = False):
-
-        try:
-            db = get_db()
-            m = db.get('id', media_id)
-
-            if update_edited:
-                m['last_edit'] = int(time.time())
-
-            tags = m.get('tags') or []
-            if tag not in tags:
-                tags.append(tag)
-                m['tags'] = tags
-                db.update(m)
-
-            return True
-        except:
-            log.error('Failed tagging: %s', traceback.format_exc())
-
-        return False
-
-    def unTag(self, media_id, tag):
-
-        try:
-            db = get_db()
-            m = db.get('id', media_id)
-
-            tags = m.get('tags') or []
-            if tag in tags:
-                new_tags = list(set(tags))
-                new_tags.remove(tag)
-
-                m['tags'] = new_tags
-                db.update(m)
-
-            return True
-        except:
-            log.error('Failed untagging: %s', traceback.format_exc())
-
-        return False

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/newznab.py

@@ -1,267 +0,0 @@
-from urlparse import urlparse
-import time
-import traceback
-import re
-
-from couchpotato.core.helpers.encoding import tryUrlencode, toUnicode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import cleanHost, splitString, tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import ResultList
-from couchpotato.core.media._base.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-from dateutil.parser import parse
-from requests import HTTPError
-
-
-log = CPLog(__name__)
-
-
-class Base(NZBProvider, RSS):
-
-    urls = {
-        'detail': 'details/%s',
-        'download': 't=get&id=%s'
-    }
-
-    passwords_regex = 'password|wachtwoord'
-    limits_reached = {}
-
-    http_time_between_calls = 1  # Seconds
-
-    def search(self, media, quality):
-        hosts = self.getHosts()
-
-        results = ResultList(self, media, quality, imdb_results = True)
-
-        for host in hosts:
-            if self.isDisabled(host):
-                continue
-
-            self._searchOnHost(host, media, quality, results)
-
-        return results
-
-    def _searchOnHost(self, host, media, quality, results):
-
-        query = self.buildUrl(media, host)
-        url = '%s%s' % (self.getUrl(host['host']), query)
-        nzbs = self.getRSSData(url, cache_timeout = 1800, headers = {'User-Agent': Env.getIdentifier()})
-
-        for nzb in nzbs:
-
-            date = None
-            spotter = None
-            for item in nzb:
-                if date and spotter:
-                    break
-                if item.attrib.get('name') == 'usenetdate':
-                    date = item.attrib.get('value')
-                    break
-
-                # Get the name of the person who posts the spot
-                if item.attrib.get('name') == 'poster':
-                    if "@spot.net" in item.attrib.get('value'):
-                        spotter = item.attrib.get('value').split("@")[0]
-                        continue
-
-            if not date:
-                date = self.getTextElement(nzb, 'pubDate')
-
-            nzb_id = self.getTextElement(nzb, 'guid').split('/')[-1:].pop()
-            name = self.getTextElement(nzb, 'title')
-
-            if not name:
-                continue
-
-            name_extra = ''
-            if spotter:
-                name_extra = spotter
-
-            description = ''
-            if "@spot.net" in nzb_id:
-                try:
-                    # Get details for extended description to retrieve passwords
-                    query = self.buildDetailsUrl(nzb_id, host['api_key'])
-                    url = '%s%s' % (self.getUrl(host['host']), query)
-                    nzb_details = self.getRSSData(url, cache_timeout = 1800, headers = {'User-Agent': Env.getIdentifier()})[0]
-
-                    description = self.getTextElement(nzb_details, 'description')
-
-                    # Extract a password from the description
-                    password = re.search('(?:' + self.passwords_regex + ')(?: *)(?:\:|\=)(?: *)(.*?)\<br\>|\n|$', description, flags = re.I).group(1)
-                    if password:
-                        name += ' {{%s}}' % password.strip()
-                except:
-                    log.debug('Error getting details of "%s": %s', (name, traceback.format_exc()))
-
-            results.append({
-                'id': nzb_id,
-                'provider_extra': urlparse(host['host']).hostname or host['host'],
-                'name': toUnicode(name),
-                'name_extra': name_extra,
-                'age': self.calculateAge(int(time.mktime(parse(date).timetuple()))),
-                'size': int(self.getElement(nzb, 'enclosure').attrib['length']) / 1024 / 1024,
-                'url': ((self.getUrl(host['host']) + self.urls['download']) % tryUrlencode(nzb_id)) + self.getApiExt(host),
-                'detail_url': (cleanHost(host['host']) + self.urls['detail']) % tryUrlencode(nzb_id),
-                'content': self.getTextElement(nzb, 'description'),
-                'description': description,
-                'score': host['extra_score'],
-            })
-
-    def getHosts(self):
-
-        uses = splitString(str(self.conf('use')), clean = False)
-        hosts = splitString(self.conf('host'), clean = False)
-        api_keys = splitString(self.conf('api_key'), clean = False)
-        extra_score = splitString(self.conf('extra_score'), clean = False)
-        custom_tags = splitString(self.conf('custom_tag'), clean = False)
-
-        list = []
-        for nr in range(len(hosts)):
-
-            try: key = api_keys[nr]
-            except: key = ''
-
-            try: host = hosts[nr]
-            except: host = ''
-
-            try: score = tryInt(extra_score[nr])
-            except: score = 0
-
-            try: custom_tag = custom_tags[nr]
-            except: custom_tag = ''
-
-            list.append({
-                'use': uses[nr],
-                'host': host,
-                'api_key': key,
-                'extra_score': score,
-                'custom_tag': custom_tag
-            })
-
-        return list
-
-    def belongsTo(self, url, provider = None, host = None):
-
-        hosts = self.getHosts()
-
-        for host in hosts:
-            result = super(Base, self).belongsTo(url, host = host['host'], provider = provider)
-            if result:
-                return result
-
-    def getUrl(self, host):
-        if '?page=newznabapi' in host:
-            return cleanHost(host)[:-1] + '&'
-
-        return cleanHost(host) + 'api?'
-
-    def isDisabled(self, host = None):
-        return not self.isEnabled(host)
-
-    def isEnabled(self, host = None):
-
-        # Return true if at least one is enabled and no host is given
-        if host is None:
-            for host in self.getHosts():
-                if self.isEnabled(host):
-                    return True
-            return False
-
-        return NZBProvider.isEnabled(self) and host['host'] and host['api_key'] and int(host['use'])
-
-    def getApiExt(self, host):
-        return '&apikey=%s' % host['api_key']
-
-    def download(self, url = '', nzb_id = ''):
-        host = urlparse(url).hostname
-
-        if self.limits_reached.get(host):
-            # Try again in 3 hours
-            if self.limits_reached[host] > time.time() - 10800:
-                return 'try_next'
-
-        try:
-            data = self.urlopen(url, show_error = False)
-            self.limits_reached[host] = False
-            return data
-        except HTTPError as e:
-            sc = e.response.status_code
-            if sc in [503, 429]:
-                response = e.read().lower()
-                if sc == 429 or 'maximum api' in response or 'download limit' in response:
-                    if not self.limits_reached.get(host):
-                        log.error('Limit reached / to many requests for newznab provider: %s', host)
-                    self.limits_reached[host] = time.time()
-                    return 'try_next'
-
-            log.error('Failed download from %s: %s', (host, traceback.format_exc()))
-
-        return 'try_next'
-
-    def buildDetailsUrl(self, nzb_id, api_key):
-        query = tryUrlencode({
-            't': 'details',
-            'id': nzb_id,
-            'apikey': api_key,
-        })
-        return query
-
-
-
-config = [{
-    'name': 'newznab',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'nzb_providers',
-            'name': 'newznab',
-            'order': 10,
-            'description': 'Enable <a href="http://newznab.com/" target="_blank">NewzNab</a> such as <a href="https://nzb.su" target="_blank">NZB.su</a>, \
-                <a href="https://nzbs.org" target="_blank">NZBs.org</a>, <a href="http://dognzb.cr/" target="_blank">DOGnzb.cr</a>, \
-                <a href="https://github.com/spotweb/spotweb" target="_blank">Spotweb</a>, <a href="https://nzbgeek.info/" target="_blank">NZBGeek</a>, \
-                <a href="https://www.nzbfinder.ws" target="_blank">NZBFinder</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAgMAAABinRfyAAAACVBMVEVjhwD///86aRovd/sBAAAAMklEQVQI12NgAIPQUCCRmQkjssDEShiRuRIqwZqZGcDAGBrqANUhGgIkWAOABKMDxCAA24UK50b26SAAAAAASUVORK5CYII=',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': True,
-                },
-                {
-                    'name': 'use',
-                    'default': '0,0,0,0,0'
-                },
-                {
-                    'name': 'host',
-                    'default': 'api.nzb.su,api.dognzb.cr,nzbs.org,https://api.nzbgeek.info,https://www.nzbfinder.ws',
-                    'description': 'The hostname of your newznab provider',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'default': '0,0,0,0,0',
-                    'description': 'Starting score for each release found via this provider.',
-                },
-                {
-                    'name': 'custom_tag',
-                    'advanced': True,
-                    'label': 'Custom tag',
-                    'default': ',,,,',
-                    'description': 'Add custom tags, for example add rls=1 to get only scene releases from nzbs.org',
-                },
-                {
-                    'name': 'api_key',
-                    'default': ',,,,',
-                    'label': 'Api Key',
-                    'description': 'Can be found on your profile page',
-                    'type': 'combined',
-                    'combine': ['use', 'host', 'api_key', 'extra_score', 'custom_tag'],
-                },
-            ],
-        },
-    ],
-}]

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

@@ -1,103 +0,0 @@
-from urlparse import urlparse, parse_qs
-import time
-
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.nzb.base import NZBProvider
-from dateutil.parser import parse
-
-
-log = CPLog(__name__)
-
-
-class Base(NZBProvider, RSS):
-
-    urls = {
-        'search': 'https://rss.omgwtfnzbs.org/rss-search.php?%s',
-        'detail_url': 'https://omgwtfnzbs.org/details.php?id=%s',
-    }
-
-    http_time_between_calls = 1   # Seconds
-
-    cat_ids = [
-        ([15], ['dvdrip']),
-        ([15, 16], ['brrip']),
-        ([16], ['720p', '1080p', 'bd50']),
-        ([17], ['dvdr']),
-    ]
-    cat_backup_id = 'movie'
-
-    def search(self, movie, quality):
-
-        if quality['identifier'] in fireEvent('quality.pre_releases', single = True):
-            return []
-
-        return super(Base, self).search(movie, quality)
-
-    def _searchOnTitle(self, title, movie, quality, results):
-
-        q = '%s %s' % (title, movie['info']['year'])
-        params = tryUrlencode({
-            'search': q,
-            'catid': ','.join([str(x) for x in self.getCatId(quality)]),
-            'user': self.conf('username', default = ''),
-            'api': self.conf('api_key', default = ''),
-        })
-
-        nzbs = self.getRSSData(self.urls['search'] % params)
-
-        for nzb in nzbs:
-
-            enclosure = self.getElement(nzb, 'enclosure').attrib
-            nzb_id = parse_qs(urlparse(self.getTextElement(nzb, 'link')).query).get('id')[0]
-
-            results.append({
-                'id': nzb_id,
-                'name': toUnicode(self.getTextElement(nzb, 'title')),
-                'age': self.calculateAge(int(time.mktime(parse(self.getTextElement(nzb, 'pubDate')).timetuple()))),
-                'size': tryInt(enclosure['length']) / 1024 / 1024,
-                'url': enclosure['url'],
-                'detail_url': self.urls['detail_url'] % nzb_id,
-                'description': self.getTextElement(nzb, 'description')
-            })
-
-
-config = [{
-    'name': 'omgwtfnzbs',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'nzb_providers',
-            'name': 'OMGWTFNZBs',
-            'description': 'See <a href="http://omgwtfnzbs.org/">OMGWTFNZBs</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAIAAADAAbR1AAADbElEQVR4AZ2UW0ybZRiAy/OvdHaLYvB0YTRIFi7GkM44zRLmIfNixkWdiRMyYoxRE8/TC7MYvXCGEBmr3mxLwVMwY0wYA7e6Wso4lB6h/U9taSlMGIfBXLYlJMyo0S///2dJI5lxN8/F2/f9nu9737e/jYmXr6KTbN9BGG9HE/NotQ76UWziNzrXFiETk/5ARUNH+7+0kW7fSgTl0VKGOLZzidOkmuuIo7q2oTArNLPIzhdIkqXkerFOm2CaD/5bcKrjIL2c3fkhPxOq93Kcb91v46fV9TQKF4TgV/TbUsQtzfCaK6jMOd5DJrguSIIhexmqqVxN0FXbRR8/ND/LYTTj6J7nl2gnL47OkDW4KJhnQHCa6JpKVNJGA3OC58nwBJoZ//ebbIyKpBxjrr0o1q1FMRkrKXZnHWF85VvxMrJxibwhGyd0f5bLnKzqJs1k0Sfo+EU8hdAUvkbcwKEgs2D0OiV4jmmD1zb+Tp6er0JMMvDxPo5xev9zTBF683NS+N56n1YiB95B5crr93KRuKhKI0tb0Kw2mgLLqTjLEWO8424i9IvURaYeOckwf3+/yCC9e3bQQ/MuD+Monk0k+XFXMUfx7z5EEP+XlXi5tLlMxH8zLppw7idJrugcus30kC86gc7UrQqjLIukM8zWHOACeU+TiMxXN6ExVOkgz4lvPEzice1GIVhxhG4CrZvpl6TH55giKWqXGLy9hZh5aUtgDSew/msSyCKpl+DDNfxJc8NBIsxUxUnz14O/oONu+IIIvso9TLBQ1SY5rUhuSzUhAqJ2mRXBLDOCeUtgUZXsaObT8BffhUJPqWgiV+3zKKzYH0ClvTRLhD77HIqVkyh5jThnivehoG+qJctIRSPn6bxvO4FCgTl9c1DmbpjLajbQFE8aW5SU3rg+zOPGUjTUF9NFpLEbH2c/KmGYlY69/GQJVtGMSUcEp9eCbB1nctbxHTLRdTUkGDf+B02uGWRG3OvpJ/zSMwzif+oxVBID3cQKBavLCiPmB2PM2UuSCUPgrX4VDb97AwEG67bh4+KTOlncvu3M31BwA5rLHbCfEjwkNDky9e/SSbSxnD46Pg0RJtpXRvhmBSZHpRjWtKwFybjuQeXaKxto4WjLZZZvVmC17pZLJFkwxm5++PS2Mrwc7nyIMYZe/IzoP5d6QgEybqTXAAAAAElFTkSuQmCC',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                },
-                {
-                    'name': 'username',
-                    'default': '',
-                },
-                {
-                    'name': 'api_key',
-                    'label': 'Api Key',
-                    'default': '',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'default': 20,
-                    'type': 'int',
-                    'description': 'Starting score for each release found via this provider.',
-                }
-            ],
-        },
-    ],
-}]

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

@@ -1,141 +0,0 @@
-import re
-import traceback
-
-from bs4 import BeautifulSoup
-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://awesome-hd.net/',
-        'detail': 'https://awesome-hd.net/torrents.php?torrentid=%s',
-        'search': 'https://awesome-hd.net/searchapi.php?action=imdbsearch&passkey=%s&imdb=%s&internal=%s',
-        'download': 'https://awesome-hd.net/torrents.php?action=download&id=%s&authkey=%s&torrent_pass=%s',
-    }
-    http_time_between_calls = 1
-
-    def _search(self, movie, quality, results):
-
-        data = self.getHTMLData(self.urls['search'] % (self.conf('passkey'), getIdentifier(movie), self.conf('only_internal')))
-
-        if data:
-            try:
-                soup = BeautifulSoup(data)
-
-                if soup.find('error'):
-                    log.error(soup.find('error').get_text())
-                    return
-
-                authkey = soup.find('authkey').get_text()
-                entries = soup.find_all('torrent')
-
-                for entry in entries:
-
-                    torrentscore = 0
-                    torrent_id = entry.find('id').get_text()
-                    name = entry.find('name').get_text()
-                    year = entry.find('year').get_text()
-                    releasegroup = entry.find('releasegroup').get_text()
-                    resolution = entry.find('resolution').get_text()
-                    encoding = entry.find('encoding').get_text()
-                    freeleech = entry.find('freeleech').get_text()
-                    torrent_desc = '/ %s / %s / %s ' % (releasegroup, resolution, encoding)
-
-                    if freeleech == '0.25' and self.conf('prefer_internal'):
-                        torrent_desc += '/ Internal'
-                        torrentscore += 200
-
-                    if encoding == 'x264' and self.conf('favor') in ['encode', 'both']:
-                        torrentscore += 300
-                    if re.search('Remux', encoding) and self.conf('favor') in ['remux', 'both']:
-                        torrentscore += 200
-
-                    results.append({
-                        'id': torrent_id,
-                        'name': re.sub('[^A-Za-z0-9\-_ \(\).]+', '', '%s (%s) %s' % (name, year, torrent_desc)),
-                        'url': self.urls['download'] % (torrent_id, authkey, self.conf('passkey')),
-                        'detail_url': self.urls['detail'] % torrent_id,
-                        'size': tryInt(entry.find('size').get_text()) / 1048576,
-                        'seeders': tryInt(entry.find('seeders').get_text()),
-                        'leechers': tryInt(entry.find('leechers').get_text()),
-                        'score': torrentscore
-                    })
-
-            except:
-                log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-
-config = [{
-    'name': 'awesomehd',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'Awesome-HD',
-            'description': '<a href="https://awesome-hd.net">AHD</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC+UlEQVR4AV1SO0y6dxQ9H4g8CoIoohZ5NA0aR2UgkYpNB5uocTSaLlrDblMH09Gt8d90r3YpJkanxjA4GGkbO7RNxSABq8jDGnkpD+UD5NV7Bxvbk9wvv+/3uPece66A/yEWi42FQqHVfD7/cbPZtIEglUpjOp3uZHR0dBvAn3gDIRqNgjE4OKj0+Xzf3NzcfD4wMCCjf5TLZbTbbajVatzf3+Pu7q5uNpt35ufnvwBQAScQRREEldfr9RWLxan+/n5YrVa+jFarhVfQQyQSCU4EhULhX15engEgSrjC0dHRVqlUmjQYDBgaGgKtuTqz4mTgIoVCASaTCX19fajVapOHh4dbFJBks9mxcDi8qtFoJEajkfVyJWi1WkxMTMDhcIAT8x6D7/Dd6+vr1fHx8TGp2+3+iqo5+YCzBwIBToK5ubl/mQwPDyMSibAs2Gw2UHNRrValz8/PDUk8Hv9EqVRCr9fj4uICTNflcqFer+Pg4AB7e3uoVCq8x9Rxfn6O7u5uqFQq8FspZXxHTekggByA3W4Hr9PpNDeRL3I1cMhkMrBrnZ2dyGQyvNYIs7OzVbJNPjIyAraLwYdcjR8wXl5eIJfLwRIFQQDLYkm3t7c1CdGPPT4+cpOImp4PODMeaK+n10As2jBbrHifHOjS6qAguVFimkqlwAMmIQnHV1dX4NDQhVwuhyZTV6pgIktzDzkkk0lEwhEEzs7ASQr5Ai4vL1nuccfCwsLO/v6+p9FoyJhF6ekJro/cPCzIZLNQa7rQoK77/SdgWWpKkCaJ5EB9aWnpe6nH40nRMBnJV4f5gw+FX3/5GX/8/htXRZdOzzqhJWn6nl6YbTZqqhrhULD16fT0d8FgcFtYW1vD5uamfGVl5cd4IjldKhZACdkJvKfWUANrxEaJV4hiGVaL1b+7653hXzwRZQr2X76xsfG1xWIRaZzbNPv/CdrjEL9cX/+WXFBSgEPgzxuwG3Yans9OT0+naBZMIJDNfzudzp8WFxd/APAX3uAf9WOTxOPLdosAAAAASUVORK5CYII=',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-                {
-                    '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': 'only_internal',
-                    'advanced': True,
-                    'type': 'bool',
-                    'default': 1,
-                    'description': 'Only search for internal releases.'
-                },
-                {
-                    'name': 'prefer_internal',
-                    'advanced': True,
-                    'type': 'bool',
-                    'default': 1,
-                    'description': 'Favors internal releases over non-internal releases.'
-                },
-                {
-                    'name': 'favor',
-                    'advanced': True,
-                    'default': 'both',
-                    'type': 'dropdown',
-                    'values': [('Encodes & Remuxes', 'both'), ('Encodes', 'encode'), ('Remuxes', 'remux'), ('None', 'none')],
-                    'description': 'Give extra scoring to encodes or remuxes.'
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'type': 'int',
-                    'default': 20,
-                    'description': 'Starting score for each release found via this provider.',
-                },
-            ],
-        },
-    ],
-}]
-

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

@@ -1,78 +0,0 @@
-import time
-import traceback
-
-from couchpotato.core.helpers.variable import getImdb, md5, cleanHost
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import YarrProvider
-from couchpotato.environment import Env
-
-
-log = CPLog(__name__)
-
-
-class TorrentProvider(YarrProvider):
-
-    protocol = 'torrent'
-
-    proxy_domain = None
-    proxy_list = []
-
-    def imdbMatch(self, url, imdbId):
-        if getImdb(url) == imdbId:
-            return True
-
-        if url[:4] == 'http':
-            try:
-                cache_key = md5(url)
-                data = self.getCache(cache_key, url)
-            except IOError:
-                log.error('Failed to open %s.', url)
-                return False
-
-            return getImdb(data) == imdbId
-
-        return False
-
-    def getDomain(self, url = ''):
-
-        forced_domain = self.conf('domain')
-        if forced_domain:
-            return cleanHost(forced_domain).rstrip('/') + url
-
-        if not self.proxy_domain:
-            for proxy in self.proxy_list:
-
-                prop_name = 'proxy.%s' % proxy
-                last_check = float(Env.prop(prop_name, default = 0))
-
-                if last_check > time.time() - 86400:
-                    continue
-
-                data = ''
-                try:
-                    data = self.urlopen(proxy, timeout = 3, show_error = False)
-                except:
-                    log.debug('Failed %s proxy %s: %s', (self.getName(), proxy, traceback.format_exc()))
-
-                if self.correctProxy(data):
-                    log.debug('Using proxy for %s: %s', (self.getName(), proxy))
-                    self.proxy_domain = proxy
-                    break
-
-                Env.prop(prop_name, time.time())
-
-        if not self.proxy_domain:
-            log.error('No %s proxies left, please add one in settings, or let us know which one to add on the forum.', self.getName())
-            return None
-
-        return cleanHost(self.proxy_domain).rstrip('/') + url
-
-    def correctProxy(self, data):
-        return True
-
-
-class TorrentMagnetProvider(TorrentProvider):
-
-    protocol = 'torrent_magnet'
-
-    download = None

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

@@ -1,139 +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': 'http://www.bit-hdtv.com/',
-        'login': 'http://www.bit-hdtv.com/takelogin.php',
-        'login_check': 'http://www.bit-hdtv.com/messages.php',
-        'detail': 'http://www.bit-hdtv.com/details.php?id=%s',
-        'search': 'http://www.bit-hdtv.com/torrents.php?',
-    }
-
-    # Searches for movies only - BiT-HDTV's subcategory and resolution search filters appear to be broken
-    http_time_between_calls = 1  # Seconds
-
-    def _search(self, media, quality, results):
-
-        query = self.buildUrl(media, quality)
-
-        url = "%s&%s" % (self.urls['search'], query)
-
-        data = self.getHTMLData(url)
-
-        if data:
-            # Remove BiT-HDTV's output garbage so outdated BS4 versions successfully parse the HTML
-            split_data = data.partition('-->')
-            if '## SELECT COUNT(' in split_data[0]:
-                data = split_data[2]
-
-            html = BeautifulSoup(data)
-
-            try:
-                result_table = html.find('table', attrs = {'width': '750', 'class': ''})
-                if result_table is None:
-                    return
-
-                entries = result_table.find_all('tr')
-                for result in entries[1:]:
-
-                    cells = result.find_all('td')
-                    link = cells[2].find('a')
-                    torrent_id = link['href'].replace('/details.php?id=', '')
-
-                    results.append({
-                        'id': torrent_id,
-                        'name': link.contents[0].get_text(),
-                        'url': cells[0].find('a')['href'],
-                        'detail_url': self.urls['detail'] % torrent_id,
-                        'size': self.parseSize(cells[6].get_text()),
-                        'seeders': tryInt(cells[8].string),
-                        'leechers': tryInt(cells[9].string),
-                        'get_more_info': self.getMoreInfo,
-                    })
-
-            except:
-                log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-    def getLoginParams(self):
-        return {
-            'username': self.conf('username'),
-            'password': self.conf('password'),
-        }
-
-    def getMoreInfo(self, item):
-        full_description = self.getCache('bithdtv.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
-        html = BeautifulSoup(full_description)
-        nfo_pre = html.find('table', attrs = {'class': 'detail'})
-        description = toUnicode(nfo_pre.text) if nfo_pre else ''
-
-        item['description'] = description
-        return item
-
-    def loginSuccess(self, output):
-        return 'logout.php' in output.lower()
-
-    loginCheckSuccess = loginSuccess
-
-
-config = [{
-    'name': 'bithdtv',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'BiT-HDTV',
-            'description': '<a href="http://bit-hdtv.com">BiT-HDTV</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABnRSTlMAAAAAAABupgeRAAABMklEQVR4AZ3Qu0ojcQCF8W9MJcQbJNgEEQUbQVIqWgnaWfkIvoCgggixEAmIhRtY2GV3w7KwU61B0EYIxmiw0YCik84ipaCuc0nmP5dcjIUgOjqDvxf4OAdf9mnMLcUJyPyGSCP+YRdC+Kp8iagJKhuS+InYRhTGgDbeV2uEMand4ZRxizjXHQEimxhraAnUr73BNqQxMiNeV2SwcjTLEVtb4Zl10mXutvOWm2otw5Sxz6TGTbdd6ncuYvVLXAXrvM+ruyBpy1S3JLGDfUQ1O6jn5vTsrJXvqSt4UNfj6vxTRPxBHER5QeSirhLGk/5rWN+ffB1XZuxjnDy1q87m7TS+xOGA+Iv4gfkbaw+nOMXHDHnITGEk0VfRFnn4Po4vNYm6RGukmggR0L08+l+e4HMeASo/i6AJUjLgAAAAAElFTkSuQmCC',
-            '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/bitsoup.py

@@ -1,137 +0,0 @@
-import traceback
-
-from bs4 import BeautifulSoup, SoupStrainer
-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.bitsoup.me/',
-        'login': 'https://www.bitsoup.me/takelogin.php',
-        'login_check': 'https://www.bitsoup.me/my.php',
-        'search': 'https://www.bitsoup.me/browse.php?%s',
-        'baseurl': 'https://www.bitsoup.me/%s',
-    }
-
-    http_time_between_calls = 1  # Seconds
-    only_tables_tags = SoupStrainer('table')
-
-    torrent_name_cell = 1
-    torrent_download_cell = 2
-
-    def _searchOnTitle(self, title, movie, quality, results):
-
-        url = self.urls['search'] % self.buildUrl(title, movie, quality)
-        data = self.getHTMLData(url)
-
-        if data:
-            html = BeautifulSoup(data, 'html.parser', parse_only = self.only_tables_tags)
-
-            try:
-                result_table = html.find('table', attrs = {'class': 'koptekst'})
-                if not result_table or 'nothing found!' in data.lower():
-                    return
-
-                entries = result_table.find_all('tr')
-                for result in entries[1:]:
-
-                    all_cells = result.find_all('td')
-
-                    torrent = all_cells[self.torrent_name_cell].find('a')
-                    download = all_cells[self.torrent_download_cell].find('a')
-
-                    torrent_id = torrent['href']
-                    torrent_id = torrent_id.replace('details.php?id=', '')
-                    torrent_id = torrent_id.replace('&hit=1', '')
-
-                    torrent_name = torrent.getText()
-
-                    torrent_size = self.parseSize(all_cells[8].getText())
-                    torrent_seeders = tryInt(all_cells[10].getText())
-                    torrent_leechers = tryInt(all_cells[11].getText())
-                    torrent_url = self.urls['baseurl'] % download['href']
-                    torrent_detail_url = self.urls['baseurl'] % torrent['href']
-
-                    results.append({
-                        'id': torrent_id,
-                        'name': torrent_name,
-                        'size': torrent_size,
-                        'seeders': torrent_seeders,
-                        'leechers': torrent_leechers,
-                        'url': torrent_url,
-                        'detail_url': torrent_detail_url,
-                    })
-
-            except:
-                log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-    def getLoginParams(self):
-        return {
-            'username': self.conf('username'),
-            'password': self.conf('password'),
-            'ssl': 'yes',
-        }
-
-    def loginSuccess(self, output):
-        return 'logout.php' in output.lower()
-
-    loginCheckSuccess = loginSuccess
-
-
-config = [{
-    'name': 'bitsoup',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'Bitsoup',
-            'description': '<a href="https://bitsoup.me">Bitsoup</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAB8ElEQVR4AbWSS2sTURiGz3euk0mswaE37HhNhIrajQheFgF3rgR/lAt/gOBCXNZlo6AbqfUWRVCxi04wqUnTRibpJLaJzdzOOZ6WUumyC5/VHOb9eN/FA91uFx0FjI4IPfgiGLTWH73tn348GKmN7ijD0d2b41fO5qJEaX24AWNIUrVQCTTJ3Llx6vbV6Vtzk7Gi9+ebi996guFDDYAQAVj4FExP5qdOZB49W62t/zH3hECcwsPnbWeMXz6Xi2K1f0ApeK3hMCHHbP5gvvoriBgFAAQJEAxhjJ4u+YWTNsVI6b1JgtPWZkoIefKy4fcii2OTw2BABs7wj3bYDlLL4rvjGWOdTser1j5Xf7c3Q/MbHQYApxItvnm31mhQQ71eX2vUB76/vsWB2hg0QuogrMwLIG8P3InM2/eVGXeDViqVwWB79vRU2lgJYmdHcgXCTAXQFJTN5HguvDCR2Hxsxe8EvT54nlcul5vNpqDIEgwRQanAhAAABgRIyiQcjpIkkTOuWyqVoN/vSylX67XXH74uV1vHRUyxxFqbLBCSmBpiXSq6xcL5QrGYzWZ3XQIAwdlOJB+/aL764ucdmncYs0WsCI7kvTnn+qyDMEnTVCn1Tz5KsBFg6fvWcmsUAcnYNC/g2hnromvvqbHvxv+39S+MX+bWkFXwAgAAAABJRU5ErkJggg==',
-            '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/hdbits.py

@@ -1,116 +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',
-            'wizard': True,
-            'description': '<a href="http://hdbits.org">HDBits</a>',
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABi0lEQVR4AZWSzUsbQRjGdyabTcvSNPTSHlpQQeMHJApC8CJRvHgQQU969+LJP8G7f4N3DwpeFRQvRr0EKaUl0ATSpkigUNFsMl/r9NmZLCEHA/nNO5PfvMPDm0DI6fV3ZxiolEICe1oZCBVCCmBPKwOh2ErKBHGE4KYEXBpSLkUlqO4LcM7f+6nVhRnOhSkOz/hexk+tL+YL0yPF2YmN4tynD++4gTLGkNNac9YFLoREBR1+cnF3dFY6v/m6PD+FaXiNJtgA4xYbABxiGrz6+6HWaI5/+Qh37YS0/3Znc8UxwNGBIIBX22z+/ZdJ+4wzyjpR4PEpODg8tgUXBv2iWUzSpa12B0IR6n6lvt8Aek2lZHb084+fdRNgrwY8z81PjhVy2d2ttUrtV/lbBa+JXGEpDMPnoF2tN1QYRqVUtf6nFbThb7wk7le395elcqhASLb39okDiHY00VCtCTEHwSiH4AI0lkOiT1dwMeSfT3SRxiQWNO7Zwj1egkoVIQFMKvSiC3bcjXq9Jf8DcDIRT3hh10kAAAAASUVORK5CYII=',
-            '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/ilovetorrents.py

@@ -1,195 +0,0 @@
-import re
-import traceback
-
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.helpers.variable import tryInt, splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'download': 'https://www.ilovetorrents.me/%s',
-        'detail': 'https://www.ilovetorrents.me/%s',
-        'search': 'https://www.ilovetorrents.me/browse.php?search=%s&page=%s&cat=%s',
-        'test': 'https://www.ilovetorrents.me/',
-        'login': 'https://www.ilovetorrents.me/takelogin.php',
-        'login_check': 'https://www.ilovetorrents.me'
-    }
-
-    cat_ids = [
-        (['41'], ['720p', '1080p', 'brrip']),
-        (['19'], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr']),
-        (['20'], ['dvdr'])
-    ]
-
-    cat_backup_id = 200
-    disable_provider = False
-    http_time_between_calls = 1
-
-    def _searchOnTitle(self, title, movie, quality, results):
-
-        page = 0
-        total_pages = 1
-        cats = self.getCatId(quality)
-
-        while page < total_pages:
-
-            movieTitle = tryUrlencode('"%s" %s' % (title, movie['info']['year']))
-            search_url = self.urls['search'] % (movieTitle, page, cats[0])
-            page += 1
-
-            data = self.getHTMLData(search_url)
-            if data:
-                try:
-
-                    results_table = None
-
-                    data_split = splitString(data, '<table')
-                    soup = None
-                    for x in data_split:
-                        soup = BeautifulSoup(x)
-                        results_table = soup.find('table', attrs = {'class': 'koptekst'})
-                        if results_table:
-                            break
-
-                    if not results_table:
-                        return
-
-                    try:
-                        pagelinks = soup.findAll(href = re.compile('page'))
-                        page_numbers = [int(re.search('page=(?P<page_number>.+'')', i['href']).group('page_number')) for i in pagelinks]
-                        total_pages = max(page_numbers)
-                    except:
-                        pass
-
-                    entries = results_table.find_all('tr')
-
-                    for result in entries[1:]:
-                        prelink = result.find(href = re.compile('details.php'))
-                        link = prelink['href']
-                        download = result.find('a', href = re.compile('download.php'))['href']
-
-                        if link and download:
-
-                            def extra_score(item):
-                                trusted = (0, 10)[result.find('img', alt = re.compile('Trusted')) is not None]
-                                vip = (0, 20)[result.find('img', alt = re.compile('VIP')) is not None]
-                                confirmed = (0, 30)[result.find('img', alt = re.compile('Helpers')) is not None]
-                                moderated = (0, 50)[result.find('img', alt = re.compile('Moderator')) is not None]
-
-                                return confirmed + trusted + vip + moderated
-
-                            id = re.search('id=(?P<id>\d+)&', link).group('id')
-                            url = self.urls['download'] % download
-
-                            fileSize = self.parseSize(result.select('td.rowhead')[5].text)
-                            results.append({
-                                'id': id,
-                                'name': toUnicode(prelink.find('b').text),
-                                'url': url,
-                                'detail_url': self.urls['detail'] % link,
-                                'size': fileSize,
-                                'seeders': tryInt(result.find_all('td')[2].string),
-                                'leechers': tryInt(result.find_all('td')[3].string),
-                                'extra_score': extra_score,
-                                'get_more_info': self.getMoreInfo
-                            })
-
-                except:
-                    log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-    def getLoginParams(self):
-        return {
-            'username': self.conf('username'),
-            'password': self.conf('password'),
-            'submit': 'Welcome to ILT',
-        }
-
-    def getMoreInfo(self, item):
-        cache_key = 'ilt.%s' % item['id']
-        description = self.getCache(cache_key)
-
-        if not description:
-
-            try:
-                full_description = self.getHTMLData(item['detail_url'])
-                html = BeautifulSoup(full_description)
-                nfo_pre = html.find('td', attrs = {'class': 'main'}).findAll('table')[1]
-                description = toUnicode(nfo_pre.text) if nfo_pre else ''
-            except:
-                log.error('Failed getting more info for %s', item['name'])
-                description = ''
-
-            self.setCache(cache_key, description, timeout = 25920000)
-
-        item['description'] = description
-        return item
-
-    def loginSuccess(self, output):
-        return 'logout.php' in output.lower()
-
-    loginCheckSuccess = loginSuccess
-
-
-config = [{
-    'name': 'ilovetorrents',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'ILoveTorrents',
-            'description': 'Where the Love of Torrents is Born',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAACPUlEQVR4AYWM0U9SbxjH3+v266I/oNvWZTfd2J1d0ZqbZEFwWrUImOKs4YwtumFKZvvlJJADR2TCQQlMPKg5NmpREgaekAPnBATKgmK1LqQlx6awHnZWF1Tr2Xfvvs+7z+dB0mlO7StpAh+M4S/2jbo3w8+xvJvlnSneEt+10zwer5ujNUOoChjALWFw5XOwdCAk/P57cGvPl+Oht0W7VJHN5NC1uW1BON4hGjXbwpVWMZhsy9v7sEIXAsDNYBXgdkEoIKyWD2CF8ut/aOXTZc/fBSgLWw1BgA4BDHOV0GkT90cBQpXahU5TFomsb38XhJC5/Tbh1P8c6rJlBeGfAeyMhUFwNVcs9lxV9Ot0dwmyd+mrNvRtbJ2fSPC6Z3Vsvub2z3sDFACAAYzk0+kUyxEkyfN7PopqNBro55A+P6yPKIrL5zF1HwjdeBJJCObIsZO79bo3sHhWhglo5WMV3mazuVPb4fLvSL8/FAkB1hK6rXQPwYhMyROK8VK5LAiH/jsMt0HQjxiN4/ePdoilllcqDyt3Mkg8mRBNbIhMb8RERkowQA/p76g0/UDDdCoNmDminM0qSK5vlpE5kugCHhNPxntwWmJPYTMZtYcFR6ABHQsVRlYLukVORaaULvqKI46keFSCv77kSPS6kxrPptLNDHgz16fWBtyxe6v5h08LUy+KI8ushqTPWWIX8Sg6b45IrGtyW6zXFb/hpQf9m3oqfWuB0fpSw0uZ4WB69En69uOk2rmO2V52PXj+A/mI4ESKpb2HAAAAAElFTkSuQmCC',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False
-                },
-                {
-                    'name': 'username',
-                    'label': 'Username',
-                    'type': 'string',
-                    'default': '',
-                    'description': 'The user name for your ILT account',
-                },
-                {
-                    'name': 'password',
-                    'label': 'Password',
-                    'type': 'password',
-                    'default': '',
-                    'description': 'The password for your ILT account.',
-                },
-                {
-                    '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,172 +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': '<a href="http://www.iptorrents.com">IPTorrents</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABRklEQVR42qWQO0vDUBiG8zeKY3EqQUtNO7g0J6ZJ1+ifKIIFQXAqDYKCyaaYxM3udrZLHdRFhXrZ6liCW6mubfk874EESgqaeOCF7/Y8hEh41aq6yZi2nyZgBGya9XKtZs4No05pAkZV2YbEmyMMsoSxLQeC46wCTdPPY4HruPQyGIhF97qLWsS78Miydn4XdK46NJ9OsQAYBzMIMf8MQ9wtCnTdWCaIDx/u7uljOIQEe0hiIWPamSTLay3+RxOCSPI9+RJAo7Er9r2bnqjBFAqyK+VyK4f5/Cr5ni8OFKVCz49PFI5GdNvvU7ttE1M1zMU+8AMqFksEhrMnQsBDzqmDAwzx2ehRLwT7yyCI+vSC99c3mozH1NxrJgWWtR1BOECfEJSVCm6WCzJGCA7+IWhBsM4zywDPwEp4vCjx2DzBH2ODAfsDb33Ps6dQwJgAAAAASUVORK5CYII=',
-            '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/kickasstorrents.py

@@ -1,181 +0,0 @@
-import re
-import traceback
-
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.variable import tryInt, getIdentifier
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentMagnetProvider):
-
-    urls = {
-        'detail': '%s/%s',
-        'search': '%s/%s-i%s/',
-    }
-
-    cat_ids = [
-        (['cam'], ['cam']),
-        (['telesync'], ['ts', 'tc']),
-        (['screener', 'tvrip'], ['screener']),
-        (['x264', '720p', '1080p', 'blu-ray', 'hdrip'], ['bd50', '1080p', '720p', 'brrip']),
-        (['dvdrip'], ['dvdrip']),
-        (['dvd'], ['dvdr']),
-    ]
-
-    http_time_between_calls = 1  # Seconds
-    cat_backup_id = None
-
-    proxy_list = [
-        'https://kickass.to',
-        'http://kickass.pw',
-        'http://kickassto.come.in',
-        'http://katproxy.ws',
-        'http://kickass.bitproxy.eu',
-        'http://katph.eu',
-        'http://kickassto.come.in',
-    ]
-
-    def _search(self, media, quality, results):
-
-        data = self.getHTMLData(self.urls['search'] % (self.getDomain(), 'm', getIdentifier(media).replace('tt', '')))
-
-        if data:
-
-            cat_ids = self.getCatId(quality)
-            table_order = ['name', 'size', None, 'age', 'seeds', 'leechers']
-
-            try:
-                html = BeautifulSoup(data)
-                resultdiv = html.find('div', attrs = {'class': 'tabs'})
-                for result in resultdiv.find_all('div', recursive = False):
-                    if result.get('id').lower().strip('tab-') not in cat_ids:
-                        continue
-
-                    try:
-                        for temp in result.find_all('tr'):
-                            if temp['class'] is 'firstr' or not temp.get('id'):
-                                continue
-
-                            new = {}
-
-                            nr = 0
-                            for td in temp.find_all('td'):
-                                column_name = table_order[nr]
-                                if column_name:
-
-                                    if column_name == 'name':
-                                        link = td.find('div', {'class': 'torrentname'}).find_all('a')[2]
-                                        new['id'] = temp.get('id')[-7:]
-                                        new['name'] = link.text
-                                        new['url'] = td.find('a', 'imagnet')['href']
-                                        new['detail_url'] = self.urls['detail'] % (self.getDomain(), link['href'][1:])
-                                        new['verified'] = True if td.find('a', 'iverify') else False
-                                        new['score'] = 100 if new['verified'] else 0
-                                    elif column_name is 'size':
-                                        new['size'] = self.parseSize(td.text)
-                                    elif column_name is 'age':
-                                        new['age'] = self.ageToDays(td.text)
-                                    elif column_name is 'seeds':
-                                        new['seeders'] = tryInt(td.text)
-                                    elif column_name is 'leechers':
-                                        new['leechers'] = tryInt(td.text)
-
-                                nr += 1
-
-                            # Only store verified torrents
-                            if self.conf('only_verified') and not new['verified']:
-                                continue
-
-                            results.append(new)
-                    except:
-                        log.error('Failed parsing KickAssTorrents: %s', traceback.format_exc())
-
-            except AttributeError:
-                log.debug('No search results found.')
-
-    def ageToDays(self, age_str):
-        age = 0
-        age_str = age_str.replace(' ', ' ')
-
-        regex = '(\d*.?\d+).(sec|hour|day|week|month|year)+'
-        matches = re.findall(regex, age_str)
-        for match in matches:
-            nr, size = match
-            mult = 1
-            if size == 'week':
-                mult = 7
-            elif size == 'month':
-                mult = 30.5
-            elif size == 'year':
-                mult = 365
-
-            age += tryInt(nr) * mult
-
-        return tryInt(age)
-
-    def isEnabled(self):
-        return super(Base, self).isEnabled() and self.getDomain()
-
-    def correctProxy(self, data):
-        return 'search query' in data.lower()
-
-
-config = [{
-    'name': 'kickasstorrents',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'KickAssTorrents',
-            'description': '<a href="https://kat.ph/">KickAssTorrents</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACD0lEQVR42pXK20uTcRjA8d/fsJsuap0orBuFlm3hir3JJvQOVmuwllN20Lb2isI2nVHKjBqrCWYaNnNuBrkSWxglhDVJOkBdSWUOq5FgoiOrMdRJ2xPPxW+8OUf1ge/FcyCUSVe2qedK5U/OxNTTXRNXEQ52Glb4O6dNEfK1auJkvRY7+/zxnQbA/D596laXcY3OWOiaIX2393SGznUmxkUo/YkDgqHemuzobQ7+NV+reo5Q1mqp68GABdY3+/EloO+JeN4tEqiFU8f3CwhyWo9E7wfMgI0ELTDx0AvjIxcgvZoC9P7NMN7yMmrFeoKa68rfDfmrARsNN0Ihr55cx59ctZWSiwS5bLKpwW4dYJH+M/B6/CYszE0BFZ+egG+Ln+HRoBN/cpl1pV6COIMkOnBVA/w+fXgGKJVM4LxhumMleoL06hJ3wKcCfl+/TAKKx17gnFePRwkqxR4BQSpFkbCrrQJueI7mWpyfATQ9OQY43+uv/+PutBycJ3y2qn2x7jY50GJvnwLKZjOwspyE5I8F4N+1yr1uwqcs3ym63Hwo29EiAyzUWQVr6WVAS4lZCPutQG/2GtES2YiW3d3XflYKtL72kzAcdEDHeSa3czeIMyyz/TApRKvcFfE0isHbJMnrHCf6xTLb1ORvWNlWo91cvHrJUQo0o6ZoRi7dIiT/g2WEDi27Iyov21xMCvgNfXvtwIACfHwAAAAASUVORK5CYII=',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': True,
-                },
-                {
-                    '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': 'only_verified',
-                    'advanced': True,
-                    'type': 'bool',
-                    'default': False,
-                    'description': 'Only search for verified 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/sceneaccess.py

@@ -1,135 +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 _searchOnTitle(self, title, media, quality, results):
-
-        url = self.buildUrl(title, 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': '<a href="https://sceneaccess.eu/">SceneAccess</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABnRSTlMAAAAAAABupgeRAAACT0lEQVR4AYVQS0sbURidO3OTmajJ5FElTTOkPmZ01GhHrIq0aoWAj1Vc+A/cuRMXbl24V9SlCGqrLhVFCrooEhCp2BAx0mobTY2kaR7qmOm87EXL1EWxh29xL+c7nPMdgGHYO5bF/gdbefnr6WlbWRnxluMwAB4Z0uEgXa7nwaDL7+/RNPzxbYvb/XJ0FBYVfd/ayh0fQ4qCGEHcm0KLRZUk7Pb2YRJPRwcsKMidnKD3t9VVT3s7BDh+z5FOZ3Vfn3h+Hltfx00mRRSRWFcUmmVNhYVqPn8dj3va2oh+txvcQRVF9ebm1fi4k+dRFbosY5rm4Hk7xxULQnJnx93S4g0EIEEQRoDLo6PrWEw8Pc0eHLwYGopMTDirqlJ7eyhYYGHhfgfHCcKYksZGVB/NcXI2mw6HhZERqrjYTNPHi4tFPh8aJIYIhgPlcCRDoZLW1s75+Z/7+59nZ/OJhLWigqAoKZX6Mjf3dXkZ3pydGYLc4aEoCCkInzQ1fRobS2xuvllaonkedfArnY5OTdGVldBkOADgqq2Nr6z8CIWaJietDHOhKB+HhwFKC6Gnq4ukKJvP9zcSbjYDXbeVlkKzuZBhnnV3e3t6UOmaJO0ODibW1hB1GYkg8R/gup7Z3TVZLJ5AILW9LcZiVpYtYBhw16O3t7cauckyeF9Tgz0ATpL2+nopmWycmbnY2LiKRjFk6/d7+/vRJfl4HGzV1T0UIM43MGBvaIBWK/YvwM5w+IMgGH8tkyEgvIpE7M3Nt6qqZrNyOq1kMmouh455Ggz+BhKY4GEc2CfwAAAAAElFTkSuQmCC',
-            '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/thepiratebay.py

@@ -1,172 +0,0 @@
-import re
-import traceback
-
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
-import six
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentMagnetProvider):
-
-    urls = {
-         'detail': '%s/torrent/%s',
-         'search': '%s/search/%%s/%%s/7/%%s'
-    }
-
-    cat_backup_id = 200
-    disable_provider = False
-    http_time_between_calls = 0
-
-    proxy_list = [
-        'https://dieroschtibay.org',
-        'https://thebay.al',
-        'https://thepiratebay.se',
-        'http://thepiratebay.se.net',
-        'http://thebootlegbay.com',
-        'http://tpb.ninja.so',
-        'http://proxybay.fr',
-        'http://pirateproxy.in',
-        'http://piratebay.skey.sk',
-        'http://pirateproxy.be',
-        'http://bayproxy.li',
-        'http://proxybay.pw',
-    ]
-
-    def _search(self, media, quality, results):
-
-        page = 0
-        total_pages = 1
-        cats = self.getCatId(quality)
-
-        base_search_url = self.urls['search'] % self.getDomain()
-
-        while page < total_pages:
-
-            search_url = base_search_url % self.buildUrl(media, page, cats)
-
-            page += 1
-
-            data = self.getHTMLData(search_url)
-
-            if data:
-                try:
-                    soup = BeautifulSoup(data)
-                    results_table = soup.find('table', attrs = {'id': 'searchResult'})
-
-                    if not results_table:
-                        return
-
-                    try:
-                        total_pages = len(soup.find('div', attrs = {'align': 'center'}).find_all('a'))
-                    except:
-                        pass
-
-                    entries = results_table.find_all('tr')
-                    for result in entries[1:]:
-                        link = result.find(href = re.compile('torrent\/\d+\/'))
-                        download = result.find(href = re.compile('magnet:'))
-
-                        try:
-                            size = re.search('Size (?P<size>.+),', six.text_type(result.select('font.detDesc')[0])).group('size')
-                        except:
-                            continue
-
-                        if link and download:
-
-                            def extra_score(item):
-                                trusted = (0, 10)[result.find('img', alt = re.compile('Trusted')) is not None]
-                                vip = (0, 20)[result.find('img', alt = re.compile('VIP')) is not None]
-                                confirmed = (0, 30)[result.find('img', alt = re.compile('Helpers')) is not None]
-                                moderated = (0, 50)[result.find('img', alt = re.compile('Moderator')) is not None]
-
-                                return confirmed + trusted + vip + moderated
-
-                            results.append({
-                                'id': re.search('/(?P<id>\d+)/', link['href']).group('id'),
-                                'name': six.text_type(link.string),
-                                'url': download['href'],
-                                'detail_url': self.getDomain(link['href']),
-                                'size': self.parseSize(size),
-                                'seeders': tryInt(result.find_all('td')[2].string),
-                                'leechers': tryInt(result.find_all('td')[3].string),
-                                'extra_score': extra_score,
-                                'get_more_info': self.getMoreInfo
-                            })
-
-                except:
-                    log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-    def isEnabled(self):
-        return super(Base, self).isEnabled() and self.getDomain()
-
-    def correctProxy(self, data):
-        return 'title="Pirate Search"' in data
-
-    def getMoreInfo(self, item):
-        full_description = self.getCache('tpb.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
-        html = BeautifulSoup(full_description)
-        nfo_pre = html.find('div', attrs = {'class': 'nfo'})
-        description = ''
-        try:
-            description = toUnicode(nfo_pre.text)
-        except:
-            pass
-
-        item['description'] = description
-        return item
-
-
-config = [{
-    'name': 'thepiratebay',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'ThePirateBay',
-            'description': 'The world\'s largest bittorrent tracker. <a href="http://fucktimkuik.org/">ThePirateBay</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAA3UlEQVQY02P4DwT/YADIZvj//7qnozMYODmtAAusZoCDELDAegYGViZhAWZmRoYoqIDupfhNN1M3dTBEggXWMZg9jZRXV77YxhAOFpjDwMAPMoCXmcHsF1SAQZ6bQY2VgUEbKHClcAYzg3mINEO8jSCD478/DPsZmvqWblu1bOmStes3Pp0ezVDF4Gif0Hfx9///74/ObRZ2YNiZ47C8XIRBxFJR0jbSSUud4f9zAQWn8NTuziAt2zy5xIMM/z8LFX0E+fD/x0MRDCeA1v7Z++Y/FDzyvAtyBxIA+h8A8ZKLeT+lJroAAAAASUVORK5CYII=',
-            '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/providers/torrent/torrentbytes.py

@@ -1,136 +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
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {
-        'test': 'https://www.torrentbytes.net/',
-        'login': 'https://www.torrentbytes.net/takelogin.php',
-        'login_check': 'https://www.torrentbytes.net/inbox.php',
-        'detail': 'https://www.torrentbytes.net/details.php?id=%s',
-        'search': 'https://www.torrentbytes.net/browse.php?search=%s&cat=%d',
-        'download': 'https://www.torrentbytes.net/download.php?id=%s&name=%s',
-    }
-
-    cat_ids = [
-        ([5], ['720p', '1080p', 'bd50']),
-        ([19], ['cam']),
-        ([19], ['ts', 'tc']),
-        ([19], ['r5', 'scr']),
-        ([19], ['dvdrip']),
-        ([19], ['brrip']),
-        ([20], ['dvdr']),
-    ]
-
-    http_time_between_calls = 1  # Seconds
-    cat_backup_id = None
-
-    def _searchOnTitle(self, title, movie, quality, results):
-
-        url = self.urls['search'] % (tryUrlencode('%s %s' % (title.replace(':', ''), movie['info']['year'])), self.getCatId(quality)[0])
-        data = self.getHTMLData(url)
-
-        if data:
-            html = BeautifulSoup(data)
-
-            try:
-                result_table = html.find('table', attrs = {'border': '1'})
-                if not result_table:
-                    return
-
-                entries = result_table.find_all('tr')
-
-                for result in entries[1:]:
-                    cells = result.find_all('td')
-
-                    link = cells[1].find('a', attrs = {'class': 'index'})
-
-                    full_id = link['href'].replace('details.php?id=', '')
-                    torrent_id = full_id[:6]
-
-                    results.append({
-                        'id': torrent_id,
-                        'name': link.contents[0],
-                        'url': self.urls['download'] % (torrent_id, link.contents[0]),
-                        'detail_url': self.urls['detail'] % torrent_id,
-                        'size': self.parseSize(cells[6].contents[0] + cells[6].contents[2]),
-                        'seeders': tryInt(cells[8].find('span').contents[0]),
-                        'leechers': tryInt(cells[9].find('span').contents[0]),
-                    })
-
-            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'),
-            'login': 'submit',
-        }
-
-    def loginSuccess(self, output):
-        return 'logout.php' in output.lower() or 'Welcome' in output.lower()
-
-    loginCheckSuccess = loginSuccess
-
-
-config = [{
-    'name': 'torrentbytes',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'TorrentBytes',
-            'description': '<a href="http://torrentbytes.net">TorrentBytes</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAeFBMVEUAAAAAAEQAA1QAEmEAKnQALHYAMoEAOokAQpIASYsASZgAS5UATZwATosATpgAVJ0AWZwAYZ4AZKAAaZ8Ab7IAcbMAfccAgcQAgcsAhM4AiscAjMkAmt0AoOIApecAp/EAqvQAs+kAt+wA3P8A4f8A//8VAAAfDbiaAl08AAAAjUlEQVQYGQXBO04DQRAFwHqz7Z8sECIl5f73ISRD5GBs7UxTlWfg9vYXnvJRQJqOL88D6BAwJtMMumHUVCl60aa6H93IrIv0b+157f1lpk+fm87lMWrZH0vncKbXdRUQrRmrh9C6Iwkq6rg4PXZcyXmbizzeV/g+rDra0rGve8jPKLSOJNi2AQAwAGjwD7ApPkEHdtPQAAAAAElFTkSuQmCC',
-            '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,114 +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 _searchOnTitle(self, title, media, quality, results):
-
-        query = '"%s" %s' % (title, media['info']['year'])
-
-        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': '<a href="http://www.td.af/">TorrentDay</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC5ElEQVQ4y12TXUgUURTH//fO7Di7foeQJH6gEEEIZZllVohfSG/6UA+RSFAQQj74VA8+Bj30lmAlRVSEvZRfhNhaka5ZUG1paKaW39tq5O6Ou+PM3M4o6m6X+XPPzD3zm/+dcy574r515WfIW8CZBM4YAA5Gc/aQC3yd7oXYEONcsISE5dTDh91HS0t7FEWhBUAeN9ynV/d9qJAgE4AECURAcVsGlCCnly26LMA0IQwTa52dje3d3e3hcPi8qqrrMjcVYI3EHCQZlkFOHBwR2QHh2ASAAIJxWGAQEDxjePhs3527XjJwnb37OHBq0T+Tyyjh+9KnEzNJ7nouc1Q/3A3HGsOvnJy+PSUlj81w2Lny9WuJ6+3AmTjD4HOcrdR2dWXLRQePvyaSLfQOPMPC8mC9iHCsOxSyzJCelzdSXlNzD5ujpb25Wbfc/XXJemTXF4+nnCNq+AMLe50uFfEJTiw4GXSFtiHL0SnIq66+p0kSArqO+eH3RdsAv9+f5vW7L7GICq6rmM8XBCAXlBw90rOyxibn5yzfkg/L09M52/jxqdESaIrBXHYZZbB1GX8cEpySxKIB8S5XcOnvqpli1zuwmrTtoLjw5LOK/eeuWsE4JH5IRPaPZKiKigmPp+5pa+u1aEjIMhEgrRkmi9mgxGUhM7LNJSzOzsE3+cOeExovXOjdytE0LV4zqNZUtV0uZzAGoGkhDH/2YHZiErmv4uyWQnZZWc+hoqL3WzlTExN5hhA8IEwkZWZOxwB++30YG/9GkYCPvqAaHAW5uWPROW86OmqCprUR7z1yZDAGQNuCvkoB/baIKUBWMTYymv+gra3eJNvjXu+B562tFyXqTJ6YuHK8rKwvBmC3vR7cOCPQLWFz8LnfXWUrJo9U19BwMyUlJRjTSMJ2ENxUiGxq9KXQfwqYlnWstvbR5aamG9g0uzM8Q4OFt++3NNixQ2NgYmeN03FOTUv7XVpV9aKisvLl1vN/WVhNc/Fi1NEAAAAASUVORK5CYII=',
-            '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,126 +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://www.torrentleech.org/',
-        'login': 'https://www.torrentleech.org/user/account/login/',
-        'login_check': 'https://torrentleech.org/user/messages',
-        'detail': 'https://www.torrentleech.org/torrent/%s',
-        'search': 'https://www.torrentleech.org/torrents/browse/index/query/%s/categories/%d',
-        'download': 'https://www.torrentleech.org%s',
-    }
-
-    http_time_between_calls = 1  # Seconds
-    cat_backup_id = None
-
-    def _searchOnTitle(self, title, media, quality, results):
-
-        url = self.urls['search'] % self.buildUrl(title, 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': '<a href="http://torrentleech.org">TorrentLeech</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAACHUlEQVR4AZVSO48SYRSdGTCBEMKzILLAWiybkKAGMZRUUJEoDZX7B9zsbuQPYEEjNLTQkYgJDwsoSaxspEBsCITXjjNAIKi8AkzceXgmbHQ1NJ5iMufmO9/9zrmXlCSJ+B8o75J8Pp/NZj0eTzweBy0Wi4PBYD6f12o1r9ebTCZx+22HcrnMsuxms7m6urTZ7LPZDMVYLBZ8ZV3yo8aq9Pq0wzCMTqe77dDv9y8uLyAWBH6xWOyL0K/56fcb+rrPgPZ6PZfLRe1fsl6vCUmGKIqoqNXqdDr9Dbjps9znUV0uTqdTjuPkDoVCIfcuJ4gizjMMm8u9vW+1nr04czqdK56c37CbKY9j2+1WEARZ0Gq1RFHAz2q1qlQqXxoN69HRcDjUarW8ZD6QUigUOnY8uKYH8N1sNkul9yiGw+F6vS4Rxn8EsodEIqHRaOSnq9T7ajQazWQycEIR1AEBYDabSZJyHDucJyegwWBQr9ebTCaKvHd4cCQANUU9evwQ1Ofz4YvUKUI43GE8HouSiFiNRhOowWBIpVLyHITJkuW3PwgAEf3pgIwxF5r+OplMEsk3CPT5szCMnY7EwUdhwUh/CXiej0Qi3idPz89fdrpdbsfBzH7S3Q9K5pP4c0sAKpVKoVAQGO1ut+t0OoFAQHkH2Da/3/+but3uarWK0ZMQoNdyucRutdttmqZxMTzY7XaYxsrgtUjEZrNhkSwWyy/0NCatZumrNQAAAABJRU5ErkJggg==',
-            '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/torrentpotato.py

@@ -1,188 +0,0 @@
-from urlparse import urlparse
-import re
-import traceback
-
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import splitString, tryInt, tryFloat
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import ResultList
-from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentProvider):
-
-    urls = {}
-    limits_reached = {}
-
-    http_time_between_calls = 1  # Seconds
-
-    def search(self, media, quality):
-        hosts = self.getHosts()
-
-        results = ResultList(self, media, quality, imdb_results = True)
-
-        for host in hosts:
-            if self.isDisabled(host):
-                continue
-
-            self._searchOnHost(host, media, quality, results)
-
-        return results
-
-    def _searchOnHost(self, host, media, quality, results):
-
-        torrents = self.getJsonData(self.buildUrl(media, host), cache_timeout = 1800)
-
-        if torrents:
-            try:
-                if torrents.get('error'):
-                    log.error('%s: %s', (torrents.get('error'), host['host']))
-                elif torrents.get('results'):
-                    for torrent in torrents.get('results', []):
-                        results.append({
-                            'id': torrent.get('torrent_id'),
-                            'protocol': 'torrent' if re.match('^(http|https|ftp)://.*$', torrent.get('download_url')) else 'torrent_magnet',
-                            'provider_extra': urlparse(host['host']).hostname or host['host'],
-                            'name': toUnicode(torrent.get('release_name')),
-                            'url': torrent.get('download_url'),
-                            'detail_url': torrent.get('details_url'),
-                            'size': torrent.get('size'),
-                            'score': host['extra_score'],
-                            'seeders': torrent.get('seeders'),
-                            'leechers': torrent.get('leechers'),
-                            'seed_ratio': host['seed_ratio'],
-                            'seed_time': host['seed_time'],
-                        })
-
-            except:
-                log.error('Failed getting results from %s: %s', (host['host'], traceback.format_exc()))
-
-    def getHosts(self):
-
-        uses = splitString(str(self.conf('use')), clean = False)
-        hosts = splitString(self.conf('host'), clean = False)
-        names = splitString(self.conf('name'), clean = False)
-        seed_times = splitString(self.conf('seed_time'), clean = False)
-        seed_ratios = splitString(self.conf('seed_ratio'), clean = False)
-        pass_keys = splitString(self.conf('pass_key'), clean = False)
-        extra_score = splitString(self.conf('extra_score'), clean = False)
-
-        host_list = []
-        for nr in range(len(hosts)):
-
-            try: key = pass_keys[nr]
-            except: key = ''
-
-            try: host = hosts[nr]
-            except: host = ''
-
-            try: name = names[nr]
-            except: name = ''
-
-            try: ratio = seed_ratios[nr]
-            except: ratio = ''
-
-            try: seed_time = seed_times[nr]
-            except: seed_time = ''
-
-            host_list.append({
-                'use': uses[nr],
-                'host': host,
-                'name': name,
-                'seed_ratio': tryFloat(ratio),
-                'seed_time': tryInt(seed_time),
-                'pass_key': key,
-                'extra_score': tryInt(extra_score[nr]) if len(extra_score) > nr else 0
-            })
-
-        return host_list
-
-    def belongsTo(self, url, provider = None, host = None):
-
-        hosts = self.getHosts()
-
-        for host in hosts:
-            result = super(Base, self).belongsTo(url, host = host['host'], provider = provider)
-            if result:
-                return result
-
-    def isDisabled(self, host = None):
-        return not self.isEnabled(host)
-
-    def isEnabled(self, host = None):
-
-    # Return true if at least one is enabled and no host is given
-        if host is None:
-            for host in self.getHosts():
-                if self.isEnabled(host):
-                    return True
-            return False
-
-        return TorrentProvider.isEnabled(self) and host['host'] and host['pass_key'] and int(host['use'])
-
-
-config = [{
-    'name': 'torrentpotato',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'list': 'torrent_providers',
-            'name': 'TorrentPotato',
-            'order': 10,
-            'description': 'CouchPotato torrent provider. Checkout <a href="https://github.com/RuudBurger/CouchPotatoServer/wiki/CouchPotato-Torrent-Provider">the wiki page about this provider</a> for more info.',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABnRSTlMAAAAAAABupgeRAAABSElEQVR4AZ2Nz0oCURTGv8t1YMpqUxt9ARFxoQ/gQtppgvUKcu/sxB5iBJkogspaBC6iVUplEC6kv+oiiKDNhAtt16roP0HQgdsMLgaxfvy4nHP4Pi48qE2g4v91JOqT1CH/UnA7w7icUlLawyEdj+ZI/7h6YluWbRiddHonHh9M70aj7VTKzuXuikUMci/EO/ACnAI15599oAk8AR/AgxBQNCzreD7bmpl+FOIVuAHqQDUcJo+AK+CZFKLt95/MpSmMt0TiW9POxse6UvYZ6zB2wFgjFiNpOGesR0rZ0PVPXf8KhUCl22CwClz4eN8weoZBb9c0bdPsOWvHx/cYu9Y0CoNoZTJrwAbn5DrnZc6XOV+igVbnsgo0IxEomlJuA1vUIYGyq3PZBChwmExCUSmVZgMBDIUCK4UCFIv5vHIhm/XUDeAf/ADbcpd5+aXSWQAAAABJRU5ErkJggg==',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-                {
-                    'name': 'use',
-                    'default': ''
-                },
-                {
-                    'name': 'host',
-                    'default': '',
-                    'description': 'The url path of your TorrentPotato provider.',
-                },
-                {
-                    'name': 'extra_score',
-                    'advanced': True,
-                    'label': 'Extra Score',
-                    'default': '0',
-                    'description': 'Starting score for each release found via this provider.',
-                },
-                {
-                    'name': 'name',
-                    'label': 'Username',
-                    'default': '',
-                },
-                {
-                    'name': 'seed_ratio',
-                    'label': 'Seed ratio',
-                    'default': '1',
-                    'description': 'Will not be (re)moved until this seed ratio is met.',
-                },
-                {
-                    'name': 'seed_time',
-                    'label': 'Seed time',
-                    'default': '40',
-                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
-                },
-                {
-                    'name': 'pass_key',
-                    'default': ',',
-                    'label': 'Pass Key',
-                    'description': 'Can be found on your profile page',
-                    'type': 'combined',
-                    'combine': ['use', 'host', 'pass_key', 'name', 'seed_ratio', 'seed_time', 'extra_score'],
-                },
-            ],
-        },
-    ],
-}]

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

@@ -1,133 +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://torrentshack.eu/',
-        'login': 'http://torrentshack.eu/login.php',
-        'login_check': 'http://torrentshack.eu/inbox.php',
-        'detail': 'http://torrentshack.eu/torrent/%s',
-        'search': 'http://torrentshack.eu/torrents.php?action=advanced&searchstr=%s&scene=%s&filter_cat[%d]=1',
-        'download': 'http://torrentshack.eu/%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')
-                    tds = result.find_all('td')
-
-                    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')[5].string),
-                        'seeders': tryInt(tds[len(tds)-2].string),
-                        'leechers': tryInt(tds[len(tds)-1].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': '<a href="http://torrentshack.eu/">TorrentShack</a>',
-            'wizard': True,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABmElEQVQoFQXBzY2cVRiE0afqvd84CQiAnxWWtyxsS6ThINBYg2Dc7mZBMEjE4mzs6e9WcY5+ePNuVFJJodQAoLo+SaWCy9rcV8cmjah3CI6iYu7oRU30kE5xxELRfamklY3k1NL19sSm7vPzP/ZdNZzKVDaY2sPZJBh9fv5ITrmG2+Vp4e1sPchVqTCQZJnVXi+/L4uuAJGly1+Pw8CprLbi8Om7tbT19/XRqJUk11JP9uHj9ulxhXbvJbI9qJvr5YkGXFG2IBT8tXczt+sfzDZCp3765f3t9tHEHGEDACma77+8o4oATKk+/PfW9YmHruRFjWoVSFsVsGu1YSKq6Oc37+n98unPZSRlY7vsKDqN+92X3yR9+PdXee3iJNKMStqdcZqoTJbUSi5JOkpfRlhSI0mSpEmCFKoU7FqSNOLAk54uGwCStMUCgLrVic62g7oDoFmmdI+P3S0pDe1xvDqb6XrZqbtzShWNoh9fv/XQHaDdM9OqrZi2M7M3UrB2vlkPS1IbdEBk7UiSoD6VlZ6aKWer4aH4f/AvKoHUTjuyAAAAAElFTkSuQmCC',
-            '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,129 +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,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAQklEQVQ4y2NgAALjtJn/ycEMlGiGG0IVAxiwAKzOxaKGARcgxgC8YNSAwWoAzuRMjgsIugqfAUR5CZcBRIcHsWEAADSA96Ig020yAAAAAElFTkSuQmCC',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': True
-                },
-                {
-                    '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,120 +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 TorrentMagnetProvider
-
-
-log = CPLog(__name__)
-
-
-class Base(TorrentMagnetProvider):
-
-    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):
-
-        domain = self.getDomain()
-        if not domain:
-            return
-
-        search_url = self.urls['search'] % (domain, getIdentifier(movie), quality['identifier'])
-
-        data = self.getJsonData(search_url)
-
-        if data and data.get('MovieList'):
-            try:
-                for result in data.get('MovieList'):
-
-                    if result['Quality'] and result['Quality'] not in result['MovieTitle']:
-                        title = result['MovieTitle'] + ' BrRip ' + result['Quality']
-                    else:
-                        title = result['MovieTitle'] + ' BrRip'
-
-                    results.append({
-                        'id': result['MovieID'],
-                        'name': title,
-                        'url': result['TorrentMagnetUrl'],
-                        'detail_url': self.urls['detail'] % (domain, 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,
-            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAACL0lEQVR4AS1SPW/UQBAd23fxne/Ld2dvzvHuzPocEBAKokCBqGiQ6IgACYmvUKRBFEQgKKGg4BAlUoggggYUEQpSHOI7CIEoQs/fYcbLaU/efTvvvZlnA1qydoxU5kcxX0CkgmQZtPy0hCUjvK+WgEByOZ5dns1O5bzna8fRVkgsxH8B0YouIvBhdD5T11NiVOoKrsttyUcpRW0InUrFnwe9HzuP2uaQZYhF2LQ76TTXw2RVMTK8mYYbjfh+zNquMVCrqn93aArLSixPxnafdGDLaz1tjY5rmNa8z5BczEQOxQfCl1GyoqoWxYRN1bkh7ELw3q/vhP6HIL4TG9KumpjgvwuyM7OsjSj98E/vszMfZ7xvPtMaWxGO5crwIumKCR5HxDtJ0AWKGG204RfUd/3smJYqwem/Q7BTS1ZGfM4LNpVwuKAz6cMeROst0S2EwNE7GjTehO2H3dxqIpdkydat15G3F8SXBi4GlpBNlSz012L/k2+W0CLLk/jbcf13rf41yJeMQ8QWUZiHCfCA9ad+81nEKPtoS9mJOf9v0NmMJHgUT6xayheK9EIK7JJeU/AF4scDF7Y5SPlJrRcxJ+um4ibNEdObxLiIwJim+eT2AL5D9CIcnZ5zvSJi9eIlNHVVtZ831dk5svPgvjPWTq+ktWkd/kD0qtm71x+sDQe3kt6DXnM7Ct+GajmTxKlkAokWljyAKSm5oWa2w+BH4P2UuVub7eTyiGOQYapY/wEztHduSDYz5gAAAABJRU5ErkJggg==',
-            '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 +0,0 @@
-from .main import Search
-
-
-def autoload():
-    return Search()

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

@@ -1,68 +0,0 @@
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.helpers.variable import mergeDicts, getImdb
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-
-log = CPLog(__name__)
-
-
-class Search(Plugin):
-
-    def __init__(self):
-
-        addApiView('search', self.search, docs = {
-            'desc': 'Search the info in providers for a movie',
-            'params': {
-                'q': {'desc': 'The (partial) movie name you want to search for'},
-                'type': {'desc': 'Search for a specific media type. Leave empty to search all.'},
-            },
-            'return': {'type': 'object', 'example': """{
-    'success': True,
-    'movies': array,
-    'show': array,
-    etc
-}"""}
-        })
-
-        addEvent('app.load', self.addSingleSearches)
-
-    def search(self, q = '', types = None, **kwargs):
-
-        # Make sure types is the correct instance
-        if isinstance(types, (str, unicode)):
-            types = [types]
-        elif isinstance(types, (list, tuple, set)):
-            types = list(types)
-
-        imdb_identifier = getImdb(q)
-
-        if not types:
-            if imdb_identifier:
-                result = fireEvent('movie.info', identifier = imdb_identifier, merge = True)
-                result = {result['type']: [result]}
-            else:
-                result = fireEvent('info.search', q = q, merge = True)
-        else:
-            result = {}
-            for media_type in types:
-                if imdb_identifier:
-                    result[media_type] = fireEvent('%s.info' % media_type, identifier = imdb_identifier)
-                else:
-                    result[media_type] = fireEvent('%s.search' % media_type, q = q)
-
-        return mergeDicts({
-            'success': True,
-        }, result)
-
-    def createSingleSearch(self, media_type):
-
-        def singleSearch(q, **kwargs):
-            return self.search(q, type = media_type, **kwargs)
-
-        return singleSearch
-
-    def addSingleSearches(self):
-
-        for media_type in fireEvent('media.types', merge = True):
-            addApiView('%s.search' % media_type, self.createSingleSearch(media_type))

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

@@ -1,191 +0,0 @@
-Block.Search = new Class({
-
-	Extends: BlockBase,
-
-	cache: {},
-
-	create: function(){
-		var self = this;
-
-		var focus_timer = 0;
-		self.el = new Element('div.search_form').adopt(
-			new Element('div.input').adopt(
-				self.input = new Element('input', {
-					'placeholder': 'Search & add a new media',
-					'events': {
-						'input': self.keyup.bind(self),
-						'paste': self.keyup.bind(self),
-						'change': self.keyup.bind(self),
-						'keyup': self.keyup.bind(self),
-						'focus': function(){
-							if(focus_timer) clearTimeout(focus_timer);
-							self.el.addClass('focused');
-							if(this.get('value'))
-								self.hideResults(false)
-						},
-						'blur': function(){
-							focus_timer = (function(){
-								self.el.removeClass('focused')
-							}).delay(100);
-						}
-					}
-				}),
-				new Element('a.icon2', {
-					'events': {
-						'click': self.clear.bind(self),
-						'touchend': self.clear.bind(self)
-					}
-				})
-			),
-			self.result_container = new Element('div.results_container', {
-				'tween': {
-					'duration': 200
-				},
-				'events': {
-					'mousewheel': function(e){
-						(e).stopPropagation();
-					}
-				}
-			}).adopt(
-				self.results = new Element('div.results')
-			)
-		);
-
-		self.mask = new Element('div.mask').inject(self.result_container).fade('hide');
-
-	},
-
-	clear: function(e){
-		var self = this;
-		(e).preventDefault();
-
-		if(self.last_q === ''){
-			self.input.blur();
-			self.last_q = null;
-		}
-		else {
-
-			self.last_q = '';
-			self.input.set('value', '');
-			self.input.focus();
-
-			self.media = {};
-			self.results.empty();
-			self.el.removeClass('filled')
-
-		}
-	},
-
-	hideResults: function(bool){
-		var self = this;
-
-		if(self.hidden == bool) return;
-
-		self.el[bool ? 'removeClass' : 'addClass']('shown');
-
-		if(bool){
-			History.removeEvent('change', self.hideResults.bind(self, !bool));
-			self.el.removeEvent('outerClick', self.hideResults.bind(self, !bool));
-		}
-		else {
-			History.addEvent('change', self.hideResults.bind(self, !bool));
-			self.el.addEvent('outerClick', self.hideResults.bind(self, !bool));
-		}
-
-		self.hidden = bool;
-	},
-
-	keyup: function(){
-		var self = this;
-
-		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);
-			self.autocomplete_timer = self.autocomplete.delay(300, self)
-		}
-
-	},
-
-	autocomplete: function(){
-		var self = this;
-
-		if(!self.q()){
-			self.hideResults(true);
-			return
-		}
-
-		self.list()
-	},
-
-	list: function(){
-		var self = this,
-			q = self.q(),
-			cache = self.cache[q];
-
-		self.hideResults(false);
-
-		if(!cache){
-			self.mask.fade('in');
-
-			if(!self.spinner)
-				self.spinner = createSpinner(self.mask);
-
-			self.api_request = Api.request('search', {
-				'data': {
-					'q': q
-				},
-				'onComplete': self.fill.bind(self, q)
-			})
-		}
-		else
-			self.fill(q, cache);
-
-		self.last_q = q;
-
-	},
-
-	fill: function(q, json){
-		var self = this;
-
-		self.cache[q] = json;
-
-		self.media = {};
-		self.results.empty();
-
-		Object.each(json, function(media){
-			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;
-
-					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.mask.fade('out')
-
-	},
-
-	loading: function(bool){
-		this.el[bool ? 'addClass' : 'removeClass']('loading')
-	},
-
-	q: function(){
-		return this.input.get('value').trim();
-	}
-
-});

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

@@ -1,7 +1,6 @@
 from .main import Searcher
 
-
+def start():
-def autoload():
     return Searcher()
 
 config = [{
@@ -48,7 +47,7 @@ config = [{
                 {
                     'name': 'ignored_words',
                     'label': 'Ignored',
-                    'default': 'german, dutch, french, truefrench, danish, swedish, spanish, italian, korean, dubbed, swesub, korsub, dksubs, vain',
+                    'default': 'german, dutch, french, truefrench, danish, swedish, spanish, italian, korean, dubbed, swesub, korsub, dksubs',
                     'description': 'Ignores releases that match any of these sets. (Works like explained above)'
                 },
             ],
@@ -73,24 +72,4 @@ config = [{
             ],
         },
     ],
-}, {
-    'name': 'torrent',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'name': 'searcher',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'minimum_seeders',
-                    'advanced': True,
-                    'label': 'Minimum seeders',
-                    'description': 'Ignore torrents with seeders below this number',
-                    'default': 1,
-                    'type': 'int',
-                    'unit': 'seeders'
-                },
-            ],
-        },
-    ],
 }]

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

@@ -12,6 +12,7 @@ class SearcherBase(Plugin):
     def __init__(self):
         super(SearcherBase, self).__init__()
 
+
         addEvent('searcher.progress', self.getProgress)
         addEvent('%s.searcher.progress' % self.getType(), self.getProgress)
 
@@ -25,8 +26,9 @@ class SearcherBase(Plugin):
         _type = self.getType()
 
         def setCrons():
+
             fireEvent('schedule.cron', '%s.searcher.all' % _type, self.searchAll,
-                      day = self.conf('cron_day'), hour = self.conf('cron_hour'), minute = self.conf('cron_minute'))
+                day = self.conf('cron_day'), hour = self.conf('cron_hour'), minute = self.conf('cron_minute'))
 
         addEvent('app.load', setCrons)
         addEvent('setting.save.%s_searcher.cron_day.after' % _type, setCrons)

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

@@ -1,28 +1,29 @@
-import datetime
+from couchpotato import get_session
-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.encoding import simplifyString, toUnicode
-from couchpotato.core.helpers.variable import splitString, removeEmpty, removeDuplicate
+from couchpotato.core.helpers.variable import md5, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.searcher.base import SearcherBase
-
+from couchpotato.core.settings.model import Movie, Release, ReleaseInfo
+from couchpotato.environment import Env
+from inspect import ismethod, isfunction
+import datetime
+import re
+import time
+import traceback
 
 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)
+        addEvent('searcher.download', self.download)
-        addEvent('searcher.search', self.search)
 
         addApiView('searcher.full_search', self.searchAllView, docs = {
             'desc': 'Starts a full search for all media',
@@ -48,21 +49,86 @@ class Searcher(SearcherBase):
         progress = fireEvent('searcher.progress', merge = True)
         return progress
 
-    def search(self, protocols, media, quality):
+    def download(self, data, movie, manual = False):
-        results = []
 
-        for search_protocol in protocols:
+        if not data.get('protocol'):
-            protocol_results = fireEvent('provider.search.%s.%s' % (search_protocol, media.get('type')), media, quality, merge = True)
+            data['protocol'] = data['type']
-            if protocol_results:
+            data['type'] = 'movie'
-                results += protocol_results
 
-        sorted_results = sorted(results, key = lambda k: k['score'], reverse = True)
+        # Test to see if any downloaders are enabled for this type
+        downloader_enabled = fireEvent('download.enabled', manual, data, single = True)
 
-        download_preference = self.conf('preferred_method', section = 'searcher')
+        if downloader_enabled:
-        if download_preference != 'both':
-            sorted_results = sorted(sorted_results, key = lambda k: k['protocol'][:3], reverse = (download_preference == 'torrent'))
 
-        return sorted_results
+            snatched_status = fireEvent('status.get', 'snatched', single = True)
+
+            # Download movie to temp
+            filedata = None
+            if data.get('download') and (ismethod(data.get('download')) or isfunction(data.get('download'))):
+                filedata = data.get('download')(url = data.get('url'), nzb_id = data.get('id'))
+                if filedata == 'try_next':
+                    return filedata
+
+            download_result = fireEvent('download', data = data, movie = movie, manual = manual, filedata = filedata, single = True)
+            log.debug('Downloader result: %s', download_result)
+
+            if download_result:
+                try:
+                    # Mark release as snatched
+                    db = get_session()
+                    rls = db.query(Release).filter_by(identifier = md5(data['url'])).first()
+                    if rls:
+                        renamer_enabled = Env.setting('enabled', 'renamer')
+
+                        done_status = fireEvent('status.get', 'done', single = True)
+                        rls.status_id = done_status.get('id') if not renamer_enabled else snatched_status.get('id')
+
+                        # Save download-id info if returned
+                        if isinstance(download_result, dict):
+                            for key in download_result:
+                                rls_info = ReleaseInfo(
+                                    identifier = 'download_%s' % key,
+                                    value = toUnicode(download_result.get(key))
+                                )
+                                rls.info.append(rls_info)
+                        db.commit()
+
+                        log_movie = '%s (%s) in %s' % (getTitle(movie['library']), movie['library']['year'], rls.quality.label)
+                        snatch_message = 'Snatched "%s": %s' % (data.get('name'), log_movie)
+                        log.info(snatch_message)
+                        fireEvent('movie.snatched', message = snatch_message, data = rls.to_dict())
+
+                        # If renamer isn't used, mark movie done
+                        if not renamer_enabled:
+                            active_status = fireEvent('status.get', 'active', single = True)
+                            done_status = fireEvent('status.get', 'done', single = True)
+                            try:
+                                if movie['status_id'] == active_status.get('id'):
+                                    for profile_type in movie['profile']['types']:
+                                        if profile_type['quality_id'] == rls.quality.id and profile_type['finish']:
+                                            log.info('Renamer disabled, marking movie as finished: %s', log_movie)
+
+                                            # Mark release done
+                                            rls.status_id = done_status.get('id')
+                                            rls.last_edit = int(time.time())
+                                            db.commit()
+
+                                            # Mark movie done
+                                            mvie = db.query(Movie).filter_by(id = movie['id']).first()
+                                            mvie.status_id = done_status.get('id')
+                                            mvie.last_edit = int(time.time())
+                                            db.commit()
+                            except:
+                                log.error('Failed marking movie finished, renamer disabled: %s', traceback.format_exc())
+
+                except:
+                    log.error('Failed marking movie finished: %s', traceback.format_exc())
+
+                return True
+
+        log.info('Tried to download, but none of the "%s" downloaders are enabled or gave an error', (data.get('protocol')))
+
+        return False
 
     def getSearchProtocols(self):
 
@@ -87,26 +153,34 @@ class Searcher(SearcherBase):
     def containsOtherQuality(self, nzb, movie_year = None, preferred_quality = None):
         if not preferred_quality: preferred_quality = {}
 
+        name = nzb['name']
+        size = nzb.get('size', 0)
+        nzb_words = re.split('\W+', simplifyString(name))
+
+        qualities = fireEvent('quality.all', single = True)
+
         found = {}
+        for quality in qualities:
+            # Main in words
+            if quality['identifier'] in nzb_words:
+                found[quality['identifier']] = True
+
+            # Alt in words
+            if list(set(nzb_words) & set(quality['alternative'])):
+                found[quality['identifier']] = True
 
         # Try guessing via quality tags
-        guess = fireEvent('quality.guess', files = [nzb.get('name')], size = nzb.get('size', None), single = True)
+        guess = fireEvent('quality.guess', [nzb.get('name')], single = True)
         if guess:
             found[guess['identifier']] = True
 
         # Hack for older movies that don't contain quality tag
-        name = nzb['name']
-        size = nzb.get('size', 0)
-
         year_name = fireEvent('scanner.name_year', name, single = True)
         if len(found) == 0 and movie_year < datetime.datetime.now().year - 3 and not year_name.get('year', None):
-            if size > 20000:  # Assume bd50
+            if size > 3000: # Assume dvdr
-                log.info('Quality was missing in name, assuming it\'s a BR-Disk based on the size: %s', size)
-                found['bd50'] = True
-            elif size > 3000:  # Assume dvdr
                 log.info('Quality was missing in name, assuming it\'s a DVD-R based on the size: %s', size)
                 found['dvdr'] = True
-            else:  # Assume dvdrip
+            else: # Assume dvdrip
                 log.info('Quality was missing in name, assuming it\'s a DVD-Rip based on the size: %s', size)
                 found['dvdrip'] = True
 
@@ -115,25 +189,7 @@ class Searcher(SearcherBase):
             if found.get(allowed):
                 del found[allowed]
 
-        if found.get(preferred_quality['identifier']) and len(found) == 1:
+        return not (found.get(preferred_quality['identifier']) and len(found) == 1)
-            return False
-
-        return found
-
-    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)
-
-        if guess:
-            return threed == guess.get('is_3d')
-        # If no quality guess, assume not 3d
-        else:
-            return threed == False
 
     def correctYear(self, haystack, year, year_range):
 
@@ -161,15 +217,15 @@ class Searcher(SearcherBase):
         except: pass
 
         # Match longest name between []
-        try: check_names.append(max(re.findall(r'[^[]*\[([^]]*)\]', check_name), key = len).strip())
+        try: check_names.append(max(check_name.split('['), key = len))
         except: pass
 
-        for check_name in removeDuplicate(check_names):
+        for check_name in list(set(check_names)):
             check_movie = fireEvent('scanner.name_year', check_name, single = True)
 
             try:
-                check_words = removeEmpty(re.split('\W+', check_movie.get('name', '')))
+                check_words = filter(None, re.split('\W+', check_movie.get('name', '')))
-                movie_words = removeEmpty(re.split('\W+', simplifyString(movie_name)))
+                movie_words = filter(None, re.split('\W+', simplifyString(movie_name)))
 
                 if len(check_words) > 0 and len(movie_words) > 0 and len(list(set(check_words) - set(movie_words))) == 0:
                     return True
@@ -178,50 +234,5 @@ class Searcher(SearcherBase):
 
         return False
 
-    def containsWords(self, rel_name, rel_words, conf, media):
-
-        # Make sure it has required words
-        words = splitString(self.conf('%s_words' % conf, section = 'searcher').lower())
-        try: words = removeDuplicate(words + splitString(media['category'][conf].lower()))
-        except: pass
-
-        req_match = 0
-        for req_set in words:
-            if len(req_set) >= 2 and (req_set[:1] + req_set[-1:]) == '//':
-                if re.search(req_set[1:-1], rel_name):
-                    log.debug('Regex match: %s', req_set[1:-1])
-                    req_match += 1
-            else:
-                req = splitString(req_set, '&')
-                req_match += len(list(set(rel_words) & set(req))) == len(req)
-
-        return words, req_match > 0
-
-    def correctWords(self, rel_name, media):
-        media_title = fireEvent('searcher.get_search_title', media, single = True)
-        media_words = re.split('\W+', simplifyString(media_title))
-
-        rel_name = simplifyString(rel_name)
-        rel_words = re.split('\W+', rel_name)
-
-        required_words, contains_required = self.containsWords(rel_name, rel_words, 'required', media)
-        if len(required_words) > 0 and not contains_required:
-            log.info2('Wrong: Required word missing: %s', rel_name)
-            return False
-
-        ignored_words, contains_ignored = self.containsWords(rel_name, rel_words, 'ignored', media)
-        if len(ignored_words) > 0 and contains_ignored:
-            log.info2("Wrong: '%s' contains 'ignored words'", rel_name)
-            return False
-
-        # Ignore porn stuff
-        pron_tags = ['xxx', 'sex', 'anal', 'tits', 'fuck', 'porn', 'orgy', 'milf', 'boobs', 'erotica', 'erotic', 'cock', 'dick']
-        pron_words = list(set(rel_words) & set(pron_tags) - set(media_words))
-        if pron_words:
-            log.info('Wrong: %s, probably pr0n', rel_name)
-            return False
-
-        return True
-
 class SearchSetupError(Exception):
     pass

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

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

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

@@ -1,23 +1,32 @@
-import traceback
+from couchpotato import get_session
-import time
-
-from CodernityDB.database import RecordNotFound
-from couchpotato import get_db
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
-from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.encoding import toUnicode, simplifyString
-from couchpotato.core.helpers.variable import splitString, getTitle, getImdb, getIdentifier
+from couchpotato.core.helpers.variable import getImdb, splitString, tryInt, \
+    mergeDicts
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie import MovieTypeBase
-import six
+from couchpotato.core.settings.model import Library, LibraryTitle, Movie, \
-
+    Release
+from couchpotato.environment import Env
+from sqlalchemy.orm import joinedload_all
+from sqlalchemy.sql.expression import or_, asc, not_, desc
+from string import ascii_lowercase
+import time
 
 log = CPLog(__name__)
 
 
 class MovieBase(MovieTypeBase):
 
-    _type = 'movie'
+    default_dict = {
+        'profile': {'types': {'quality': {}}},
+        'releases': {'status': {}, 'quality': {}, 'files':{}, 'info': {}},
+        'library': {'titles': {}, 'files':{}},
+        'files': {},
+        'status': {},
+        'category': {},
+    }
 
     def __init__(self):
 
@@ -25,16 +34,50 @@ class MovieBase(MovieTypeBase):
         super(MovieBase, self).__init__()
         self.initType()
 
-        addApiView('movie.add', self.addView, docs = {
+        addApiView('movie.search', self.search, docs = {
-            'desc': 'Add new movie to the wanted list',
+            'desc': 'Search the movie providers for a movie',
+            'params': {
+                'q': {'desc': 'The (partial) movie name you want to search for'},
+            },
             'return': {'type': 'object', 'example': """{
     'success': True,
-    'movie': object
+    'empty': bool, any movies returned or not,
-}"""},
+    'movies': array, movies found,
+}"""}
+        })
+        addApiView('movie.list', self.listView, docs = {
+            'desc': 'List movies in wanted list',
+            'params': {
+                'status': {'type': 'array or csv', 'desc': 'Filter movie by status. Example:"active,done"'},
+                'release_status': {'type': 'array or csv', 'desc': 'Filter movie by status of its releases. Example:"snatched,available"'},
+                'limit_offset': {'desc': 'Limit and offset the movie list. Examples: "50" or "50,30"'},
+                'starts_with': {'desc': 'Starts with these characters. Example: "a" returns all movies starting with the letter "a"'},
+                'search': {'desc': 'Search movie title'},
+            },
+            'return': {'type': 'object', 'example': """{
+    'success': True,
+    'empty': bool, any movies returned or not,
+    'movies': array, movies found,
+}"""}
+        })
+        addApiView('movie.get', self.getView, docs = {
+            'desc': 'Get a movie by id',
+            'params': {
+                'id': {'desc': 'The id of the movie'},
+            }
+        })
+        addApiView('movie.refresh', self.refresh, docs = {
+            'desc': 'Refresh a movie by id',
+            'params': {
+                'id': {'desc': 'Movie ID(s) you want to refresh.', 'type': 'int (comma separated)'},
+            }
+        })
+        addApiView('movie.available_chars', self.charView)
+        addApiView('movie.add', self.addView, docs = {
+            'desc': 'Add new movie to the wanted list',
             'params': {
                 'identifier': {'desc': 'IMDB id of the movie your want to add.'},
                 'profile_id': {'desc': 'ID of quality profile you want the add the movie in. If empty will use the default profile.'},
-                'category_id': {'desc': 'ID of category you want the add the movie in. If empty will use no category.'},
                 'title': {'desc': 'Movie title to use for searches. Has to be one of the titles returned by movie.search.'},
             }
         })
@@ -43,27 +86,337 @@ class MovieBase(MovieTypeBase):
             'params': {
                 'id': {'desc': 'Movie ID(s) you want to edit.', 'type': 'int (comma separated)'},
                 'profile_id': {'desc': 'ID of quality profile you want the edit the movie to.'},
-                'category_id': {'desc': 'ID of category you want the add the movie in. If empty will use no category.'},
                 'default_title': {'desc': 'Movie title to use for searches. Has to be one of the titles returned by movie.search.'},
             }
         })
+        addApiView('movie.delete', self.deleteView, docs = {
+            'desc': 'Delete a movie from the wanted list',
+            'params': {
+                'id': {'desc': 'Movie ID(s) you want to delete.', 'type': 'int (comma separated)'},
+                'delete_from': {'desc': 'Delete movie from this page', 'type': 'string: all (default), wanted, manage'},
+            }
+        })
 
         addEvent('movie.add', self.add)
-        addEvent('movie.update', self.update)
+        addEvent('movie.delete', self.delete)
-        addEvent('movie.update_release_dates', self.updateReleaseDate)
+        addEvent('movie.get', self.get)
+        addEvent('movie.list', self.list)
+        addEvent('movie.restatus', self.restatus)
 
-    def add(self, params = None, force_readd = True, search_after = True, update_after = True, notify_after = True, status = None):
+        # Clean releases that didn't have activity in the last week
+        addEvent('app.load', self.cleanReleases)
+        fireEvent('schedule.interval', 'movie.clean_releases', self.cleanReleases, hours = 4)
+
+    def cleanReleases(self):
+
+        log.debug('Removing releases from dashboard')
+
+        now = time.time()
+        week = 262080
+
+        done_status, available_status, snatched_status = \
+            fireEvent('status.get', ['done', 'available', 'snatched'], single = True)
+
+        db = get_session()
+
+        # get movies last_edit more than a week ago
+        movies = db.query(Movie) \
+            .filter(Movie.status_id == done_status.get('id'), Movie.last_edit < (now - week)) \
+            .all()
+
+        for movie in movies:
+            for rel in movie.releases:
+                if rel.status_id in [available_status.get('id'), snatched_status.get('id')]:
+                    fireEvent('release.delete', id = rel.id, single = True)
+
+        db.expire_all()
+
+    def getView(self, id = None, **kwargs):
+
+        movie = self.get(id) if id else None
+
+        return {
+            'success': movie is not None,
+            'movie': movie,
+        }
+
+    def get(self, movie_id):
+
+        db = get_session()
+
+        imdb_id = getImdb(str(movie_id))
+
+        if imdb_id:
+            m = db.query(Movie).filter(Movie.library.has(identifier = imdb_id)).first()
+        else:
+            m = db.query(Movie).filter_by(id = movie_id).first()
+
+        results = None
+        if m:
+            results = m.to_dict(self.default_dict)
+
+        db.expire_all()
+        return results
+
+    def list(self, status = None, release_status = None, limit_offset = None, starts_with = None, search = None, order = None):
+
+        db = get_session()
+
+        # Make a list from string
+        if status and not isinstance(status, (list, tuple)):
+            status = [status]
+        if release_status and not isinstance(release_status, (list, tuple)):
+            release_status = [release_status]
+
+        # query movie ids
+        q = db.query(Movie) \
+            .with_entities(Movie.id) \
+            .group_by(Movie.id)
+
+        # Filter on movie status
+        if status and len(status) > 0:
+            statuses = fireEvent('status.get', status, single = len(status) > 1)
+            statuses = [s.get('id') for s in statuses]
+
+            q = q.filter(Movie.status_id.in_(statuses))
+
+        # Filter on release status
+        if release_status and len(release_status) > 0:
+            q = q.join(Movie.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))
+
+        # Only join when searching / ordering
+        if starts_with or search or order != 'release_order':
+            q = q.join(Movie.library, Library.titles) \
+                .filter(LibraryTitle.default == True)
+
+        # Add search filters
+        filter_or = []
+        if 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)))
+
+        if search:
+            filter_or.append(LibraryTitle.simple_title.like('%%' + search + '%%'))
+
+        if len(filter_or) > 0:
+            q = q.filter(or_(*filter_or))
+
+        total_count = q.count()
+        if total_count == 0:
+            return 0, []
+
+        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 = splt[0]
+            offset = 0 if len(splt) is 1 else splt[1]
+            q = q.limit(limit).offset(offset)
+
+        # Get all movie_ids in sorted order
+        movie_ids = [m.id for m in q.all()]
+
+        # List release statuses
+        releases = db.query(Release) \
+            .filter(Release.movie_id.in_(movie_ids)) \
+            .all()
+
+        release_statuses = dict((m, set()) for m in movie_ids)
+        releases_count = dict((m, 0) for m in movie_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(Movie) \
+            .options(joinedload_all('library.titles')) \
+            .options(joinedload_all('library.files')) \
+            .options(joinedload_all('status')) \
+            .options(joinedload_all('files'))
+
+        q2 = q2.filter(Movie.id.in_(movie_ids))
+
+        results = q2.all()
+
+        # Create dict by movie id
+        movie_dict = {}
+        for movie in results:
+            movie_dict[movie.id] = movie
+
+        # List movies based on movie_ids order
+        movies = []
+        for movie_id in movie_ids:
+
+            releases = []
+            for r in release_statuses.get(movie_id):
+                x = splitString(r)
+                releases.append({'status_id': x[0], 'quality_id': x[1]})
+
+            # Merge releases with movie dict
+            movies.append(mergeDicts(movie_dict[movie_id].to_dict({
+                'library': {'titles': {}, 'files':{}},
+                'files': {},
+            }), {
+                'releases': releases,
+                'releases_count': releases_count.get(movie_id),
+            }))
+
+        db.expire_all()
+        return total_count, movies
+
+    def availableChars(self, status = None, release_status = None):
+
+        status = status or []
+        release_status = release_status or []
+
+        db = get_session()
+
+        # Make a list from string
+        if not isinstance(status, (list, tuple)):
+            status = [status]
+        if release_status and not isinstance(release_status, (list, tuple)):
+            release_status = [release_status]
+
+        q = db.query(Movie)
+
+        # Filter on movie status
+        if status and len(status) > 0:
+            statuses = fireEvent('status.get', status, single = len(release_status) > 1)
+            statuses = [s.get('id') for s in statuses]
+
+            q = q.filter(Movie.status_id.in_(statuses))
+
+        # Filter on release status
+        if release_status and len(release_status) > 0:
+
+            statuses = fireEvent('status.get', release_status, single = len(release_status) > 1)
+            statuses = [s.get('id') for s in statuses]
+
+            q = q.join(Movie.releases) \
+                .filter(Release.status_id.in_(statuses))
+
+        q = q.join(Library, LibraryTitle) \
+            .with_entities(LibraryTitle.simple_title) \
+            .filter(LibraryTitle.default == True)
+
+        titles = q.all()
+
+        chars = set()
+        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
+
+        db.expire_all()
+        return ''.join(sorted(chars))
+
+    def listView(self, **kwargs):
+
+        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(
+            status = status,
+            release_status = release_status,
+            limit_offset = limit_offset,
+            starts_with = starts_with,
+            search = search,
+            order = order
+        )
+
+        return {
+            'success': True,
+            'empty': len(movies) == 0,
+            'total': total_movies,
+            'movies': movies,
+        }
+
+    def charView(self, **kwargs):
+
+        status = splitString(kwargs.get('status', None))
+        release_status = splitString(kwargs.get('release_status', None))
+        chars = self.availableChars(status, release_status)
+
+        return {
+            'success': True,
+            'empty': len(chars) == 0,
+            'chars': chars,
+        }
+
+    def refresh(self, id = '', **kwargs):
+
+        db = get_session()
+
+        for x in splitString(id):
+            movie = db.query(Movie).filter_by(id = x).first()
+
+            if movie:
+
+                # Get current selected title
+                default_title = ''
+                for title in movie.library.titles:
+                    if title.default: default_title = title.title
+
+                fireEvent('notify.frontend', type = 'movie.busy.%s' % x, data = True)
+                fireEventAsync('library.update.movie', identifier = movie.library.identifier, default_title = default_title, force = True, on_complete = self.createOnComplete(x))
+
+        db.expire_all()
+        return {
+            'success': True,
+        }
+
+    def search(self, q = '', **kwargs):
+
+        cache_key = u'%s/%s' % (__name__, simplifyString(q))
+        movies = Env.get('cache').get(cache_key)
+
+        if not movies:
+
+            if getImdb(q):
+                movies = [fireEvent('movie.info', identifier = q, merge = True)]
+            else:
+                movies = fireEvent('movie.search', q = q, merge = True)
+            Env.get('cache').set(cache_key, movies)
+
+        return {
+            'success': True,
+            'empty': len(movies) == 0 if movies else 0,
+            'movies': movies,
+        }
+
+    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:
@@ -74,290 +427,235 @@ 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'))
 
-        # Set default title
+        library = fireEvent('library.add.movie', single = True, attrs = params, update_after = update_library)
-        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:
+        # Status
-            def_title = toUnicode(titles[0])
+        status_active, snatched_status, ignored_status, done_status, downloaded_status = \
+            fireEvent('status.get', ['active', 'snatched', 'ignored', 'done', 'downloaded'], single = True)
 
-        # Default profile and category
+        default_profile = fireEvent('profile.default', single = True)
-        default_profile = {}
-        if (not params.get('profile_id') and status != 'done') or params.get('ignore_previous', False):
-            default_profile = fireEvent('profile.default', single = True)
         cat_id = params.get('category_id')
 
-        try:
+        db = get_session()
-            db = get_db()
+        m = db.query(Movie).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')
+        if not m:
+            m = Movie(
+                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()
 
-            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') or 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
-            previous_profile = None
-            try:
-                m = db.get('media', 'imdb-%s' % params.get('identifier'), with_doc = True)['doc']
-
-                try:
-                    db.get('id', m.get('profile_id'))
-                    previous_profile = m.get('profile_id')
-                except RecordNotFound:
-                    pass
-                except:
-                    log.error('Failed getting previous profile: %s', traceback.format_exc())
-            except:
-                new = True
-                m = db.insert(media)
-
-            # Update dict to be usable
-            m.update(media)
-
-            added = True
-            do_search = False
-            search_after = search_after and self.conf('search_on_add', section = 'moviesearcher')
             onComplete = None
+            if search_after:
+                onComplete = self.createOnComplete(m.id)
 
-            if new:
+            fireEventAsync('library.update.movie', params.get('identifier'), default_title = params.get('title', ''), on_complete = onComplete)
-                if search_after:
+            search_after = False
-                    onComplete = self.createOnComplete(m['_id'])
+        elif force_readd:
-                search_after = False
-            elif force_readd:
 
-                # Clean snatched history
+            # Clean snatched history
-                for release in fireEvent('release.for_media', m['_id'], single = True):
+            for release in m.releases:
-                    if release.get('status') in ['downloaded', 'snatched', 'seeding', 'done']:
+                if release.status_id in [downloaded_status.get('id'), snatched_status.get('id'), done_status.get('id')]:
-                        if params.get('ignore_previous', False):
+                    if params.get('ignore_previous', False):
-                            fireEvent('release.update_status', release['_id'], status = 'ignored')
+                        release.status_id = ignored_status.get('id')
-                        else:
-                            fireEvent('release.delete', release['_id'], single = True)
-
-                m['profile_id'] = (params.get('profile_id') or default_profile.get('_id')) if not previous_profile else previous_profile
-                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())
-                m['tags'] = []
-
-                do_search = True
-                db.update(m)
-            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', m['_id'], default_title = params.get('title'), on_complete = onComplete)
-
-            # Remove releases
-            for rel in fireEvent('release.for_media', m['_id'], single = True):
-                if rel['status'] is 'available':
-                    db.delete(rel)
-
-            movie_dict = fireEvent('media.get', m['_id'], single = True)
-            if not movie_dict:
-                log.debug('Failed adding media, can\'t find it anymore')
-                return False
-
-            if do_search and search_after:
-                onComplete = self.createOnComplete(m['_id'])
-                onComplete()
-
-            if added and notify_after:
-
-                if params.get('title'):
-                    message = 'Successfully added "%s" to your wanted list.' % params.get('title', '')
-                else:
-                    title = getTitle(m)
-                    if title:
-                        message = 'Successfully added "%s" to your wanted list.' % title
                     else:
-                        message = 'Successfully added to your wanted list.'
+                        fireEvent('release.delete', release.id, single = True)
-                fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = message)
+
+            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:
+            log.debug('Movie already exists, not updating: %s', params)
+            added = False
+
+        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
+        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 = m.to_dict(self.default_dict)
+
+        if do_search and search_after:
+            onComplete = self.createOnComplete(m.id)
+            onComplete()
+
+        if added:
+            fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = 'Successfully added "%s" to your wanted list.' % params.get('title', ''))
+
+        db.expire_all()
+        return movie_dict
 
-            return movie_dict
-        except:
-            log.error('Failed adding media: %s', traceback.format_exc())
 
     def addView(self, **kwargs):
-        add_dict = self.add(params = kwargs)
+
+        movie_dict = self.add(params = kwargs)
 
         return {
-            'success': True if add_dict else False,
+            'success': True,
-            'movie': add_dict,
+            'added': True if movie_dict else False,
+            'movie': movie_dict,
         }
 
     def edit(self, id = '', **kwargs):
 
-        try:
+        db = get_session()
-            db = get_db()
 
-            ids = splitString(id)
+        available_status = fireEvent('status.get', 'available', single = True)
-            for media_id in ids:
 
-                try:
+        ids = splitString(id)
-                    m = db.get('id', media_id)
+        for movie_id in ids:
-                    m['profile_id'] = kwargs.get('profile_id')
 
-                    cat_id = kwargs.get('category_id')
+            m = db.query(Movie).filter_by(id = movie_id).first()
-                    if cat_id is not None:
+            if not m:
-                        m['category_id'] = cat_id if len(cat_id) > 0 else None
+                continue
 
-                    # Remove releases
+            m.profile_id = kwargs.get('profile_id')
-                    for rel in fireEvent('release.for_media', m['_id'], single = True):
-                        if rel['status'] is 'available':
-                            db.delete(rel)
 
-                    # Default title
+            cat_id = kwargs.get('category_id')
-                    if kwargs.get('default_title'):
+            if cat_id is not None:
-                        m['title'] = kwargs.get('default_title')
+                m.category_id = tryInt(cat_id) if tryInt(cat_id) > 0 else None
 
-                    db.update(m)
+            # Remove releases
+            for rel in m.releases:
+                if rel.status_id is available_status.get('id'):
+                    db.delete(rel)
+                    db.commit()
 
-                    fireEvent('media.restatus', m['_id'], single = True)
+            # 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()
 
-                    m = db.get('id', media_id)
+            db.commit()
 
-                    movie_dict = fireEvent('media.get', m['_id'], single = True)
+            fireEvent('movie.restatus', m.id)
-                    fireEventAsync('movie.searcher.single', movie_dict, on_complete = self.createNotifyFront(media_id))
 
-                except:
+            movie_dict = m.to_dict(self.default_dict)
-                    log.error('Can\'t edit non-existing media')
+            fireEventAsync('movie.searcher.single', movie_dict, on_complete = self.createNotifyFront(movie_id))
-
-            return {
-                'success': True,
-            }
-        except:
-            log.error('Failed editing media: %s', traceback.format_exc())
 
+        db.expire_all()
         return {
-            'success': False,
+            'success': True,
         }
 
-    def update(self, media_id = None, identifier = None, default_title = None, extended = False):
+    def deleteView(self, id = '', **kwargs):
-        """
-        Update movie information inside media['doc']['info']
 
-        @param media_id: document id
+        ids = splitString(id)
-        @param default_title: default title, if empty, use first one or existing one
+        for movie_id in ids:
-        @param extended: update with extended info (parses more info, actors, images from some info providers)
+            self.delete(movie_id, delete_from = kwargs.get('delete_from', 'all'))
-        @return: dict, with media
-        """
 
-        if self.shuttingDown():
+        return {
-            return
+            'success': True,
+        }
 
-        lock_key = 'media.get.%s' % media_id if media_id else identifier
+    def delete(self, movie_id, delete_from = None):
-        self.acquireLock(lock_key)
 
-        media = {}
+        db = get_session()
-        try:
-            db = get_db()
 
-            if media_id:
+        movie = db.query(Movie).filter_by(id = movie_id).first()
-                media = db.get('id', media_id)
+        if movie:
+            deleted = False
+            if delete_from == 'all':
+                db.delete(movie)
+                db.commit()
+                deleted = True
             else:
-                media = db.get('media', 'imdb-%s' % identifier, with_doc = True)['doc']
+                done_status = fireEvent('status.get', 'done', single = True)
 
-            info = fireEvent('movie.info', merge = True, extended = extended, identifier = getIdentifier(media))
+                total_releases = len(movie.releases)
+                total_deleted = 0
+                new_movie_status = None
+                for release in movie.releases:
+                    if delete_from in ['wanted', 'snatched', 'late']:
+                        if release.status_id != done_status.get('id'):
+                            db.delete(release)
+                            total_deleted += 1
+                        new_movie_status = 'done'
+                    elif delete_from == 'manage':
+                        if release.status_id == done_status.get('id'):
+                            db.delete(release)
+                            total_deleted += 1
+                        new_movie_status = 'active'
+                db.commit()
 
-            # Don't need those here
+                if total_releases == total_deleted:
-            try: del info['in_wanted']
+                    db.delete(movie)
-            except: pass
+                    db.commit()
-            try: del info['in_library']
+                    deleted = True
-            except: pass
+                elif new_movie_status:
+                    new_status = fireEvent('status.get', new_movie_status, single = True)
+                    movie.profile_id = None
+                    movie.status_id = new_status.get('id')
+                    db.commit()
+                else:
+                    fireEvent('movie.restatus', movie.id, single = True)
 
-            if not info or len(info) == 0:
+            if deleted:
-                log.error('Could not update, no movie info to work with: %s', identifier)
+                fireEvent('notify.frontend', type = 'movie.deleted', data = movie.to_dict())
-                return False
 
-            # Update basic info
+        db.expire_all()
-            media['info'] = info
+        return True
 
-            titles = info.get('titles', [])
+    def restatus(self, movie_id):
-            log.debug('Adding titles: %s', titles)
 
-            # Define default title
+        active_status, done_status = fireEvent('status.get', ['active', 'done'], single = True)
-            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:
+        db = get_session()
-                    def_title = toUnicode(titles[0])
 
-                media['title'] = def_title
+        m = db.query(Movie).filter_by(id = movie_id).first()
+        if not m or len(m.library.titles) == 0:
+            log.debug('Can\'t restatus movie, doesn\'t seem to exist.')
+            return False
 
-            # Files
+        log.debug('Changing status for %s', m.library.titles[0].title)
-            image_urls = info.get('images', [])
+        if not m.profile:
+            m.status_id = done_status.get('id')
+        else:
+            move_to_wanted = True
 
-            self.getPoster(media, image_urls)
+            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
 
-            db.update(media)
+            m.status_id = active_status.get('id') if move_to_wanted else done_status.get('id')
-        except:
-            log.error('Failed update media: %s', traceback.format_exc())
 
-        self.releaseLock(lock_key)
+        db.commit()
-        return media
 
-    def updateReleaseDate(self, media_id):
+        return True
-        """
-        Update release_date (eta) info only
 
-        @param media_id: document id
+    def createOnComplete(self, movie_id):
-        @return: dict, with dates dvd, theater, bluray, expires
-        """
 
-        try:
+        def onComplete():
-            db = get_db()
+            db = get_session()
+            movie = db.query(Movie).filter_by(id = movie_id).first()
+            fireEventAsync('movie.searcher.single', movie.to_dict(self.default_dict), on_complete = self.createNotifyFront(movie_id))
+            db.expire_all()
 
-            media = db.get('id', media_id)
+        return onComplete
 
-            if not media.get('info'):
-                media = self.update(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:
+    def createNotifyFront(self, movie_id):
-                dates = fireEvent('movie.info.release_date', identifier = getIdentifier(media), merge = True)
-                media['info'].update({'release_date': dates})
-                db.update(media)
 
-            return dates
+        def notifyFront():
-        except:
+            db = get_session()
-            log.error('Failed updating release dates: %s', traceback.format_exc())
+            movie = db.query(Movie).filter_by(id = movie_id).first()
+            fireEvent('notify.frontend', type = 'movie.update.%s' % movie.id, data = movie.to_dict(self.default_dict))
+            db.expire_all()
 
-        return {}
+        return notifyFront