One up

Conflicts:
	version.py

CouchPotato.py

@@ -62,7 +62,6 @@ class Loader(object):
         self.log.logger.addHandler(hdlr)
 
     def addSignals(self):
-
         signal.signal(signal.SIGINT, self.onExit)
         signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))
 
@@ -74,7 +73,7 @@ class Loader(object):
 
     def onExit(self, signal, frame):
         from couchpotato.core.event import fireEvent
-        fireEvent('app.crappy_shutdown', single = True)
+        fireEvent('app.shutdown', single = True)
 
     def run(self):
 
@@ -100,7 +99,7 @@ class Loader(object):
             logging.shutdown()
             time.sleep(3)
 
-            args = [sys.executable] + [os.path.join(base_path, __file__)] + sys.argv[1:]
+            args = [sys.executable] + [os.path.join(base_path, os.path.basename(__file__))] + sys.argv[1:]
             subprocess.Popen(args)
         except:
             self.log.critical(traceback.format_exc())

Desktop.py

@@ -1,12 +1,12 @@
+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
-import subprocess
-
 
 # Include proper dirs
 if hasattr(sys, 'frozen'):
@@ -166,8 +166,8 @@ class CouchPotatoApp(wx.App, SoftwareUpdate):
     def OnInit(self):
 
         # Updater
-        base_url = 'http://couchpota.to/updates/'
-        self.InitUpdates(base_url, base_url + 'changelog.html',
+        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)
@@ -214,5 +214,18 @@ if __name__ == '__main__':
     time.sleep(1)
 
     if app.restart:
-        args = [sys.executable] + [os.path.join(base_path, 'Desktop.py')] + sys.argv[1:]
-        subprocess.Popen(args)
+
+        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

@@ -17,6 +17,7 @@ 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/`
 
 OSx:
 
@@ -26,6 +27,7 @@ OSx:
 * 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/`
 
 Linux (ubuntu / debian):
 
@@ -33,7 +35,28 @@ Linux (ubuntu / debian):
 * 'cd' to the folder of your choosing.
 * Run `git clone https://github.com/RuudBurger/CouchPotatoServer.git`
 * Then do `python CouchPotatoServer/CouchPotato.py` to start
-* To run on boot copy the init script. `cp CouchPotatoServer/init/ubuntu /etc/init.d/couchpotato`
-* Change the paths inside the init script. `nano /etc/init.d/couchpotato`
-* Make it executable. `chmod +x /etc/init.d/couchpotato`
+* To run on boot copy the init script. `sudo cp CouchPotatoServer/init/ubuntu /etc/init.d/couchpotato`
+* Change the paths inside the init script. `sudo nano /etc/init.d/couchpotato`
+* Make it executable. `sudo chmod +x /etc/init.d/couchpotato`
 * Add it to defaults. `sudo update-rc.d couchpotato defaults`
+* Open your browser and go to: `http://localhost:5050/`
+ 
+
+FreeBSD :
+
+* Update your ports tree `sudo portsnap fetch update`
+* Install Python 2.6+ [lang/python](http://www.freshports.org/lang/python) with `cd /usr/ports/lang/python; sudo make install clean`
+* Install port [databases/py-sqlite3](http://www.freshports.org/databases/py-sqlite3) with `cd /usr/ports/databases/py-sqlite3; sudo make install clean`
+* Add a symlink to 'python2' `sudo ln -s /usr/local/bin/python /usr/local/bin/python2`
+* Install port [ftp/libcurl](http://www.freshports.org/ftp/libcurl) with `cd /usr/ports/ftp/fpc-libcurl; sudo make install clean`
+* Install port [ftp/curl](http://www.freshports.org/ftp/bcurl), deselect 'Asynchronous DNS resolution via c-ares' when prompted as part of config `cd /usr/ports/ftp/fpc-libcurl; sudo make install clean`
+* Install port [textproc/docbook-xml-450](http://www.freshports.org/textproc/docbook-xml-450) with `cd /usr/ports/textproc/docbook-xml-450; sudo make install clean`
+* Install port [GIT](http://git-scm.com/) with `cd /usr/ports/devel/git; sudo make install clean`
+* 'cd' to the folder of your choosing.
+* 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/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

@@ -0,0 +1,15 @@
+#So you feel like posting a bug, sending me a pull request or just telling me how awesome I am. No problem! 
+
+##Just make sure you think of the following things:
+
+ * Search through the existing (and closed) issues first. See if you can get your answer there.
+ * Double check the result manually, because it could be an external issue. 
+ * Post logs! Without seeing what is going on, I can't reproduce the error.
+ * What is the movie + quality you are searching for.
+ * 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 ;)
+
+**If I don't get enough info, the change of the issue getting closed is a lot bigger ;)**

couchpotato/__init__.py

@@ -1,83 +1,85 @@
-from couchpotato.api import api_docs, api_docs_missing
+from couchpotato.api import api_docs, api_docs_missing, api
 from couchpotato.core.auth import requires_auth
 from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.request import getParams, jsonified
 from couchpotato.core.helpers.variable import md5
 from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
-from flask.app import Flask
-from flask.blueprints import Blueprint
-from flask.globals import request
-from flask.helpers import url_for
-from flask.templating import render_template
 from sqlalchemy.engine import create_engine
 from sqlalchemy.orm import scoped_session
 from sqlalchemy.orm.session import sessionmaker
-from werkzeug.utils import redirect
+from tornado import template
+from tornado.web import RequestHandler
 import os
 import time
 
 log = CPLog(__name__)
 
-app = Flask(__name__, static_folder = 'nope')
-web = Blueprint('web', __name__)
+views = {}
+template_loader = template.Loader(os.path.join(os.path.dirname(__file__), 'templates'))
 
+# Main web handler
+@requires_auth
+class WebHandler(RequestHandler):
+    def get(self, route, *args, **kwargs):
+        route = route.strip('/')
+        if not views.get(route):
+            page_not_found(self)
+            return
+        self.write(views[route]())
+
+def addView(route, func, static = False):
+    views[route] = func
 
 def get_session(engine = None):
     return Env.getSession(engine)
 
-def addView(route, func, static = False):
-    web.add_url_rule(route + ('' if static else '/'), endpoint = route if route else 'index', view_func = func)
 
-""" Web view """
-@web.route('/')
-@requires_auth
+# Web view
 def index():
-    return render_template('index.html', sep = os.sep, fireEvent = fireEvent, env = Env)
+    return template_loader.load('index.html').generate(sep = os.sep, fireEvent = fireEvent, Env = Env)
+addView('', index)
 
-""" Api view """
-@web.route('docs/')
-@requires_auth
+# API docs
 def apiDocs():
-    from couchpotato import app
     routes = []
-    for route, x in sorted(app.view_functions.iteritems()):
-        if route[0:4] == 'api.':
-            routes += [route[4:].replace('::', '.')]
+
+    for route in api.iterkeys():
+        routes.append(route)
 
     if api_docs.get(''):
         del api_docs['']
         del api_docs_missing['']
-    return render_template('api.html', fireEvent = fireEvent, routes = sorted(routes), api_docs = api_docs, api_docs_missing = sorted(api_docs_missing))
 
-@web.route('getkey/')
-def getApiKey():
+    return template_loader.load('api.html').generate(fireEvent = fireEvent, routes = sorted(routes), api_docs = api_docs, api_docs_missing = sorted(api_docs_missing), Env = Env)
 
-    api = None
-    params = getParams()
-    username = Env.setting('username')
-    password = Env.setting('password')
+addView('docs', apiDocs)
 
-    if (params.get('u') == md5(username) or not username) and (params.get('p') == password or not password):
-        api = Env.setting('api_key')
+# Make non basic auth option to get api key
+class KeyHandler(RequestHandler):
+    def get(self, *args, **kwargs):
+        api = None
+        username = Env.setting('username')
+        password = Env.setting('password')
 
-    return jsonified({
-        'success': api is not None,
-        'api_key': api
-    })
+        if (self.get_argument('u') == md5(username) or not username) and (self.get_argument('p') == password or not password):
+            api = Env.setting('api_key')
 
-@app.errorhandler(404)
-def page_not_found(error):
-    index_url = url_for('web.index')
-    url = request.path[len(index_url):]
+        self.write({
+            'success': api is not None,
+            'api_key': api
+        })
+
+def page_not_found(rh):
+    index_url = Env.get('web_base')
+    url = rh.request.uri[len(index_url):]
 
     if url[:3] != 'api':
-        if request.path != '/':
-            r = request.url.replace(request.path, index_url + '#' + url)
-        else:
-            r = '%s%s' % (request.url.rstrip('/'), index_url + '#' + url)
-        return redirect(r)
+        r = index_url + '#' + url.lstrip('/')
+        rh.redirect(r)
     else:
-        time.sleep(0.1)
-        return 'Wrong API key used', 404
+        if not Env.get('dev'):
+            time.sleep(0.1)
+
+        rh.set_status(404)
+        rh.write('Wrong API key used')
 

couchpotato/api.py

@@ -1,23 +1,24 @@
-from flask.blueprints import Blueprint
-from flask.helpers import url_for
-from tornado.ioloop import IOLoop
+from couchpotato.core.helpers.request import getParams
 from tornado.web import RequestHandler, asynchronous
-from werkzeug.utils import redirect
+import json
+import urllib
 
-api = Blueprint('api', __name__)
-api_docs = {}
-api_docs_missing = []
+api = {}
 api_nonblock = {}
 
+api_docs = {}
+api_docs_missing = []
 
+# NonBlock API handler
 class NonBlockHandler(RequestHandler):
+
     stoppers = []
 
     @asynchronous
-    def get(self, route):
-        cls = NonBlockHandler
+    def get(self, route, *args, **kwargs):
+        route = route.strip('/')
         start, stop = api_nonblock[route]
-        cls.stoppers.append(stop)
+        self.stoppers.append(stop)
 
         start(self.onNewMessage, last_id = self.get_argument("last_id", None))
 
@@ -27,20 +28,11 @@ class NonBlockHandler(RequestHandler):
         self.finish(response)
 
     def on_connection_close(self):
-        cls = NonBlockHandler
 
-        for stop in cls.stoppers:
+        for stop in self.stoppers:
             stop(self.onNewMessage)
 
-        cls.stoppers = []
-
-
-def addApiView(route, func, static = False, docs = None, **kwargs):
-    api.add_url_rule(route + ('' if static else '/'), endpoint = route.replace('.', '::') if route else 'index', view_func = func, **kwargs)
-    if docs:
-        api_docs[route[4:] if route[0:4] == 'api.' else route] = docs
-    else:
-        api_docs_missing.append(route)
+        self.stoppers = []
 
 def addNonBlockApiView(route, func_tuple, docs = None, **kwargs):
     api_nonblock[route] = func_tuple
@@ -50,9 +42,43 @@ def addNonBlockApiView(route, func_tuple, docs = None, **kwargs):
     else:
         api_docs_missing.append(route)
 
-""" Api view """
-def index():
-    index_url = url_for('web.index')
-    return redirect(index_url + 'docs/')
+# Blocking API handler
+class ApiHandler(RequestHandler):
 
-addApiView('', index)
+    def get(self, route, *args, **kwargs):
+        route = route.strip('/')
+        if not api.get(route):
+            self.write('API call doesn\'t seem to exist')
+            return
+
+        kwargs = {}
+        for x in self.request.arguments:
+            kwargs[x] = urllib.unquote(self.get_argument(x))
+
+        # Split array arguments
+        kwargs = getParams(kwargs)
+
+        # Remove t random string
+        try: del kwargs['t']
+        except: pass
+
+        # Check JSONP callback
+        result = api[route](**kwargs)
+        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)
+
+def addApiView(route, func, static = False, docs = None, **kwargs):
+
+    if static: func(route)
+    else: api[route] = func
+
+    if docs:
+        api_docs[route[4:] if route[0:4] == 'api.' else route] = docs
+    else:
+        api_docs_missing.append(route)

couchpotato/core/_base/_core/__init__.py

@@ -23,19 +23,22 @@ config = [{
                     'default': '',
                     'type': 'password',
                 },
-                {
-                    'name': 'host',
-                    'advanced': True,
-                    'default': '0.0.0.0',
-                    'label': 'IP',
-                    'description': 'Host that I should listen to. "0.0.0.0" listens to all ips.',
-                },
                 {
                     '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,
@@ -67,7 +70,7 @@ config = [{
                     'name': 'development',
                     'default': 0,
                     'type': 'bool',
-                    'description': 'Disables some checks/downloads for faster reloading.',
+                    'description': 'Enable this if you\'re developing, and NOT in any other case, thanks.',
                 },
                 {
                     'name': 'data_dir',

couchpotato/core/_base/_core/main.py

@@ -1,6 +1,5 @@
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.helpers.request import jsonified
 from couchpotato.core.helpers.variable import cleanHost, md5
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
@@ -9,6 +8,7 @@ from tornado.ioloop import IOLoop
 from uuid import uuid4
 import os
 import platform
+import signal
 import time
 import traceback
 import webbrowser
@@ -51,6 +51,9 @@ class Core(Plugin):
         addEvent('setting.save.core.password', self.md5Password)
         addEvent('setting.save.core.api_key', self.checkApikey)
 
+        # Make sure we can close-down with ctrl+c properly
+        if not Env.get('desktop'):
+            self.signalHandler()
 
     def md5Password(self, value):
         return md5(value.encode(Env.get('encoding'))) if value else ''
@@ -64,28 +67,28 @@ class Core(Plugin):
 
         return True
 
-    def available(self):
-        return jsonified({
-            'succes': True
-        })
+    def available(self, **kwargs):
+        return {
+            'success': True
+        }
 
-    def shutdown(self):
+    def shutdown(self, **kwargs):
         if self.shutdown_started:
             return False
 
         def shutdown():
             self.initShutdown()
-        IOLoop.instance().add_callback(shutdown)
+        IOLoop.current().add_callback(shutdown)
 
         return 'shutdown'
 
-    def restart(self):
+    def restart(self, **kwargs):
         if self.shutdown_started:
             return False
 
         def restart():
             self.initShutdown(restart = True)
-        IOLoop.instance().add_callback(restart)
+        IOLoop.current().add_callback(restart)
 
         return 'restarting'
 
@@ -98,7 +101,7 @@ class Core(Plugin):
 
         self.shutdown_started = True
 
-        fireEvent('app.shutdown')
+        fireEvent('app.do_shutdown')
         log.debug('Every plugin got shutdown event')
 
         loop = True
@@ -124,7 +127,7 @@ class Core(Plugin):
         log.debug('Save to shutdown/restart')
 
         try:
-            IOLoop.instance().stop()
+            IOLoop.current().stop()
         except RuntimeError:
             pass
         except:
@@ -148,14 +151,14 @@ class Core(Plugin):
 
     def createBaseUrl(self):
         host = Env.setting('host')
-        if host == '0.0.0.0':
+        if host == '0.0.0.0' or host == '':
             host = 'localhost'
         port = Env.setting('port')
 
-        return '%s:%d%s' % (cleanHost(host).rstrip('/'), int(port), '/' + Env.setting('url_base').lstrip('/') if Env.setting('url_base') else '')
+        return '%s:%d%s' % (cleanHost(host).rstrip('/'), int(port), Env.get('web_base'))
 
     def createApiUrl(self):
-        return '%s/api/%s' % (self.createBaseUrl(), Env.setting('api_key'))
+        return '%sapi/%s' % (self.createBaseUrl(), Env.setting('api_key'))
 
     def version(self):
         ver = fireEvent('updater.info', single = True)
@@ -166,7 +169,16 @@ class Core(Plugin):
 
         return '%s - %s-%s - v2' % (platf, ver.get('version')['type'], ver.get('version')['hash'])
 
-    def versionView(self):
-        return jsonified({
+    def versionView(self, **kwargs):
+        return {
             'version': self.version()
-        })
+        }
+
+    def signalHandler(self):
+        if Env.get('daemonized'): return
+
+        def signal_handler(signal, frame):
+            fireEvent('app.shutdown', single = True)
+
+        signal.signal(signal.SIGINT, signal_handler)
+        signal.signal(signal.SIGTERM, signal_handler)

couchpotato/core/_base/clientscript/main.py

@@ -1,15 +1,61 @@
 from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.encoding import ss
+from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+from minify.cssmin import cssmin
+from minify.jsmin import jsmin
+import os
+import re
+import traceback
 
 log = CPLog(__name__)
 
 
 class ClientScript(Plugin):
 
-    urls = {
-        'style': {},
-        'script': {},
+    core_static = {
+        'style': [
+            'style/main.css',
+            'style/uniform.generic.css',
+            'style/uniform.css',
+            'style/settings.css',
+        ],
+        'script': [
+            'scripts/library/mootools.js',
+            'scripts/library/mootools_more.js',
+            'scripts/library/uniform.js',
+            'scripts/library/form_replacement/form_check.js',
+            'scripts/library/form_replacement/form_radio.js',
+            'scripts/library/form_replacement/form_dropdown.js',
+            'scripts/library/form_replacement/form_selectoption.js',
+            'scripts/library/question.js',
+            'scripts/library/scrollspy.js',
+            'scripts/library/spin.js',
+            'scripts/couchpotato.js',
+            'scripts/api.js',
+            'scripts/library/history.js',
+            'scripts/page.js',
+            'scripts/block.js',
+            'scripts/block/navigation.js',
+            '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': {}, }
+    paths = {'style': {}, 'script': {}, }
+    comment = {
+       'style': '/*** %s:%d ***/\n',
+       'script': '// %s:%d\n'
     }
 
     html = {
@@ -24,6 +70,70 @@ class ClientScript(Plugin):
         addEvent('clientscript.get_styles', self.getStyles)
         addEvent('clientscript.get_scripts', self.getScripts)
 
+        if not Env.get('dev'):
+            addEvent('app.load', self.minify)
+
+        self.addCore()
+
+    def addCore(self):
+
+        for static_type in self.core_static:
+            for rel_path in self.core_static.get(static_type):
+                file_path = os.path.join(Env.get('app_dir'), 'couchpotato', 'static', rel_path)
+                core_url = 'api/%s/static/%s?%s' % (Env.setting('api_key'), rel_path, tryInt(os.path.getmtime(file_path)))
+
+                if static_type == 'script':
+                    self.registerScript(core_url, file_path, position = 'front')
+                else:
+                    self.registerStyle(core_url, file_path, position = 'front')
+
+
+    def minify(self):
+
+        for file_type in ['style', 'script']:
+            ext = 'js' if file_type is 'script' else 'css'
+            positions = self.paths.get(file_type, {})
+            for position in positions:
+                files = positions.get(position)
+                self._minify(file_type, files, position, position + '.' + ext)
+
+    def _minify(self, file_type, files, position, out):
+
+        cache = Env.get('cache_dir')
+        out_name = 'minified_' + out
+        out = os.path.join(cache, out_name)
+
+        raw = []
+        for file_path in files:
+            f = open(file_path, 'r').read()
+
+            if file_type == 'script':
+                data = jsmin(f)
+            else:
+                data = self.prefix(f)
+                data = cssmin(f)
+                data = data.replace('../images/', '../static/images/')
+                data = data.replace('../fonts/', '../static/fonts/')
+                data = data.replace('../../static/', '../static/') # Replace inside plugins
+
+            raw.append({'file': file_path, 'date': int(os.path.getmtime(file_path)), 'data': data})
+
+        # Combine all files together with some comments
+        data = ''
+        for r in raw:
+            data += self.comment.get(file_type) % (ss(r.get('file')), r.get('date'))
+            data += r.get('data') + '\n\n'
+
+        self.createFile(out, data.strip())
+
+        if not self.minified.get(file_type):
+            self.minified[file_type] = {}
+        if not self.minified[file_type].get(position):
+            self.minified[file_type][position] = []
+
+        minified_url = 'api/%s/file.cache/%s?%s' % (Env.setting('api_key'), out_name, tryInt(os.path.getmtime(out)))
+        self.minified[file_type][position].append(minified_url)
+
     def getStyles(self, *args, **kwargs):
         return self.get('style', *args, **kwargs)
 
@@ -35,22 +145,55 @@ class ClientScript(Plugin):
         data = '' if as_html else []
 
         try:
+            try:
+                if not Env.get('dev'):
+                    return self.minified[type][location]
+            except:
+                pass
+
             return self.urls[type][location]
-        except Exception, e:
-            log.error(e)
+        except:
+            log.error('Error getting minified %s, %s: %s', (type, location, traceback.format_exc()))
 
         return data
 
-    def registerStyle(self, path, position = 'head'):
-        self.register(path, 'style', position)
+    def registerStyle(self, api_path, file_path, position = 'head'):
+        self.register(api_path, file_path, 'style', position)
 
-    def registerScript(self, path, position = 'head'):
-        self.register(path, 'script', position)
+    def registerScript(self, api_path, file_path, position = 'head'):
+        self.register(api_path, file_path, 'script', position)
 
-    def register(self, filepath, type, location):
+    def register(self, api_path, file_path, type, location):
 
         if not self.urls[type].get(location):
             self.urls[type][location] = []
+        self.urls[type][location].append(api_path)
 
-        filePath = filepath
-        self.urls[type][location].append(filePath)
+        if not self.paths[type].get(location):
+            self.paths[type][location] = []
+        self.paths[type][location].append(file_path)
+
+    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)
+
+        new_data = ''
+        colon_split = trimmed_data.split(';')
+        for splt in colon_split:
+            curl_split = splt.strip().split('{')
+            for curly in curl_split:
+                curly = curly.strip()
+                for prop in self.prefix_properties:
+                    if curly[:len(prop) + 1] == prop + ':':
+                        for tag in self.prefix_tags:
+                            new_data += ' -%s-%s; ' % (tag, curly)
+
+                new_data += curly + (' { ' if len(curl_split) > 1 else ' ')
+
+            new_data += '; '
+
+        new_data = new_data.replace('{ ;', '; ').replace('} ;', '} ')
+
+        return new_data

couchpotato/core/_base/scheduler/main.py

@@ -2,7 +2,6 @@ from apscheduler.scheduler import Scheduler as Sched
 from couchpotato.core.event import addEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-import logging
 
 log = CPLog(__name__)
 
@@ -17,51 +16,19 @@ class Scheduler(Plugin):
 
         addEvent('schedule.cron', self.cron)
         addEvent('schedule.interval', self.interval)
-        addEvent('schedule.start', self.start)
-        addEvent('schedule.restart', self.start)
-
-        addEvent('app.load', self.start)
+        addEvent('schedule.remove', self.remove)
 
         self.sched = Sched(misfire_grace_time = 60)
-
-    def remove(self, identifier):
-        for type in ['interval', 'cron']:
-            try:
-                self.sched.unschedule_job(getattr(self, type)[identifier]['job'])
-                log.debug('%s unscheduled %s', (type.capitalize(), identifier))
-            except:
-                pass
-
-    def start(self):
-
-        # Stop all running
-        self.stop()
-
-        # Crons
-        for identifier in self.crons:
-            try:
-                self.remove(identifier)
-                cron = self.crons[identifier]
-                job = self.sched.add_cron_job(cron['handle'], day = cron['day'], hour = cron['hour'], minute = cron['minute'])
-                cron['job'] = job
-            except ValueError, e:
-                log.error('Failed adding cronjob: %s', e)
-
-        # Intervals
-        for identifier in self.intervals:
-            try:
-                self.remove(identifier)
-                interval = self.intervals[identifier]
-                job = self.sched.add_interval_job(interval['handle'], hours = interval['hours'], minutes = interval['minutes'], seconds = interval['seconds'])
-                interval['job'] = job
-            except ValueError, e:
-                log.error('Failed adding interval cronjob: %s', e)
-
-        # Start it
-        log.debug('Starting scheduler')
         self.sched.start()
         self.started = True
-        log.debug('Scheduler started')
+
+    def remove(self, identifier):
+        for cron_type in ['intervals', 'crons']:
+            try:
+                self.sched.unschedule_job(getattr(self, cron_type)[identifier]['job'])
+                log.debug('%s unscheduled %s', (cron_type.capitalize(), identifier))
+            except:
+                pass
 
     def doShutdown(self):
         super(Scheduler, self).doShutdown()
@@ -83,6 +50,7 @@ class Scheduler(Plugin):
             'day': day,
             'hour': hour,
             'minute': minute,
+            'job': self.sched.add_cron_job(handle, day = day, hour = hour, minute = minute)
         }
 
     def interval(self, identifier = '', handle = None, hours = 0, minutes = 0, seconds = 0):
@@ -94,4 +62,5 @@ class Scheduler(Plugin):
             'hours': hours,
             'minutes': minutes,
             'seconds': seconds,
+            'job': self.sched.add_interval_job(handle, hours = hours, minutes = minutes, seconds = seconds)
         }

couchpotato/core/_base/updater/__init__.py

@@ -1,4 +1,6 @@
 from .main import Updater
+from couchpotato.environment import Env
+import os
 
 def start():
     return Updater()
@@ -33,6 +35,7 @@ config = [{
                 {
                     'name': 'git_command',
                     'default': 'git',
+                    'hidden': not os.path.isdir(os.path.join(Env.get('app_dir'), '.git')),
                     'advanced': True
                 },
             ],

couchpotato/core/_base/updater/main.py

@@ -1,7 +1,6 @@
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
 from couchpotato.core.helpers.encoding import ss
-from couchpotato.core.helpers.request import jsonified
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
@@ -15,6 +14,7 @@ import tarfile
 import time
 import traceback
 import version
+import zipfile
 
 log = CPLog(__name__)
 
@@ -32,11 +32,10 @@ class Updater(Plugin):
         else:
             self.updater = SourceUpdater()
 
-        fireEvent('schedule.interval', 'updater.check', self.autoUpdate, hours = 6)
-        addEvent('app.load', self.autoUpdate)
+        addEvent('app.load', self.setCrons)
         addEvent('updater.info', self.info)
 
-        addApiView('updater.info', self.getInfo, docs = {
+        addApiView('updater.info', self.info, docs = {
             'desc': 'Get updater information',
             'return': {
                 'type': 'object',
@@ -52,8 +51,17 @@ class Updater(Plugin):
             'return': {'type': 'see updater.info'}
         })
 
+        addEvent('setting.save.updater.enabled.after', self.setCrons)
+
+    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
+
     def autoUpdate(self):
-        if self.check() and self.conf('automatic') and not self.updater.update_failed:
+        if self.isEnabled() and self.check() and self.conf('automatic') and not self.updater.update_failed:
             if self.updater.doUpdate():
 
                 # Notify before restarting
@@ -71,31 +79,30 @@ class Updater(Plugin):
 
         return False
 
-    def check(self):
-        if self.isDisabled():
+    def check(self, force = False):
+        if not force and self.isDisabled():
             return
 
         if self.updater.check():
             if not self.available_notified and self.conf('notification') and not self.conf('automatic'):
-                fireEvent('updater.available', message = 'A new update is available', data = self.updater.info())
+                info = self.updater.info()
+                version_date = datetime.fromtimestamp(info['update_version']['date'])
+                fireEvent('updater.available', message = 'A new update with hash "%s" is available, this version is from %s' % (info['update_version']['hash'], version_date), data = info)
                 self.available_notified = True
             return True
 
         return False
 
-    def info(self):
+    def info(self, **kwargs):
         return self.updater.info()
 
-    def getInfo(self):
-        return jsonified(self.updater.info())
-
-    def checkView(self):
-        return jsonified({
-            'update_available': self.check(),
+    def checkView(self, **kwargs):
+        return {
+            'update_available': self.check(force = True),
             'info': self.updater.info()
-        })
+        }
 
-    def doUpdateView(self):
+    def doUpdateView(self, **kwargs):
 
         self.check()
         if not self.updater.update_version:
@@ -106,9 +113,13 @@ class Updater(Plugin):
             if success:
                 fireEventAsync('app.restart')
 
-        return jsonified({
+            # Assume the updater handles things
+            if not success:
+                success = True
+
+        return {
             'success': success
-        })
+        }
 
 
 class BaseUpdater(Plugin):
@@ -125,9 +136,6 @@ class BaseUpdater(Plugin):
     def doUpdate(self):
         pass
 
-    def getInfo(self):
-        return jsonified(self.info())
-
     def info(self):
         return {
             'last_check': self.last_check,
@@ -251,11 +259,11 @@ class SourceUpdater(BaseUpdater):
     def doUpdate(self):
 
         try:
-            url = 'https://github.com/%s/%s/tarball/%s' % (self.repo_user, self.repo_name, self.branch)
-            destination = os.path.join(Env.get('cache_dir'), self.update_version.get('hash') + '.tar.gz')
-            extracted_path = os.path.join(Env.get('cache_dir'), 'temp_updater')
+            download_data = fireEvent('cp.source_url', repo = self.repo_user, repo_name = self.repo_name, branch = self.branch, single = True)
+            destination = os.path.join(Env.get('cache_dir'), self.update_version.get('hash')) + '.' + download_data.get('type')
 
-            destination = fireEvent('file.download', url = url, dest = destination, single = True)
+            extracted_path = os.path.join(Env.get('cache_dir'), 'temp_updater')
+            destination = fireEvent('file.download', url = download_data.get('url'), dest = destination, single = True)
 
             # Cleanup leftover from last time
             if os.path.isdir(extracted_path):
@@ -263,9 +271,15 @@ class SourceUpdater(BaseUpdater):
             self.makeDir(extracted_path)
 
             # Extract
-            tar = tarfile.open(destination)
-            tar.extractall(path = extracted_path)
-            tar.close()
+            if download_data.get('type') == 'zip':
+                zip = zipfile.ZipFile(destination)
+                zip.extractall(extracted_path)
+                zip.close()
+            else:
+                tar = tarfile.open(destination)
+                tar.extractall(path = extracted_path)
+                tar.close()
+
             os.remove(destination)
 
             if self.replaceWith(os.path.join(extracted_path, os.listdir(extracted_path)[0])):
@@ -383,11 +397,6 @@ class SourceUpdater(BaseUpdater):
 
 class DesktopUpdater(BaseUpdater):
 
-    version = None
-    update_failed = False
-    update_version = None
-    last_check = 0
-
     def __init__(self):
         self.desktop = Env.get('desktop')
 
@@ -396,11 +405,12 @@ class DesktopUpdater(BaseUpdater):
             def do_restart(e):
                 if e['status'] == 'done':
                     fireEventAsync('app.restart')
-                else:
+                elif e['status'] == 'error':
                     log.error('Failed updating desktop: %s', e['exception'])
                     self.update_failed = True
 
             self.desktop._esky.auto_update(callback = do_restart)
+            return
         except:
             self.update_failed = True
 
@@ -411,7 +421,7 @@ class DesktopUpdater(BaseUpdater):
             'last_check': self.last_check,
             'update_version': self.update_version,
             'version': self.getVersion(),
-            'branch': 'desktop_build',
+            'branch': self.branch,
         }
 
     def check(self):

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, 1000))
+		App.addEvent('load', self.info.bind(self, 2000))
 		App.addEvent('unload', function(){
 			if(self.timer)
 				clearTimeout(self.timer);
@@ -84,23 +84,24 @@ var UpdaterBase = new Class({
 					'click': self.doUpdate.bind(self)
 				}
 			})
-		).inject($(document.body).getElement('.header'))
+		).inject(document.body)
 	},
 
 	doUpdate: function(){
 		var self = this;
 
+		App.blockPage('Please wait while CouchPotato is being updated with more awesome stuff.', 'Updating');
 		Api.request('updater.update', {
 			'onComplete': function(json){
-				if(json.success){
+				if(json.success)
 					self.updating();
-				}
+				else
+					App.unBlockPage()
 			}
 		});
 	},
 
 	updating: function(){
-		App.blockPage('Please wait while CouchPotato is being updated with more awesome stuff.', 'Updating');
 		App.checkAvailable.delay(500, App, [1000, function(){
 			window.location.reload();
 		}]);

couchpotato/core/auth.py

@@ -1,26 +1,40 @@
 from couchpotato.core.helpers.variable import md5
 from couchpotato.environment import Env
-from flask import request, Response
-from functools import wraps
+import base64
 
 def check_auth(username, password):
     return username == Env.setting('username') and password == Env.setting('password')
 
-def authenticate():
-    return Response(
-        'This is not the page you are looking for. *waves hand*', 401,
-        {'WWW-Authenticate': 'Basic realm="CouchPotato Login"'}
-    )
+def requires_auth(handler_class):
 
-def requires_auth(f):
+    def wrap_execute(handler_execute):
 
-    @wraps(f)
-    def decorated(*args, **kwargs):
-        auth = getattr(request, 'authorization')
-        if Env.setting('username') and Env.setting('password'):
-            if (not auth or not check_auth(auth.username.decode('latin1'), md5(auth.password.decode('latin1').encode(Env.get('encoding'))))):
-                return authenticate()
+        def require_basic_auth(handler, kwargs):
+            if Env.setting('username') and Env.setting('password'):
 
-        return f(*args, **kwargs)
+                auth_header = handler.request.headers.get('Authorization')
+                auth_decoded = base64.decodestring(auth_header[6:]) if auth_header else None
+                if auth_decoded:
+                    username, password = auth_decoded.split(':', 2)
 
-    return decorated
+                if auth_header is None or not auth_header.startswith('Basic ') or (not check_auth(username.decode('latin'), md5(password.decode('latin')))):
+                    handler.set_status(401)
+                    handler.set_header('WWW-Authenticate', 'Basic realm="CouchPotato Login"')
+                    handler._transforms = []
+                    handler.finish()
+
+                    return False
+
+            return True
+
+        def _execute(self, transforms, *args, **kwargs):
+
+            if not require_basic_auth(self, kwargs):
+                return False
+            return handler_execute(self, transforms, *args, **kwargs)
+
+        return _execute
+
+    handler_class._execute = wrap_execute(handler_class._execute)
+
+    return handler_class

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,77 @@
 from base64 import b32decode, b16encode
 from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import toSafeString
+from couchpotato.core.helpers.variable import mergeDicts
 from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-import os
+from couchpotato.core.providers.base import Provider
 import random
 import re
 
 log = CPLog(__name__)
 
 
-class Downloader(Plugin):
+class Downloader(Provider):
 
     type = []
+    http_time_between_calls = 0
 
     torrent_sources = [
         'http://torrage.com/torrent/%s.torrent',
-        'http://torrage.ws/torrent/%s.torrent',
-        'http://torcache.net/torrent/%s.torrent',
+        'https://torcache.net/torrent/%s.torrent',
+    ]
+
+    torrent_trackers = [
+        'http://tracker.publicbt.com/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',
+        'http://tracker.openbittorrent.com/announce',
     ]
 
     def __init__(self):
-        addEvent('download', self.download)
-        addEvent('download.status', self.getDownloadStatus)
+        addEvent('download', self._download)
+        addEvent('download.enabled', self._isEnabled)
+        addEvent('download.enabled_types', self.getEnabledDownloadType)
+        addEvent('download.status', self._getAllDownloadStatus)
+        addEvent('download.remove_failed', self._removeFailed)
 
-    def download(self, data = {}, movie = {}, manual = False, filedata = None):
-        pass
+    def getEnabledDownloadType(self):
+        for download_type in self.type:
+            if self.isEnabled(manual = True, data = {'type': download_type}):
+                return self.type
+
+        return []
+
+    def _download(self, data = {}, movie = {}, manual = False, filedata = None):
+        if self.isDisabled(manual, data):
+            return
+        return self.download(data = data, movie = movie, filedata = filedata)
+
+    def _getAllDownloadStatus(self):
+        if self.isDisabled(manual = True, data = {}):
+            return
+
+        return self.getAllDownloadStatus()
+
+    def getAllDownloadStatus(self):
+        return
+
+    def _removeFailed(self, item):
+        if self.isDisabled(manual = True, data = {}):
+            return
+
+        if self.conf('delete_failed', default = True):
+            return self.removeFailed(item)
 
-    def getDownloadStatus(self, data = {}, movie = {}):
         return False
 
-    def createNzbName(self, data, movie):
-        tag = self.cpTag(movie)
-        return '%s%s' % (toSafeString(data.get('name')[:127 - len(tag)]), tag)
-
-    def createFileName(self, data, filedata, movie):
-        name = os.path.join(self.createNzbName(data, movie))
-        if data.get('type') == 'nzb' and 'DOCTYPE nzb' not in filedata and '</nzb>' not in filedata:
-            return '%s.%s' % (name, 'rar')
-        return '%s.%s' % (name, data.get('type'))
-
-    def cpTag(self, movie):
-        if Env.setting('enabled', 'renamer'):
-            return '.cp(' + movie['library'].get('identifier') + ')' if movie['library'].get('identifier') else ''
-
-        return ''
+    def removeFailed(self, item):
+        return
 
     def isCorrectType(self, item_type):
         is_correct = item_type in self.type
@@ -56,7 +82,7 @@ class Downloader(Plugin):
         return is_correct
 
     def magnetToTorrent(self, magnet_link):
-        torrent_hash = re.findall('urn:btih:([\w]{32,40})', magnet_link)[0]
+        torrent_hash = re.findall('urn:btih:([\w]{32,40})', magnet_link)[0].upper()
 
         # Convert base 32 to hex
         if len(torrent_hash) == 32:
@@ -67,7 +93,10 @@ class Downloader(Plugin):
 
         for source in sources:
             try:
-                filedata = self.urlopen(source % torrent_hash, show_error = False)
+                filedata = self.urlopen(source % torrent_hash, headers = {'Referer': ''}, show_error = False)
+                if 'torcache' in filedata and 'file not found' in filedata.lower():
+                    continue
+
                 return filedata
             except:
                 log.debug('Torrent hash "%s" wasn\'t found on: %s', (torrent_hash, source))
@@ -75,9 +104,54 @@ class Downloader(Plugin):
         log.error('Failed converting magnet url to torrent: %s', (torrent_hash))
         return False
 
-    def isDisabled(self, manual):
-        return not self.isEnabled(manual)
+    def downloadReturnId(self, download_id):
+        return {
+            'downloader': self.getName(),
+            'id': download_id
+        }
 
-    def isEnabled(self, manual):
+    def isDisabled(self, manual, data):
+        return not self.isEnabled(manual, data)
+
+    def _isEnabled(self, manual, data = {}):
+        if not self.isEnabled(manual, data):
+            return
+        return True
+
+    def isEnabled(self, manual, data = {}):
         d_manual = self.conf('manual', default = False)
-        return super(Downloader, self).isEnabled() and ((d_manual and manual) or (d_manual is False))
+        return super(Downloader, self).isEnabled() and \
+            ((d_manual and manual) or (d_manual is False)) and \
+            (not data or self.isCorrectType(data.get('type')))
+
+
+class StatusList(list):
+
+    provider = None
+
+    def __init__(self, provider, **kwargs):
+
+        self.provider = provider
+        self.kwargs = kwargs
+
+        super(StatusList, self).__init__()
+
+    def extend(self, results):
+        for r in results:
+            self.append(r)
+
+    def append(self, result):
+        new_result = self.fillResult(result)
+        super(StatusList, self).append(new_result)
+
+    def fillResult(self, result):
+
+        defaults = {
+            'id': 0,
+            'status': 'busy',
+            'downloader': self.provider.getName(),
+            'folder': '',
+        }
+
+        return mergeDicts(defaults, result)
+

couchpotato/core/downloaders/blackhole/__init__.py

@@ -1,4 +1,5 @@
 from .main import Blackhole
+from couchpotato.core.helpers.variable import getDownloadDir
 
 def start():
     return Blackhole()
@@ -9,6 +10,7 @@ config = [{
     'groups': [
         {
             'tab': 'downloaders',
+            'list': 'download_providers',
             'name': 'blackhole',
             'label': 'Black hole',
             'description': 'Download the NZB/Torrent to a specific folder.',
@@ -16,7 +18,7 @@ config = [{
             'options': [
                 {
                     'name': 'enabled',
-                    'default': 0,
+                    'default': True,
                     'type': 'enabler',
                     'radio_group': 'nzb,torrent',
                 },
@@ -24,6 +26,7 @@ config = [{
                     'name': 'directory',
                     'type': 'directory',
                     'description': 'Directory where the .nzb (or .torrent) file is saved to.',
+                    'default': getDownloadDir()
                 },
                 {
                     'name': 'use_for',

couchpotato/core/downloaders/blackhole/main.py

@@ -1,6 +1,7 @@
 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
 
@@ -10,11 +11,7 @@ class Blackhole(Downloader):
 
     type = ['nzb', 'torrent', 'torrent_magnet']
 
-    def download(self, data = {}, movie = {}, manual = False, filedata = None):
-        if self.isDisabled(manual) or \
-        (not self.isCorrectType(data.get('type')) or \
-        (not self.conf('use_for') in ['both', 'torrent' if 'torrent' in data.get('type') else data.get('type')])):
-            return
+    def download(self, data = {}, movie = {}, filedata = None):
 
         directory = self.conf('directory')
         if not directory or not os.path.isdir(directory):
@@ -40,6 +37,7 @@ class Blackhole(Downloader):
                         log.info('Downloading %s to %s.', (data.get('type'), 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)
@@ -52,4 +50,23 @@ class Blackhole(Downloader):
             except:
                 log.info('Failed to download file %s: %s', (data.get('name'), traceback.format_exc()))
                 return False
+
         return False
+
+    def getEnabledDownloadType(self):
+        if self.conf('use_for') == 'both':
+            return super(Blackhole, self).getEnabledDownloadType()
+        elif self.conf('use_for') == 'torrent':
+            return ['torrent', 'torrent_magnet']
+        else:
+            return ['nzb']
+
+    def isEnabled(self, manual, data = {}):
+        for_type = ['both']
+        if data and 'torrent' in data.get('type'):
+            for_type.append('torrent')
+        elif data:
+            for_type.append(data.get('type'))
+
+        return super(Blackhole, self).isEnabled(manual, data) and \
+            ((self.conf('use_for') in for_type))

couchpotato/core/downloaders/nzbget/__init__.py

@@ -8,10 +8,10 @@ config = [{
     'groups': [
         {
             'tab': 'downloaders',
+            'list': 'download_providers',
             'name': 'nzbget',
             'label': 'NZBGet',
-            'description': 'Send NZBs to your NZBGet installation.',
-            'wizard': True,
+            'description': 'Use <a href="http://nzbget.sourceforge.net/Main_Page" target="_blank">NZBGet</a> to download NZBs.',
             'options': [
                 {
                     'name': 'enabled',
@@ -24,8 +24,15 @@ config = [{
                     '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>',
                 },
                 {
@@ -33,6 +40,13 @@ config = [{
                     'default': 'Movies',
                     'description': 'The category CP places the nzb in. Like <strong>movies</strong> or <strong>couchpotato</strong>',
                 },
+                {
+                    'name': 'priority',
+                    '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,
@@ -40,6 +54,12 @@ config = [{
                     'advanced': True,
                     'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
                 },
+                {
+                    'name': 'delete_failed',
+                    'default': True,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
             ],
         }
     ],

couchpotato/core/downloaders/nzbget/main.py

@@ -1,7 +1,11 @@
 from base64 import standard_b64encode
-from couchpotato.core.downloaders.base import Downloader
+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 inspect import isfunction
+from datetime import timedelta
+import re
+import shutil
 import socket
 import traceback
 import xmlrpclib
@@ -12,12 +16,9 @@ class NZBGet(Downloader):
 
     type = ['nzb']
 
-    url = 'http://nzbget:%(password)s@%(host)s/xmlrpc'
+    url = 'http://%(username)s:%(password)s@%(host)s/xmlrpc'
 
-    def download(self, data = {}, movie = {}, manual = False, filedata = None):
-
-        if self.isDisabled(manual) or not self.isCorrectType(data.get('type')):
-            return
+    def download(self, data = {}, movie = {}, filedata = None):
 
         if not filedata:
             log.error('Unable to get NZB file: %s', traceback.format_exc())
@@ -25,8 +26,8 @@ class NZBGet(Downloader):
 
         log.info('Sending "%s" to NZBGet.', data.get('name'))
 
-        url = self.url % {'host': self.conf('host'), 'password': self.conf('password')}
-        nzb_name = '%s.nzb' % self.createNzbName(data, movie)
+        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:
@@ -44,9 +45,140 @@ class NZBGet(Downloader):
                 log.error('Protocol Error: %s', e)
             return False
 
-        if rpc.append(nzb_name, self.conf('category'), False, standard_b64encode(filedata.strip())):
+        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')
-            return True
+            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.info('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'] == 'SUCCESS' and item['ScriptStatus'] == 'SUCCESS' else 'failed',
+                'original_status': item['ParStatus'] + ', ' + item['ScriptStatus'],
+                'timeleft': str(timedelta(seconds = 0)),
+                'folder': item['DestDir']
+            })
+
+        return statuses
+
+    def removeFailed(self, item):
+
+        log.info('%s failed downloading, deleting...', item['name'])
+
+        url = self.url % {'host': self.conf('host'), 'password': self.conf('password')}
+
+        rpc = xmlrpclib.ServerProxy(url)
+        try:
+            if rpc.writelog('INFO', 'CouchPotato connected to delete some history'):
+                log.info('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()
+            for hist in history:
+                if hist['Parameters'] and hist['Parameters']['couchpotato'] and hist['Parameters']['couchpotato'] == item['id']:
+                    nzb_id = hist['ID']
+                    path = hist['DestDir']
+            if 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/__init__.py

@@ -0,0 +1,47 @@
+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,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/downloaders/nzbvortex/main.py

@@ -0,0 +1,173 @@
+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):
+
+    type = ['nzb']
+    api_level = None
+    session_id = None
+
+    def download(self, data = {}, movie = {}, filedata = None):
+
+        # 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': 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 = {}, repeat = False, auth = True, *args, **kwargs):
+
+        # Login first
+        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, *args, **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, 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/__init__.py

@@ -9,10 +9,10 @@ config = [{
     'groups': [
         {
             'tab': 'downloaders',
+            'list': 'download_providers',
             'name': 'pneumatic',
             'label': 'Pneumatic',
-            'description': 'Download the .strm file to a specific folder.',
-            'wizard': True,
+            'description': 'Use <a href="http://forum.xbmc.org/showthread.php?tid=97657" target="_blank">Pneumatic</a> to download .strm files.',
             'options': [
                 {
                     'name': 'enabled',

couchpotato/core/downloaders/pneumatic/main.py

@@ -11,9 +11,7 @@ class Pneumatic(Downloader):
     type = ['nzb']
     strm_syntax = 'plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb=%s&nzbname=%s'
 
-    def download(self, data = {}, movie = {}, manual = False, filedata = None):
-        if self.isDisabled(manual) or (not self.isCorrectType(data.get('type'))):
-            return
+    def download(self, data = {}, movie = {}, filedata = None):
 
         directory = self.conf('directory')
         if not directory or not os.path.isdir(directory):

couchpotato/core/downloaders/sabnzbd/__init__.py

@@ -8,9 +8,10 @@ config = [{
     'groups': [
         {
             'tab': 'downloaders',
+            'list': 'download_providers',
             'name': 'sabnzbd',
             'label': 'Sabnzbd',
-            'description': 'Send NZBs to your Sabnzbd installation.',
+            'description': 'Use <a href="http://sabnzbd.org/" target="_blank">SABnzbd</a> (0.7+) to download NZBs.',
             'wizard': True,
             'options': [
                 {

couchpotato/core/downloaders/sabnzbd/main.py

@@ -1,9 +1,12 @@
-from couchpotato.core.downloaders.base import Downloader
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import cleanHost
+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
-import traceback
+from couchpotato.environment import Env
+from datetime import timedelta
+from urllib2 import URLError
 import json
+import traceback
 
 log = CPLog(__name__)
 
@@ -11,15 +14,11 @@ class Sabnzbd(Downloader):
 
     type = ['nzb']
 
-    def download(self, data = {}, movie = {}, manual = False, filedata = None):
-
-        if self.isDisabled(manual) or not self.isCorrectType(data.get('type')):
-            return
+    def download(self, data = {}, movie = {}, filedata = None):
 
         log.info('Sending "%s" to SABnzbd.', data.get('name'))
 
-        params = {
-            'apikey': self.conf('api_key'),
+        req_params = {
             'cat': self.conf('category'),
             'mode': 'addurl',
             'nzbname': self.createNzbName(data, movie),
@@ -27,135 +26,124 @@ class Sabnzbd(Downloader):
 
         if filedata:
             if len(filedata) < 50:
-                log.error('No proper nzb available!')
+                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)
-            params['mode'] = 'addfile'
+            req_params['mode'] = 'addfile'
         else:
-            params['name'] = data.get('url')
-
-        url = cleanHost(self.conf('host')) + "api?" + tryUrlencode(params)
+            req_params['name'] = data.get('url')
 
         try:
-            if params.get('mode') is 'addfile':
-                sab = self.urlopen(url, timeout = 60, params = {"nzbfile": (nzb_filename, filedata)}, multipart = True, show_error = False)
+            if req_params.get('mode') is 'addfile':
+                sab_data = self.call(req_params, params = {'nzbfile': (ss(nzb_filename), filedata)}, multipart = True)
             else:
-                sab = self.urlopen(url, timeout = 60, show_error = False)
+                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: %s', traceback.format_exc())
+            log.error('Failed sending release, use API key, NOT the NZB key: %s', traceback.format_exc(0))
             return False
 
-        result = sab.strip()
-        if not result:
-            log.error("SABnzbd didn't return anything.")
-            return False
-
-        log.debug("Result text from SAB: " + result[:40])
-        if result == "ok":
-            log.info("NZB sent to SAB successfully.")
-            return True
-        elif result == "Missing authentication":
-            log.error("Incorrect username/password.")
-            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("Unknown error: " + result[:40])
+            log.error('Error getting data from SABNZBd: %s', sab_data)
             return False
 
-    def getDownloadStatus(self, data = {}, movie = {}):
-        if self.isDisabled(manual = True) or not self.isCorrectType(data.get('type')):
-            return
+    def getAllDownloadStatus(self):
 
-        nzbname = self.createNzbName(data, movie)
-        log.info('Checking download status of "%s" at SABnzbd.', nzbname)
+        log.debug('Checking SABnzbd download status.')
 
         # Go through Queue
-        params = {
-            'apikey': self.conf('api_key'),
-            'mode': 'queue',
-            'output': 'json'
-        }
-        url = cleanHost(self.conf('host')) + "api?" + tryUrlencode(params)
-
         try:
-            sab = self.urlopen(url, timeout = 60, show_error = False)
+            queue = self.call({
+                'mode': 'queue',
+            })
         except:
-            log.error('Failed checking status: %s', traceback.format_exc())
+            log.error('Failed getting queue: %s', traceback.format_exc(1))
             return False
 
-        try:
-            history = json.loads(sab)
-        except:
-            log.debug("Result text from SAB: " + sab[:40])
-            log.error('Failed parsing json status: %s', traceback.format_exc())
-            return False
-
-        for slot in history['queue']['slots']:
-            log.debug('Found %s in SabNZBd queue, which is %s, with %s left', (slot['filename'], slot['status'], slot['timeleft']))
-            if slot['filename'] == nzbname:
-                return slot['status'].lower()
-
         # Go through history items
-        params = {
-            'apikey': self.conf('api_key'),
-            'mode': 'history',
-            'output': 'json'
-        }
-        url = cleanHost(self.conf('host')) + "api?" + tryUrlencode(params)
+        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': item['storage'],
+            })
+
+        return statuses
+
+    def removeFailed(self, item):
+
+        log.info('%s failed downloading, deleting...', item['name'])
 
         try:
-            sab = self.urlopen(url, timeout = 60, show_error = False)
+            self.call({
+                'mode': 'history',
+                'name': 'delete',
+                'del_files': '1',
+                'value': item['id']
+            }, use_json = False)
         except:
-            log.error('Failed getting history: %s', traceback.format_exc())
-            return
+            log.error('Failed deleting: %s', traceback.format_exc(0))
+            return False
 
-        try:
-            history = json.loads(sab)
-        except:
-            log.debug("Result text from SAB: " + sab[:40])
-            log.error('Failed parsing history json: %s', traceback.format_exc())
-            return
+        return True
 
-        for slot in history['history']['slots']:
-            log.debug('Found %s in SabNZBd history, which has %s', (slot['name'], slot['status']))
-            if slot['name'] == nzbname:
-                # Note: if post process even if failed is on in SabNZBd, it will complete with a fail message
-                if slot['status'] == 'Failed' or (slot['status'] == 'Completed' and slot['fail_message'].strip()):
+    def call(self, request_params, use_json = True, **kwargs):
 
-                    # Delete failed download
-                    if self.conf('delete_failed', default = True):
+        url = cleanHost(self.conf('host')) + 'api?' + tryUrlencode(mergeDicts(request_params, {
+           'apikey': self.conf('api_key'),
+           'output': 'json'
+        }))
 
-                        log.info('%s failed downloading, deleting...', slot['name'])
-                        params = {
-                            'apikey': self.conf('api_key'),
-                            'mode': 'history',
-                            'name': 'delete',
-                            'del_files': '1',
-                            'value': slot['nzo_id']
-                        }
-                        url = cleanHost(self.conf('host')) + "api?" + tryUrlencode(params)
+        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 {}
 
-                        try:
-                            sab = self.urlopen(url, timeout = 60, show_error = False)
-                        except:
-                            log.error('Failed deleting: %s', traceback.format_exc())
-                            return False
+            return d.get(request_params['mode']) or d
+        else:
+            return data
 
-                        result = sab.strip()
-                        if not result:
-                            log.error("SABnzbd didn't return anything.")
-
-                        log.debug("Result text from SAB: " + result[:40])
-                        if result == "ok":
-                            log.info('SabNZBd deleted failed release %s successfully.', slot['name'])
-                        elif result == "Missing authentication":
-                            log.error("Incorrect username/password or API?.")
-                        else:
-                            log.error("Unknown error: " + result[:40])
-
-                    return 'failed'
-                else:
-                    return slot['status'].lower()
-
-        return 'not_found'

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

@@ -0,0 +1,142 @@
+from couchpotato.core.downloaders.base import Downloader
+from couchpotato.core.helpers.encoding import isInt
+from couchpotato.core.logger import CPLog
+import json
+import requests
+
+log = CPLog(__name__)
+
+
+class Synology(Downloader):
+
+    type = ['nzb', 'torrent', 'torrent_magnet']
+    log = CPLog(__name__)
+
+    def download(self, data, movie, filedata = None):
+
+        response = False
+        log.error('Sending "%s" (%s) to Synology.', (data['name'], data['type']))
+
+        # 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
+
+        try:
+            # Send request to Synology
+            srpc = SynologyRPC(host[0], host[1], self.conf('username'), self.conf('password'))
+            if data['type'] == 'torrent_magnet':
+                log.info('Adding torrent URL %s', data['url'])
+                response = srpc.create_task(url = data['url'])
+            elif data['type'] in ['nzb', 'torrent']:
+                log.info('Adding %s' % data['type'])
+                if not filedata:
+                    log.error('No %s data found' % data['type'])
+                else:
+                    filename = data['name'] + '.' + data['type']
+                    response = srpc.create_task(filename = filename, filedata = filedata)
+        except Exception, err:
+            log.error('Exception while adding torrent: %s', err)
+        finally:
+            return response
+
+    def getEnabledDownloadType(self):
+        if self.conf('use_for') == 'both':
+            return super(Synology, self).getEnabledDownloadType()
+        elif self.conf('use_for') == 'torrent':
+            return ['torrent', 'torrent_magnet']
+        else:
+            return ['nzb']
+
+    def isEnabled(self, manual, data = {}):
+        for_type = ['both']
+        if data and 'torrent' in data.get('type'):
+            for_type.append('torrent')
+        elif data:
+            for_type.append(data.get('type'))
+
+        return super(Synology, self).isEnabled(manual, data) and\
+               ((self.conf('use_for') in for_type))
+
+class SynologyRPC(object):
+
+    '''SynologyRPC lite library'''
+
+    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.username = username
+        self.password = password
+        self.session_name = 'DownloadStation'
+
+    def _login(self):
+        if self.username and self.password:
+            args = {'api': 'SYNO.API.Auth', 'account': self.username, 'passwd': self.password, 'version': 2,
+            'method': 'login', 'session': self.session_name, 'format': 'sid'}
+            response = self._req(self.auth_url, args)
+            if response['success']:
+                self.sid = response['data']['sid']
+                log.debug('sid=%s', self.sid)
+            else:
+                log.error('Couldn\'t login to Synology, %s', response)
+            return response['success']
+        else:
+            log.error('User or password missing, not using authentication.')
+            return False
+
+    def _logout(self):
+        args = {'api':'SYNO.API.Auth', 'version':1, 'method':'logout', 'session':self.session_name, '_sid':self.sid}
+        return self._req(self.auth_url, args)
+
+    def _req(self, url, args, files = None):
+        response = {'success': False}
+        try:
+            req = requests.post(url, data = args, files = files)
+            req.raise_for_status()
+            response = json.loads(req.text)
+            if response['success'] == True:
+                log.info('Synology action successfull')
+            return response
+        except requests.ConnectionError, err:
+            log.error('Synology connection error, check your config %s', err)
+        except requests.HTTPError, err:
+            log.error('SynologyRPC HTTPError: %s', err)
+        except Exception, err:
+            log.error('Exception: %s', err)
+        finally:
+            return response
+
+    def create_task(self, url = None, filename = None, filedata = None):
+        ''' Creates new download task in Synology DownloadStation. Either specify
+        url or pair (filename, filedata).
+
+        Returns True if task was created, False otherwise
+        '''
+        result = False
+        # login
+        if self._login():
+            args = {'api': 'SYNO.DownloadStation.Task',
+                    'version': '1',
+                    'method': 'create',
+                    '_sid': self.sid}
+            if url:
+                log.info('Login success, adding torrent URI')
+                args['uri'] = url
+                response = self._req(self.download_url, args = args)
+                log.info('Response: %s', response)
+                result = response['success']
+            elif filename and filedata:
+                log.info('Login success, adding torrent')
+                files = {'file': (filename, filedata)}
+                response = self._req(self.download_url, args = args, files = files)
+                log.info('Response: %s', response)
+                result = response['success']
+            else:
+                log.error('Invalid use of SynologyRPC.create_task: either url or filename+filedata must be specified')
+            self._logout()
+
+        return result

couchpotato/core/downloaders/transmission/__init__.py

@@ -8,9 +8,10 @@ config = [{
     'groups': [
         {
             'tab': 'downloaders',
+            'list': 'download_providers',
             'name': 'transmission',
             'label': 'Transmission',
-            'description': 'Send torrents to Transmission.',
+            'description': 'Use <a href="http://www.transmissionbt.com/" target="_blank">Transmission</a> to download torrents.',
             'wizard': True,
             'options': [
                 {
@@ -40,15 +41,22 @@ config = [{
                 {
                     'name': 'directory',
                     'type': 'directory',
-                    'description': 'Where should Transmission saved the downloaded files?',
+                    'description': 'Download to this directory. Keep empty for default Transmission download directory.',
                 },
                 {
                     'name': 'ratio',
                     'default': 10,
-                    'type': 'int',
+                    'type': 'float',
                     'advanced': True,
                     'description': 'Stop transfer when reaching ratio',
                 },
+                {
+                    'name': 'ratiomode',
+                    'default': 0,
+                    'type': 'int',
+                    'advanced': True,
+                    'description': '0 = Use session limit, 1 = Use transfer limit, 2 = Disable limit.',
+                },
                 {
                     'name': 'manual',
                     'default': 0,

couchpotato/core/downloaders/transmission/main.py

@@ -1,11 +1,14 @@
 from base64 import b64encode
-from couchpotato.core.downloaders.base import Downloader
+from couchpotato.core.downloaders.base import Downloader, StatusList
 from couchpotato.core.helpers.encoding import isInt
 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 traceback
 import urllib2
 
 log = CPLog(__name__)
@@ -16,12 +19,9 @@ class Transmission(Downloader):
     type = ['torrent', 'torrent_magnet']
     log = CPLog(__name__)
 
-    def download(self, data, movie, manual = False, filedata = None):
+    def download(self, data, movie, filedata = None):
 
-        if self.isDisabled(manual) or not self.isCorrectType(data.get('type')):
-            return
-
-        log.debug('Sending "%s" (%s) to Transmission.', (data.get('name'), data.get('type')))
+        log.info('Sending "%s" (%s) to Transmission.', (data.get('name'), data.get('type')))
 
         # Load host from config and split out port.
         host = self.conf('host').split(':')
@@ -32,13 +32,18 @@ class Transmission(Downloader):
         # Set parameters for Transmission
         params = {
             'paused': self.conf('paused', default = 0),
-            'download-dir': self.conf('directory', default = '').rstrip(os.path.sep)
         }
 
-        torrent_params = {
-            'seedRatioLimit': self.conf('ratio'),
-            'seedRatioMode': (0 if self.conf('ratio') else 1)
-        }
+        if len(self.conf('directory', default = '')) > 0:
+            folder_name = self.createFileName(data, filedata, movie)[:-len(data.get('type')) - 1]
+            params['download-dir'] = os.path.join(self.conf('directory', default = ''), folder_name).rstrip(os.path.sep)
+
+        torrent_params = {}
+        if self.conf('ratio'):
+            torrent_params = {
+                'seedRatioLimit': self.conf('ratio'),
+                'seedRatioMode': self.conf('ratiomode')
+            }
 
         if not filedata and data.get('type') == 'torrent':
             log.error('Failed sending torrent, no data')
@@ -49,17 +54,103 @@ class Transmission(Downloader):
             trpc = TransmissionRPC(host[0], port = host[1], username = self.conf('username'), password = self.conf('password'))
             if data.get('type') == 'torrent_magnet':
                 remote_torrent = trpc.add_torrent_uri(data.get('url'), arguments = params)
+                torrent_params['trackerAdd'] = self.torrent_trackers
             else:
                 remote_torrent = trpc.add_torrent_file(b64encode(filedata), arguments = params)
 
-            # Change settings of added torrents
-            trpc.set_torrent(remote_torrent['torrent-added']['hashString'], torrent_params)
+            if not remote_torrent:
+                return False
 
-            return True
-        except Exception, err:
-            log.error('Failed to change settings for transfer: %s', err)
+            # Change settings of added torrents
+            elif torrent_params:
+                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'])
+        except:
+            log.error('Failed to change settings for transfer: %s', traceback.format_exc())
             return False
 
+    def getAllDownloadStatus(self):
+
+        log.debug('Checking Transmission download status.')
+
+        # 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
+
+        # Go through Queue
+        try:
+            trpc = TransmissionRPC(host[0], port = host[1], username = self.conf('username'), password = self.conf('password'))
+            return_params = {
+                'fields': ['id', 'name', 'hashString', 'percentDone', 'status', 'eta', 'isFinished', 'downloadDir', 'uploadRatio']
+            }
+            queue = trpc.get_alltorrents(return_params)
+        except Exception, err:
+            log.error('Failed getting queue: %s', err)
+            return False
+
+        if not queue:
+            return []
+
+        statuses = StatusList(self)
+
+        # Get torrents status
+            # CouchPotato Status
+                #status = 'busy'
+                #status = 'failed'
+                #status = 'completed'
+            # Transmission Status
+                #status = 0 => "Torrent is stopped"
+                #status = 1 => "Queued to check files"
+                #status = 2 => "Checking files"
+                #status = 3 => "Queued to download"
+                #status = 4 => "Downloading"
+                #status = 4 => "Queued to seed"
+                #status = 6 => "Seeding"
+        #To do :
+        #   add checking file
+        #   manage no peer in a range time => fail
+
+        for item in queue['torrents']:
+            log.debug('name=%s / id=%s / downloadDir=%s / hashString=%s / percentDone=%s / status=%s / eta=%s / uploadRatio=%s / confRatio=%s / isFinished=%s', (item['name'], item['id'], item['downloadDir'], item['hashString'], item['percentDone'], item['status'], item['eta'], item['uploadRatio'], self.conf('ratio'), item['isFinished']))
+
+            if not os.path.isdir(Env.setting('from', 'renamer')):
+                log.error('Renamer "from" folder doesn\'t to exist.')
+                return
+
+            if (item['percentDone'] * 100) >= 100 and (item['status'] == 6 or item['status'] == 0) and item['uploadRatio'] > self.conf('ratio'):
+                try:
+                    trpc.stop_torrent(item['hashString'], {})
+                    statuses.append({
+                        'id': item['hashString'],
+                        'name': item['name'],
+                        'status': 'completed',
+                        'original_status': item['status'],
+                        'timeleft': str(timedelta(seconds = 0)),
+                        'folder': os.path.join(item['downloadDir'], item['name']),
+                    })
+                except Exception, err:
+                    log.error('Failed to stop and remove torrent "%s" with error: %s', (item['name'], err))
+                    statuses.append({
+                        'id': item['hashString'],
+                        'name': item['name'],
+                        'status': 'failed',
+                        'original_status': item['status'],
+                        'timeleft': str(timedelta(seconds = 0)),
+                    })
+            else:
+                statuses.append({
+                    'id': item['hashString'],
+                    'name': item['name'],
+                    'status': 'busy',
+                    'original_status': item['status'],
+                    'timeleft': str(timedelta(seconds = item['eta'])), # Is ETA in seconds??
+                })
+
+        return statuses
 
 class TransmissionRPC(object):
 
@@ -90,6 +181,7 @@ class TransmissionRPC(object):
         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 successfull')
@@ -139,3 +231,18 @@ class TransmissionRPC(object):
         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, arguments):
+        arguments['ids'] = torrent_id
+        post_data = {'arguments': arguments, 'method': 'torrent-stop', 'tag': self.tag}
+        return self._request(post_data)
+
+    def remove_torrent(self, torrent_id, remove_local_data, arguments):
+        arguments['ids'] = torrent_id
+        arguments['delete-local-data'] = remove_local_data
+        post_data = {'arguments': arguments, 'method': 'torrent-remove', 'tag': self.tag}
+        return self._request(post_data)

couchpotato/core/downloaders/utorrent/__init__.py

@@ -0,0 +1,55 @@
+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> 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': 'paused',
+                    'type': 'bool',
+                    '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/utorrent/main.py

@@ -0,0 +1,221 @@
+from base64 import b16encode, b32decode
+from bencode import bencode, bdecode
+from couchpotato.core.downloaders.base import Downloader, StatusList
+from couchpotato.core.helpers.encoding import isInt, ss
+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 re
+import time
+import urllib
+import urllib2
+
+
+log = CPLog(__name__)
+
+
+class uTorrent(Downloader):
+
+    type = ['torrent', 'torrent_magnet']
+    utorrent_api = None
+
+    def download(self, data, movie, filedata = None):
+
+        log.debug('Sending "%s" (%s) to uTorrent.', (data.get('name'), data.get('type')))
+
+        # 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
+
+        torrent_params = {}
+        if self.conf('label'):
+            torrent_params['label'] = self.conf('label')
+
+        if not filedata and data.get('type') == 'torrent':
+            log.error('Failed sending torrent, no data')
+            return False
+
+        if data.get('type') == '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(bencode(info)).hexdigest().upper()
+            torrent_filename = self.createFileName(data, filedata, movie)
+
+        # Convert base 32 to hex
+        if len(torrent_hash) == 32:
+            torrent_hash = b16encode(b32decode(torrent_hash))
+
+        # Send request to uTorrent
+        try:
+            if not self.utorrent_api:
+                self.utorrent_api = uTorrentAPI(host[0], port = host[1], username = self.conf('username'), password = self.conf('password'))
+
+            if data.get('type') == 'torrent_magnet':
+                self.utorrent_api.add_torrent_uri(data.get('url'))
+            else:
+                self.utorrent_api.add_torrent_file(torrent_filename, filedata)
+
+            # Change settings of added torrents
+            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)
+        except Exception, err:
+            log.error('Failed to send torrent to uTorrent: %s', err)
+            return False
+
+    def getAllDownloadStatus(self):
+
+        log.debug('Checking uTorrent download status.')
+
+        # 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
+
+        try:
+            self.utorrent_api = uTorrentAPI(host[0], port = host[1], username = self.conf('username'), password = self.conf('password'))
+        except Exception, err:
+            log.error('Failed to get uTorrent object: %s', err)
+            return False
+
+        data = ''
+        try:
+            data = self.utorrent_api.get_status()
+            queue = json.loads(data)
+            if queue.get('error'):
+                log.error('Error getting data from uTorrent: %s', queue.get('error'))
+                return False
+
+        except Exception, err:
+            log.error('Failed to get status from uTorrent: %s', err)
+            return False
+
+        if queue.get('torrents', []) == []:
+            log.debug('Nothing in queue')
+            return False
+
+        statuses = StatusList(self)
+
+        # Get torrents
+        for item in queue.get('torrents', []):
+
+            # item[21] = Paused | Downloading | Seeding | Finished
+            status = 'busy'
+            if item[21] == 'Finished' or item[21] == 'Seeding':
+                status = 'completed'
+
+            statuses.append({
+                'id': item[0],
+                'name': item[2],
+                'status':  status,
+                'original_status': item[1],
+                'timeleft': str(timedelta(seconds = item[10])),
+                'folder': item[26],
+            })
+
+        return statuses
+
+
+
+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, torrent):
+        action = "action=add-url&s=%s" % urllib.quote(torrent)
+        return self._request(action)
+
+    def add_torrent_file(self, filename, filedata):
+        action = "action=add-file"
+        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):
+        action = "action=pause&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

couchpotato/core/event.py

@@ -12,83 +12,80 @@ def runHandler(name, handler, *args, **kwargs):
         return handler(*args, **kwargs)
     except:
         from couchpotato.environment import Env
-        log.error('Error in event "%s", that wasn\'t caught: %s%s', (name, traceback.format_exc(), Env.all()))
+        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 events.get(name):
-        e = events[name]
-    else:
-        e = events[name] = Event(name = name, threads = 20, exc_info = True, traceback = True, lock = threading.RLock())
+    if not events.get(name):
+        events[name] = []
 
     def createHandle(*args, **kwargs):
 
         try:
-            parent = handler.im_self
-            bc = hasattr(parent, 'beforeCall')
-            if bc: parent.beforeCall(handler)
+            # Open handler
+            has_parent = hasattr(handler, 'im_self')
+            if has_parent:
+                parent = handler.im_self
+                bc = hasattr(parent, 'beforeCall')
+                if bc: parent.beforeCall(handler)
+
+            # Main event
             h = runHandler(name, handler, *args, **kwargs)
-            ac = hasattr(parent, 'afterCall')
-            if ac: parent.afterCall(handler)
+
+            # Close handler
+            if has_parent:
+                ac = hasattr(parent, 'afterCall')
+                if ac: parent.afterCall(handler)
         except:
-            h = runHandler(name, handler, *args, **kwargs)
+            log.error('Failed creating handler %s %s: %s', (name, handler, traceback.format_exc()))
 
         return h
 
-    e.handle(createHandle, priority = priority)
+    events[name].append({
+        'handler': createHandle,
+        'priority': priority,
+    })
 
 def removeEvent(name, handler):
     e = events[name]
     e -= handler
 
 def fireEvent(name, *args, **kwargs):
-    if not events.get(name): return
+    if not events.has_key(name): return
+
+    e = Event(name = name, threads = 10, asynch = kwargs.get('async', False), exc_info = True, traceback = True, lock = threading.RLock())
+
+    for event in events[name]:
+        e.handle(event['handler'], priority = event['priority'])
+
     #log.debug('Firing event %s', name)
     try:
 
-        # Fire after event
-        is_after_event = False
-        try:
-            del kwargs['is_after_event']
-            is_after_event = True
-        except: pass
+        options = {
+            'is_after_event': False, # Fire after event
+            'on_complete': False, # onComplete event
+            'single': False, # Return single handler
+            'merge': False, # Merge items
+            'in_order': False, # Fire them in specific order, waits for the other to finish
+            'async': False
+        }
 
-        # onComplete event
-        on_complete = False
-        try:
-            on_complete = kwargs['on_complete']
-            del kwargs['on_complete']
-        except: pass
+        # Do options
+        for x in options:
+            try:
+                val = kwargs[x]
+                del kwargs[x]
+                options[x] = val
+            except: pass
 
-        # Return single handler
-        single = False
-        try:
-            del kwargs['single']
-            single = True
-        except: pass
+        # Make sure only 1 event is fired at a time when order is wanted
+        kwargs['event_order_lock'] = threading.RLock() if options['in_order'] or options['single'] else None
+        kwargs['event_return_on_result'] = options['single']
 
-        # Merge items
-        merge = False
-        try:
-            del kwargs['merge']
-            merge = True
-        except: pass
-
-        # Merge items
-        in_order = False
-        try:
-            del kwargs['in_order']
-            in_order = True
-        except: pass
-
-        e = events[name]
-        if not in_order: e.lock.acquire()
-        e.asynchronous = False
-        e.in_order = in_order
+        # Fire
         result = e(*args, **kwargs)
-        if not in_order: e.lock.release()
 
-        if single and not merge:
+        if options['single'] and not options['merge']:
             results = None
 
             # Loop over results, stop when first not None result is found.
@@ -112,19 +109,23 @@ def fireEvent(name, *args, **kwargs):
                     errorHandler(r[1])
 
             # Merge
-            if merge and len(results) > 0:
+            if options['merge'] and len(results) > 0:
+
                 # Dict
-                if type(results[0]) == dict:
+                if isinstance(results[0], dict):
+                    results.reverse()
+
                     merged = {}
                     for result in results:
-                        merged = mergeDicts(merged, result)
+                        merged = mergeDicts(merged, result, prepend_list = True)
 
                     results = merged
                 # Lists
-                elif type(results[0]) == list:
+                elif isinstance(results[0], list):
                     merged = []
                     for result in results:
-                        merged += result
+                        if result not in merged:
+                            merged += result
 
                     results = merged
 
@@ -133,23 +134,21 @@ def fireEvent(name, *args, **kwargs):
             log.debug('Return modified results for %s', name)
             results = modified_results
 
-        if not is_after_event:
+        if not options['is_after_event']:
             fireEvent('%s.after' % name, is_after_event = True)
 
-        if on_complete:
-            on_complete()
+        if options['on_complete']:
+            options['on_complete']()
 
         return results
-    except KeyError, e:
-        pass
     except Exception:
         log.error('%s: %s', (name, traceback.format_exc()))
 
 def fireEventAsync(*args, **kwargs):
     try:
-        my_thread = threading.Thread(target = fireEvent, args = args, kwargs = kwargs)
-        my_thread.setDaemon(True)
-        my_thread.start()
+        t = threading.Thread(target = fireEvent, args = args, kwargs = kwargs)
+        t.setDaemon(True)
+        t.start()
         return True
     except Exception, e:
         log.error('%s: %s', (args[0], e))

couchpotato/core/helpers/encoding.py

@@ -68,7 +68,7 @@ def tryUrlencode(s):
 
         return new[1:]
     else:
-        for letter in toUnicode(s):
+        for letter in ss(s):
             try:
                 new += quote_plus(letter)
             except:

couchpotato/core/helpers/request.py

@@ -1,15 +1,11 @@
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import natcmp
-from flask.globals import current_app
-from flask.helpers import json, make_response
 from urllib import unquote
-from werkzeug.urls import url_decode
-import flask
 import re
 
-def getParams():
 
-    params = url_decode(getattr(flask.request, 'environ').get('QUERY_STRING', ''))
+def getParams(params):
+
     reg = re.compile('^[a-z0-9_\.]+$')
 
     current = temp = {}
@@ -36,6 +32,8 @@ def getParams():
                     current = current[item]
         else:
             temp[param] = toUnicode(unquote(value))
+            if temp[param].lower() in ['true', 'false']:
+                temp[param] = temp[param].lower() != 'false'
 
     return dictToList(temp)
 
@@ -54,29 +52,3 @@ def dictToList(params):
         new = params
 
     return new
-
-def getParam(attr, default = None):
-    try:
-        return getParams().get(attr, default)
-    except:
-        return default
-
-def padded_jsonify(callback, *args, **kwargs):
-    content = str(callback) + '(' + json.dumps(dict(*args, **kwargs)) + ')'
-    return getattr(current_app, 'response_class')(content, mimetype = 'text/javascript')
-
-def jsonify(mimetype, *args, **kwargs):
-    content = json.dumps(dict(*args, **kwargs))
-    return getattr(current_app, 'response_class')(content, mimetype = mimetype)
-
-def jsonified(*args, **kwargs):
-    callback = getParam('callback_func', None)
-    if callback:
-        content = padded_jsonify(callback, *args, **kwargs)
-    else:
-        content = jsonify('application/json', *args, **kwargs)
-
-    response = make_response(content)
-    response.cache_control.no_cache = True
-
-    return response

couchpotato/core/helpers/variable.py

@@ -1,3 +1,4 @@
+from couchpotato.core.helpers.encoding import simplifyString, toSafeString
 from couchpotato.core.logger import CPLog
 import hashlib
 import os.path
@@ -9,15 +10,48 @@ import sys
 
 log = CPLog(__name__)
 
+def link(src, dst):
+    if os.name == 'nt':
+        import ctypes
+        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(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'] = pwd.getpwuid(os.geteuid()).pw_dir
+    except:
+        pass
+
+    return os.path.expanduser('~')
+
+def getDownloadDir():
+    user_dir = getUserDir()
+
+    # OSX
+    if 'darwin' in platform.platform().lower():
+        return os.path.join(user_dir, 'Downloads')
+
+    if os.name == 'nt':
+        return os.path.join(user_dir, 'Downloads')
+
+    return user_dir
+
 def getDataDir():
 
     # Windows
     if os.name == 'nt':
         return os.path.join(os.environ['APPDATA'], 'CouchPotato')
 
-    import pwd
-    os.environ['HOME'] = pwd.getpwuid(os.geteuid()).pw_dir
-    user_dir = os.path.expanduser('~')
+    user_dir = getUserDir()
 
     # OSX
     if 'darwin' in platform.platform().lower():
@@ -33,7 +67,7 @@ def getDataDir():
 def isDict(object):
     return isinstance(object, dict)
 
-def mergeDicts(a, b):
+def mergeDicts(a, b, prepend_list = False):
     assert isDict(a), isDict(b)
     dst = a.copy()
 
@@ -47,7 +81,7 @@ def mergeDicts(a, b):
                 if isDict(current_src[key]) and isDict(current_dst[key]):
                     stack.append((current_dst[key], current_src[key]))
                 elif isinstance(current_src[key], list) and isinstance(current_dst[key], list):
-                    current_dst[key].extend(current_src[key])
+                    current_dst[key] = current_src[key] + current_dst[key] if prepend_list else current_dst[key] + current_src[key]
                     current_dst[key] = removeListDuplicates(current_dst[key])
                 else:
                     current_dst[key] = current_src[key]
@@ -84,7 +118,7 @@ def cleanHost(host):
 
     return host
 
-def getImdb(txt, check_inside = True):
+def getImdb(txt, check_inside = True, multiple = False):
 
     if check_inside and os.path.isfile(txt):
         output = open(txt, 'r')
@@ -92,8 +126,10 @@ def getImdb(txt, check_inside = True):
         output.close()
 
     try:
-        id = re.findall('(tt\d{7})', txt)[0]
-        return id
+        ids = re.findall('(tt\d{7})', txt)
+        if multiple:
+            return ids if len(ids) > 0 else []
+        return ids[0]
     except IndexError:
         pass
 
@@ -118,12 +154,33 @@ def getTitle(library_dict):
         try:
             return library_dict['titles'][0]['title']
         except:
-            log.error('Could not get title for %s', library_dict['identifier'])
-            return None
+            try:
+                for title in library_dict.titles:
+                    if title.default:
+                        return title.title
+            except:
+                log.error('Could not get title for %s', library_dict.identifier)
+                return None
+
+        log.error('Could not get title for %s', library_dict['identifier'])
+        return None
     except:
         log.error('Could not get title for library item: %s', library_dict)
         return None
 
+def possibleTitles(raw_title):
+
+    titles = []
+
+    titles.append(toSafeString(raw_title).lower())
+    titles.append(raw_title.lower())
+    titles.append(simplifyString(raw_title))
+
+    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):
+    list = [x.strip() for x in str.split(split_on)] if str else []
+    return filter(None, list) if clean else list

couchpotato/core/loader.py

@@ -67,6 +67,18 @@ class Loader(object):
 
     def addFromDir(self, plugin_type, priority, module, dir_name):
 
+        # Load dir module
+        try:
+            m = __import__(module)
+            splitted = module.split('.')
+            for sub in splitted[1:]:
+                m = getattr(m, sub)
+
+            if hasattr(m, 'config'):
+                fireEvent('settings.options', splitted[-1] + '_config', getattr(m, 'config'))
+        except:
+            raise
+
         for cur_file in glob.glob(os.path.join(dir_name, '*')):
             name = os.path.basename(cur_file)
             if os.path.isdir(os.path.join(dir_name, name)):

couchpotato/core/logger.py

@@ -1,11 +1,10 @@
 import logging
 import re
-import traceback
 
 class CPLog(object):
 
     context = ''
-    replace_private = ['api', 'apikey', 'api_key', 'password', 'username', 'h']
+    replace_private = ['api', 'apikey', 'api_key', 'password', 'username', 'h', 'uid', 'key', 'passkey']
 
     def __init__(self, context = ''):
         if context.endswith('.main'):
@@ -17,6 +16,9 @@ class CPLog(object):
     def info(self, msg, replace_tuple = ()):
         self.logger.info(self.addContext(msg, replace_tuple))
 
+    def info2(self, msg, replace_tuple = ()):
+        self.logger.log(19, self.addContext(msg, replace_tuple))
+
     def debug(self, msg, replace_tuple = ()):
         self.logger.debug(self.addContext(msg, replace_tuple))
 
@@ -47,13 +49,14 @@ class CPLog(object):
                     msg = msg % tuple([ss(x) for x in list(replace_tuple)])
                 else:
                     msg = msg % ss(replace_tuple)
-            except:
-                self.logger.error(u'Failed encoding stuff to log: %s' % traceback.format_exc())
+            except Exception, e:
+                self.logger.error(u'Failed encoding stuff to log "%s": %s' % (msg, e))
 
         if not Env.get('dev'):
 
             for replace in self.replace_private:
-                msg = re.sub('(%s=)[^\&]+' % replace, '%s=xxx' % replace, msg)
+                msg = re.sub('(\?%s=)[^\&]+' % replace, '?%s=xxx' % replace, msg)
+                msg = re.sub('(&%s=)[^\&]+' % replace, '&%s=xxx' % replace, msg)
 
             # Replace api key
             try:

couchpotato/core/migration/versions/001_Releases_last_edit.py

@@ -0,0 +1,25 @@
+from migrate.changeset.schema import create_column
+from sqlalchemy.schema import MetaData, Column, Table, Index
+from sqlalchemy.types import Integer
+
+meta = MetaData()
+
+
+def upgrade(migrate_engine):
+    meta.bind = migrate_engine
+
+    # Change release, add last_edit and index
+    last_edit_column = Column('last_edit', Integer)
+    release = Table('release', meta, last_edit_column)
+
+    create_column(last_edit_column, release)
+    Index('ix_release_last_edit', release.c.last_edit).create()
+
+    # Change movie last_edit
+    last_edit_column = Column('last_edit', Integer)
+    movie = Table('movie', meta, last_edit_column)
+    Index('ix_movie_last_edit', movie.c.last_edit).create()
+
+
+def downgrade(migrate_engine):
+    pass

couchpotato/core/notifications/__init__.py

@@ -0,0 +1,13 @@
+config = {
+    'name': 'notification_providers',
+    'groups': [
+        {
+            'label': 'Notifications',
+            'description': 'Notify when movies are done or snatched',
+            'type': 'list',
+            'name': 'notification_providers',
+            'tab': 'notifications',
+            'options': [],
+        },
+    ],
+}

couchpotato/core/notifications/base.py

@@ -1,26 +1,28 @@
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.request import jsonified
 from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
+from couchpotato.core.providers.base import Provider
 from couchpotato.environment import Env
 
 log = CPLog(__name__)
 
 
-class Notification(Plugin):
+class Notification(Provider):
+
+    type = 'notification'
 
     default_title = Env.get('appname')
     test_message = 'ZOMG Lazors Pewpewpew!'
 
     listen_to = [
-        'movie.downloaded', 'movie.snatched',
+        'renamer.after', 'movie.snatched',
         'updater.available', 'updater.updated',
+        'core.message',
     ]
     dont_listen_to = []
 
     def __init__(self):
-        addEvent('notify.%s' % self.getName().lower(), self.notify)
+        addEvent('notify.%s' % self.getName().lower(), self._notify)
 
         addApiView(self.testNotifyName(), self.test)
 
@@ -30,29 +32,38 @@ class Notification(Plugin):
                 addEvent(listener, self.createNotifyHandler(listener))
 
     def createNotifyHandler(self, listener):
-        def notify(message, data):
+        def notify(message = None, group = {}, data = None):
             if not self.conf('on_snatch', default = True) and listener == 'movie.snatched':
                 return
-            return self.notify(message = message, data = data, listener = listener)
+            return self._notify(message = message, data = data if data else group, listener = listener)
 
         return notify
 
+    def getNotificationImage(self, size = 'small'):
+        return 'https://raw.github.com/RuudBurger/CouchPotatoServer/master/couchpotato/static/images/notify.couch.%s.png' % size
+
+    def _notify(self, *args, **kwargs):
+        if self.isEnabled():
+            return self.notify(*args, **kwargs)
+
     def notify(self, message = '', data = {}, listener = None):
         pass
 
-    def test(self):
+    def test(self, **kwargs):
 
         test_type = self.testNotifyName()
 
         log.info('Sending test to %s', test_type)
 
-        success = self.notify(
+        success = self._notify(
             message = self.test_message,
             data = {},
             listener = 'test'
         )
 
-        return jsonified({'success': success})
+        return {
+            'success': success
+        }
 
     def testNotifyName(self):
         return 'notify.%s.test' % self.getName().lower()

couchpotato/core/notifications/boxcar/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'boxcar',
             'options': [
                 {

couchpotato/core/notifications/boxcar/main.py

@@ -11,7 +11,6 @@ class Boxcar(Notification):
     url = 'https://boxcar.io/devices/providers/7MNNXY3UIzVBwvzkKwkC/notifications'
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
         try:
             message = message.strip()

couchpotato/core/notifications/core/main.py

@@ -1,15 +1,16 @@
 from couchpotato import get_session
 from couchpotato.api import addApiView, addNonBlockApiView
-from couchpotato.core.event import addEvent
+from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified, getParam
-from couchpotato.core.helpers.variable import tryInt
+from couchpotato.core.helpers.variable import tryInt, splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 from couchpotato.core.settings.model import Notification as Notif
+from couchpotato.environment import Env
 from sqlalchemy.sql.expression import or_
 import threading
 import time
+import traceback
 import uuid
 
 log = CPLog(__name__)
@@ -21,11 +22,6 @@ class CoreNotifier(Notification):
     messages = []
     listeners = []
 
-    listen_to = [
-        'movie.downloaded', 'movie.snatched',
-        'updater.available', 'updater.updated',
-    ]
-
     def __init__(self):
         super(CoreNotifier, self).__init__()
 
@@ -54,7 +50,10 @@ class CoreNotifier(Notification):
         addNonBlockApiView('notification.listener', (self.addListener, self.removeListener))
         addApiView('notification.listener', self.listener)
 
+        fireEvent('schedule.interval', 'core.check_messages', self.checkMessages, hours = 12, single = True)
+
         addEvent('app.load', self.clean)
+        addEvent('app.load', self.checkMessages)
 
     def clean(self):
 
@@ -63,11 +62,9 @@ class CoreNotifier(Notification):
         db.commit()
 
 
-    def markAsRead(self):
+    def markAsRead(self, ids = None, **kwargs):
 
-        ids = None
-        if getParam('ids'):
-            ids = [x.strip() for x in getParam('ids').split(',')]
+        ids = splitString(ids) if ids else None
 
         db = get_session()
 
@@ -79,21 +76,19 @@ class CoreNotifier(Notification):
         q.update({Notif.read: True})
 
         db.commit()
-        #db.close()
 
-        return jsonified({
+        return {
             'success': True
-        })
+        }
 
-    def listView(self):
+    def listView(self, limit_offset = None, **kwargs):
 
         db = get_session()
-        limit_offset = getParam('limit_offset', None)
 
         q = db.query(Notif)
 
         if limit_offset:
-            splt = [x.strip() for x in limit_offset.split(',')]
+            splt = splitString(limit_offset)
             limit = splt[0]
             offset = 0 if len(splt) is 1 else splt[1]
             q = q.limit(limit).offset(offset)
@@ -107,12 +102,27 @@ class CoreNotifier(Notification):
             ndict['type'] = 'notification'
             notifications.append(ndict)
 
-        #db.close()
-        return jsonified({
+        return {
             'success': True,
             'empty': len(notifications) == 0,
             'notifications': notifications
-        })
+        }
+
+    def checkMessages(self):
+
+        prop_name = 'messages.last_check'
+        last_check = tryInt(Env.prop(prop_name, default = 0))
+
+        messages = fireEvent('cp.messages', last_check = last_check, single = True)
+
+        for message in messages:
+            if message.get('time') > last_check:
+                fireEvent('core.message', message = message.get('message'), data = message)
+
+            if last_check < message.get('time'):
+                last_check = message.get('time')
+
+        Env.prop(prop_name, value = last_check)
 
     def notify(self, message = '', data = {}, listener = None):
 
@@ -133,11 +143,12 @@ class CoreNotifier(Notification):
 
         self.frontend(type = listener, data = data)
 
-        #db.close()
         return True
 
     def frontend(self, type = 'notification', data = {}, message = None):
 
+        log.debug('Notifying frontend')
+
         self.m_lock.acquire()
         notification = {
             'message_id': str(uuid.uuid4()),
@@ -156,11 +167,13 @@ class CoreNotifier(Notification):
                     'result': [notification],
                 })
             except:
-                break
+                log.debug('Failed sending to listener: %s', traceback.format_exc())
 
         self.m_lock.release()
         self.cleanMessages()
 
+        log.debug('Done notifying frontend')
+
     def addListener(self, callback, last_id = None):
 
         if last_id:
@@ -182,9 +195,11 @@ class CoreNotifier(Notification):
                 if listener == callback:
                     self.listeners.remove(list_tuple)
             except:
-                pass
+                log.debug('Failed removing listener: %s', traceback.format_exc())
 
     def cleanMessages(self):
+
+        log.debug('Cleaning messages')
         self.m_lock.acquire()
 
         for message in self.messages:
@@ -192,8 +207,11 @@ class CoreNotifier(Notification):
                 self.messages.remove(message)
 
         self.m_lock.release()
+        log.debug('Done cleaning messages')
 
     def getMessages(self, last_id):
+
+        log.debug('Getting messages with id: %s', last_id)
         self.m_lock.acquire()
 
         recent = []
@@ -204,15 +222,16 @@ class CoreNotifier(Notification):
             recent = self.messages[index:]
 
         self.m_lock.release()
+        log.debug('Returning for %s %s messages', (last_id, len(recent or [])))
 
         return recent or []
 
-    def listener(self):
+    def listener(self, init = False, **kwargs):
 
         messages = []
 
         # Get unread
-        if getParam('init'):
+        if init:
             db = get_session()
 
             notifications = db.query(Notif) \
@@ -223,7 +242,7 @@ class CoreNotifier(Notification):
                 ndict['type'] = 'notification'
                 messages.append(ndict)
 
-        return jsonified({
+        return {
             'success': True,
             'result': messages,
-        })
+        }

couchpotato/core/notifications/core/static/notification.js

@@ -21,21 +21,18 @@ var NotificationBase = new Class({
 		App.addEvent('load', function(){
 
 			App.block.notification = new Block.Menu(self, {
+				'button_class': 'icon2.eye-open',
 				'class': 'notification_menu',
 				'onOpen': self.markAsRead.bind(self)
 			})
 			$(App.block.notification).inject(App.getBlock('search'), 'after');
 			self.badge = new Element('div.badge').inject(App.block.notification, 'top').hide();
 
-			/* App.getBlock('notification').addLink(new Element('a.more', {
-				'href': App.createUrl('notifications'),
-				'text': 'Show older notifications'
-			})); */
 		});
 
 		window.addEvent('load', function(){
-			self.startInterval.delay(Browser.safari ? 100 : 0, self)
-		});
+			self.startInterval.delay($(window).getSize().x <= 480 ? 2000 : 100, self);
+		})
 
 	},
 
@@ -47,14 +44,19 @@ var NotificationBase = new Class({
 
 		result.el = App.getBlock('notification').addLink(
 			new Element('span.'+(result.read ? 'read' : '' )).adopt(
-				new Element('span.message', {'text': result.message}),
+				new Element('span.message', {'html': result.message}),
 				new Element('span.added', {'text': added.timeDiffInWords(), 'title': added})
 			)
 		, 'top');
 		self.notifications.include(result);
 
-		if(!result.read)
+		if(result.data.important !== undefined && !result.read){
+			var sticky = true
+			App.fireEvent('message', [result.message, sticky, result])
+		}
+		else if(!result.read){
 			self.setBadge(self.notifications.filter(function(n){ return !n.read}).length)
+		}
 
 	},
 
@@ -64,20 +66,26 @@ var NotificationBase = new Class({
 		self.badge[value ? 'show' : 'hide']()
 	},
 
-	markAsRead: function(){
-		var self = this;
+	markAsRead: function(force_ids){
+		var self = this,
+			ids = force_ids;
 
-		var rn = self.notifications.filter(function(n){
-			return !n.read
-		})
+		if(!force_ids) {
+			var rn = self.notifications.filter(function(n){
+				return !n.read && n.data.important === undefined
+			})
 
-		var ids = []
-		rn.each(function(n){
-			ids.include(n.id)
-		})
+			var ids = []
+			rn.each(function(n){
+				ids.include(n.id)
+			})
+		}
 
 		if(ids.length > 0)
 			Api.request('notification.markread', {
+				'data': {
+					'ids': ids.join(',')
+				},
 				'onSuccess': function(){
 					self.setBadge('')
 				}
@@ -93,11 +101,20 @@ var NotificationBase = new Class({
 			return;
 		}
 
-		Api.request('notification.listener', {
+		self.request = Api.request('notification.listener', {
     		'data': {'init':true},
     		'onSuccess': self.processData.bind(self)
 		}).send()
 
+		setInterval(function(){
+
+			if(self.request && self.request.isRunning()){
+				self.request.cancel();
+				self.startPoll()
+			}
+
+		}, 120000);
+
 	},
 
 	startPoll: function(){
@@ -143,26 +160,41 @@ var NotificationBase = new Class({
 		self.startPoll()
 	},
 
-	showMessage: function(message){
+	showMessage: function(message, sticky, data){
 		var self = this;
 
 		if(!self.message_container)
 			self.message_container = new Element('div.messages').inject(document.body);
 
-		var new_message = new Element('div.message', {
-			'text': message
-		}).inject(self.message_container);
+		var new_message = new Element('div', {
+			'class': 'message' + (sticky ? ' sticky' : ''),
+			'html': message
+		}).inject(self.message_container, 'top');
 
 		setTimeout(function(){
 			new_message.addClass('show')
 		}, 10);
 
-		setTimeout(function(){
+		var hide_message = function(){
 			new_message.addClass('hide')
 			setTimeout(function(){
 				new_message.destroy();
 			}, 1000);
-		}, 4000);
+		}
+
+		if(sticky)
+			new_message.grab(
+				new Element('a.close.icon2', {
+					'events': {
+						'click': function(){
+							self.markAsRead([data.id]);
+							hide_message();
+						}
+					}
+				})
+			);
+		else
+			setTimeout(hide_message, 4000);
 
 	},
 
@@ -178,11 +210,14 @@ var NotificationBase = new Class({
 	},
 
 	addTestButton: function(fieldset, plugin_name){
-		var self = this;
+		var self = this,
+			button_name = self.testButtonName(fieldset);
+
+		if(button_name.contains('Notifications')) return;
 
 		new Element('.ctrlHolder.test_button').adopt(
 			new Element('a.button', {
-				'text': self.testButtonName(fieldset),
+				'text': button_name,
 				'events': {
 					'click': function(){
 						var button = fieldset.getElement('.test_button .button');
@@ -191,7 +226,7 @@ var NotificationBase = new Class({
 						Api.request('notify.'+plugin_name+'.test', {
 							'onComplete': function(json){
 
-								button.set('text', self.testButtonName(fieldset));
+								button.set('text', button_name);
 
 								if(json.success){
 									var message = new Element('span.success', {

couchpotato/core/notifications/email/__init__.py

@@ -0,0 +1,56 @@
+from .main import Email
+
+def start():
+    return Email()
+
+config = [{
+    'name': 'email',
+    'groups': [
+        {
+            'tab': 'notifications',
+            'list': 'notification_providers',
+            'name': 'email',
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                },
+                {
+                    'name': 'from',
+                    'label': 'Send e-mail from',
+                },
+                {
+                    'name': 'to',
+                    'label': 'Send e-mail to',
+                },
+                {
+                    'name': 'smtp_server',
+                    'label': 'SMTP server',
+                },
+                {
+                    'name': 'ssl',
+                    'label': 'Enable SSL',
+                    'default': 0,
+                    'type': 'bool',
+                },
+                {
+                    'name': 'smtp_user',
+                    'label': 'SMTP user',
+                },
+                {
+                    'name': 'smtp_pass',
+                    'label': 'SMTP password',
+                    'type': 'password',
+                },
+                {
+                    'name': 'on_snatch',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also send message when movie is snatched.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/notifications/email/main.py

@@ -0,0 +1,53 @@
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+from email.mime.text import MIMEText
+import smtplib
+import traceback
+
+log = CPLog(__name__)
+
+
+class Email(Notification):
+
+    def notify(self, message = '', data = {}, listener = None):
+
+        # Extract all the settings from settings
+        from_address = self.conf('from')
+        to_address = self.conf('to')
+        ssl = self.conf('ssl')
+        smtp_server = self.conf('smtp_server')
+        smtp_user = self.conf('smtp_user')
+        smtp_pass = self.conf('smtp_pass')
+
+        # Make the basic message
+        message = MIMEText(toUnicode(message))
+        message['Subject'] = self.default_title
+        message['From'] = from_address
+        message['To'] = to_address
+
+        try:
+            # Open the SMTP connection, via SSL if requested
+            log.debug("SMTP over SSL %s", ("enabled" if ssl == 1 else "disabled"))
+            mailserver = smtplib.SMTP_SSL(smtp_server) if ssl == 1 else smtplib.SMTP(smtp_server)
+
+            # Check too see if an login attempt should be attempted
+            if len(smtp_user) > 0:
+                log.debug("Logging on to SMTP server using username \'%s\'%s", (smtp_user, " and a password" if len(smtp_pass) > 0 else ""))
+                mailserver.login(smtp_user, smtp_pass)
+
+            # Send the e-mail
+            log.debug("Sending the email")
+            mailserver.sendmail(from_address, splitString(to_address), message.as_string())
+
+            # Close the SMTP connection
+            mailserver.quit()
+
+            log.info('Email notification sent')
+
+            return True
+        except:
+            log.error('E-mail failed: %s', traceback.format_exc())
+
+        return False

couchpotato/core/notifications/growl/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'growl',
             'description': 'Version 1.4+',
             'options': [

couchpotato/core/notifications/growl/main.py

@@ -37,11 +37,13 @@ class Growl(Notification):
             )
             self.growl.register()
             self.registered = True
-        except:
-            log.error('Failed register of growl: %s', traceback.format_exc())
+        except Exception, e:
+            if 'timed out' in str(e):
+                self.registered = True
+            else:
+                log.error('Failed register of growl: %s', traceback.format_exc())
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
         self.register()
 

couchpotato/core/notifications/nmj/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'nmj',
             'label': 'NMJ',
             'options': [

couchpotato/core/notifications/nmj/main.py

@@ -1,7 +1,6 @@
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.request import getParams, jsonified
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 import re
@@ -22,10 +21,7 @@ class NMJ(Notification):
         addApiView(self.testNotifyName(), self.test)
         addApiView('notify.nmj.auto_config', self.autoConfig)
 
-    def autoConfig(self):
-
-        params = getParams()
-        host = params.get('host', 'localhost')
+    def autoConfig(self, host = 'localhost', **kwargs):
 
         database = ''
         mount = ''
@@ -63,13 +59,13 @@ class NMJ(Notification):
                 log.error('Detected a network share on the Popcorn Hour, but could not get the mounting url')
                 return self.failed()
 
-        return jsonified({
+        return {
             'success': True,
             'database': database,
             'mount': mount,
-        })
+        }
 
-    def addToLibrary(self, group = {}):
+    def addToLibrary(self, message = None, group = {}):
         if self.isDisabled(): return
 
         host = self.conf('host')
@@ -113,9 +109,13 @@ class NMJ(Notification):
             return True
 
     def failed(self):
-        return jsonified({'success': False})
-        
-    def test(self):
-        return jsonified({'success': self.addToLibrary()})
-    
-    
+        return {
+            'success': False
+        }
+
+    def test(self, **kwargs):
+        return {
+            'success': self.addToLibrary()
+        }
+
+

couchpotato/core/notifications/notifo/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'notifo',
             'description': 'Keep in mind that Notifo service will end soon.',
             'options': [

couchpotato/core/notifications/notifo/main.py

@@ -1,8 +1,8 @@
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-from flask.helpers import json
 import base64
+import json
 import traceback
 
 log = CPLog(__name__)
@@ -13,7 +13,6 @@ class Notifo(Notification):
     url = 'https://api.notifo.com/v1/send_notification'
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
         try:
             params = {

couchpotato/core/notifications/notifymyandroid/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'notifymyandroid',
             'label': 'Notify My Android',
             'options': [

couchpotato/core/notifications/notifymyandroid/main.py

@@ -1,3 +1,4 @@
+from couchpotato.core.helpers.variable import splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 import pynma
@@ -8,10 +9,9 @@ log = CPLog(__name__)
 class NotifyMyAndroid(Notification):
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
         nma = pynma.PyNMA()
-        keys = [x.strip() for x in self.conf('api_key').split(',')]
+        keys = splitString(self.conf('api_key'))
         nma.addkey(keys)
         nma.developerkey(self.conf('dev_key'))
 

couchpotato/core/notifications/notifymywp/__init__.py

@@ -8,8 +8,9 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'notifymywp',
-            'label': 'Notify My Windows Phone',
+            'label': 'Windows Phone',
             'options': [
                 {
                     'name': 'enabled',

couchpotato/core/notifications/notifymywp/main.py

@@ -1,3 +1,4 @@
+from couchpotato.core.helpers.variable import splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 from pynmwp import PyNMWP
@@ -8,9 +9,8 @@ log = CPLog(__name__)
 class NotifyMyWP(Notification):
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
-        keys = [x.strip() for x in self.conf('api_key').split(',')]
+        keys = splitString(self.conf('api_key'))
         p = PyNMWP(keys, self.conf('dev_key'))
 
         response = p.push(application = self.default_title, event = message, description = message, priority = self.conf('priority'), batch_mode = len(keys) > 1)

couchpotato/core/notifications/plex/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'plex',
             'options': [
                 {
@@ -21,6 +22,13 @@ config = [{
                     'description': 'Default should be on localhost',
                     'advanced': True,
                 },
+                {
+                    'name': 'on_snatch',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also send message when movie is snatched.',
+                },
             ],
         }
     ],

couchpotato/core/notifications/plex/main.py

@@ -1,6 +1,5 @@
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.request import jsonified
 from couchpotato.core.helpers.variable import cleanHost
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
@@ -17,7 +16,7 @@ class Plex(Notification):
         super(Plex, self).__init__()
         addEvent('renamer.after', self.addToLibrary)
 
-    def addToLibrary(self, group = {}):
+    def addToLibrary(self, message = None, group = {}):
         if self.isDisabled(): return
 
         log.info('Sending notification to Plex')
@@ -46,7 +45,6 @@ class Plex(Notification):
         return True
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
         hosts = [x.strip() + ':3000' for x in self.conf('host').split(",")]
         successful = 0
@@ -74,7 +72,7 @@ class Plex(Notification):
         log.info('Plex notification to %s successful.', host)
         return True
 
-    def test(self):
+    def test(self, **kwargs):
 
         test_type = self.testNotifyName()
 
@@ -87,4 +85,6 @@ class Plex(Notification):
         )
         success2 = self.addToLibrary()
 
-        return jsonified({'success': success or success2})
+        return {
+            'success': success or success2
+        }

couchpotato/core/notifications/prowl/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'prowl',
             'options': [
                 {

couchpotato/core/notifications/prowl/main.py

@@ -1,17 +1,18 @@
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
+from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-from httplib import HTTPSConnection
+import traceback
 
 log = CPLog(__name__)
 
 
 class Prowl(Notification):
 
-    def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
+    urls = {
+        'api': 'https://api.prowlapp.com/publicapi/add'
+    }
 
-        http_handler = HTTPSConnection('api.prowlapp.com')
+    def notify(self, message = '', data = {}, listener = None):
 
         data = {
             'apikey': self.conf('api_key'),
@@ -19,21 +20,15 @@ class Prowl(Notification):
             'description': toUnicode(message),
             'priority': self.conf('priority'),
         }
+        headers = {
+           'Content-type': 'application/x-www-form-urlencoded'
+        }
 
-        http_handler.request('POST',
-            '/publicapi/add',
-            headers = {'Content-type': 'application/x-www-form-urlencoded'},
-            body = tryUrlencode(data)
-        )
-        response = http_handler.getresponse()
-        request_status = response.status
-
-        if request_status == 200:
+        try:
+            self.urlopen(self.urls['api'], headers = headers, params = data, multipart = True, show_error = False)
             log.info('Prowl notifications sent.')
             return True
-        elif request_status == 401:
-            log.error('Prowl auth failed: %s', response.reason)
-            return False
-        else:
-            log.error('Prowl notification failed.')
-            return False
+        except:
+            log.error('Prowl failed: %s', traceback.format_exc())
+
+        return False

couchpotato/core/notifications/pushalot/__init__.py

@@ -0,0 +1,48 @@
+from .main import Pushalot
+
+def start():
+    return Pushalot()
+
+config = [{
+    'name': 'pushalot',
+    'groups': [
+        {
+            'tab': 'notifications',
+            'list': 'notification_providers',
+            'name': 'pushalot',
+            'description': 'for Windows Phone and Windows 8',
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                },
+                {
+                    'name': 'auth_token',
+                    'label': 'Auth Token',
+                },
+                {
+                    'name': 'silent',
+                    'label': 'Silent',
+                    'default': 0,
+                    'type': 'bool',
+                    'description': 'Don\'t send Toast notifications. Only update Live Tile',
+                },
+                {
+                    'name': 'important',
+                    'label': 'High Priority',
+                    'default': 0,
+                    'type': 'bool',
+                    'description': 'Send message with High priority.',
+                },
+                {
+                    'name': 'on_snatch',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also send message when movie is snatched.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/notifications/pushalot/main.py

@@ -0,0 +1,36 @@
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+import traceback
+
+log = CPLog(__name__)
+
+class Pushalot(Notification):
+
+    urls = {
+        'api': 'https://pushalot.com/api/sendmessage'
+    }
+
+    def notify(self, message = '', data = {}, listener = None):
+
+        data = {
+            'AuthorizationToken': self.conf('auth_token'),
+            'Title': self.default_title,
+            'Body': toUnicode(message),
+            'IsImportant': self.conf('important'),
+            'IsSilent': self.conf('silent'),
+            'Image': toUnicode(self.getNotificationImage('medium') + '?1'),
+            'Source': toUnicode(self.default_title)
+        }
+
+        headers = {
+           'Content-type': 'application/x-www-form-urlencoded'
+        }
+
+        try:
+            self.urlopen(self.urls['api'], headers = headers, params = data, multipart = True, show_error = False)
+            return True
+        except:
+            log.error('PushAlot failed: %s', traceback.format_exc())
+
+        return False

couchpotato/core/notifications/pushover/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'pushover',
             'options': [
                 {

couchpotato/core/notifications/pushover/main.py

@@ -1,4 +1,5 @@
 from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
+from couchpotato.core.helpers.variable import getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 from httplib import HTTPSConnection
@@ -11,21 +12,26 @@ class Pushover(Notification):
     app_token = 'YkxHMYDZp285L265L3IwH3LmzkTaCy'
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
         http_handler = HTTPSConnection("api.pushover.net:443")
 
-        data = {
+        api_data = {
             'user': self.conf('user_key'),
             'token': self.app_token,
             'message': toUnicode(message),
-            'priority': self.conf('priority')
+            'priority': self.conf('priority'),
         }
 
+        if data and data.get('library'):
+            api_data.update({
+                'url': toUnicode('http://www.imdb.com/title/%s/' % data['library']['identifier']),
+                'url_title': toUnicode('%s on IMDb' % getTitle(data['library'])),
+            })
+
         http_handler.request('POST',
             "/1/messages.json",
             headers = {'Content-type': 'application/x-www-form-urlencoded'},
-            body = tryUrlencode(data)
+            body = tryUrlencode(api_data)
         )
 
         response = http_handler.getresponse()

couchpotato/core/notifications/synoindex/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'synoindex',
             'description': 'Automaticly adds index to Synology Media Server.',
             'options': [

couchpotato/core/notifications/synoindex/main.py

@@ -1,6 +1,7 @@
 from couchpotato.core.event import addEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
+import os
 import subprocess
 
 log = CPLog(__name__)
@@ -8,14 +9,17 @@ log = CPLog(__name__)
 
 class Synoindex(Notification):
 
+    index_path = '/usr/syno/bin/synoindex'
+
     def __init__(self):
+        super(Synoindex, self).__init__()
         addEvent('renamer.after', self.addToLibrary)
 
-    def addToLibrary(self, group = {}):
+    def addToLibrary(self, message = None, group = {}):
         if self.isDisabled(): return
 
-        command = ['/usr/syno/bin/synoindex', '-A', group.get('destination_dir')]
-        log.info(u'Executing synoindex command: %s ', command)
+        command = [self.index_path, '-A', group.get('destination_dir')]
+        log.info('Executing synoindex command: %s ', command)
         try:
             p = subprocess.Popen(command, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
             out = p.communicate()
@@ -26,3 +30,8 @@ class Synoindex(Notification):
             return False
 
         return True
+
+    def test(self, **kwargs):
+        return {
+            'success': os.path.isfile(self.index_path)
+        }

couchpotato/core/notifications/toasty/__init__.py

@@ -0,0 +1,33 @@
+from .main import Toasty
+
+def start():
+    return Toasty()
+
+config = [{
+    'name': 'toasty',
+    'groups': [
+        {
+            'tab': 'notifications',
+            'list': 'notification_providers',
+            'name': 'toasty',
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                },
+                {
+                    'name': 'api_key',
+                    'label': 'Device ID',
+                },
+                {
+                    'name': 'on_snatch',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also send message when movie is snatched.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/notifications/toasty/main.py

@@ -0,0 +1,29 @@
+from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+import traceback
+
+log = CPLog(__name__)
+
+class Toasty(Notification):
+
+    urls = {
+        'api': 'http://api.supertoasty.com/notify/%s?%s'
+    }
+
+    def notify(self, message = '', data = {}, listener = None):
+
+        data = {
+            'title': self.default_title,
+            'text': toUnicode(message),
+            'sender': toUnicode("CouchPotato"),
+            'image': 'https://raw.github.com/RuudBurger/CouchPotatoServer/master/couchpotato/static/images/homescreen.png',
+        }
+
+        try:
+            self.urlopen(self.urls['api'] % (self.conf('api_key'), tryUrlencode(data)), show_error = False)
+            return True
+        except:
+            log.error('Toasty failed: %s', traceback.format_exc())
+
+        return False

couchpotato/core/notifications/trakt/__init__.py

@@ -0,0 +1,30 @@
+from .main import Trakt
+
+def start():
+    return Trakt()
+
+config = [{
+    'name': 'trakt',
+    'groups': [
+        {
+            'tab': 'notifications',
+            'list': 'notification_providers',
+            'name': 'trakt',
+            'label': 'Trakt',
+            'description': 'add movies to your collection once downloaded. Fill in your username and password in the <a href="../automation/">Automation Trakt settings</a>',
+            'options': [
+                {
+                    'name': 'notification_enabled',
+                    'default': False,
+                    'type': 'enabler',
+                },
+                {
+                    'name': 'remove_watchlist_enabled',
+                    'label': 'Remove from watchlist',
+                    'default': False,
+                    'type': 'bool',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/notifications/trakt/main.py

@@ -0,0 +1,46 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+log = CPLog(__name__)
+
+class Trakt(Notification):
+
+    urls = {
+        'base': 'http://api.trakt.tv/%s',
+        'library': 'movie/library/%s',
+        'unwatchlist': 'movie/unwatchlist/%s',
+    }
+
+    listen_to = ['movie.downloaded']
+
+    def notify(self, message = '', data = {}, listener = None):
+
+        post_data = {
+            'username': self.conf('automation_username'),
+            'password' : self.conf('automation_password'),
+            'movies': [{
+                'imdb_id': data['library']['identifier'],
+                'title': data['library']['titles'][0]['title'],
+                'year': data['library']['year']
+            }] if data else []
+        }
+
+        result = self.call((self.urls['library'] % self.conf('automation_api_key')), post_data)
+        if self.conf('remove_watchlist_enabled'):
+            result = result and self.call((self.urls['unwatchlist'] % self.conf('automation_api_key')), post_data)
+
+        return result
+
+    def call(self, method_url, post_data):
+
+        try:
+            response = self.getJsonData(self.urls['base'] % method_url, params = post_data, cache_timeout = 1)
+            if response:
+                if response.get('status') == "success":
+                    log.info('Successfully called Trakt')
+                    return True
+        except:
+            pass
+
+        log.error('Failed to call trakt, check your login.')
+        return False

couchpotato/core/notifications/twitter/__init__.py

@@ -8,6 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'twitter',
             'options': [
                 {

couchpotato/core/notifications/twitter/main.py

@@ -1,12 +1,10 @@
 from couchpotato.api import addApiView
 from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.request import jsonified, getParam
 from couchpotato.core.helpers.variable import cleanHost
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-from flask.helpers import url_for
+from couchpotato.environment import Env
 from pytwitter import Api, parse_qsl
-from werkzeug.utils import redirect
 import oauth2
 
 log = CPLog(__name__)
@@ -32,38 +30,47 @@ class Twitter(Notification):
         addApiView('notify.%s.credentials' % self.getName().lower(), self.getCredentials)
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
         api = Api(self.consumer_key, self.consumer_secret, self.conf('access_token_key'), self.conf('access_token_secret'))
 
         direct_message = self.conf('direct_message')
         direct_message_users = self.conf('screen_name')
-        
+
         mention = self.conf('mention')
+        mention_tag = None
         if mention:
             if direct_message:
                 direct_message_users = '%s %s' % (direct_message_users, mention)
-                direct_message_users = direct_message_users.replace('@',' ')
-                direct_message_users = direct_message_users.replace(',',' ')
+                direct_message_users = direct_message_users.replace('@', ' ')
+                direct_message_users = direct_message_users.replace(',', ' ')
             else:
-                message = '%s @%s' % (message, mention.lstrip('@'))
+                mention_tag = '@%s' % mention.lstrip('@')
+                message = '%s %s' % (message, mention_tag)
 
         try:
             if direct_message:
                 for user in direct_message_users.split():
                     api.PostDirectMessage(user, '[%s] %s' % (self.default_title, message))
             else:
-                api.PostUpdate('[%s] %s' % (self.default_title, message))
+                update_message = '[%s] %s' % (self.default_title, message)
+                if len(update_message) > 140:
+                    if mention_tag:
+                        api.PostUpdate(update_message[:135 - len(mention_tag)] + ('%s 1/2 ' % mention_tag))
+                        api.PostUpdate(update_message[135 - len(mention_tag):] + ('%s 2/2 ' % mention_tag))
+                    else:
+                        api.PostUpdate(update_message[:135] + ' 1/2')
+                        api.PostUpdate(update_message[135:] + ' 2/2')
+                else:
+                    api.PostUpdate(update_message)
         except Exception, e:
             log.error('Error sending tweet: %s', e)
             return False
 
         return True
 
-    def getAuthorizationUrl(self):
+    def getAuthorizationUrl(self, host = None, **kwargs):
 
-        referer = getParam('host')
-        callback_url = cleanHost(referer) + '%snotify.%s.credentials/' % (url_for('api.index').lstrip('/'), self.getName().lower())
+        callback_url = cleanHost(host) + '%snotify.%s.credentials/' % (Env.get('api_base').lstrip('/'), self.getName().lower())
 
         oauth_consumer = oauth2.Consumer(self.consumer_key, self.consumer_secret)
         oauth_client = oauth2.Client(oauth_consumer)
@@ -72,31 +79,29 @@ class Twitter(Notification):
 
         if resp['status'] != '200':
             log.error('Invalid response from Twitter requesting temp token: %s', resp['status'])
-            return jsonified({
+            return {
                 'success': False,
-            })
+            }
         else:
             self.request_token = dict(parse_qsl(content))
 
             auth_url = self.urls['authorize'] + ("?oauth_token=%s" % self.request_token['oauth_token'])
 
             log.info('Redirecting to "%s"', auth_url)
-            return jsonified({
+            return {
                 'success': True,
                 'url': auth_url,
-            })
+            }
 
-    def getCredentials(self):
-
-        key = getParam('oauth_verifier')
+    def getCredentials(self, oauth_verifier, **kwargs):
 
         token = oauth2.Token(self.request_token['oauth_token'], self.request_token['oauth_token_secret'])
-        token.set_verifier(key)
+        token.set_verifier(oauth_verifier)
 
         oauth_consumer = oauth2.Consumer(key = self.consumer_key, secret = self.consumer_secret)
         oauth_client = oauth2.Client(oauth_consumer, token)
 
-        resp, content = oauth_client.request(self.urls['access'], method = 'POST', body = 'oauth_verifier=%s' % key)
+        resp, content = oauth_client.request(self.urls['access'], method = 'POST', body = 'oauth_verifier=%s' % oauth_verifier)
         access_token = dict(parse_qsl(content))
 
         if resp['status'] != '200':
@@ -111,4 +116,4 @@ class Twitter(Notification):
 
             self.request_token = None
 
-            return redirect(url_for('web.index') + 'settings/notifications/')
+            return 'redirect', Env.get('web_base') + 'settings/notifications/'

couchpotato/core/notifications/xbmc/__init__.py

@@ -8,8 +8,10 @@ config = [{
     'groups': [
         {
             'tab': 'notifications',
+            'list': 'notification_providers',
             'name': 'xbmc',
             'label': 'XBMC',
+            'description': 'v11 (Eden) and v12 (Frodo)',
             'options': [
                 {
                     'name': 'enabled',
@@ -29,6 +31,20 @@ config = [{
                     'default': '',
                     'type': 'password',
                 },
+                {
+                    'name': 'only_first',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Only update the first host when movie snatched, useful for synced XBMC',
+                },
+                {
+                    'name': 'on_snatch',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also send message when movie is snatched.',
+                },
             ],
         }
     ],

couchpotato/core/notifications/xbmc/main.py

@@ -1,43 +1,214 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
+from urllib2 import URLError
 import base64
+import json
+import socket
+import traceback
+import urllib
 
 log = CPLog(__name__)
 
 
 class XBMC(Notification):
 
-    listen_to = ['movie.downloaded']
+    listen_to = ['renamer.after']
+    use_json_notifications = {}
+    http_time_between_calls = 0
 
     def notify(self, message = '', data = {}, listener = None):
-        if self.isDisabled(): return
 
-        hosts = [x.strip() for x in self.conf('host').split(",")]
+        hosts = splitString(self.conf('host'))
+
         successful = 0
+        max_successful = 0
         for host in hosts:
-            if self.send({'command': 'ExecBuiltIn', 'parameter': 'Notification(CouchPotato, %s)' % message}, host):
-                successful += 1
-            if self.send({'command': 'ExecBuiltIn', 'parameter': 'XBMC.updatelibrary(video)'}, host):
-                successful += 1
 
-        return successful == len(hosts)*2
+            if self.use_json_notifications.get(host) is None:
+                self.getXBMCJSONversion(host, message = message)
 
-    def send(self, command, host):
+            if self.use_json_notifications.get(host):
+                calls = [
+                    ('GUI.ShowNotification', {'title': self.default_title, 'message': message, 'image': self.getNotificationImage('small')}),
+                ]
 
-        url = 'http://%s/xbmcCmds/xbmcHttp/?%s' % (host, tryUrlencode(command))
+                if not self.conf('only_first') or hosts.index(host) == 0:
+                    calls.append(('VideoLibrary.Scan', {}))
 
-        headers = {}
+                max_successful += len(calls)
+                response = self.request(host, calls)
+            else:
+                response = self.notifyXBMCnoJSON(host, {'title':self.default_title, 'message':message})
+
+                if not self.conf('only_first') or hosts.index(host) == 0:
+                    response += self.request(host, [('VideoLibrary.Scan', {})])
+                    max_successful += 1
+
+                max_successful += 1
+
+            try:
+                for result in response:
+                    if (result.get('result') and result['result'] == 'OK'):
+                        successful += 1
+                    elif (result.get('error')):
+                        log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
+
+            except:
+                log.error('Failed parsing results: %s', traceback.format_exc())
+
+        return successful == max_successful
+
+    def getXBMCJSONversion(self, host, message = ''):
+
+        success = False
+
+        # XBMC JSON-RPC version request
+        response = self.request(host, [
+            ('JSONRPC.Version', {})
+        ])
+        for result in response:
+            if (result.get('result') and type(result['result']['version']).__name__ == 'int'):
+                # only v2 and v4 return an int object
+                # v6 (as of XBMC v12(Frodo)) is required to send notifications
+                xbmc_rpc_version = str(result['result']['version'])
+
+                log.debug('XBMC JSON-RPC Version: %s ; Notifications by JSON-RPC only supported for v6 [as of XBMC v12(Frodo)]', xbmc_rpc_version)
+
+                # disable JSON use
+                self.use_json_notifications[host] = False
+
+                # send the text message
+                resp = self.notifyXBMCnoJSON(host, {'title':self.default_title, 'message':message})
+                for result in resp:
+                    if (result.get('result') and result['result'] == 'OK'):
+                        log.debug('Message delivered successfully!')
+                        success = True
+                        break
+                    elif (result.get('error')):
+                        log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
+                        break
+
+            elif (result.get('result') and type(result['result']['version']).__name__ == 'dict'):
+                # XBMC JSON-RPC v6 returns an array object containing
+                # major, minor and patch number
+                xbmc_rpc_version = str(result['result']['version']['major'])
+                xbmc_rpc_version += '.' + str(result['result']['version']['minor'])
+                xbmc_rpc_version += '.' + str(result['result']['version']['patch'])
+
+                log.debug('XBMC JSON-RPC Version: %s', xbmc_rpc_version)
+
+                # ok, XBMC version is supported
+                self.use_json_notifications[host] = True
+
+                # send the text message
+                resp = self.request(host, [('GUI.ShowNotification', {'title':self.default_title, 'message':message, 'image': self.getNotificationImage('small')})])
+                for result in resp:
+                    if (result.get('result') and result['result'] == 'OK'):
+                        log.debug('Message delivered successfully!')
+                        success = True
+                        break
+                    elif (result.get('error')):
+                        log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
+                        break
+
+            # error getting version info (we do have contact with XBMC though)
+            elif (result.get('error')):
+                log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
+
+        log.debug('Use JSON notifications: %s ', self.use_json_notifications)
+
+        return success
+
+    def notifyXBMCnoJSON(self, host, data):
+
+        server = 'http://%s/xbmcCmds/' % host
+
+        # Notification(title, message [, timeout , image])
+        cmd = "xbmcHttp?command=ExecBuiltIn(Notification(%s,%s,'',%s))" % (urllib.quote(data['title']), urllib.quote(data['message']), urllib.quote(self.getNotificationImage('medium')))
+        server += cmd
+
+        # I have no idea what to set to, just tried text/plain and seems to be working :)
+        headers = {
+            'Content-Type': 'text/plain',
+        }
+
+        # authentication support
         if self.conf('password'):
-            headers = {
-               'Authorization': "Basic %s" % base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password')))[:-1]
-            }
+            base64string = base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password'))).replace('\n', '')
+            headers['Authorization'] = 'Basic %s' % base64string
 
         try:
-            self.urlopen(url, headers = headers, show_error = False)
-        except:
-            log.error("Couldn't sent command to XBMC")
-            return False
+            log.debug('Sending non-JSON-type request to %s: %s', (host, data))
+
+            # response wil either be 'OK':
+            # <html>
+            # <li>OK
+            # </html>
+            #
+            # or 'Error':
+            # <html>
+            # <li>Error:<message>
+            # </html>
+            #
+            response = self.urlopen(server, headers = headers, timeout = 3, show_error = False)
+
+            if 'OK' in response:
+                log.debug('Returned from non-JSON-type request %s: %s', (host, response))
+                # manually fake expected response array
+                return [{'result': 'OK'}]
+            else:
+                log.error('Returned from non-JSON-type request %s: %s', (host, response))
+                # manually fake expected response array
+                return [{'result': 'Error'}]
+
+        except URLError, e:
+            if isinstance(e.reason, socket.timeout):
+                log.info('Couldn\'t send request to XBMC, assuming it\'s turned off')
+                return [{'result': 'Error'}]
+            else:
+                log.error('Failed sending non-JSON-type request to XBMC: %s', traceback.format_exc())
+                return [{'result': 'Error'}]
+        except:
+            log.error('Failed sending non-JSON-type request to XBMC: %s', traceback.format_exc())
+            return [{'result': 'Error'}]
+
+    def request(self, host, requests):
+        server = 'http://%s/jsonrpc' % host
+
+        data = []
+        for req in requests:
+            method, kwargs = req
+            data.append({
+                'method': method,
+                'params': kwargs,
+                'jsonrpc': '2.0',
+                'id': method,
+            })
+        data = json.dumps(data)
+
+        headers = {
+            'Content-Type': 'application/json',
+        }
+
+        if self.conf('password'):
+            base64string = base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password'))).replace('\n', '')
+            headers['Authorization'] = 'Basic %s' % base64string
+
+        try:
+            log.debug('Sending request to %s: %s', (host, data))
+            response = self.getJsonData(server, headers = headers, params = data, timeout = 3, show_error = False)
+            log.debug('Returned from request %s: %s', (host, response))
+
+            return response
+        except URLError, e:
+            if isinstance(e.reason, socket.timeout):
+                log.info('Couldn\'t send request to XBMC, assuming it\'s turned off')
+                return []
+            else:
+                log.error('Failed sending request to XBMC: %s', traceback.format_exc())
+                return []
+        except:
+            log.error('Failed sending request to XBMC: %s', traceback.format_exc())
+            return []
 
-        log.info('XBMC notification to %s successful.', host)
-        return True

couchpotato/core/plugins/automation/__init__.py

@@ -5,13 +5,12 @@ def start():
 
 config = [{
     'name': 'automation',
-    'order': 30,
+    'order': 101,
     'groups': [
         {
             'tab': 'automation',
             'name': 'automation',
-            'label': 'Automation',
-            'description': 'Minimal movie requirements',
+            'label': 'Minimal movie requirements',
             'options': [
                 {
                     'name': 'year',
@@ -37,6 +36,20 @@ config = [{
                     'unit': 'hours',
                     'description': 'hours',
                 },
+                {
+                    'name': 'required_genres',
+                    'label': 'Required Genres',
+                    'default': '',
+                    'placeholder': 'Example: Action, Crime & Drama',
+                    'description': 'Ignore movies that don\'t contain at least one set of genres. Sets are separated by "," and each word within a set must be separated with "&"'
+                },
+                {
+                    'name': 'ignored_genres',
+                    'label': 'Ignored Genres',
+                    'default': '',
+                    'placeholder': 'Example: Horror, Comedy & Drama & Romance',
+                    'description': 'Ignore movies that contain at least one set of genres. Sets work the same as above.'
+                },
             ],
         },
     ],

couchpotato/core/plugins/automation/main.py

@@ -10,17 +10,30 @@ class Automation(Plugin):
 
     def __init__(self):
 
-        fireEvent('schedule.interval', 'automation.add_movies', self.addMovies, hours = self.conf('hour', default = 12))
+        addEvent('app.load', self.setCrons)
 
         if not Env.get('dev'):
             addEvent('app.load', self.addMovies)
 
+        addEvent('setting.save.automation.hour.after', self.setCrons)
+
+    def setCrons(self):
+        fireEvent('schedule.interval', 'automation.add_movies', self.addMovies, hours = self.conf('hour', default = 12))
+
     def addMovies(self):
 
         movies = fireEvent('automation.get_movies', merge = True)
+        movie_ids = []
+
         for imdb_id in movies:
             prop_name = 'automation.added.%s' % imdb_id
             added = Env.prop(prop_name, default = False)
             if not added:
-                fireEvent('movie.add', params = {'identifier': imdb_id}, force_readd = False)
+                added_movie = fireEvent('movie.add', params = {'identifier': imdb_id}, force_readd = False, search_after = False, update_library = True, single = True)
+                if added_movie:
+                    movie_ids.append(added_movie['id'])
                 Env.prop(prop_name, True)
+
+        for movie_id in movie_ids:
+            movie_dict = fireEvent('movie.get', movie_id, single = True)
+            fireEvent('searcher.single', movie_dict)

couchpotato/core/plugins/base.py

@@ -1,12 +1,13 @@
 from StringIO import StringIO
-from couchpotato import addView
 from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.helpers.encoding import tryUrlencode, simplifyString, ss
-from couchpotato.core.helpers.variable import getExt
+from couchpotato.core.helpers.encoding import tryUrlencode, ss, toSafeString, \
+    toUnicode
+from couchpotato.core.helpers.variable import getExt, md5
 from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
-from flask.templating import render_template_string
 from multipartpost import MultipartPostHandler
+from tornado import template
+from tornado.web import StaticFileHandler
 from urlparse import urlparse
 import cookielib
 import glob
@@ -28,14 +29,16 @@ class Plugin(object):
 
     _needs_shutdown = False
 
+    user_agent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:24.0) Gecko/20130519 Firefox/24.0'
     http_last_use = {}
     http_time_between_calls = 0
     http_failed_request = {}
     http_failed_disabled = {}
 
     def registerPlugin(self):
-        addEvent('app.shutdown', self.doShutdown)
+        addEvent('app.do_shutdown', self.doShutdown)
         addEvent('plugin.running', self.isRunning)
+        self._running = []
 
     def conf(self, attr, value = None, default = None):
         return Env.setting(attr, self.getName().lower(), value = value, default = default)
@@ -43,34 +46,36 @@ class Plugin(object):
     def getName(self):
         return self.__class__.__name__
 
-    def renderTemplate(self, parent_file, template, **params):
+    def renderTemplate(self, parent_file, templ, **params):
 
-        template = open(os.path.join(os.path.dirname(parent_file), template), 'r').read()
-        return render_template_string(template, **params)
+        t = template.Template(open(os.path.join(os.path.dirname(parent_file), templ), 'r').read())
+        return t.generate(**params)
 
     def registerStatic(self, plugin_file, add_to_head = True):
 
         # Register plugin path
         self.plugin_path = os.path.dirname(plugin_file)
+        static_folder = toUnicode(os.path.join(self.plugin_path, 'static'))
+
+        if not os.path.isdir(static_folder):
+            return
 
         # Get plugin_name from PluginName
         s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', self.__class__.__name__)
         class_name = re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
 
+        # View path
         path = 'api/%s/static/%s/' % (Env.setting('api_key'), class_name)
-        addView(path + '<path:filename>', self.showStatic, static = True)
 
+        # Add handler to Tornado
+        Env.get('app').add_handlers(".*$", [(Env.get('web_base') + path + '(.*)', StaticFileHandler, {'path': static_folder})])
+
+        # Register for HTML <HEAD>
         if add_to_head:
             for f in glob.glob(os.path.join(self.plugin_path, 'static', '*')):
                 ext = getExt(f)
                 if ext in ['js', 'css']:
-                    fireEvent('register_%s' % ('script' if ext in 'js' else 'style'), path + os.path.basename(f))
-
-    def showStatic(self, filename):
-        d = os.path.join(self.plugin_path, 'static')
-
-        from flask.helpers import send_from_directory
-        return send_from_directory(d, filename)
+                    fireEvent('register_%s' % ('script' if ext in 'js' else 'style'), path + os.path.basename(f), f)
 
     def createFile(self, path, content, binary = False):
         path = ss(path)
@@ -78,7 +83,7 @@ class Plugin(object):
         self.makeDir(os.path.dirname(path))
 
         try:
-            f = open(path, 'w' if not binary else 'wb')
+            f = open(path, 'w+' if not binary else 'w+b')
             f.write(content)
             f.close()
             os.chmod(path, Env.getPermission('file'))
@@ -98,23 +103,30 @@ class Plugin(object):
 
     # http request
     def urlopen(self, url, timeout = 30, params = None, headers = None, opener = None, multipart = False, show_error = True):
+        url = ss(url)
 
         if not headers: headers = {}
         if not params: params = {}
 
         # Fill in some headers
-        headers['Referer'] = headers.get('Referer', urlparse(url).hostname)
-        headers['Host'] = headers.get('Host', urlparse(url).hostname)
-        headers['User-Agent'] = headers.get('User-Agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.2) Gecko/20100101 Firefox/10.0.2')
-        headers['Accept-encoding'] = headers.get('Accept-encoding', 'gzip')
+        parsed_url = urlparse(url)
+        host = '%s%s' % (parsed_url.hostname, (':' + str(parsed_url.port) if parsed_url.port else ''))
 
-        host = urlparse(url).hostname
+        headers['Referer'] = headers.get('Referer', '%s://%s' % (parsed_url.scheme, host))
+        headers['Host'] = headers.get('Host', host)
+        headers['User-Agent'] = headers.get('User-Agent', self.user_agent)
+        headers['Accept-encoding'] = headers.get('Accept-encoding', 'gzip')
+        headers['Connection'] = headers.get('Connection', 'keep-alive')
+        headers['Cache-Control'] = headers.get('Cache-Control', 'max-age=0')
 
         # Don't try for failed requests
         if self.http_failed_disabled.get(host, 0) > 0:
             if self.http_failed_disabled[host] > (time.time() - 900):
-                log.info('Disabled calls to %s for 15 minutes because so many failed requests.', host)
-                raise Exception
+                log.info2('Disabled calls to %s for 15 minutes because so many failed requests.', host)
+                if not show_error:
+                    raise
+                else:
+                    return ''
             else:
                 del self.http_failed_request[host]
                 del self.http_failed_disabled[host]
@@ -122,17 +134,29 @@ class Plugin(object):
         self.wait(host)
         try:
 
+            # Make sure opener has the correct headers
+            if opener:
+                opener.add_headers = headers
+
             if multipart:
-                log.info('Opening multipart url: %s, params: %s', (url, [x for x in params.iterkeys()]))
+                log.info('Opening multipart url: %s, params: %s', (url, [x for x in params.iterkeys()] if isinstance(params, dict) else 'with data'))
                 request = urllib2.Request(url, params, headers)
 
-                cookies = cookielib.CookieJar()
-                opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookies), MultipartPostHandler)
+                if opener:
+                    opener.add_handler(MultipartPostHandler())
+                else:
+                    cookies = cookielib.CookieJar()
+                    opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookies), MultipartPostHandler)
 
                 response = opener.open(request, timeout = timeout)
             else:
-                log.info('Opening url: %s, params: %s', (url, [x for x in params.iterkeys()]))
-                data = tryUrlencode(params) if len(params) > 0 else None
+                log.info('Opening url: %s, params: %s', (url, [x for x in params.iterkeys()] if isinstance(params, dict) else 'with data'))
+
+                if isinstance(params, (str, unicode)) and len(params) > 0:
+                    data = params
+                else:
+                    data = tryUrlencode(params) if len(params) > 0 else None
+
                 request = urllib2.Request(url, data, headers)
 
                 if opener:
@@ -145,8 +169,10 @@ class Plugin(object):
                 buf = StringIO(response.read())
                 f = gzip.GzipFile(fileobj = buf)
                 data = f.read()
+                f.close()
             else:
                 data = response.read()
+            response.close()
 
             self.http_failed_request[host] = 0
         except IOError:
@@ -202,9 +228,6 @@ class Plugin(object):
 
     def isRunning(self, value = None, boolean = True):
 
-        if not hasattr(self, '_running'):
-            self._running = []
-
         if value is None:
             return self._running
 
@@ -218,7 +241,7 @@ class Plugin(object):
 
 
     def getCache(self, cache_key, url = None, **kwargs):
-        cache_key = simplifyString(cache_key)
+        cache_key = md5(ss(cache_key))
         cache = Env.get('cache').get(cache_key)
         if cache:
             if not Env.get('dev'): log.debug('Getting cache %s', cache_key)
@@ -233,18 +256,36 @@ class Plugin(object):
                     del kwargs['cache_timeout']
 
                 data = self.urlopen(url, **kwargs)
-
                 if data:
                     self.setCache(cache_key, data, timeout = cache_timeout)
                 return data
             except:
-                pass
+                if not kwargs.get('show_error', True):
+                    raise
+
+                return ''
 
     def setCache(self, cache_key, value, timeout = 300):
         log.debug('Setting cache %s', cache_key)
         Env.get('cache').set(cache_key, value, timeout)
         return value
 
+    def createNzbName(self, data, movie):
+        tag = self.cpTag(movie)
+        return '%s%s' % (toSafeString(data.get('name')[:127 - len(tag)]), tag)
+
+    def createFileName(self, data, filedata, movie):
+        name = os.path.join(self.createNzbName(data, movie))
+        if data.get('type') == 'nzb' and 'DOCTYPE nzb' not in filedata and '</nzb>' not in filedata:
+            return '%s.%s' % (name, 'rar')
+        return '%s.%s' % (name, data.get('type'))
+
+    def cpTag(self, movie):
+        if Env.setting('enabled', 'renamer'):
+            return '.cp(' + movie['library'].get('identifier') + ')' if movie['library'].get('identifier') else ''
+
+        return ''
+
     def isDisabled(self):
         return not self.isEnabled()
 

couchpotato/core/plugins/browser/main.py

@@ -1,5 +1,5 @@
 from couchpotato.api import addApiView
-from couchpotato.core.helpers.request import getParam, jsonified
+from couchpotato.core.helpers.variable import getUserDir
 from couchpotato.core.plugins.base import Plugin
 import ctypes
 import os
@@ -14,7 +14,7 @@ if os.name == 'nt':
         raise ImportError("Missing the win32file module, which is a part of the prerequisite \
             pywin32 package. You can get it from http://sourceforge.net/projects/pywin32/files/pywin32/");
     else:
-        import win32file
+        import win32file #@UnresolvedImport
 
 class FileBrowser(Plugin):
 
@@ -27,6 +27,8 @@ class FileBrowser(Plugin):
             },
             'return': {'type': 'object', 'example': """{
     'is_root': bool, //is top most folder
+    'parent': string, //parent folder of requested path
+    'home': string, //user home folder
     'empty': bool, //directory is empty
     'dirs': array, //directory names
 }"""}
@@ -55,25 +57,37 @@ class FileBrowser(Plugin):
 
         driveletters = []
         for drive in string.ascii_uppercase:
-            if win32file.GetDriveType(drive + ":") in [win32file.DRIVE_FIXED, win32file.DRIVE_REMOTE]:
+            if win32file.GetDriveType(drive + ":") in [win32file.DRIVE_FIXED, win32file.DRIVE_REMOTE, win32file.DRIVE_RAMDISK, win32file.DRIVE_REMOVABLE]:
                 driveletters.append(drive + ":\\")
 
         return driveletters
 
-    def view(self):
+    def view(self, path = '/', show_hidden = True, **kwargs):
 
-        path = getParam('path', '/')
+        home = getUserDir()
+
+        if not path:
+            path = home
 
         try:
-            dirs = self.getDirectories(path = path, show_hidden = getParam('show_hidden', True))
+            dirs = self.getDirectories(path = path, show_hidden = show_hidden)
         except:
             dirs = []
 
-        return jsonified({
-            'is_root': path == '/' or not path,
+        parent = os.path.dirname(path.rstrip(os.path.sep))
+        if parent == path.rstrip(os.path.sep):
+            parent = '/'
+        elif parent != '/' and parent[-2:] != ':\\':
+            parent += os.path.sep
+
+        return {
+            'is_root': path == '/',
             'empty': len(dirs) == 0,
+            'parent': parent,
+            'home': home + os.path.sep,
+            'platform': os.name,
             'dirs': dirs,
-        })
+        }
 
 
     def is_hidden(self, filepath):
@@ -82,7 +96,7 @@ class FileBrowser(Plugin):
 
     def has_hidden_attribute(self, filepath):
         try:
-            attrs = ctypes.windll.kernel32.GetFileAttributesW(unicode(filepath))
+            attrs = ctypes.windll.kernel32.GetFileAttributesW(unicode(filepath)) #@UndefinedVariable
             assert attrs != -1
             result = bool(attrs & 2)
         except (AttributeError, AssertionError):

couchpotato/core/plugins/dashboard/__init__.py

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

couchpotato/core/plugins/dashboard/main.py

@@ -0,0 +1,110 @@
+from couchpotato import get_session
+from couchpotato.api import addApiView
+from couchpotato.core.event import fireEvent
+from couchpotato.core.helpers.variable import splitString, tryInt
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.core.settings.model import Movie
+from sqlalchemy.orm import joinedload_all
+import random as rndm
+import time
+
+log = CPLog(__name__)
+
+
+class Dashboard(Plugin):
+
+    def __init__(self):
+        addApiView('dashboard.soon', self.getSoonView)
+
+    def getSoonView(self, limit_offset = None, random = False, late = False, **kwargs):
+
+        db = get_session()
+        now = time.time()
+
+        # Get profiles first, determine pre or post theater
+        profiles = fireEvent('profile.all', single = True)
+        qualities = fireEvent('quality.all', single = True)
+        pre_releases = fireEvent('quality.pre_releases', single = True)
+
+        id_pre = {}
+        for quality in qualities:
+            id_pre[quality.get('id')] = quality.get('identifier') in pre_releases
+
+        # See what the profile contain and cache it
+        profile_pre = {}
+        for profile in profiles:
+            contains = {}
+            for profile_type in profile.get('types', []):
+                contains['theater' if id_pre.get(profile_type.get('quality_id')) else 'dvd'] = True
+
+            profile_pre[profile.get('id')] = contains
+
+        # Get all active movies
+        active_status, snatched_status, downloaded_status, available_status = fireEvent('status.get', ['active', 'snatched', 'downloaded', 'available'], single = True)
+        subq = db.query(Movie).filter(Movie.status_id == active_status.get('id')).subquery()
+
+        q = db.query(Movie).join((subq, subq.c.id == Movie.id)) \
+            .options(joinedload_all('releases')) \
+            .options(joinedload_all('profile.types')) \
+            .options(joinedload_all('library.titles')) \
+            .options(joinedload_all('library.files')) \
+            .options(joinedload_all('status')) \
+            .options(joinedload_all('files'))
+
+        # Add limit
+        limit = 12
+        if limit_offset:
+            splt = splitString(limit_offset) if isinstance(limit_offset, (str, unicode)) else limit_offset
+            limit = tryInt(splt[0])
+
+        all_movies = q.all()
+
+        if random:
+            rndm.shuffle(all_movies)
+
+        movies = []
+        for movie in all_movies:
+            pp = profile_pre.get(movie.profile.id)
+            eta = movie.library.info.get('release_date', {}) or {}
+            coming_soon = False
+
+            # Theater quality
+            if pp.get('theater') and fireEvent('searcher.could_be_released', True, eta, movie.library.year, single = True):
+                coming_soon = True
+            if pp.get('dvd') and fireEvent('searcher.could_be_released', False, eta, movie.library.year, single = True):
+                coming_soon = True
+
+            # Skip if movie is snatched/downloaded/available
+            skip = False
+            for release in movie.releases:
+                if release.status_id in [snatched_status.get('id'), downloaded_status.get('id'), available_status.get('id')]:
+                    skip = True
+                    break
+            if skip:
+                continue
+
+            if coming_soon:
+                temp = movie.to_dict({
+                    'profile': {'types': {}},
+                    'releases': {'files':{}, 'info': {}},
+                    'library': {'titles': {}, 'files':{}},
+                    'files': {},
+                })
+
+                # Don't list older movies
+                if ((not late and ((not eta.get('dvd') and not eta.get('theater')) or (eta.get('dvd') and eta.get('dvd') > (now - 2419200)))) or \
+                        (late and (eta.get('dvd', 0) > 0 or eta.get('theater')) and eta.get('dvd') < (now - 2419200))):
+                    movies.append(temp)
+
+                if len(movies) >= limit:
+                    break
+
+        db.expire_all()
+        return {
+            'success': True,
+            'empty': len(movies) == 0,
+            'movies': movies,
+        }
+
+    getLateView = getSoonView

couchpotato/core/plugins/file/main.py

@@ -5,9 +5,12 @@ from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import md5, getExt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
+from couchpotato.core.plugins.scanner.main import Scanner
 from couchpotato.core.settings.model import FileType, File
 from couchpotato.environment import Env
+from tornado.web import StaticFileHandler
 import os.path
+import time
 import traceback
 
 log = CPLog(__name__)
@@ -20,7 +23,7 @@ class FileManager(Plugin):
         addEvent('file.download', self.download)
         addEvent('file.types', self.getTypes)
 
-        addApiView('file.cache/<path:filename>', self.showCacheFile, static = True, docs = {
+        addApiView('file.cache/(.*)', self.showCacheFile, static = True, docs = {
             'desc': 'Return a file from the cp_data/cache directory',
             'params': {
                 'filename': {'desc': 'path/filename of the wanted file'}
@@ -28,13 +31,57 @@ class FileManager(Plugin):
             'return': {'type': 'file'}
         })
 
-    def showCacheFile(self, filename = ''):
+        addApiView('file.types', self.getTypesView, docs = {
+            'desc': 'Return a list of all the file types and their ids.',
+            'return': {'type': 'object', 'example': """{
+    'types': [
+        {
+            "identifier": "poster_original",
+            "type": "image",
+            "id": 1,
+            "name": "Poster_original"
+        },
+        {
+            "identifier": "poster",
+            "type": "image",
+            "id": 2,
+            "name": "Poster"
+        },
+        etc
+    ]
+}"""}
+        })
 
-        cache_dir = Env.get('cache_dir')
-        filename = os.path.basename(filename)
+        addEvent('app.load', self.cleanup)
+        addEvent('app.load', self.init)
+
+    def init(self):
+
+        for type_tuple in Scanner.file_types.values():
+            self.getType(type_tuple)
+
+    def cleanup(self):
+
+        # Wait a bit after starting before cleanup
+        time.sleep(3)
+        log.debug('Cleaning up unused files')
+
+        python_cache = Env.get('cache')._path
+        try:
+            db = get_session()
+            for root, dirs, walk_files in os.walk(Env.get('cache_dir')):
+                for filename in walk_files:
+                    if root == python_cache or 'minified' in filename or 'version' in filename or 'temp_updater' in root: continue
+                    file_path = os.path.join(root, filename)
+                    f = db.query(File).filter(File.path == toUnicode(file_path)).first()
+                    if not f:
+                        os.remove(file_path)
+        except:
+            log.error('Failed removing unused file: %s', traceback.format_exc())
+
+    def showCacheFile(self, route, **kwargs):
+        Env.get('app').add_handlers(".*$", [('%s%s' % (Env.get('api_base'), route), StaticFileHandler, {'path': Env.get('cache_dir')})])
 
-        from flask.helpers import send_from_directory
-        return send_from_directory(cache_dir, filename)
 
     def download(self, url = '', dest = None, overwrite = False, urlopen_kwargs = {}):
 
@@ -89,7 +136,6 @@ class FileManager(Plugin):
             db.commit()
 
         type_dict = ft.to_dict()
-        #db.close()
         return type_dict
 
     def getTypes(self):
@@ -102,5 +148,10 @@ class FileManager(Plugin):
         for type_object in results:
             types.append(type_object.to_dict())
 
-        #db.close()
         return types
+
+    def getTypesView(self, **kwargs):
+
+        return {
+            'types': self.getTypes()
+        }

couchpotato/core/plugins/file/static/file.js

@@ -1,10 +1,11 @@
 var File = new Class({
 
-	initialize: function(file){
+	initialize: function(type, file){
 		var self = this;
 
 		if(!file){
-			self.el = new Element('div');
+			self.empty = true;
+			self.el = new Element('div.empty_file.'+type);
 			return
 		}
 
@@ -21,7 +22,10 @@ var File = new Class({
 		var file_name = self.data.path.replace(/^.*[\\\/]/, '');
 
 		self.el = new Element('div', {
-			'class': 'type_image ' + self.type.identifier
+			'class': 'type_image ' + self.type.identifier,
+			'styles': {
+				'background-image': 'url('+Api.createUrl('file.cache') + file_name+')'
+			}
 		}).adopt(
 			new Element('img', {
 				'src': Api.createUrl('file.cache') + file_name
@@ -44,7 +48,7 @@ var FileSelect = new Class({
 		});
 
 		if(single)
-			return new File(results.pop());
+			return new File(type, results.pop());
 
 		return results;
 

couchpotato/core/plugins/library/main.py

@@ -19,7 +19,6 @@ class LibraryPlugin(Plugin):
         addEvent('library.update', self.update)
         addEvent('library.update_release_date', self.updateReleaseDate)
 
-
     def add(self, attrs = {}, update_after = True):
 
         db = get_session()
@@ -32,12 +31,13 @@ class LibraryPlugin(Plugin):
                 identifier = attrs.get('identifier'),
                 plot = toUnicode(attrs.get('plot')),
                 tagline = toUnicode(attrs.get('tagline')),
-                status_id = status.get('id')
+                status_id = status.get('id'),
+                info = {},
             )
 
             title = LibraryTitle(
                 title = toUnicode(attrs.get('title')),
-                simple_title = self.simplifyTitle(attrs.get('title'))
+                simple_title = self.simplifyTitle(attrs.get('title')),
             )
 
             l.titles.append(title)
@@ -52,7 +52,7 @@ class LibraryPlugin(Plugin):
 
         library_dict = l.to_dict(self.default_dict)
 
-        #db.close()
+        db.expire_all()
         return library_dict
 
     def update(self, identifier, default_title = '', force = False):
@@ -87,7 +87,7 @@ class LibraryPlugin(Plugin):
             library.tagline = toUnicode(info.get('tagline', ''))
             library.year = info.get('year', 0)
             library.status_id = done_status.get('id')
-            library.info = info
+            library.info.update(info)
             db.commit()
 
             # Titles
@@ -96,6 +96,7 @@ class LibraryPlugin(Plugin):
 
             titles = info.get('titles', [])
             log.debug('Adding titles: %s', titles)
+            counter = 0
             for title in titles:
                 if not title:
                     continue
@@ -103,31 +104,35 @@ class LibraryPlugin(Plugin):
                 t = LibraryTitle(
                     title = title,
                     simple_title = self.simplifyTitle(title),
-                    default = title.lower() == toUnicode(default_title.lower()) or (toUnicode(default_title) == u'' and toUnicode(titles[0]) == title)
+                    default = (len(default_title) == 0 and counter == 0) or len(titles) == 1 or title.lower() == toUnicode(default_title.lower()) or (toUnicode(default_title) == u'' and toUnicode(titles[0]) == title)
                 )
                 library.titles.append(t)
+                counter += 1
 
             db.commit()
 
             # Files
             images = info.get('images', [])
-            for type in images:
-                for image in images[type]:
-                    if not isinstance(image, str):
+            for image_type in ['poster']:
+                for image in images.get(image_type, []):
+                    if not isinstance(image, (str, unicode)):
                         continue
 
                     file_path = fireEvent('file.download', url = image, single = True)
                     if file_path:
-                        file_obj = fireEvent('file.add', path = file_path, type_tuple = ('image', type), single = True)
+                        file_obj = fireEvent('file.add', path = file_path, type_tuple = ('image', image_type), single = True)
                         try:
                             file_obj = db.query(File).filter_by(id = file_obj.get('id')).one()
                             library.files.append(file_obj)
                             db.commit()
+
+                            break
                         except:
                             log.debug('Failed to attach to library: %s', traceback.format_exc())
 
             library_dict = library.to_dict(self.default_dict)
 
+        db.expire_all()
         return library_dict
 
     def updateReleaseDate(self, identifier):
@@ -136,26 +141,24 @@ class LibraryPlugin(Plugin):
         library = db.query(Library).filter_by(identifier = identifier).first()
 
         if not library.info:
-            library_dict = self.update(identifier)
-            dates = library_dict.get('info', {}).get('release_dates')
+            library_dict = self.update(identifier, force = True)
+            dates = library_dict.get('info', {}).get('release_date')
         else:
             dates = library.info.get('release_date')
 
-        if dates and dates.get('expires', 0) < time.time():
+        if dates and dates.get('expires', 0) < time.time() or not dates:
             dates = fireEvent('movie.release_date', identifier = identifier, merge = True)
-            library.info['release_date'] = dates
-            library.info = library.info
+            library.info.update({'release_date': dates })
             db.commit()
 
-        dates = library.info.get('release_date', {})
-        #db.close()
-
+        db.expire_all()
         return dates
 
 
     def simplifyTitle(self, title):
 
         title = toUnicode(title)
+
         nr_prefix = '' if title[0] in ascii_letters else '#'
         title = simplifyString(title)
 

couchpotato/core/plugins/log/main.py

@@ -1,6 +1,5 @@
 from couchpotato.api import addApiView
 from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified, getParam, getParams
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
@@ -47,9 +46,9 @@ class Logging(Plugin):
             }
         })
 
-    def get(self):
+    def get(self, nr = 0, **kwargs):
 
-        nr = int(getParam('nr', 0))
+        nr = tryInt(nr)
         current_path = None
 
         total = 1
@@ -71,16 +70,15 @@ class Logging(Plugin):
             f = open(current_path, 'r')
             log = f.read()
 
-        return jsonified({
+        return {
             'success': True,
             'log': toUnicode(log),
             'total': total,
-        })
+        }
 
-    def partial(self):
+    def partial(self, type = 'all', lines = 30, **kwargs):
 
-        log_type = getParam('type', 'all')
-        total_lines = tryInt(getParam('lines', 30))
+        total_lines = tryInt(lines)
 
         log_lines = []
 
@@ -100,7 +98,7 @@ class Logging(Plugin):
             brk = False
             for line in reversed_lines:
 
-                if log_type == 'all' or '%s ' % log_type.upper() in line:
+                if type == 'all' or '%s ' % type.upper() in line:
                     log_lines.append(line)
 
                 if len(log_lines) >= total_lines:
@@ -111,12 +109,12 @@ class Logging(Plugin):
                 break
 
         log_lines.reverse()
-        return jsonified({
+        return {
             'success': True,
             'log': '[0m\n'.join(log_lines),
-        })
+        }
 
-    def clear(self):
+    def clear(self, **kwargs):
 
         for x in range(0, 50):
             path = '%s%s' % (Env.get('log_path'), '.%s' % x if x > 0 else '')
@@ -135,24 +133,21 @@ class Logging(Plugin):
             except:
                 log.error('Couldn\'t delete file "%s": %s', (path, traceback.format_exc()))
 
-        return jsonified({
+        return {
             'success': True
-        })
+        }
 
-    def log(self):
-
-        params = getParams()
+    def log(self, type = 'error', **kwargs):
 
         try:
-            log_message = 'API log: %s' % params
+            log_message = 'API log: %s' % kwargs
             try:
-                getattr(log, params.get('type', 'error'))(log_message)
+                getattr(log, type)(log_message)
             except:
                 log.error(log_message)
         except:
-            log.error('Couldn\'t log via API: %s', params)
+            log.error('Couldn\'t log via API: %s', kwargs)
 
-
-        return jsonified({
+        return {
             'success': True
-        })
+        }

couchpotato/core/plugins/log/static/log.css

@@ -1,17 +1,18 @@
 .page.log .nav {
 	display: block;
 	text-align: center;
-	padding: 20px 0;
+	padding: 0 0 30px;
 	margin: 0;
 	font-size: 20px;
 	position: fixed;
-	width: 960px;
+	width: 100%;
 	bottom: 0;
+	left: 0;
 	background: #4E5969;
 }
 
 	.page.log .nav li {
-		display: inline;
+		display: inline-block;
 		padding: 5px 10px;
 		margin: 0;
 		cursor: pointer;
@@ -24,7 +25,17 @@
 		.page.log .nav li.active {
 			font-weight: bold;
 			cursor: default;
-			font-size: 30px;
+			background: rgba(255,255,255,.1);
+		}
+		
+		@media all and (max-width: 480px) {
+			.page.log .nav {
+				font-size: 14px;
+			}
+			
+				.page.log .nav li {
+					padding: 5px;
+				}
 		}
 
 .page.log .loading {

couchpotato/core/plugins/log/static/log.js

@@ -6,19 +6,6 @@ Page.Log = new Class({
 	title: 'Show recent logs.',
 	has_tab: false,
 
-	initialize: function(options){
-		var self = this;
-		self.parent(options)
-
-
-		App.getBlock('more').addLink(new Element('a', {
-			'href': App.createUrl(self.name),
-			'text': self.name.capitalize(),
-			'title': self.title
-		}))
-
-	},
-
 	indexAction: function(){
 		var self = this;
 

couchpotato/core/plugins/manage/__init__.py

@@ -8,7 +8,7 @@ config = [{
     'groups': [
         {
             'tab': 'manage',
-            'label': 'movie library manager',
+            'label': 'Movie Library Manager',
             'description': 'Add your existing movie folders.',
             'options': [
                 {

couchpotato/core/plugins/manage/main.py

@@ -1,23 +1,35 @@
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, addEvent, fireEventAsync
 from couchpotato.core.helpers.encoding import ss
-from couchpotato.core.helpers.request import jsonified, getParam
+from couchpotato.core.helpers.variable import splitString, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
+import ctypes
 import os
+import sys
 import time
+import traceback
 
 
 log = CPLog(__name__)
 
 class Manage(Plugin):
 
+    in_progress = False
+
     def __init__(self):
 
         fireEvent('scheduler.interval', identifier = 'manage.update_library', handle = self.updateLibrary, hours = 2)
 
         addEvent('manage.update', self.updateLibrary)
+        addEvent('manage.diskspace', self.getDiskSpace)
+
+        # Add files after renaming
+        def after_rename(message = None, group = {}):
+            return self.scanFilesToLibrary(folder = group['destination_dir'], files = group['renamed_files'])
+        addEvent('renamer.after', after_rename, priority = 110)
+
         addApiView('manage.update', self.updateLibraryView, docs = {
             'desc': 'Update the library by scanning for new movies',
             'params': {
@@ -25,67 +37,212 @@ class Manage(Plugin):
             }
         })
 
-        if not Env.get('dev'):
-            def updateLibrary():
-                self.updateLibrary(full = False)
-            addEvent('app.load', updateLibrary)
-
-    def updateLibraryView(self):
-
-        full = getParam('full', default = 1)
-        fireEventAsync('manage.update', full = True if full == '1' else False)
-
-        return jsonified({
-            'success': True
+        addApiView('manage.progress', self.getProgress, docs = {
+            'desc': 'Get the progress of current manage update',
+            'return': {'type': 'object', 'example': """{
+    'progress': False || object, total & to_go,
+}"""},
         })
 
+        if not Env.get('dev'):
+            addEvent('app.load', self.updateLibraryQuick)
+
+    def getProgress(self, **kwargs):
+        return {
+            'progress': self.in_progress
+        }
+
+    def updateLibraryView(self, full = 1, **kwargs):
+
+        fireEventAsync('manage.update', full = True if full == '1' else False)
+
+        return {
+            'success': True
+        }
+
+    def updateLibraryQuick(self):
+        return self.updateLibrary(full = False)
 
     def updateLibrary(self, full = True):
         last_update = float(Env.prop('manage.last_update', default = 0))
 
-        if self.isDisabled() or (last_update > time.time() - 20):
+        if self.in_progress:
+            log.info('Already updating library: %s', self.in_progress)
+            return
+        elif self.isDisabled() or (last_update > time.time() - 20):
             return
 
-        directories = self.directories()
-        added_identifiers = []
+        self.in_progress = {}
+        fireEvent('notify.frontend', type = 'manage.updating', data = True)
 
-        for directory in directories:
+        try:
 
-            if not os.path.isdir(directory):
-                if len(directory) > 0:
-                    log.error('Directory doesn\'t exist: %s', directory)
-                continue
+            directories = self.directories()
+            added_identifiers = []
 
-            log.info('Updating manage library: %s', directory)
-            identifiers = fireEvent('scanner.folder', folder = directory, newer_than = last_update if not full else 0, single = True)
-            if identifiers:
-                added_identifiers.extend(identifiers)
+            # Add some progress
+            self.in_progress = {}
+            for directory in directories:
+                self.in_progress[os.path.normpath(directory)] = {
+                    'total': None,
+                    'to_go': None,
+                }
 
-            # Break if CP wants to shut down
-            if self.shuttingDown():
+            for directory in directories:
+                folder = os.path.normpath(directory)
+
+                if not os.path.isdir(folder):
+                    if len(directory) > 0:
+                        log.error('Directory doesn\'t exist: %s', folder)
+                    continue
+
+                log.info('Updating manage library: %s', folder)
+                fireEvent('notify.frontend', type = 'manage.update', data = True, message = 'Scanning for movies in "%s"' % folder)
+
+                onFound = self.createAddToLibrary(folder, added_identifiers)
+                fireEvent('scanner.scan', folder = folder, simple = True, newer_than = last_update if not full else 0, on_found = onFound, single = True)
+
+                # Break if CP wants to shut down
+                if self.shuttingDown():
+                    break
+
+            # If cleanup option is enabled, remove offline files from database
+            if self.conf('cleanup') and full and not self.shuttingDown():
+
+                # Get movies with done status
+                total_movies, done_movies = fireEvent('movie.list', status = 'done', single = True)
+
+                for done_movie in done_movies:
+                    if done_movie['library']['identifier'] not in added_identifiers:
+                        fireEvent('movie.delete', movie_id = done_movie['id'], delete_from = 'all')
+                    else:
+
+                        for release in done_movie.get('releases', []):
+                            if len(release.get('files', [])) == 0:
+                                fireEvent('release.delete', release['id'])
+                            else:
+                                for release_file in release.get('files', []):
+                                    # Remove release not available anymore
+                                    if not os.path.isfile(ss(release_file['path'])):
+                                        fireEvent('release.clean', release['id'])
+                                        break
+
+                        # Check if there are duplicate releases (different quality) use the last one, delete the rest
+                        if len(done_movie.get('releases', [])) > 1:
+                            used_files = {}
+                            for release in done_movie.get('releases', []):
+
+                                for release_file in release.get('files', []):
+                                    already_used = used_files.get(release_file['path'])
+
+                                    if already_used:
+                                        if already_used < release['id']:
+                                            fireEvent('release.delete', release['id'], single = True) # delete this one
+                                        else:
+                                            fireEvent('release.delete', already_used, single = True) # delete previous one
+                                        break
+                                    else:
+                                        used_files[release_file['path']] = release.get('id')
+                            del used_files
+
+            Env.prop('manage.last_update', time.time())
+        except:
+            log.error('Failed updating library: %s', (traceback.format_exc()))
+
+        while True and not self.shuttingDown():
+
+            delete_me = {}
+
+            for folder in self.in_progress:
+                if self.in_progress[folder]['to_go'] <= 0:
+                    delete_me[folder] = True
+
+            for delete in delete_me:
+                del self.in_progress[delete]
+
+            if len(self.in_progress) == 0:
                 break
 
-        # If cleanup option is enabled, remove offline files from database
-        if self.conf('cleanup') and full and not self.shuttingDown():
+            time.sleep(1)
 
-            # Get movies with done status
-            total_movies, done_movies = fireEvent('movie.list', status = 'done', single = True)
+        fireEvent('notify.frontend', type = 'manage.updating', data = False)
+        self.in_progress = False
 
-            for done_movie in done_movies:
-                if done_movie['library']['identifier'] not in added_identifiers:
-                    fireEvent('movie.delete', movie_id = done_movie['id'], delete_from = 'all')
-                else:
-                    for release in done_movie.get('releases', []):
-                        for release_file in release.get('files', []):
-                            # Remove release not available anymore
-                            if not os.path.isfile(ss(release_file['path'])):
-                                fireEvent('release.clean', release['id'])
-                                break
+    def createAddToLibrary(self, folder, added_identifiers = []):
+        def addToLibrary(group, total_found, to_go):
+            if self.in_progress[folder]['total'] is None:
+                self.in_progress[folder] = {
+                    'total': total_found,
+                    'to_go': total_found,
+                }
 
-        Env.prop('manage.last_update', time.time())
+            if group['library'] and group['library'].get('identifier'):
+                identifier = group['library'].get('identifier')
+                added_identifiers.append(identifier)
+
+                # Add it to release and update the info
+                fireEvent('release.add', group = group)
+                fireEventAsync('library.update', identifier = identifier, on_complete = self.createAfterUpdate(folder, identifier))
+            else:
+                self.in_progress[folder]['to_go'] = self.in_progress[folder]['to_go'] - 1
+
+        return addToLibrary
+
+    def createAfterUpdate(self, folder, identifier):
+
+        # Notify frontend
+        def afterUpdate():
+            self.in_progress[folder]['to_go'] = self.in_progress[folder]['to_go'] - 1
+            total = self.in_progress[folder]['total']
+            movie_dict = fireEvent('movie.get', identifier, single = True)
+
+            fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = None if total > 5 else 'Added "%s" to manage.' % getTitle(movie_dict['library']))
+
+        return afterUpdate
 
     def directories(self):
         try:
-            return [x.strip() for x in self.conf('library', default = '').split('::')]
+            if self.conf('library', default = '').strip():
+                return splitString(self.conf('library', default = ''), '::')
         except:
-            return []
+            pass
+
+        return []
+
+    def scanFilesToLibrary(self, folder = None, files = None):
+
+        folder = os.path.normpath(folder)
+
+        groups = fireEvent('scanner.scan', folder = folder, files = files, single = True)
+
+        for group in groups.itervalues():
+            if group['library'] and group['library'].get('identifier'):
+                fireEvent('release.add', group = group)
+
+    def getDiskSpace(self):
+
+        free_space = {}
+        for folder in self.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()
+                    used = total.value - free.value
+                    return [total.value, used, free.value]
+                else:
+                    s = os.statvfs(folder)
+                    size = [s.f_blocks * s.f_frsize / (1024 * 1024), (s.f_bavail * s.f_frsize) / (1024 * 1024)]
+
+            free_space[folder] = size
+
+        return free_space
+

couchpotato/core/plugins/movie/main.py

@@ -2,15 +2,16 @@ from couchpotato import get_session
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
 from couchpotato.core.helpers.encoding import toUnicode, simplifyString
-from couchpotato.core.helpers.request import getParams, jsonified, getParam
-from couchpotato.core.helpers.variable import getImdb
+from couchpotato.core.helpers.variable import getImdb, splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Library, LibraryTitle, Movie
+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_
+from sqlalchemy.sql.expression import or_, asc, not_, desc
 from string import ascii_lowercase
+import time
 
 log = CPLog(__name__)
 
@@ -41,6 +42,7 @@ class MoviePlugin(Plugin):
             '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'},
@@ -94,43 +96,83 @@ class MoviePlugin(Plugin):
         addEvent('movie.list', self.list)
         addEvent('movie.restatus', self.restatus)
 
-    def getView(self):
+        # 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)
 
-        movie_id = getParam('id')
-        movie = self.get(movie_id) if movie_id else None
+    def cleanReleases(self):
 
-        return jsonified({
+        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()
-        m = db.query(Movie).filter_by(id = movie_id).first()
+
+        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.close()
+        db.expire_all()
         return results
 
-    def list(self, status = ['active'], limit_offset = None, starts_with = None, search = None):
+    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 not isinstance(status, (list, tuple)):
+        if status and 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) \
-            .join(Movie.library, Library.titles) \
+            .outerjoin(Movie.releases, Movie.library, Library.titles) \
             .filter(LibraryTitle.default == True) \
-            .filter(or_(*[Movie.status.has(identifier = s) for s in status])) \
             .group_by(Movie.id)
 
-        total_count = q.count()
+        # Filter on movie status
+        if status and len(status) > 0:
+            q = q.filter(or_(*[Movie.status.has(identifier = s) for s in status]))
+
+        # Filter on release status
+        if release_status and len(release_status) > 0:
+            q = q.filter(or_(*[Release.status.has(identifier = s) for s in release_status]))
 
         filter_or = []
         if starts_with:
@@ -149,7 +191,12 @@ class MoviePlugin(Plugin):
         if filter_or:
             q = q.filter(or_(*filter_or))
 
-        q = q.order_by(asc(LibraryTitle.simple_title))
+        total_count = q.count()
+
+        if order == 'release_order':
+            q = q.order_by(desc(Release.last_edit))
+        else:
+            q = q.order_by(asc(LibraryTitle.simple_title))
 
         q = q.subquery()
         q2 = db.query(Movie).join((q, q.c.id == Movie.id)) \
@@ -161,7 +208,7 @@ class MoviePlugin(Plugin):
             .options(joinedload_all('files'))
 
         if limit_offset:
-            splt = [x.strip() for x in limit_offset.split(',')]
+            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]
             q2 = q2.limit(limit).offset(offset)
@@ -169,18 +216,17 @@ class MoviePlugin(Plugin):
         results = q2.all()
         movies = []
         for movie in results:
-            temp = movie.to_dict({
+            movies.append(movie.to_dict({
                 'profile': {'types': {}},
                 'releases': {'files':{}, 'info': {}},
                 'library': {'titles': {}, 'files':{}},
                 'files': {},
-            })
-            movies.append(temp)
+            }))
 
-        #db.close()
+        db.expire_all()
         return (total_count, movies)
 
-    def availableChars(self, status = ['active']):
+    def availableChars(self, status = None, release_status = None):
 
         chars = ''
 
@@ -189,11 +235,20 @@ class MoviePlugin(Plugin):
         # 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) \
-            .join(Movie.library, Library.titles, Movie.status) \
-            .options(joinedload_all('library.titles')) \
-            .filter(or_(*[Movie.status.has(identifier = s) for s in status]))
+            .outerjoin(Movie.releases, Movie.library, Library.titles, Movie.status) \
+            .options(joinedload_all('library.titles'))
+
+        # Filter on movie status
+        if status and len(status) > 0:
+            q = q.filter(or_(*[Movie.status.has(identifier = s) for s in status]))
+
+        # Filter on release status
+        if release_status and len(release_status) > 0:
+            q = q.filter(or_(*[Release.status.has(identifier = s) for s in release_status]))
 
         results = q.all()
 
@@ -201,46 +256,54 @@ class MoviePlugin(Plugin):
             char = movie.library.titles[0].simple_title[0]
             char = char if char in ascii_lowercase else '#'
             if char not in chars:
-                chars += char
+                chars += str(char)
 
-        #db.close()
-        return chars
+        db.expire_all()
+        return ''.join(sorted(chars, key = str.lower))
 
-    def listView(self):
+    def listView(self, **kwargs):
 
-        params = getParams()
-        status = params.get('status', ['active'])
-        limit_offset = params.get('limit_offset', None)
-        starts_with = params.get('starts_with', None)
-        search = params.get('search', None)
+        status = splitString(kwargs.get('status', None))
+        release_status = splitString(kwargs.get('release_status', None))
+        limit_offset = kwargs.get('limit_offset', None)
+        starts_with = kwargs.get('starts_with', None)
+        search = kwargs.get('search', None)
+        order = kwargs.get('order', None)
 
-        total_movies, movies = self.list(status = status, limit_offset = limit_offset, starts_with = starts_with, search = search)
+        total_movies, movies = self.list(
+            status = status,
+            release_status = release_status,
+            limit_offset = limit_offset,
+            starts_with = starts_with,
+            search = search,
+            order = order
+        )
 
-        return jsonified({
+        return {
             'success': True,
             'empty': len(movies) == 0,
             'total': total_movies,
             'movies': movies,
-        })
+        }
 
-    def charView(self):
+    def charView(self, **kwargs):
 
-        params = getParams()
-        status = params.get('status', ['active'])
-        chars = self.availableChars(status)
+        status = splitString(kwargs.get('status', None))
+        release_status = splitString(kwargs.get('release_status', None))
+        chars = self.availableChars(status, release_status)
 
-        return jsonified({
+        return {
             'success': True,
             'empty': len(chars) == 0,
             'chars': chars,
-        })
+        }
 
-    def refresh(self):
+    def refresh(self, id = '', **kwargs):
 
         db = get_session()
 
-        for id in getParam('id').split(','):
-            movie = db.query(Movie).filter_by(id = id).first()
+        for x in splitString(id):
+            movie = db.query(Movie).filter_by(id = x).first()
 
             if movie:
 
@@ -249,18 +312,16 @@ class MoviePlugin(Plugin):
                 for title in movie.library.titles:
                     if title.default: default_title = title.title
 
-                fireEvent('notify.frontend', type = 'movie.busy.%s' % id, data = True, message = 'Updating "%s"' % default_title)
-                fireEventAsync('library.update', identifier = movie.library.identifier, default_title = default_title, force = True, on_complete = self.createOnComplete(id))
+                fireEvent('notify.frontend', type = 'movie.busy.%s' % x, data = True)
+                fireEventAsync('library.update', identifier = movie.library.identifier, default_title = default_title, force = True, on_complete = self.createOnComplete(x))
 
-
-        #db.close()
-        return jsonified({
+        db.expire_all()
+        return {
             'success': True,
-        })
+        }
 
-    def search(self):
+    def search(self, q = '', **kwargs):
 
-        q = getParam('q')
         cache_key = u'%s/%s' % (__name__, simplifyString(q))
         movies = Env.get('cache').get(cache_key)
 
@@ -272,23 +333,36 @@ class MoviePlugin(Plugin):
                 movies = fireEvent('movie.search', q = q, merge = True)
             Env.get('cache').set(cache_key, movies)
 
-        return jsonified({
+        return {
             'success': True,
             'empty': len(movies) == 0 if movies else 0,
             'movies': movies,
-        })
+        }
 
-    def add(self, params = {}, force_readd = True, search_after = True):
+    def add(self, params = {}, force_readd = True, search_after = True, update_library = False, status_id = None):
 
         if not params.get('identifier'):
-            log.error('Can\'t add movie without imdb identifier.')
+            msg = 'Can\'t add movie without imdb identifier.'
+            log.error(msg)
+            fireEvent('notify.frontend', type = 'movie.is_tvshow', message = msg)
             return False
+        else:
+            try:
+                is_movie = fireEvent('movie.is_movie', identifier = params.get('identifier'), single = True)
+                if not is_movie:
+                    msg = 'Can\'t add movie, seems to be a TV show.'
+                    log.error(msg)
+                    fireEvent('notify.frontend', type = 'movie.is_tvshow', message = msg)
+                    return False
+            except:
+                pass
 
-        library = fireEvent('library.add', single = True, attrs = params, update_after = False)
+
+        library = fireEvent('library.add', single = True, attrs = params, update_after = update_library)
 
         # Status
-        status_active = fireEvent('status.add', 'active', single = True)
-        status_snatched = fireEvent('status.add', 'snatched', single = True)
+        status_active, snatched_status, ignored_status, done_status, downloaded_status = \
+            fireEvent('status.get', ['active', 'snatched', 'ignored', 'done', 'downloaded'], single = True)
 
         default_profile = fireEvent('profile.default', single = True)
 
@@ -300,7 +374,7 @@ class MoviePlugin(Plugin):
             m = Movie(
                 library_id = library.get('id'),
                 profile_id = params.get('profile_id', default_profile.get('id')),
-                status_id = status_active.get('id'),
+                status_id = status_id if status_id else status_active.get('id'),
             )
             db.add(m)
             db.commit()
@@ -312,10 +386,14 @@ class MoviePlugin(Plugin):
             fireEventAsync('library.update', params.get('identifier'), default_title = params.get('title', ''), on_complete = onComplete)
             search_after = False
         elif force_readd:
+
             # Clean snatched history
             for release in m.releases:
-                if release.status_id == status_snatched.get('id'):
-                    release.delete()
+                if release.status_id in [downloaded_status.get('id'), snatched_status.get('id'), done_status.get('id')]:
+                    if params.get('ignore_previous', False):
+                        release.status_id = ignored_status.get('id')
+                    else:
+                        fireEvent('release.delete', release.id, single = True)
 
             m.profile_id = params.get('profile_id', default_profile.get('id'))
         else:
@@ -323,7 +401,8 @@ class MoviePlugin(Plugin):
             added = False
 
         if force_readd:
-            m.status_id = status_active.get('id')
+            m.status_id = status_id if status_id else status_active.get('id')
+            m.last_edit = int(time.time())
             do_search = True
 
         db.commit()
@@ -344,37 +423,34 @@ class MoviePlugin(Plugin):
         if added:
             fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = 'Successfully added "%s" to your wanted list.' % params.get('title', ''))
 
-        #db.close()
+        db.expire_all()
         return movie_dict
 
 
-    def addView(self):
+    def addView(self, **kwargs):
 
-        params = getParams()
+        movie_dict = self.add(params = kwargs)
 
-        movie_dict = self.add(params)
-
-        return jsonified({
+        return {
             'success': True,
             'added': True if movie_dict else False,
             'movie': movie_dict,
-        })
+        }
 
-    def edit(self):
+    def edit(self, id = '', **kwargs):
 
-        params = getParams()
         db = get_session()
 
         available_status = fireEvent('status.get', 'available', single = True)
 
-        ids = [x.strip() for x in params.get('id').split(',')]
+        ids = splitString(id)
         for movie_id in ids:
 
             m = db.query(Movie).filter_by(id = movie_id).first()
             if not m:
                 continue
 
-            m.profile_id = params.get('profile_id')
+            m.profile_id = kwargs.get('profile_id')
 
             # Remove releases
             for rel in m.releases:
@@ -383,9 +459,9 @@ class MoviePlugin(Plugin):
                     db.commit()
 
             # Default title
-            if params.get('default_title'):
+            if kwargs.get('default_title'):
                 for title in m.library.titles:
-                    title.default = toUnicode(params.get('default_title', '')).lower() == toUnicode(title.title).lower()
+                    title.default = toUnicode(kwargs.get('default_title', '')).lower() == toUnicode(title.title).lower()
 
             db.commit()
 
@@ -394,22 +470,20 @@ class MoviePlugin(Plugin):
             movie_dict = m.to_dict(self.default_dict)
             fireEventAsync('searcher.single', movie_dict, on_complete = self.createNotifyFront(movie_id))
 
-        #db.close()
-        return jsonified({
+        db.expire_all()
+        return {
             'success': True,
-        })
+        }
 
-    def deleteView(self):
+    def deleteView(self, id = '', **kwargs):
 
-        params = getParams()
-
-        ids = [x.strip() for x in params.get('id').split(',')]
+        ids = splitString(id)
         for movie_id in ids:
-            self.delete(movie_id, delete_from = params.get('delete_from', 'all'))
+            self.delete(movie_id, delete_from = kwargs.get('delete_from', 'all'))
 
-        return jsonified({
+        return {
             'success': True,
-        })
+        }
 
     def delete(self, movie_id, delete_from = None):
 
@@ -417,9 +491,11 @@ class MoviePlugin(Plugin):
 
         movie = db.query(Movie).filter_by(id = movie_id).first()
         if movie:
+            deleted = False
             if delete_from == 'all':
                 db.delete(movie)
                 db.commit()
+                deleted = True
             else:
                 done_status = fireEvent('status.get', 'done', single = True)
 
@@ -427,7 +503,7 @@ class MoviePlugin(Plugin):
                 total_deleted = 0
                 new_movie_status = None
                 for release in movie.releases:
-                    if delete_from == 'wanted':
+                    if delete_from in ['wanted', 'snatched']:
                         if release.status_id != done_status.get('id'):
                             db.delete(release)
                             total_deleted += 1
@@ -442,6 +518,7 @@ class MoviePlugin(Plugin):
                 if total_releases == total_deleted:
                     db.delete(movie)
                     db.commit()
+                    deleted = True
                 elif new_movie_status:
                     new_status = fireEvent('status.get', new_movie_status, single = True)
                     movie.profile_id = None
@@ -450,13 +527,15 @@ class MoviePlugin(Plugin):
                 else:
                     fireEvent('movie.restatus', movie.id, single = True)
 
-        #db.close()
+            if deleted:
+                fireEvent('notify.frontend', type = 'movie.deleted', data = movie.to_dict())
+
+        db.expire_all()
         return True
 
     def restatus(self, movie_id):
 
-        active_status = fireEvent('status.get', 'active', single = True)
-        done_status = fireEvent('status.get', 'done', single = True)
+        active_status, done_status = fireEvent('status.get', ['active', 'done'], single = True)
 
         db = get_session()
 
@@ -479,7 +558,6 @@ class MoviePlugin(Plugin):
             m.status_id = active_status.get('id') if move_to_wanted else done_status.get('id')
 
         db.commit()
-        #db.close()
 
         return True
 
@@ -489,6 +567,7 @@ class MoviePlugin(Plugin):
             db = get_session()
             movie = db.query(Movie).filter_by(id = movie_id).first()
             fireEventAsync('searcher.single', movie.to_dict(self.default_dict), on_complete = self.createNotifyFront(movie_id))
+            db.expire_all()
 
         return onComplete
 
@@ -499,5 +578,6 @@ class MoviePlugin(Plugin):
             db = get_session()
             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 notifyFront

couchpotato/core/plugins/movie/static/list.js

@@ -1,48 +1,87 @@
 var MovieList = new Class({
 
-	Implements: [Options],
+	Implements: [Events, Options],
 
 	options: {
 		navigation: true,
 		limit: 50,
+		load_more: true,
+		loader: true,
 		menu: [],
-		add_new: false
+		add_new: false,
+		force_view: false
 	},
 
 	movies: [],
 	movies_added: {},
+	total_movies: 0,
 	letters: {},
-	filter: {
-		'startswith': null,
-		'search': null
-	},
+	filter: null,
 
 	initialize: function(options){
 		var self = this;
 		self.setOptions(options);
 
 		self.offset = 0;
+		self.filter = self.options.filter || {
+			'starts_with': null,
+			'search': null
+		}
 
 		self.el = new Element('div.movies').adopt(
+			self.title = self.options.title ? new Element('h2', {
+				'text': self.options.title,
+				'styles': {'display': 'none'}
+			}) : null,
+			self.description = self.options.description ? new Element('div.description', {
+				'html': self.options.description,
+				'styles': {'display': 'none'}
+			}) : null,
 			self.movie_list = new Element('div'),
-			self.load_more = new Element('a.load_more', {
+			self.load_more = self.options.load_more ? new Element('a.load_more', {
 				'events': {
 					'click': self.loadMore.bind(self)
 				}
-			})
+			}) : null
 		);
+
+		if($(window).getSize().x <= 480 && !self.options.force_view)
+			self.changeView('list');
+		else
+			self.changeView(self.getSavedView() || self.options.view || 'details');
+
 		self.getMovies();
 
-		if(options.add_new)
-			App.addEvent('movie.added', self.movieAdded.bind(self))
+		App.addEvent('movie.added', self.movieAdded.bind(self))
+		App.addEvent('movie.deleted', self.movieDeleted.bind(self))
+	},
+
+	movieDeleted: function(notification){
+		var self = this;
+
+		if(self.movies_added[notification.data.id]){
+			self.movies.each(function(movie){
+				if(movie.get('id') == notification.data.id){
+					movie.destroy();
+					delete self.movies_added[notification.data.id];
+					self.setCounter(self.counter_count-1);
+				}
+			})
+		}
+
+		self.checkIfEmpty();
 	},
 
 	movieAdded: function(notification){
 		var self = this;
-		window.scroll(0,0);
 
-		if(!self.movies_added[notification.data.id])
+		if(self.options.add_new && !self.movies_added[notification.data.id] && notification.data.status.identifier == self.options.status){
+			window.scroll(0,0);
 			self.createMovie(notification.data, 'top');
+			self.setCounter(self.counter_count+1);
+
+			self.checkIfEmpty();
+		}
 	},
 
 	create: function(){
@@ -52,22 +91,14 @@ var MovieList = new Class({
 		if(self.options.navigation)
 			self.createNavigation();
 
-		self.movie_list.addEvents({
-			'mouseenter:relay(.movie)': function(e, el){
-				el.addClass('hover');
-			},
-			'mouseleave:relay(.movie)': function(e, el){
-				el.removeClass('hover');
-			}
-		});
-
-		self.scrollspy = new ScrollSpy({
-			min: function(){
-				var c = self.load_more.getCoordinates()
-				return c.top - window.document.getSize().y - 300
-			},
-			onEnter: self.loadMore.bind(self)
-		});
+		if(self.options.load_more)
+			self.scrollspy = new ScrollSpy({
+				min: function(){
+					var c = self.load_more.getCoordinates()
+					return c.top - window.document.getSize().y - 300
+				},
+				onEnter: self.loadMore.bind(self)
+			});
 
 		self.created = true;
 	},
@@ -78,7 +109,7 @@ var MovieList = new Class({
 		if(!self.created) self.create();
 
 		// do scrollspy
-		if(movies.length < self.options.limit){
+		if(movies.length < self.options.limit && self.scrollspy){
 			self.load_more.hide();
 			self.scrollspy.stop();
 		}
@@ -86,34 +117,64 @@ var MovieList = new Class({
 		Object.each(movies, function(movie){
 			self.createMovie(movie);
 		});
-		
+
+		self.total_movies += total;
 		self.setCounter(total);
 
 	},
-	
+
 	setCounter: function(count){
 		var self = this;
-		
+
 		if(!self.navigation_counter) return;
-		
-		self.navigation_counter.set('text', (count || 0));
-		
+
+		self.counter_count = count;
+		self.navigation_counter.set('text', (count || 0) + ' movies');
+
+		if (self.empty_message) {
+			self.empty_message.destroy();
+			self.empty_message = null;
+		}
+
+		if(self.total_movies && count == 0 && !self.empty_message){
+			var message = (self.filter.search ? 'for "'+self.filter.search+'"' : '') +
+				(self.filter.starts_with ? ' in <strong>'+self.filter.starts_with+'</strong>' : '');
+
+			self.empty_message = new Element('.message', {
+				'html': 'No movies found ' + message + '.<br/>'
+			}).grab(
+				new Element('a', {
+					'text': 'Reset filter',
+					'events': {
+						'click': function(){
+							self.filter = {
+								'starts_with': null,
+								'search': null
+							};
+							self.navigation_search_input.set('value', '');
+							self.reset();
+							self.activateLetter();
+							self.getMovies(true);
+							self.last_search_value = '';
+						}
+					}
+				})
+			).inject(self.movie_list);
+
+		}
+
 	},
 
 	createMovie: function(movie, inject_at){
 		var self = this;
-
-		// Attach proper actions
-		var a = self.options.actions,
-			status = Status.get(movie.status_id);
-		var actions = a[status.identifier.capitalize()] || a.Wanted || {};
-
 		var m = new Movie(self, {
-			'actions': actions,
+			'actions': self.options.actions,
 			'view': self.current_view,
 			'onSelect': self.calculateSelected.bind(self)
 		}, movie);
+
 		$(m).inject(self.movie_list, inject_at || 'bottom');
+
 		m.fireEvent('injected');
 
 		self.movies.include(m)
@@ -124,29 +185,9 @@ var MovieList = new Class({
 		var self = this;
 		var chars = '#ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
-		self.current_view = self.getSavedView();
-		self.el.addClass(self.current_view+'_list')
+		self.el.addClass('with_navigation')
 
 		self.navigation = new Element('div.alph_nav').adopt(
-			self.navigation_actions = new Element('ul.inlay.actions.reversed'),
-			self.navigation_counter = new Element('span.counter[title=Total]'),
-			self.navigation_alpha = new Element('ul.numbers', {
-				'events': {
-					'click:relay(li)': function(e, el){
-						self.movie_list.empty()
-						self.activateLetter(el.get('data-letter'))
-						self.getMovies()
-					}
-				}
-			}),
-			self.navigation_search_input = new Element('input.inlay', {
-				'placeholder': 'Search',
-				'events': {
-					'keyup': self.search.bind(self),
-					'change': self.search.bind(self)
-				}
-			}),
-			self.navigation_menu = new Block.Menu(self),
 			self.mass_edit_form = new Element('div.mass_edit_form').adopt(
 				new Element('span.select').adopt(
 					self.mass_edit_select = new Element('input[type=checkbox].inlay', {
@@ -184,6 +225,31 @@ var MovieList = new Class({
 						}
 					})
 				)
+			),
+			new Element('div.menus').adopt(
+				self.navigation_counter = new Element('span.counter[title=Total]'),
+				self.filter_menu = new Block.Menu(self, {
+					'class': 'filter'
+				}),
+				self.navigation_actions = new Element('ul.actions', {
+					'events': {
+						'click:relay(li)': function(e, el){
+							var a = 'active';
+							self.navigation_actions.getElements('.'+a).removeClass(a);
+							self.changeView(el.get('data-view'));
+							this.addClass(a);
+
+							el.inject(el.getParent(), 'top');
+							el.getSiblings().hide()
+							setTimeout(function(){
+								el.getSiblings().setStyle('display', null);
+							}, 100)
+						}
+					}
+				}),
+				self.navigation_menu = new Block.Menu(self, {
+					'class': 'extra'
+				})
 			)
 		).inject(self.el, 'top');
 
@@ -196,20 +262,39 @@ var MovieList = new Class({
 			}).inject(self.mass_edit_quality)
 		});
 
-		// Actions
-		['mass_edit', 'thumbs', 'list'].each(function(view){
-			self.navigation_actions.adopt(
-				new Element('li.'+view+(self.current_view == view ? '.active' : '')+'[data-view='+view+']', {
-					'events': {
-						'click': function(e){
-							var a = 'active';
-							self.navigation_actions.getElements('.'+a).removeClass(a);
-							self.changeView(this.get('data-view'));
-							this.addClass(a);
-						}
+		self.filter_menu.addLink(
+			self.navigation_search_input = new Element('input', {
+				'title': 'Search through ' + self.options.identifier,
+				'placeholder': 'Search through ' + self.options.identifier,
+				'events': {
+					'keyup': self.search.bind(self),
+					'change': self.search.bind(self)
+				}
+			})
+		).addClass('search');
+
+		self.filter_menu.addEvent('open', function(){
+			self.navigation_search_input.focus();
+		});
+
+		self.filter_menu.addLink(
+			self.navigation_alpha = new Element('ul.numbers', {
+				'events': {
+					'click:relay(li.available)': function(e, el){
+						self.activateLetter(el.get('data-letter'))
+						self.getMovies(true)
 					}
-				}).adopt(new Element('span'))
-			)
+				}
+			})
+		);
+
+		// Actions
+		['mass_edit', 'details', 'list'].each(function(view){
+			var current = self.current_view == view;
+			new Element('li', {
+				'class': 'icon2 ' + view + (current ?  ' active ' : ''),
+				'data-view': view
+			}).inject(self.navigation_actions, current ? 'top' : 'bottom');
 		});
 
 		// All
@@ -227,18 +312,19 @@ var MovieList = new Class({
 		});
 
 		// Get available chars and highlight
-		Api.request('movie.available_chars', {
-			'data': Object.merge({
-				'status': self.options.status
-			}, self.filter),
-			'onComplete': function(json){
+		if(self.navigation.isDisplayed() || self.navigation.isVisible())
+			Api.request('movie.available_chars', {
+				'data': Object.merge({
+					'status': self.options.status
+				}, self.filter),
+				'onSuccess': function(json){
 
-				json.chars.split('').each(function(c){
-					self.letters[c.capitalize()].addClass('available')
-				})
+					json.chars.split('').each(function(c){
+						self.letters[c.capitalize()].addClass('available')
+					})
 
-			}
-		});
+				}
+			});
 
 		// Add menu or hide
 		if (self.options.menu.length > 0)
@@ -246,17 +332,7 @@ var MovieList = new Class({
 				self.navigation_menu.addLink(menu_item);
 			})
 		else
-			self.navigation_menu.hide()
-
-		self.nav_scrollspy = new ScrollSpy({
-			min: 10,
-			onEnter: function(){
-				self.navigation.addClass('float')
-			},
-			onLeave: function(){
-				self.navigation.removeClass('float')
-			}
-		});
+			self.navigation_menu.hide();
 
 	},
 
@@ -281,10 +357,11 @@ var MovieList = new Class({
 	},
 
 	deleteSelected: function(){
-		var self = this;
-		var ids = self.getSelectedMovies()
+		var self = this,
+			ids = self.getSelectedMovies(),
+			help_msg = self.identifier == 'wanted' ? 'If you do, you won\'t be able to watch them, as they won\'t get downloaded!' : 'Your files will be safe, this will only delete the reference from the CouchPotato manage list';
 
-		var qObj = new Question('Are you sure you want to delete '+ids.length+' movie'+ (ids.length != 1 ? 's' : '') +'?', 'If you do, you won\'t be able to watch them, as they won\'t get downloaded!', [{
+		var qObj = new Question('Are you sure you want to delete '+ids.length+' movie'+ (ids.length != 1 ? 's' : '') +'?', help_msg, [{
 			'text': 'Yes, delete '+(ids.length != 1 ? 'them' : 'it'),
 			'class': 'delete',
 			'events': {
@@ -303,12 +380,14 @@ var MovieList = new Class({
 							self.movies.each(function(movie){
 								if (movie.isSelected()){
 									$(movie).destroy()
-									erase_movies.include(movie)
+									erase_movies.include(movie);
 								}
 							});
 
 							erase_movies.each(function(movie){
 								self.movies.erase(movie);
+								movie.destroy();
+								self.setCounter(self.counter_count-1);
 							});
 
 							self.calculateSelected();
@@ -376,11 +455,16 @@ var MovieList = new Class({
 		var self = this;
 
 		self.movies = []
-		self.calculateSelected()
-		self.navigation_alpha.getElements('.active').removeClass('active')
+		if(self.mass_edit_select)
+			self.calculateSelected()
+		if(self.navigation_alpha)
+			self.navigation_alpha.getElements('.active').removeClass('active')
+
 		self.offset = 0;
-		self.load_more.show();
-		self.scrollspy.start();
+		if(self.scrollspy){
+			self.load_more.show();
+			self.scrollspy.start();
+		}
 	},
 
 	activateLetter: function(letter){
@@ -396,21 +480,17 @@ var MovieList = new Class({
 	changeView: function(new_view){
 		var self = this;
 
-		self.movies.each(function(movie){
-			movie.changeView(new_view)
-		});
-
 		self.el
 			.removeClass(self.current_view+'_list')
 			.addClass(new_view+'_list')
 
 		self.current_view = new_view;
-		Cookie.write(self.options.identifier+'_view', new_view, {duration: 1000});
+		Cookie.write(self.options.identifier+'_view2', new_view, {duration: 1000});
 	},
 
 	getSavedView: function(){
 		var self = this;
-		return Cookie.read(self.options.identifier+'_view') || 'thumbs';
+		return Cookie.read(self.options.identifier+'_view2');
 	},
 
 	search: function(){
@@ -426,8 +506,7 @@ var MovieList = new Class({
 			self.activateLetter();
 			self.filter.search = search_value;
 
-			self.movie_list.empty();
-			self.getMovies();
+			self.getMovies(true);
 
 			self.last_search_value = search_value;
 
@@ -439,25 +518,62 @@ var MovieList = new Class({
 		var self = this;
 
 		self.reset();
-		self.movie_list.empty();
-		self.getMovies();
+		self.getMovies(true);
 	},
 
-	getMovies: function(){
+	getMovies: function(reset){
 		var self = this;
 
-		if(self.scrollspy) self.scrollspy.stop();
-		self.load_more.set('text', 'loading...');
-		Api.request('movie.list', {
+		if(self.scrollspy){
+			self.scrollspy.stop();
+			self.load_more.set('text', 'loading...');
+		}
+
+		if(self.movies.length == 0 && self.options.loader){
+
+			self.loader_first = new Element('div.loading').adopt(
+				new Element('div.message', {'text': self.options.title ? 'Loading \'' + self.options.title + '\'' : 'Loading...'})
+			).inject(self.el, 'top');
+
+			createSpinner(self.loader_first, {
+				radius: 4,
+				length: 4,
+				width: 1
+			});
+
+			self.el.setStyle('min-height', 93);
+
+		}
+
+		Api.request(self.options.api_call || 'movie.list', {
 			'data': Object.merge({
 				'status': self.options.status,
-				'limit_offset': self.options.limit + ',' + self.offset
+				'limit_offset': self.options.limit ? self.options.limit + ',' + self.offset : null
 			}, self.filter),
-			'onComplete': function(json){
+			'onSuccess': function(json){
+
+				if(reset)
+					self.movie_list.empty();
+
+				if(self.loader_first){
+					var lf = self.loader_first;
+					self.loader_first.addClass('hide')
+					self.loader_first = null;
+					setTimeout(function(){
+						lf.destroy();
+					}, 20000);
+					self.el.setStyle('min-height', null);
+				}
+
 				self.store(json.movies);
 				self.addMovies(json.movies, json.total);
-				self.load_more.set('text', 'load more movies');
-				if(self.scrollspy) self.scrollspy.start();
+				if(self.scrollspy) {
+					self.load_more.set('text', 'load more movies');
+					self.scrollspy.start();
+				}
+
+				self.checkIfEmpty();
+				self.fireEvent('loaded');
 			}
 		});
 	},
@@ -475,6 +591,34 @@ var MovieList = new Class({
 
 	},
 
+	checkIfEmpty: function(){
+		var self = this;
+
+		var is_empty = self.movies.length == 0 && (self.total_movies == 0 || self.total_movies === undefined);
+
+		if(self.title)
+			self.title[is_empty ? 'hide' : 'show']()
+
+		if(self.description)
+			self.description.setStyle('display', [is_empty ? 'none' : ''])
+
+		if(is_empty && self.options.on_empty_element){
+			self.options.on_empty_element.inject(self.loader_first || self.title || self.movie_list, 'after');
+
+			if(self.navigation)
+				self.navigation.hide();
+
+			self.empty_element = self.options.on_empty_element;
+		}
+		else if(self.empty_element){
+			self.empty_element.destroy();
+
+			if(self.navigation)
+				self.navigation.show();
+		}
+
+	},
+
 	toElement: function(){
 		return this.el;
 	}

couchpotato/core/plugins/movie/static/movie.actions.js

@@ -0,0 +1,788 @@
+var MovieAction = new Class({
+	
+	Implements: [Options],
+
+	class_name: 'action icon2',
+
+	initialize: function(movie, options){
+		var self = this;
+		self.setOptions(options);
+
+		self.movie = movie;
+
+		self.create();
+		if(self.el)
+			self.el.addClass(self.class_name)
+	},
+
+	create: function(){},
+
+	disable: function(){
+		this.el.addClass('disable')
+	},
+
+	enable: function(){
+		this.el.removeClass('disable')
+	},
+
+	getTitle: function(){
+		var self = this;
+
+		try {
+			return self.movie.getTitle();
+		}
+		catch(e){
+			try {
+				return self.movie.original_title ? self.movie.original_title : self.movie.titles[0];
+			}
+			catch(e){
+				return 'Unknown';
+			}
+		}
+	},
+
+	get: function(key){
+		var self = this;
+		try {
+			return self.movie.get(key)
+		}
+		catch(e){
+			return self.movie[key]
+		}
+	},
+
+	createMask: function(){
+		var self = this;
+		self.mask = new Element('div.mask', {
+			'styles': {
+				'z-index': '1'
+			}
+		}).inject(self.movie, 'top').fade('hide');
+		//self.positionMask();
+	},
+
+	positionMask: function(){
+		var self = this,
+			movie = $(self.movie),
+			s = movie.getSize()
+
+		return;
+
+		return self.mask.setStyles({
+			'width': s.x,
+			'height': s.y
+		}).position({
+			'relativeTo': movie
+		})
+	},
+
+	toElement: function(){
+		return this.el || null
+	}
+
+});
+
+var MA = {};
+
+MA.IMDB = new Class({
+
+	Extends: MovieAction,
+	id: null,
+
+	create: function(){
+		var self = this;
+
+		self.id = self.movie.get('imdb') || self.movie.get('identifier');
+
+		self.el = new Element('a.imdb', {
+			'title': 'Go to the IMDB page of ' + self.getTitle(),
+			'href': 'http://www.imdb.com/title/'+self.id+'/',
+			'target': '_blank'
+		});
+
+		if(!self.id) self.disable();
+	}
+
+});
+
+MA.Release = new Class({
+
+	Extends: MovieAction,
+
+	create: function(){
+		var self = this;
+
+		self.el = new Element('a.releases.download', {
+			'title': 'Show the releases that are available for ' + self.getTitle(),
+			'events': {
+				'click': self.show.bind(self)
+			}
+		});
+
+		if(self.movie.data.releases.length == 0)
+			self.el.hide()
+		else
+			self.showHelper();
+
+	},
+
+	createReleases: function(){
+		var self = this;
+
+		if(!self.options_container){
+			self.options_container = new Element('div.options').grab(
+				self.release_container = new Element('div.releases.table')
+			);
+
+			// Header
+			new Element('div.item.head').adopt(
+				new Element('span.name', {'text': 'Release name'}),
+				new Element('span.status', {'text': 'Status'}),
+				new Element('span.quality', {'text': 'Quality'}),
+				new Element('span.size', {'text': 'Size'}),
+				new Element('span.age', {'text': 'Age'}),
+				new Element('span.score', {'text': 'Score'}),
+				new Element('span.provider', {'text': 'Provider'})
+			).inject(self.release_container)
+
+			self.movie.data.releases.sortBy('-info.score').each(function(release){
+
+				var status = Status.get(release.status_id),
+					quality = Quality.getProfile(release.quality_id) || {},
+					info = release.info,
+					provider = self.get(release, 'provider') + (release.info['provider_extra'] ? self.get(release, 'provider_extra') : '');
+				release.status = status;
+
+				var release_name = self.get(release, 'name');
+				if(release.files && release.files.length > 0){
+					try {
+						var movie_file = release.files.filter(function(file){
+							var type = File.Type.get(file.type_id);
+							return type && type.identifier == 'movie'
+						}).pick();
+						release_name = movie_file.path.split(Api.getOption('path_sep')).getLast();
+					}
+					catch(e){}
+				}
+
+				// Create release
+				var item = new Element('div', {
+					'class': 'item '+status.identifier,
+					'id': 'release_'+release.id
+				}).adopt(
+					new Element('span.name', {'text': release_name, 'title': release_name}),
+					new Element('span.status', {'text': status.identifier, 'class': 'release_status '+status.identifier}),
+					new Element('span.quality', {'text': quality.get('label') || 'n/a'}),
+					new Element('span.size', {'text': release.info['size'] ? Math.floor(self.get(release, 'size')) : 'n/a'}),
+					new Element('span.age', {'text': self.get(release, 'age')}),
+					new Element('span.score', {'text': self.get(release, 'score')}),
+					new Element('span.provider', { 'text': provider, 'title': provider }),
+					release.info['detail_url'] ? new Element('a.info.icon2', {
+						'href': release.info['detail_url'],
+						'target': '_blank'
+					}) : new Element('a'),
+					new Element('a.download.icon2', {
+						'events': {
+							'click': function(e){
+								(e).preventDefault();
+								if(!this.hasClass('completed'))
+									self.download(release);
+							}
+						}
+					}),
+					new Element('a.delete.icon2', {
+						'events': {
+							'click': function(e){
+								(e).preventDefault();
+								self.ignore(release);
+							}
+						}
+					})
+				).inject(self.release_container);
+
+				release['el'] = item;
+
+				if(status.identifier == 'ignored' || status.identifier == 'failed' || status.identifier == 'snatched'){
+					if(!self.last_release || (self.last_release && self.last_release.status.identifier != 'snatched' && status.identifier == 'snatched'))
+						self.last_release = release;
+				}
+				else if(!self.next_release && status.identifier == 'available'){
+					self.next_release = release;
+				}
+			});
+
+			if(self.last_release){
+				self.release_container.getElement('#release_'+self.last_release.id).addClass('last_release');
+			}
+
+			if(self.next_release){
+				self.release_container.getElement('#release_'+self.next_release.id).addClass('next_release');
+			}
+
+			if(self.next_release || (self.last_release && ['ignored', 'failed'].indexOf(self.last_release.status.identifier) === false)){
+
+				self.trynext_container = new Element('div.buttons.try_container').inject(self.release_container, 'top');
+
+				self.trynext_container.adopt(
+					new Element('span.or', {
+						'text': 'This movie is snatched, if anything went wrong, download'
+					}),
+					self.last_release ? new Element('a.button.orange', {
+						'text': 'the same release again',
+						'events': {
+							'click': self.trySameRelease.bind(self)
+						}
+					}) : null,
+					self.next_release && self.last_release ? new Element('span.or', {
+						'text': ','
+					}) : null,
+					self.next_release ? [new Element('a.button.green', {
+						'text': self.last_release ? 'another release' : 'the best release',
+						'events': {
+							'click': self.tryNextRelease.bind(self)
+						}
+					}),
+					new Element('span.or', {
+						'text': 'or pick one below'
+					})] : null
+				)
+			}
+
+		}
+
+	},
+
+	show: function(e){
+		var self = this;
+		if(e)
+			(e).preventDefault();
+
+		self.createReleases();
+		self.options_container.inject(self.movie, 'top');
+		self.movie.slide('in', self.options_container);
+	},
+
+	showHelper: function(e){
+		var self = this;
+		if(e)
+			(e).preventDefault();
+
+		self.createReleases();
+
+		if(self.next_release || (self.last_release && ['ignored', 'failed'].indexOf(self.last_release.status.identifier) === false)){
+
+			self.trynext_container = new Element('div.buttons.trynext').inject(self.movie.info_container);
+
+			self.trynext_container.adopt(
+				self.next_release ? [new Element('a.icon2.readd', {
+					'text': self.last_release ? 'Download another release' : 'Download the best release',
+					'events': {
+						'click': self.tryNextRelease.bind(self)
+					}
+				}),
+				new Element('a.icon2.download', {
+					'text': 'pick one yourself',
+					'events': {
+						'click': function(){
+							self.movie.quality.fireEvent('click');
+						}
+					}
+				})] : null,
+				new Element('a.icon2.completed', {
+					'text': 'mark this movie done',
+					'events': {
+						'click': function(){
+							Api.request('movie.delete', {
+								'data': {
+									'id': self.movie.get('id'),
+									'delete_from': 'wanted'
+								},
+								'onComplete': function(){
+									var movie = $(self.movie);
+									movie.set('tween', {
+										'duration': 300,
+										'onComplete': function(){
+											self.movie.destroy()
+										}
+									});
+									movie.tween('height', 0);
+								}
+							});
+						}
+					}
+				})
+			)
+		}
+
+	},
+
+	get: function(release, type){
+		return release.info[type] || 'n/a'
+	},
+
+	download: function(release){
+		var self = this;
+
+		var release_el = self.release_container.getElement('#release_'+release.id),
+			icon = release_el.getElement('.download.icon2');
+
+		self.movie.busy(true);
+
+		Api.request('release.download', {
+			'data': {
+				'id': release.id
+			},
+			'onComplete': function(json){
+				self.movie.busy(false);
+
+				if(json.success)
+					icon.addClass('completed');
+				else
+					icon.addClass('attention').set('title', 'Something went wrong when downloading, please check logs.');
+			}
+		});
+	},
+
+	ignore: function(release){
+		var self = this;
+
+		Api.request('release.ignore', {
+			'data': {
+				'id': release.id
+			},
+			'onComplete': function(){
+				var el = release.el;
+				if(el.hasClass('failed') || el.hasClass('ignored')){
+					el.removeClass('failed').removeClass('ignored');
+					el.getElement('.release_status').set('text', 'available');
+				}
+				else {
+					el.addClass('ignored');
+					el.getElement('.release_status').set('text', 'ignored');
+				}
+			}
+		})
+
+	},
+
+	tryNextRelease: function(movie_id){
+		var self = this;
+
+		self.createReleases();
+
+		if(self.last_release)
+			self.ignore(self.last_release);
+
+		if(self.next_release)
+			self.download(self.next_release);
+
+	},
+
+	trySameRelease: function(movie_id){
+		var self = this;
+
+		if(self.last_release)
+			self.download(self.last_release);
+
+	}
+
+});
+
+MA.Trailer = new Class({
+
+	Extends: MovieAction,
+	id: null,
+
+	create: function(){
+		var self = this;
+
+		self.el = new Element('a.trailer', {
+			'title': 'Watch the trailer of ' + self.getTitle(),
+			'events': {
+				'click': self.watch.bind(self)
+			}
+		});
+
+	},
+
+	watch: function(offset){
+		var self = this;
+
+		var data_url = 'http://gdata.youtube.com/feeds/videos?vq="{title}" {year} trailer&max-results=1&alt=json-in-script&orderby=relevance&sortorder=descending&format=5&fmt=18'
+		var url = data_url.substitute({
+				'title': encodeURI(self.getTitle()),
+				'year': self.get('year'),
+				'offset': offset || 1
+			}),
+			size = $(self.movie).getSize(),
+			height = self.options.height || (size.x/16)*9,
+			id = 'trailer-'+randomString();
+
+		self.player_container = new Element('div[id='+id+']');
+		self.container = new Element('div.hide.trailer_container')
+			.adopt(self.player_container)
+			.inject($(self.movie), 'top');
+
+		self.container.setStyle('height', 0);
+		self.container.removeClass('hide');
+
+		self.close_button = new Element('a.hide.hide_trailer', {
+			'text': 'Hide trailer',
+			'events': {
+				'click': self.stop.bind(self)
+			}
+		}).inject(self.movie);
+
+		self.container.setStyle('height', height);
+		$(self.movie).setStyle('height', height);
+
+		new Request.JSONP({
+			'url': url,
+			'onComplete': function(json){
+				var video_url = json.feed.entry[0].id.$t.split('/'),
+					video_id = video_url[video_url.length-1];
+
+				self.player = new YT.Player(id, {
+					'height': height,
+					'width': size.x,
+					'videoId': video_id,
+					'playerVars': {
+						'autoplay': 1,
+						'showsearch': 0,
+						'wmode': 'transparent',
+						'iv_load_policy': 3
+					}
+				});
+
+				self.close_button.removeClass('hide');
+
+				var quality_set = false;
+				var change_quality = function(state){
+					if(!quality_set && (state.data == 1 || state.data || 2)){
+						try {
+							self.player.setPlaybackQuality('hd720');
+							quality_set = true;
+						}
+						catch(e){
+
+						}
+					}
+				}
+				self.player.addEventListener('onStateChange', change_quality);
+
+			}
+		}).send()
+
+	},
+
+	stop: function(){
+		var self = this;
+
+		self.player.stopVideo();
+		self.container.addClass('hide');
+		self.close_button.addClass('hide');
+		$(self.movie).setStyle('height', null);
+
+		setTimeout(function(){
+			self.container.destroy()
+			self.close_button.destroy();
+		}, 1800)
+	}
+
+
+});
+
+MA.Edit = new Class({
+
+	Extends: MovieAction,
+
+	create: function(){
+		var self = this;
+
+		self.el = new Element('a.edit', {
+			'title': 'Change movie information, like title and quality.',
+			'events': {
+				'click': self.editMovie.bind(self)
+			}
+		});
+
+	},
+
+	editMovie: function(e){
+		var self = this;
+		(e).preventDefault();
+
+		if(!self.options_container){
+			self.options_container = new Element('div.options').adopt(
+				new Element('div.form').adopt(
+					self.title_select = new Element('select', {
+						'name': 'title'
+					}),
+					self.profile_select = new Element('select', {
+						'name': 'profile'
+					}),
+					new Element('a.button.edit', {
+						'text': 'Save & Search',
+						'events': {
+							'click': self.save.bind(self)
+						}
+					})
+				)
+			).inject(self.movie, 'top');
+
+			Array.each(self.movie.data.library.titles, function(alt){
+				new Element('option', {
+					'text': alt.title
+				}).inject(self.title_select);
+
+				if(alt['default'])
+					self.title_select.set('value', alt.title);
+			});
+
+
+			Quality.getActiveProfiles().each(function(profile){
+
+				var profile_id = profile.id ? profile.id : profile.data.id;
+
+				new Element('option', {
+					'value': profile_id,
+					'text': profile.label ? profile.label : profile.data.label
+				}).inject(self.profile_select);
+
+				if(self.movie.profile && self.movie.profile.data && self.movie.profile.data.id == profile_id)
+					self.profile_select.set('value', profile_id);
+			});
+
+		}
+
+		self.movie.slide('in', self.options_container);
+	},
+
+	save: function(e){
+		(e).preventDefault();
+		var self = this;
+
+		Api.request('movie.edit', {
+			'data': {
+				'id': self.movie.get('id'),
+				'default_title': self.title_select.get('value'),
+				'profile_id': self.profile_select.get('value')
+			},
+			'useSpinner': true,
+			'spinnerTarget': $(self.movie),
+			'onComplete': function(){
+				self.movie.quality.set('text', self.profile_select.getSelected()[0].get('text'));
+				self.movie.title.set('text', self.title_select.getSelected()[0].get('text'));
+			}
+		});
+
+		self.movie.slide('out');
+	}
+
+})
+
+MA.Refresh = new Class({
+
+	Extends: MovieAction,
+
+	create: function(){
+		var self = this;
+
+		self.el = new Element('a.refresh', {
+			'title': 'Refresh the movie info and do a forced search',
+			'events': {
+				'click': self.doRefresh.bind(self)
+			}
+		});
+
+	},
+
+	doRefresh: function(e){
+		var self = this;
+		(e).preventDefault();
+
+		Api.request('movie.refresh', {
+			'data': {
+				'id': self.movie.get('id')
+			}
+		});
+	}
+
+});
+
+MA.Readd = new Class({
+
+	Extends: MovieAction,
+
+	create: function(){
+		var self = this;
+
+		var movie_done = Status.get(self.movie.data.status_id).identifier == 'done';
+		if(!movie_done)
+			var snatched = self.movie.data.releases.filter(function(release){
+				return release.status && (release.status.identifier == 'snatched' || release.status.identifier == 'downloaded' || release.status.identifier == 'done');
+			}).length;
+
+		if(movie_done || snatched && snatched > 0)
+			self.el = new Element('a.readd', {
+				'title': 'Readd the movie and mark all previous snatched/downloaded as ignored',
+				'events': {
+					'click': self.doReadd.bind(self)
+				}
+			});
+
+	},
+
+	doReadd: function(e){
+		var self = this;
+		(e).preventDefault();
+
+		Api.request('movie.add', {
+			'data': {
+				'identifier': self.movie.get('identifier'),
+				'ignore_previous': 1
+			}
+		});
+	}
+
+});
+
+MA.Delete = new Class({
+
+	Extends: MovieAction,
+
+	Implements: [Chain],
+
+	create: function(){
+		var self = this;
+
+		self.el = new Element('a.delete', {
+			'title': 'Remove the movie from this CP list',
+			'events': {
+				'click': self.showConfirm.bind(self)
+			}
+		});
+
+	},
+
+	showConfirm: function(e){
+		var self = this;
+		(e).preventDefault();
+
+		if(!self.delete_container){
+			self.delete_container = new Element('div.buttons.delete_container').adopt(
+				new Element('a.cancel', {
+					'text': 'Cancel',
+					'events': {
+						'click': self.hideConfirm.bind(self)
+					}
+				}),
+				new Element('span.or', {
+					'text': 'or'
+				}),
+				new Element('a.button.delete', {
+					'text': 'Delete ' + self.movie.title.get('text'),
+					'events': {
+						'click': self.del.bind(self)
+					}
+				})
+			).inject(self.movie, 'top');
+		}
+
+		self.movie.slide('in', self.delete_container);
+
+	},
+
+	hideConfirm: function(e){
+		var self = this;
+		(e).preventDefault();
+
+		self.movie.slide('out');
+	},
+
+	del: function(e){
+		(e).preventDefault();
+		var self = this;
+
+		var movie = $(self.movie);
+
+		self.chain(
+			function(){
+				self.callChain();
+			},
+			function(){
+				Api.request('movie.delete', {
+					'data': {
+						'id': self.movie.get('id'),
+						'delete_from': self.movie.list.options.identifier
+					},
+					'onComplete': function(){
+						movie.set('tween', {
+							'duration': 300,
+							'onComplete': function(){
+								self.movie.destroy()
+							}
+						});
+						movie.tween('height', 0);
+					}
+				});
+			}
+		);
+
+		self.callChain();
+
+	}
+
+});
+
+MA.Files = new Class({
+
+	Extends: MovieAction,
+
+	create: function(){
+		var self = this;
+
+		self.el = new Element('a.directory', {
+			'title': 'Available files',
+			'events': {
+				'click': self.showFiles.bind(self)
+			}
+		});
+
+	},
+
+	showFiles: function(e){
+		var self = this;
+		(e).preventDefault();
+
+		if(!self.options_container){
+			self.options_container = new Element('div.options').adopt(
+				self.files_container = new Element('div.files.table')
+			).inject(self.movie, 'top');
+
+			// Header
+			new Element('div.item.head').adopt(
+				new Element('span.name', {'text': 'File'}),
+				new Element('span.type', {'text': 'Type'}),
+				new Element('span.is_available', {'text': 'Available'})
+			).inject(self.files_container)
+
+			Array.each(self.movie.data.releases, function(release){
+
+				var rel = new Element('div.release').inject(self.files_container);
+
+				Array.each(release.files, function(file){
+					new Element('div.file.item').adopt(
+						new Element('span.name', {'text': file.path}),
+						new Element('span.type', {'text': File.Type.get(file.type_id).name}),
+						new Element('span.available', {'text': file.available})
+					).inject(rel)
+				});
+			});
+
+		}
+
+		self.movie.slide('in', self.options_container);
+	},
+
+});

couchpotato/core/plugins/movie/static/movie.js

@@ -8,44 +8,76 @@ var Movie = new Class({
 		var self = this;
 
 		self.data = data;
-		self.view = options.view || 'thumbs';
+		self.view = options.view || 'details';
 		self.list = list;
 
-		self.el = new Element('div.movie.inlay');
+		self.el = new Element('div.movie');
 
 		self.profile = Quality.getProfile(data.profile_id) || {};
 		self.parent(self, options);
 
-		App.addEvent('movie.update.'+data.id, self.update.bind(self));
+		self.addEvents();
+	},
+
+	addEvents: function(){
+		var self = this;
+
+		App.addEvent('movie.update.'+self.data.id, function(notification){
+			self.busy(false);
+			self.removeView();
+			self.update.delay(2000, self, notification);
+		});
 
 		['movie.busy', 'searcher.started'].each(function(listener){
-			App.addEvent(listener+'.'+data.id, function(notification){
+			App.addEvent(listener+'.'+self.data.id, function(notification){
 				if(notification.data)
 					self.busy(true)
 			});
 		})
+
+		App.addEvent('searcher.ended.'+self.data.id, function(notification){
+			if(notification.data)
+				self.busy(false)
+		});
+	},
+
+	destroy: function(){
+		var self = this;
+
+		self.el.destroy();
+		delete self.list.movies_added[self.get('id')];
+		self.list.movies.erase(self)
+
+		self.list.checkIfEmpty();
+
+		// Remove events
+		App.removeEvents('movie.update.'+self.data.id);
+		['movie.busy', 'searcher.started'].each(function(listener){
+			App.removeEvents(listener+'.'+self.data.id);
+		})
 	},
 
 	busy: function(set_busy){
 		var self = this;
 
 		if(!set_busy){
-			if(self.spinner){
-				self.mask.fade('out');
-				setTimeout(function(){
-					if(self.mask)
-						self.mask.destroy();
-					if(self.spinner)
-						self.spinner.el.destroy();
-					self.spinner = null;
-					self.mask = null;
-				}, 400);
-			}
+			setTimeout(function(){
+				if(self.spinner){
+					self.mask.fade('out');
+					setTimeout(function(){
+						if(self.mask)
+							self.mask.destroy();
+						if(self.spinner)
+							self.spinner.el.destroy();
+						self.spinner = null;
+						self.mask = null;
+					}, 400);
+				}
+			}, 1000)
 		}
 		else if(!self.spinner) {
 			self.createMask();
 			self.spinner = createSpinner(self.mask);
-			self.positionMask();
 			self.mask.fade('in');
 		}
 	},
@@ -54,10 +86,9 @@ var Movie = new Class({
 		var self = this;
 		self.mask = new Element('div.mask', {
 			'styles': {
-				'z-index': '1'
+				'z-index': 4
 			}
 		}).inject(self.el, 'top').fade('hide');
-		self.positionMask();
 	},
 
 	positionMask: function(){
@@ -76,7 +107,8 @@ var Movie = new Class({
 		var self = this;
 
 		self.data = notification.data;
-		self.container.destroy();
+		self.el.empty();
+		self.removeView();
 
 		self.profile = Quality.getProfile(self.data.profile_id) || {};
 		self.create();
@@ -87,52 +119,49 @@ var Movie = new Class({
 	create: function(){
 		var self = this;
 
+		var s = Status.get(self.get('status_id'));
+		self.el.addClass('status_'+s.identifier);
+
 		self.el.adopt(
-			self.container = new Element('div.movie_container').adopt(
-				self.select_checkbox = new Element('input[type=checkbox].inlay', {
-					'events': {
-						'change': function(){
-							self.fireEvent('select')
-						}
+			self.select_checkbox = new Element('input[type=checkbox].inlay', {
+				'events': {
+					'change': function(){
+						self.fireEvent('select')
 					}
-				}),
-				self.thumbnail = File.Select.single('poster', self.data.library.files),
-				self.data_container = new Element('div.data.inlay.light', {
-					'tween': {
-						duration: 400,
-						transition: 'quint:in:out',
-						onComplete: self.fireEvent.bind(self, 'slideEnd')
-					}
-				}).adopt(
-					self.info_container = new Element('div.info').adopt(
-						self.title = new Element('div.title', {
+				}
+			}),
+			self.thumbnail = File.Select.single('poster', self.data.library.files),
+			self.data_container = new Element('div.data.inlay.light').adopt(
+				self.info_container = new Element('div.info').adopt(
+					new Element('div.title').adopt(
+						self.title = new Element('span', {
 							'text': self.getTitle() || 'n/a'
 						}),
 						self.year = new Element('div.year', {
 							'text': self.data.library.year || 'n/a'
-						}),
-						self.rating = new Element('div.rating.icon', {
-							'text': self.data.library.rating
-						}),
-						self.description = new Element('div.description', {
-							'text': self.data.library.plot
-						}),
-						self.quality = new Element('div.quality', {
-							'events': {
-								'click': function(e){
-									var releases = self.el.getElement('.actions .releases');
-										if(releases)
-											releases.fireEvent('click', [e])
-								}
-							}
 						})
 					),
-					self.actions = new Element('div.actions')
-				)
+					self.description = new Element('div.description', {
+						'text': self.data.library.plot
+					}),
+					self.quality = new Element('div.quality', {
+						'events': {
+							'click': function(e){
+								var releases = self.el.getElement('.actions .releases');
+								if(releases.isVisible())
+									releases.fireEvent('click', [e])
+							}
+						}
+					})
+				),
+				self.actions = new Element('div.actions')
 			)
 		);
 
-		self.changeView(self.view);
+		if(self.thumbnail.empty)
+			self.el.addClass('no_thumbnail');
+
+		//self.changeView(self.view);
 		self.select_checkbox_class = new Form.Check(self.select_checkbox);
 
 		// Add profile
@@ -147,7 +176,7 @@ var Movie = new Class({
 
 			});
 
-		// Add done releases
+		// Add releases
 		self.data.releases.each(function(release){
 
 			var q = self.quality.getElement('.q_id'+ release.quality_id),
@@ -169,9 +198,6 @@ var Movie = new Class({
 				self.actions.adopt(action)
 		});
 
-		if(!self.data.library.rating)
-			self.rating.hide();
-
 	},
 
 	addQuality: function(quality_id){
@@ -214,23 +240,23 @@ var Movie = new Class({
 
 		if(direction == 'in'){
 			self.temp_view = self.view;
-			self.changeView('thumbs')
+			self.changeView('details');
 
 			self.el.addEvent('outerClick', function(){
-				self.changeView(self.temp_view)
+				self.removeView();
 				self.slide('out')
 			})
 			el.show();
-			self.data_container.tween('right', 0, -840);
+			self.data_container.addClass('hide_right');
 		}
 		else {
 			self.el.removeEvents('outerClick')
 
-			self.addEvent('slideEnd:once', function(){
+			setTimeout(function(){
 				self.el.getElements('> :not(.data):not(.poster):not(.movie_container)').hide();
-			});
+			}, 600);
 
-			self.data_container.tween('right', -840, 0);
+			self.data_container.removeClass('hide_right');
 		}
 	},
 
@@ -244,6 +270,12 @@ var Movie = new Class({
 		self.view = new_view;
 	},
 
+	removeView: function(){
+		var self = this;
+
+		self.el.removeClass(self.view+'_view')
+	},
+
 	get: function(attr){
 		return this.data[attr] || this.data.library[attr]
 	},
@@ -261,377 +293,4 @@ var Movie = new Class({
 		return this.el;
 	}
 
-});
-
-var MovieAction = new Class({
-
-	class_name: 'action icon',
-
-	initialize: function(movie){
-		var self = this;
-		self.movie = movie;
-
-		self.create();
-		if(self.el)
-			self.el.addClass(self.class_name)
-	},
-
-	create: function(){},
-
-	disable: function(){
-		this.el.addClass('disable')
-	},
-
-	enable: function(){
-		this.el.removeClass('disable')
-	},
-
-	createMask: function(){
-		var self = this;
-		self.mask = new Element('div.mask', {
-			'styles': {
-				'z-index': '1'
-			}
-		}).inject(self.movie, 'top').fade('hide');
-		self.positionMask();
-	},
-
-	positionMask: function(){
-		var self = this,
-			movie = $(self.movie),
-			s = movie.getSize()
-
-		return;
-
-		return self.mask.setStyles({
-			'width': s.x,
-			'height': s.y
-		}).position({
-			'relativeTo': movie
-		})
-	},
-
-	toElement: function(){
-		return this.el || null
-	}
-
-});
-
-var IMDBAction = new Class({
-
-	Extends: MovieAction,
-	id: null,
-
-	create: function(){
-		var self = this;
-
-		self.id = self.movie.get('identifier');
-
-		self.el = new Element('a.imdb', {
-			'title': 'Go to the IMDB page of ' + self.movie.getTitle(),
-			'href': 'http://www.imdb.com/title/'+self.id+'/',
-			'target': '_blank'
-		});
-
-		if(!self.id) self.disable();
-	}
-
-});
-
-var ReleaseAction = new Class({
-
-	Extends: MovieAction,
-
-	create: function(){
-		var self = this;
-
-		self.el = new Element('a.releases.icon.download', {
-			'title': 'Show the releases that are available for ' + self.movie.getTitle(),
-			'events': {
-				'click': self.show.bind(self)
-			}
-		});
-
-		var buttons_done = false;
-
-		self.movie.data.releases.sortBy('-info.score').each(function(release){
-			if(buttons_done) return;
-
-			var status = Status.get(release.status_id);
-
-			if((status.identifier == 'ignored' || status.identifier == 'failed') || (!self.next_release && status.identifier == 'available')){
-				self.hide_on_click = false;
-				self.show();
-				buttons_done = true;
-			}
-
-		});
-
-	},
-
-	show: function(e){
-		var self = this;
-		if(e)
-			(e).preventDefault();
-
-		if(!self.options_container){
-			self.options_container = new Element('div.options').adopt(
-				self.release_container = new Element('div.releases.table').adopt(
-					self.trynext_container = new Element('div.buttons.try_container')
-				)
-			).inject(self.movie, 'top');
-
-			// Header
-			new Element('div.item.head').adopt(
-				new Element('span.name', {'text': 'Release name'}),
-				new Element('span.status', {'text': 'Status'}),
-				new Element('span.quality', {'text': 'Quality'}),
-				new Element('span.size', {'text': 'Size'}),
-				new Element('span.age', {'text': 'Age'}),
-				new Element('span.score', {'text': 'Score'}),
-				new Element('span.provider', {'text': 'Provider'})
-			).inject(self.release_container)
-
-			self.movie.data.releases.sortBy('-info.score').each(function(release){
-
-				var status = Status.get(release.status_id),
-					quality = Quality.getProfile(release.quality_id) || {},
-					info = release.info;
-
-				if( status.identifier == 'ignored' || status.identifier == 'failed'){
-					self.last_release = release;
-				}
-				else if(!self.next_release && status.identifier == 'available'){
-					self.next_release = release;
-				}
-
-				// Create release
-				new Element('div', {
-					'class': 'item '+status.identifier +
-						(self.next_release && self.next_release.id == release.id ? ' next_release' : '') +
-						(self.last_release && self.last_release.id == release.id ? ' last_release' : ''),
-					'id': 'release_'+release.id
-				}).adopt(
-					new Element('span.name', {'text': self.get(release, 'name'), 'title': self.get(release, 'name')}),
-					new Element('span.status', {'text': status.identifier, 'class': 'release_status '+status.identifier}),
-					new Element('span.quality', {'text': quality.get('label') || 'n/a'}),
-					new Element('span.size', {'text': release.info['size'] ? Math.floor(self.get(release, 'size')) : 'n/a'}),
-					new Element('span.age', {'text': self.get(release, 'age')}),
-					new Element('span.score', {'text': self.get(release, 'score')}),
-					new Element('span.provider', {'text': self.get(release, 'provider')}),
-					release.info['detail_url'] ? new Element('a.info.icon', {
-						'href': release.info['detail_url'],
-						'target': '_blank'
-					}) : null,
-					new Element('a.download.icon', {
-						'events': {
-							'click': function(e){
-								(e).preventDefault();
-								if(!this.hasClass('completed'))
-									self.download(release);
-							}
-						}
-					}),
-					new Element('a.delete.icon', {
-						'events': {
-							'click': function(e){
-								(e).preventDefault();
-								self.ignore(release);
-								this.getParent('.item').toggleClass('ignored')
-							}
-						}
-					})
-				).inject(self.release_container)
-			});
-
-			self.trynext_container.adopt(
-				new Element('span.or', {
-					'text': 'Download'
-				}),
-				self.last_release ? new Element('a.button.orange', {
-					'text': 'the same release again',
-					'events': {
-						'click': self.trySameRelease.bind(self)
-					}
-				}) : null,
-				self.next_release && self.last_release ? new Element('span.or', {
-					'text': 'or'
-				}) : null,
-				self.next_release ? [new Element('a.button.green', {
-					'text': self.last_release ? 'another release' : 'the best release',
-					'events': {
-						'click': self.tryNextRelease.bind(self)
-					}
-				}),
-				new Element('span.or', {
-					'text': 'or pick one below'
-				})] : null
-			)
-
-		}
-
-		self.movie.slide('in', self.options_container);
-	},
-
-	get: function(release, type){
-		return release.info[type] || 'n/a'
-	},
-
-	download: function(release){
-		var self = this;
-
-		var release_el = self.release_container.getElement('#release_'+release.id),
-			icon = release_el.getElement('.download.icon');
-
-		icon.addClass('spinner');
-
-		Api.request('release.download', {
-			'data': {
-				'id': release.id
-			},
-			'onComplete': function(json){
-				icon.removeClass('spinner')
-				if(json.success)
-					icon.addClass('completed');
-				else
-					icon.addClass('attention').set('title', 'Something went wrong when downloading, please check logs.');
-			}
-		});
-	},
-
-	ignore: function(release){
-		var self = this;
-
-		Api.request('release.ignore', {
-			'data': {
-				'id': release.id
-			}
-		})
-
-	},
-
-	tryNextRelease: function(movie_id){
-		var self = this;
-
-		if(self.last_release)
-			self.ignore(self.last_release);
-
-		if(self.next_release)
-			self.download(self.next_release);
-
-	},
-
-	trySameRelease: function(movie_id){
-		var self = this;
-
-		if(self.last_release)
-			self.download(self.last_release);
-
-	}
-
-});
-
-var TrailerAction = new Class({
-
-	Extends: MovieAction,
-	id: null,
-
-	create: function(){
-		var self = this;
-
-		self.el = new Element('a.trailer', {
-			'title': 'Watch the trailer of ' + self.movie.getTitle(),
-			'events': {
-				'click': self.watch.bind(self)
-			}
-		});
-
-	},
-
-	watch: function(offset){
-		var self = this;
-
-		var data_url = 'http://gdata.youtube.com/feeds/videos?vq="{title}" {year} trailer&max-results=1&alt=json-in-script&orderby=relevance&sortorder=descending&format=5&fmt=18'
-		var url = data_url.substitute({
-				'title': encodeURI(self.movie.getTitle()),
-				'year': self.movie.get('year'),
-				'offset': offset || 1
-			}),
-			size = $(self.movie).getSize(),
-			height = (size.x/16)*9,
-			id = 'trailer-'+randomString();
-
-		self.player_container = new Element('div[id='+id+']');
-		self.container = new Element('div.hide.trailer_container')
-			.adopt(self.player_container)
-			.inject(self.movie.container, 'top');
-
-		self.container.setStyle('height', 0);
-		self.container.removeClass('hide');
-
-		self.close_button = new Element('a.hide.hide_trailer', {
-			'text': 'Hide trailer',
-			'events': {
-				'click': self.stop.bind(self)
-			}
-		}).inject(self.movie);
-
-		setTimeout(function(){
-			$(self.movie).setStyle('max-height', height);
-			self.container.setStyle('height', height);
-		}, 100)
-
-		new Request.JSONP({
-			'url': url,
-			'onComplete': function(json){
-				var video_url = json.feed.entry[0].id.$t.split('/'),
-					video_id = video_url[video_url.length-1];
-
-				self.player = new YT.Player(id, {
-					'height': height,
-					'width': size.x,
-					'videoId': video_id,
-					'playerVars': {
-						'autoplay': 1,
-						'showsearch': 0,
-						'wmode': 'transparent',
-						'iv_load_policy': 3
-					}
-				});
-
-				self.close_button.removeClass('hide');
-
-				var quality_set = false;
-				var change_quality = function(state){
-					if(!quality_set && (state.data == 1 || state.data || 2)){
-						try {
-							self.player.setPlaybackQuality('hd720');
-							quality_set = true;
-						}
-						catch(e){
-
-						}
-					}
-				}
-				self.player.addEventListener('onStateChange', change_quality);
-
-			}
-		}).send()
-
-	},
-
-	stop: function(){
-		var self = this;
-
-		self.player.stopVideo();
-		self.container.addClass('hide');
-		self.close_button.addClass('hide');
-
-		setTimeout(function(){
-			self.container.destroy()
-			self.close_button.destroy();
-		}, 1800)
-	}
-
-
 });

couchpotato/core/plugins/movie/static/search.css

@@ -1,108 +1,152 @@
 .search_form {
 	display: inline-block;
 	vertical-align: middle;
-	width: 25%;
+	position: absolute;
+	right: 105px;
+	top: 0;
+	text-align: right;
+	height: 100%;
+	border-bottom: 4px solid transparent;
+	transition: all .4s cubic-bezier(0.9,0,0.1,1);
+	position: absolute;
+	z-index: 20;
+	border: 1px solid transparent;
+	border-width: 0 0 4px;
 }
-
-	.search_form input {
-		padding: 4px 20px 4px 4px;
-		margin: 0;
-		font-size: 14px;
-		width: 100%;
-		height: 24px;
+	.search_form:hover {
+		border-color: #047792;
 	}
-		.search_form input:focus {
-			padding-right: 83px;
+
+	@media all and (max-width: 480px) {
+		.search_form {
+			right: 44px;
+		}
+	}
+	
+	.search_form.focused,
+	.search_form.shown {
+		border-color: #04bce6;
+	}
+	
+	.search_form .input {
+		height: 100%;
+		overflow: hidden;
+		width: 45px;
+		transition: all .4s cubic-bezier(0.9,0,0.1,1);
+	}
+	
+		.search_form.focused .input,
+		.search_form.shown .input  {
+			width: 380px;
+			background: #4e5969;
 		}
 
-		.search_form .input .enter {
-			background: #369545 url('../images/sprite.png') right -188px no-repeat;
-			padding: 0 20px 0 4px;
-			border-radius: 2px;
-			text-transform: uppercase;
-			font-size: 10px;
-			margin-left: -78px;
-			display: inline-block;
-			opacity: 0;
-			position: relative;
-			top: -2px;
-			cursor: pointer;
-			vertical-align: middle;
-			visibility: hidden;
-		}
-			.search_form.focused .input .enter {
-				visibility: visible;
+			.search_form .input input {
+				border-radius: 0;
+				display: block;
+				border: 0;
+				background: none;
+				color: #FFF;
+				font-size: 25px;
+				height: 100%;
+				padding: 10px;
+				width: 100%;
+				opacity: 0;
+				padding: 0 40px 0 10px;
+				transition: all .4s ease-in-out .2s;
 			}
-			.search_form.focused.filled .input .enter {
-				opacity: 1;
+				.search_form.focused .input input,
+				.search_form.shown .input input {
+					opacity: 1;
+				}
+					
+			@media all and (max-width: 480px) {
+				.search_form .input input {
+					font-size: 15px;
+				}
+				
+				.search_form.focused .input,
+				.search_form.shown .input {
+					width: 277px;
+				}
 			}
-
-		.search_form .input a  {
-			width:  17px;
-			height: 20px;
-			display: inline-block;
-			margin: -2px 0 0 2px;
-			top: 4px;
-			right: 5px;
-			background: url('../images/sprite.png') left -37px no-repeat;
-			cursor: pointer;
-			opacity: 0;
-			transition: all 0.2s ease-in-out;
-			vertical-align: middle;
+	
+	.search_form .input a  {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width:  44px;
+		height: 100%;
+		cursor: pointer;
+		vertical-align: middle;
+		text-align: center;
+		line-height: 66px;
+		font-size: 15px;
+		color: #FFF;
+	}
+		
+		.search_form .input a:after {
+			content: "\e03e";
 		}
 
-		.search_form.filled .input a {
-			opacity: 1;
+		.search_form.shown.filled .input a:after {
+			content: "\e04e";
+		}
+		
+		@media all and (max-width: 480px) {
+			.search_form .input a  {
+				line-height: 44px;
+			}
 		}
 
 	.search_form .results_container {
+		text-align: left;
 		position: absolute;
 		background: #5c697b;
-		margin: 6px 0 0 -230px;
+		margin: 4px 0 0;
 		width: 470px;
-		min-height: 140px;
-		border-radius: 3px;
+		min-height: 50px;
 		box-shadow: 0 20px 20px -10px rgba(0,0,0,0.55);
 		display: none;
 	}
+		@media all and (max-width: 480px) {
+			.search_form .results_container {
+				width: 320px;
+			}
+		}
+		.search_form.focused.filled .results_container,
 		.search_form.shown.filled .results_container {
 			display: block;
 		}
 
-		.search_form .results_container:before {
-			content: ' ';
-			height: 0;
-			position: relative;
-			width: 0;
-			border: 10px solid transparent;
-			border-bottom-color: #5c697b;
-			display: block;
-			top: -20px;
-			left: 346px;
-		}
-
 	.search_form .results {
 		max-height: 570px;
 		overflow-x: hidden;
-		padding: 10px 0;
-		margin-top: -18px;
 	}
 
 	.movie_result {
 		overflow: hidden;
-		height: 140px;
+		height: 50px;
+		position: relative;
 	}
 
 		.movie_result .options {
-			height: 140px;
+			position: absolute;
+			height: 100%;
+			top: 0;
+			left: 30px;
+			right: 0;
+			padding: 13px;
 			border: 1px solid transparent;
 			border-width: 1px 0;
 			border-radius: 0;
 			box-shadow: inset 0 1px 8px rgba(0,0,0,0.25);
 		}
+			.movie_result .options > .in_library_wanted {
+				margin-top: -7px;
+			}
 
 			.movie_result .options > div {
-				padding: 0 15px;
 				border: 0;
 			}
 
@@ -117,6 +161,13 @@
 			}
 				.movie_result .options select[name=title] { width: 180px; }
 				.movie_result .options select[name=profile] { width: 90px; }
+				
+				@media all and (max-width: 480px) {
+				
+					.movie_result .options select[name=title] { width: 90px; }
+					.movie_result .options select[name=profile] { width: 60px; }
+					
+				}
 
 			.movie_result .options .button {
 				vertical-align: middle;
@@ -125,72 +176,73 @@
 
 			.movie_result .options .message {
 				height: 100%;
-				line-height: 140px;
 				font-size: 20px;
-				text-align: center;
 				color: #fff;
+				line-height: 20px;
 			}
 
 		.movie_result .data {
-			padding: 0 15px;
-			width: 470px;
-			position: relative;
-			height: 140px;
+			position: absolute;
+			height: 100%;
 			top: 0;
-			margin: -140px 0 0 0;
+			left: 30px;
+			right: 0;
 			background: #5c697b;
 			cursor: pointer;
-
-			border-bottom: 1px solid #333;
-			border-top: 1px solid rgba(255,255,255, 0.15);
+			border-top: 1px solid rgba(255,255,255, 0.08);
+			transition: all .4s cubic-bezier(0.9,0,0.1,1);
 		}
+			.movie_result .data.open {
+				left: 100% !important;
+			}
 
 			.movie_result:last-child .data { border-bottom: 0; }
 
 			.movie_result .in_wanted, .movie_result .in_library {
 				position: absolute;
-				margin-top: 105px;
+				bottom: 2px;
+				left: 14px;
+				font-size: 11px;
 			}
 
 			.movie_result .thumbnail {
-				width: 17%;
-				display: inline-block;
-				margin: 15px 3% 15px 0;
+				width: 34px;
+				min-height: 100%;
+				display: block;
+				margin: 0;
 				vertical-align: top;
-				border-radius: 3px;
-				box-shadow: 0 0 3px rgba(0,0,0,0.35);
 			}
 
 			.movie_result .info {
-				width: 80%;
-				display: inline-block;
-				vertical-align: top;
-				padding: 15px 0;
-				height: 120px;
-				overflow: hidden;
-			}
-
-			.movie_result .info .tagline {
-				max-height: 70px;
-				overflow: hidden;
-				display: inline-block;
-			}
-
-			.movie_result .add +.info {
-				margin-left: 20%;
+				position: absolute;
+				top: 20%;
+				left: 15px;
+				right: 60px;
+				vertical-align: middle;
 			}
 
 				.movie_result .info h2 {
+					font-weight: normal;
+					font-size: 20px;
+					display: block;
 					margin: 0;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					width: 100%;
 				}
 
 				.movie_result .info h2 span {
 					padding: 0 5px;
+					position: absolute;
+					right: -60px;
 				}
 
-				.movie_result .info h2 span:before { content: "("; }
-				.movie_result .info h2 span:after { content: ")"; }
-
-.search_form .mask {
-	border-radius: 3px;
+.search_form .mask,
+.movie_result .mask {
+	position: absolute;
+	height: 100%;
+	width: 100%;
+	left: 0;
+	top: 0;
 }

couchpotato/core/plugins/movie/static/search.js

@@ -7,31 +7,30 @@ Block.Search = new Class({
 	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.inlay', {
+				self.input = new Element('input', {
 					'placeholder': 'Search & add a new movie',
 					'events': {
 						'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(){
-							self.el.removeClass('focused')
+							focus_timer = (function(){
+								self.el.removeClass('focused')
+							}).delay(100);
 						}
 					}
 				}),
-				new Element('span.enter', {
+				new Element('a.icon2', {
 					'events': {
-						'click': self.keyup.bind(self)
-					},
-					'text':'Enter'
-				}),
-				new Element('a', {
-					'events': {
-						'click': self.clear.bind(self)
+						'click': self.clear.bind(self),
+						'touchend': self.clear.bind(self)
 					}
 				})
 			),
@@ -57,13 +56,21 @@ Block.Search = new Class({
 		var self = this;
 		(e).preventDefault();
 
-		self.last_q = '';
-		self.input.set('value', '');
-		self.input.focus()
+		if(self.last_q === ''){
+			self.input.blur()
+			self.last_q = null;
+		}
+		else {
 
-		self.movies = []
-		self.results.empty()
-		self.el.removeClass('filled')
+			self.last_q = '';
+			self.input.set('value', '');
+			self.input.focus()
+
+			self.movies = []
+			self.results.empty()
+			self.el.removeClass('filled')
+
+		}
 	},
 
 	hideResults: function(bool){
@@ -90,8 +97,13 @@ Block.Search = new Class({
 
 		self.el[self.q() ? 'addClass' : 'removeClass']('filled')
 
-		if(self.q() != self.last_q && (['enter'].indexOf(e.key) > -1 || e.type == 'click'))
-			self.autocomplete()
+		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)
+		}
 
 	},
 
@@ -107,17 +119,14 @@ Block.Search = new Class({
 	},
 
 	list: function(){
-		var self = this;
-
-		if(self.api_request && self.api_request.running) return
-
-		var q = self.q();
-		var cache = self.cache[q];
+		var self = this,
+			q = self.q(),
+			cache = self.cache[q];
 
 		self.hideResults(false);
 
 		if(!cache){
-			self.positionMask().fade('in');
+			self.mask.fade('in');
 
 			if(!self.spinner)
 				self.spinner = createSpinner(self.mask);
@@ -139,7 +148,6 @@ Block.Search = new Class({
 	fill: function(q, json){
 		var self = this;
 
-		self.positionMask()
 		self.cache[q] = json
 
 		self.movies = {}
@@ -156,9 +164,6 @@ Block.Search = new Class({
 
 		});
 
-		if(q != self.q())
-			self.list()
-
 		// Calculate result heights
 		var w = window.getSize(),
 			rc = self.result_container.getCoordinates();
@@ -168,19 +173,6 @@ Block.Search = new Class({
 
 	},
 
-	positionMask: function(){
-		var self = this;
-
-		var s = self.result_container.getSize()
-
-		return self.mask.setStyles({
-			'width': s.x,
-			'height': s.y
-		}).position({
-			'relativeTo': self.result_container
-		})
-	},
-
 	loading: function(bool){
 		this.el[bool ? 'addClass' : 'removeClass']('loading')
 	},
@@ -193,8 +185,11 @@ Block.Search = new Class({
 
 Block.Search.Item = new Class({
 
-	initialize: function(info){
+	Implements: [Options, Events],
+
+	initialize: function(info, options){
 		var self = this;
+		self.setOptions(options);
 
 		self.info = info;
 		self.alternative_titles = [];
@@ -203,63 +198,41 @@ Block.Search.Item = new Class({
 	},
 
 	create: function(){
-		var self = this;
-
-		var info = self.info;
+		var self = this,
+			info = self.info;
 
 		self.el = new Element('div.movie_result', {
 			'id': info.imdb
 		}).adopt(
-			self.options = new Element('div.options.inlay'),
+			self.thumbnail = info.images && info.images.poster.length > 0 ? new Element('img.thumbnail', {
+				'src': info.images.poster[0],
+				'height': null,
+				'width': null
+			}) : null,
+			self.options_el = new Element('div.options.inlay'),
 			self.data_container = new Element('div.data', {
-				'tween': {
-					duration: 400,
-					transition: 'quint:in:out'
-				},
 				'events': {
 					'click': self.showOptions.bind(self)
 				}
 			}).adopt(
-				self.thumbnail = info.images && info.images.poster.length > 0 ? new Element('img.thumbnail', {
-					'src': info.images.poster[0],
-					'height': null,
-					'width': null
-				}) : null,
 				new Element('div.info').adopt(
 					self.title = new Element('h2', {
-						'text': info.titles[0]
+						'text': info.titles && info.titles.length > 0 ? info.titles[0] : 'Unknown'
 					}).adopt(
 						self.year = info.year ? new Element('span.year', {
 							'text': info.year
 						}) : null
-					),
-					self.tagline = new Element('span.tagline', {
-						'text': info.tagline ? info.tagline : info.plot,
-						'title': info.tagline ? info.tagline : info.plot
-					}),
-					self.director = self.info.director ?  new Element('span.director', {
-						'text': 'Director:' + info.director
-					}) : null,
-					self.starring = info.actors ? new Element('span.actors', {
-						'text': 'Starring:'
-					}) : null
+					)
 				)
 			)
 		)
 
-		if(info.actors){
-			Object.each(info.actors, function(actor){
-				new Element('span', {
-					'text': actor
-				}).inject(self.starring)
+		if(info.titles)
+			info.titles.each(function(title){
+				self.alternativeTitle({
+					'title': title
+				});
 			})
-		}
-
-		info.titles.each(function(title){
-			self.alternativeTitle({
-				'title': title
-			});
-		})
 	},
 
 	alternativeTitle: function(alternative){
@@ -268,16 +241,26 @@ Block.Search.Item = new Class({
 		self.alternative_titles.include(alternative);
 	},
 
+	getTitle: function(){
+		var self = this;
+		try {
+			return self.info.original_title ? self.info.original_title : self.info.titles[0];
+		}
+		catch(e){
+			return 'Unknown';
+		}
+	},
+
+	get: function(key){
+		return this.info[key]
+	},
+
 	showOptions: function(){
 		var self = this;
 
 		self.createOptions();
 
-		if(!self.width)
-			self.width = self.data_container.getCoordinates().width
-
-		self.data_container.tween('left', 0, self.width);
-
+		self.data_container.addClass('open');
 		self.el.addEvent('outerClick', self.closeOptions.bind(self))
 
 	},
@@ -285,7 +268,7 @@ Block.Search.Item = new Class({
 	closeOptions: function(){
 		var self = this;
 
-		self.data_container.tween('left', self.width, 0);
+		self.data_container.removeClass('open');
 		self.el.removeEvents('outerClick')
 	},
 
@@ -302,29 +285,34 @@ Block.Search.Item = new Class({
 				'profile_id': self.profile_select.get('value')
 			},
 			'onComplete': function(json){
-				self.options.empty();
-				self.options.adopt(
+				self.options_el.empty();
+				self.options_el.adopt(
 					new Element('div.message', {
-						'text': json.added ? 'Movie succesfully added.' : 'Movie didn\'t add properly. Check logs'
+						'text': json.added ? 'Movie successfully added.' : 'Movie didn\'t add properly. Check logs'
 					})
 				);
+				self.mask.fade('out');
+
+				self.fireEvent('added');
 			},
 			'onFailure': function(){
-				self.options.empty();
-				self.options.adopt(
+				self.options_el.empty();
+				self.options_el.adopt(
 					new Element('div.message', {
 						'text': 'Something went wrong, check the logs for more info.'
 					})
 				);
+				self.mask.fade('out');
 			}
 		});
 	},
 
 	createOptions: function(){
-		var self = this;
+		var self = this,
+			info = self.info;
+
+		if(!self.options_el.hasClass('set')){
 
-		if(!self.options.hasClass('set')){
-			
 			if(self.info.in_library){
 				var in_library = [];
 				self.info.in_library.releases.each(function(release){
@@ -332,14 +320,11 @@ Block.Search.Item = new Class({
 				});
 			}
 
-			self.options.adopt(
-				new Element('div').adopt(
-					self.option_thumbnail = self.info.images && self.info.images.poster.length > 0 ? new Element('img.thumbnail', {
-						'src': self.info.images.poster[0],
-						'height': null,
-						'width': null
-					}) : null,
-					self.info.in_wanted ? new Element('span.in_wanted', {
+			self.options_el.grab(
+				new Element('div', {
+					'class': self.info.in_wanted && self.info.in_wanted.profile || in_library ? 'in_library_wanted' : ''
+				}).adopt(
+					self.info.in_wanted && self.info.in_wanted.profile ? new Element('span.in_wanted', {
 						'text': 'Already in wanted list: ' + self.info.in_wanted.profile.label
 					}) : (in_library ? new Element('span.in_library', {
 						'text': 'Already in library: ' + in_library.join(', ')
@@ -372,7 +357,7 @@ Block.Search.Item = new Class({
 				}).inject(self.profile_select)
 			});
 
-			self.options.addClass('set');
+			self.options_el.addClass('set');
 		}
 
 	},
@@ -380,17 +365,7 @@ Block.Search.Item = new Class({
 	loadingMask: function(){
 		var self = this;
 
-		var s = self.options.getSize();
-
-		self.mask = new Element('span.mask', {
-			'styles': {
-				'position': 'relative',
-				'width': s.x,
-				'height': s.y,
-				'top': -s.y,
-				'display': 'block'
-			}
-		}).inject(self.options).fade('hide')
+		self.mask = new Element('div.mask').inject(self.el).fade('hide')
 
 		createSpinner(self.mask)
 		self.mask.fade('in')

couchpotato/core/plugins/profile/main.py

@@ -2,10 +2,9 @@ from couchpotato import get_session
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent
 from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified, getParams, getParam
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Profile, ProfileType
+from couchpotato.core.settings.model import Profile, ProfileType, Movie
 
 log = CPLog(__name__)
 
@@ -30,13 +29,28 @@ class ProfilePlugin(Plugin):
         })
 
         addEvent('app.initialize', self.fill, priority = 90)
+        addEvent('app.load', self.forceDefaults)
 
-    def allView(self):
+    def forceDefaults(self):
 
-        return jsonified({
+        # Get all active movies without profile
+        active_status = fireEvent('status.get', 'active', single = True)
+
+        db = get_session()
+        movies = db.query(Movie).filter(Movie.status_id == active_status.get('id'), Movie.profile == None).all()
+
+        if len(movies) > 0:
+            default_profile = self.default()
+            for movie in movies:
+                movie.profile_id = default_profile.get('id')
+                db.commit()
+
+    def allView(self, **kwargs):
+
+        return {
             'success': True,
             'list': self.all()
-        })
+        }
 
     def all(self):
 
@@ -47,33 +61,31 @@ class ProfilePlugin(Plugin):
         for profile in profiles:
             temp.append(profile.to_dict(self.to_dict))
 
-        #db.close()
+        db.expire_all()
         return temp
 
-    def save(self):
-
-        params = getParams()
+    def save(self, **kwargs):
 
         db = get_session()
 
-        p = db.query(Profile).filter_by(id = params.get('id')).first()
+        p = db.query(Profile).filter_by(id = kwargs.get('id')).first()
         if not p:
             p = Profile()
             db.add(p)
 
-        p.label = toUnicode(params.get('label'))
-        p.order = params.get('order', p.order if p.order else 0)
-        p.core = params.get('core', False)
+        p.label = toUnicode(kwargs.get('label'))
+        p.order = kwargs.get('order', p.order if p.order else 0)
+        p.core = kwargs.get('core', False)
 
         #delete old types
         [db.delete(t) for t in p.types]
 
         order = 0
-        for type in params.get('types', []):
+        for type in kwargs.get('types', []):
             t = ProfileType(
                 order = order,
                 finish = type.get('finish') if order > 0 else 1,
-                wait_for = params.get('wait_for'),
+                wait_for = kwargs.get('wait_for'),
                 quality_id = type.get('quality_id')
             )
             p.types.append(t)
@@ -84,44 +96,39 @@ class ProfilePlugin(Plugin):
 
         profile_dict = p.to_dict(self.to_dict)
 
-        #db.close()
-        return jsonified({
+        return {
             'success': True,
             'profile': profile_dict
-        })
+        }
 
     def default(self):
 
         db = get_session()
         default = db.query(Profile).first()
         default_dict = default.to_dict(self.to_dict)
-        #db.close()
 
+        db.expire_all()
         return default_dict
 
-    def saveOrder(self):
+    def saveOrder(self, **kwargs):
 
-        params = getParams()
         db = get_session()
 
         order = 0
-        for profile in params.get('ids', []):
+        for profile in kwargs.get('ids', []):
             p = db.query(Profile).filter_by(id = profile).first()
-            p.hide = params.get('hidden')[order]
+            p.hide = kwargs.get('hidden')[order]
             p.order = order
 
             order += 1
 
         db.commit()
-        #db.close()
 
-        return jsonified({
+        return {
             'success': True
-        })
+        }
 
-    def delete(self):
-
-        id = getParam('id')
+    def delete(self, id = None, **kwargs):
 
         db = get_session()
 
@@ -133,16 +140,18 @@ class ProfilePlugin(Plugin):
             db.delete(p)
             db.commit()
 
+            # Force defaults on all empty profile movies
+            self.forceDefaults()
+
             success = True
         except Exception, e:
             message = log.error('Failed deleting Profile: %s', e)
 
-        #db.close()
-
-        return jsonified({
+        db.expire_all()
+        return {
             'success': success,
             'message': message
-        })
+        }
 
     def fill(self):
 
@@ -181,10 +190,10 @@ class ProfilePlugin(Plugin):
                 )
                 p.types.append(profile_type)
 
-                db.commit()
                 quality_order += 1
 
             order += 1
 
-        #db.close()
+        db.commit()
+
         return True

couchpotato/core/plugins/profile/static/profile.css

@@ -6,19 +6,30 @@
 	border-bottom: 1px solid rgba(255,255,255,0.2);
 }
 
-.profile {	border-bottom: 1px solid rgba(255,255,255,0.2) }
+.profile {
+	border-bottom: 1px solid rgba(255,255,255,0.2);
+	position: relative;
+}
 
 	.profile > .delete {
-		height: 20px;
-		width: 20px;
 		position: absolute;
-		margin-left: 690px;
-		padding: 14px;
-		background-position: center;
+		padding: 16px;
+		right: 0;
+		cursor: pointer;
+		opacity: 0.6;
+		color: #fd5353;
+	}
+		.profile > .delete:hover {
+			opacity: 1;
+		}
+		
+	.profile .ctrlHolder:hover {
+		background: none;
 	}
 
 	.profile .qualities {
 		min-height: 80px;
+		padding-top: 0;
 	}
 
 	.profile .formHint {
@@ -34,7 +45,8 @@
 
 	.profile .wait_for {
 		position: absolute;
-		margin: -45px 0 0 437px;
+		right: 60px;
+		top: 0;
 	}
 
 	.profile .wait_for input {
@@ -61,6 +73,10 @@
 				margin-right: 10px;
 			}
 
+			.profile .type .check {
+				margin-top: -1px;
+			}
+
 			.profile .quality_type select {
 				width: 186px;
 				margin-left: -1px;
@@ -71,22 +87,24 @@
 			}
 
 		.profile .types .type .handle {
-			background: url('./handle.png') center;
+			background: url('../../static/profile_plugin/handle.png') center;
 			display: inline-block;
 			height: 20px;
 			width: 20px;
-			cursor: grab;
-			cursor: -moz-grab;
 			cursor: -webkit-grab;
+			cursor: -moz-grab;
+			cursor: grab;
 			margin: 0;
 		}
 
 		.profile .types .type .delete {
-			background-position: left center;
 			height: 20px;
 			width: 20px;
+			line-height: 20px;
 			visibility: hidden;
 			cursor: pointer;
+			font-size: 13px;
+			color: #fd5353;
 		}
 
 		.profile .types .type:hover:not(.is_empty) .delete {
@@ -105,9 +123,9 @@
 	}
 
 		#profile_ordering li {
-			cursor: grab;
-			cursor: -moz-grab;
 			cursor: -webkit-grab;
+			cursor: -moz-grab;
+			cursor: grab;
 			border-bottom: 1px solid rgba(255,255,255,0.2);
 			padding: 0 5px;
 		}
@@ -126,7 +144,7 @@
 			}
 
 			#profile_ordering li .handle {
-				background: url('./handle.png') center;
+				background: url('../../static/profile_plugin/handle.png') center;
 				width: 20px;
 				float: right;
 			}

couchpotato/core/plugins/profile/static/profile.js

@@ -24,7 +24,7 @@ var Profile = new Class({
 		var data = self.data;
 
 		self.el = new Element('div.profile').adopt(
-			self.delete_button = new Element('span.delete.icon', {
+			self.delete_button = new Element('span.delete.icon2', {
 				'events': {
 					'click': self.del.bind(self)
 				}
@@ -86,7 +86,10 @@ var Profile = new Class({
 				},
 				'onComplete': function(json){
 					if(json.success){
-						self.data = json.profile
+						self.data = json.profile;
+						self.type_container.getElement('li:first-child input[type=checkbox]')
+							.set('checked', true)
+							.getParent().addClass('checked');
 					}
 				}
 			});
@@ -239,13 +242,21 @@ Profile.Type = new Class({
 			),
 			new Element('span.finish').adopt(
 				self.finish = new Element('input.inlay.finish[type=checkbox]', {
-					'checked': data.finish,
+					'checked': data.finish !== undefined ? data.finish : 1,
 					'events': {
-						'change': self.fireEvent.bind(self, 'change')
+						'change': function(e){
+							if(self.el == self.el.getParent().getElement(':first-child')){
+								self.finish_class.check();
+								alert('Top quality always finishes the search')
+								return;
+							}
+
+							self.fireEvent('change');
+						}
 					}
 				})
 			),
-			new Element('span.delete.icon', {
+			new Element('span.delete.icon2', {
 				'events': {
 					'click': self.del.bind(self)
 				}
@@ -255,7 +266,7 @@ Profile.Type = new Class({
 
 		self.el[self.data.quality_id > 0 ? 'removeClass' : 'addClass']('is_empty');
 
-		new Form.Check(self.finish);
+		self.finish_class = new Form.Check(self.finish);
 
 	},
 

couchpotato/core/plugins/quality/main.py

@@ -2,13 +2,13 @@ from couchpotato import get_session
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified, getParams
 from couchpotato.core.helpers.variable import mergeDicts, md5, getExt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.core.settings.model import Quality, Profile, ProfileType
-import os.path
+from sqlalchemy.sql.expression import or_
 import re
+import time
 
 log = CPLog(__name__)
 
@@ -17,15 +17,15 @@ class QualityPlugin(Plugin):
 
     qualities = [
         {'identifier': 'bd50', 'hd': True, 'size': (15000, 60000), 'label': 'BR-Disk', 'alternative': ['bd25'], 'allow': ['1080p'], 'ext':[], 'tags': ['bdmv', 'certificate', ('complete', 'bluray')]},
-        {'identifier': '1080p', 'hd': True, 'size': (5000, 20000), 'label': '1080P', 'width': 1920, 'alternative': [], 'allow': [], 'ext':['mkv', 'm2ts'], 'tags': ['m2ts']},
-        {'identifier': '720p', 'hd': True, 'size': (3500, 10000), 'label': '720P', 'width': 1280, 'alternative': [], 'allow': [], 'ext':['mkv', 'ts']},
-        {'identifier': 'brrip', 'hd': True, 'size': (700, 7000), 'label': 'BR-Rip', 'alternative': ['bdrip'], 'allow': ['720p'], 'ext':['avi']},
+        {'identifier': '1080p', 'hd': True, 'size': (4000, 20000), 'label': '1080p', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv', 'm2ts'], 'tags': ['m2ts']},
+        {'identifier': '720p', 'hd': True, 'size': (3000, 10000), 'label': '720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv', 'ts']},
+        {'identifier': 'brrip', 'hd': True, 'size': (700, 7000), 'label': 'BR-Rip', 'alternative': ['bdrip'], 'allow': ['720p', '1080p'], 'ext':['avi']},
         {'identifier': 'dvdr', 'size': (3000, 10000), 'label': 'DVD-R', 'alternative': [], 'allow': [], 'ext':['iso', 'img'], 'tags': ['pal', 'ntsc', 'video_ts', 'audio_ts']},
-        {'identifier': 'dvdrip', 'size': (600, 2400), 'label': 'DVD-Rip', 'width': 720, 'alternative': ['dvdrip'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']},
-        {'identifier': 'scr', 'size': (600, 1600), 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip'], 'allow': ['dvdr', 'dvd'], 'ext':['avi', 'mpg', 'mpeg']},
-        {'identifier': 'r5', 'size': (600, 1000), 'label': 'R5', 'alternative': [], 'allow': ['dvdr'], 'ext':['avi', 'mpg', 'mpeg']},
+        {'identifier': 'dvdrip', 'size': (600, 2400), 'label': 'DVD-Rip', 'width': 720, 'alternative': ['dvdrip'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]},
+        {'identifier': 'scr', 'size': (600, 1600), 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip', 'dvdscreener'], 'allow': ['dvdr', 'dvd'], 'ext':['avi', 'mpg', 'mpeg']},
+        {'identifier': 'r5', 'size': (600, 1000), 'label': 'R5', 'alternative': ['r6'], 'allow': ['dvdr'], 'ext':['avi', 'mpg', 'mpeg']},
         {'identifier': 'tc', 'size': (600, 1000), 'label': 'TeleCine', 'alternative': ['telecine'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']},
-        {'identifier': 'ts', 'size': (600, 1000), 'label': 'TeleSync', 'alternative': ['telesync'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']},
+        {'identifier': 'ts', 'size': (600, 1000), 'label': 'TeleSync', 'alternative': ['telesync', 'hdts'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']},
         {'identifier': 'cam', 'size': (600, 1000), 'label': 'Cam', 'alternative': ['camrip', 'hdcam'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']}
     ]
     pre_releases = ['cam', 'ts', 'tc', 'r5', 'scr']
@@ -50,12 +50,12 @@ class QualityPlugin(Plugin):
     def preReleases(self):
         return self.pre_releases
 
-    def allView(self):
+    def allView(self, **kwargs):
 
-        return jsonified({
+        return {
             'success': True,
             'list': self.all()
-        })
+        }
 
     def all(self):
 
@@ -68,7 +68,6 @@ class QualityPlugin(Plugin):
             q = mergeDicts(self.getQuality(quality.identifier), quality.to_dict())
             temp.append(q)
 
-        #db.close()
         return temp
 
     def single(self, identifier = ''):
@@ -76,11 +75,10 @@ class QualityPlugin(Plugin):
         db = get_session()
         quality_dict = {}
 
-        quality = db.query(Quality).filter_by(identifier = identifier).first()
+        quality = db.query(Quality).filter(or_(Quality.identifier == identifier, Quality.id == identifier)).first()
         if quality:
             quality_dict = dict(self.getQuality(quality.identifier), **quality.to_dict())
 
-        #db.close()
         return quality_dict
 
     def getQuality(self, identifier):
@@ -89,21 +87,18 @@ class QualityPlugin(Plugin):
             if identifier == q.get('identifier'):
                 return q
 
-    def saveSize(self):
-
-        params = getParams()
+    def saveSize(self, **kwargs):
 
         db = get_session()
-        quality = db.query(Quality).filter_by(identifier = params.get('identifier')).first()
+        quality = db.query(Quality).filter_by(identifier = kwargs.get('identifier')).first()
 
         if quality:
-            setattr(quality, params.get('value_type'), params.get('value'))
+            setattr(quality, kwargs.get('value_type'), kwargs.get('value'))
             db.commit()
 
-        #db.close()
-        return jsonified({
+        return {
             'success': True
-        })
+        }
 
     def fill(self):
 
@@ -113,46 +108,48 @@ class QualityPlugin(Plugin):
         for q in self.qualities:
 
             # Create quality
-            quality = db.query(Quality).filter_by(identifier = q.get('identifier')).first()
+            qual = db.query(Quality).filter_by(identifier = q.get('identifier')).first()
 
-            if not quality:
+            if not qual:
                 log.info('Creating quality: %s', q.get('label'))
-                quality = Quality()
-                db.add(quality)
+                qual = Quality()
+                qual.order = order
+                qual.identifier = q.get('identifier')
+                qual.label = toUnicode(q.get('label'))
+                qual.size_min, qual.size_max = q.get('size')
 
-            quality.order = order
-            quality.identifier = q.get('identifier')
-            quality.label = toUnicode(q.get('label'))
-            quality.size_min, quality.size_max = q.get('size')
+                db.add(qual)
 
             # Create single quality profile
-            profile = db.query(Profile).filter(
+            prof = db.query(Profile).filter(
                     Profile.core == True
                 ).filter(
-                    Profile.types.any(quality = quality)
+                    Profile.types.any(quality = qual)
                 ).all()
 
-            if not profile:
+            if not prof:
                 log.info('Creating profile: %s', q.get('label'))
-                profile = Profile(
+                prof = Profile(
                     core = True,
-                    label = toUnicode(quality.label),
+                    label = toUnicode(qual.label),
                     order = order
                 )
-                db.add(profile)
+                db.add(prof)
 
                 profile_type = ProfileType(
-                    quality = quality,
-                    profile = profile,
+                    quality = qual,
+                    profile = prof,
                     finish = True,
                     order = 0
                 )
-                profile.types.append(profile_type)
+                prof.types.append(profile_type)
 
             order += 1
-            db.commit()
 
-        #db.close()
+        db.commit()
+
+        time.sleep(0.3) # Wait a moment
+
         return True
 
     def guess(self, files, extra = {}):
@@ -163,7 +160,6 @@ class QualityPlugin(Plugin):
         if cached and extra is {}: return cached
 
         for cur_file in files:
-            size = (os.path.getsize(cur_file) / 1024 / 1024) if os.path.isfile(cur_file) else 0
             words = re.split('\W+', cur_file.lower())
 
             for quality in self.all():
@@ -187,24 +183,30 @@ class QualityPlugin(Plugin):
                     return self.setCache(hash, quality)
 
         # Try again with loose testing
-        quality = self.guessLoose(hash, extra = extra)
+        quality = self.guessLoose(hash, files = files, extra = extra)
         if quality:
             return self.setCache(hash, quality)
 
         log.debug('Could not identify quality for: %s', files)
         return None
 
-    def guessLoose(self, hash, extra):
+    def guessLoose(self, hash, files = None, extra = None):
 
-        for quality in self.all():
+        if extra:
+            for quality in self.all():
 
-            # Last check on resolution only
-            if quality.get('width', 480) == extra.get('resolution_width', 0):
-                log.debug('Found %s via resolution_width: %s == %s', (quality['identifier'], quality.get('width', 480), extra.get('resolution_width', 0)))
-                return self.setCache(hash, quality)
+                # Check width resolution, range 20
+                if quality.get('width') and (quality.get('width') - 20) <= extra.get('resolution_width', 0) <= (quality.get('width') + 20):
+                    log.debug('Found %s via resolution_width: %s == %s', (quality['identifier'], quality.get('width'), extra.get('resolution_width', 0)))
+                    return self.setCache(hash, quality)
 
-        if 480 <= extra.get('resolution_width', 0) <= 720:
-            log.debug('Found as dvdrip')
-            return self.setCache(hash, self.single('dvdrip'))
+                # Check height resolution, range 20
+                if quality.get('height') and (quality.get('height') - 20) <= extra.get('resolution_height', 0) <= (quality.get('height') + 20):
+                    log.debug('Found %s via resolution_height: %s == %s', (quality['identifier'], quality.get('height'), extra.get('resolution_height', 0)))
+                    return self.setCache(hash, quality)
+
+            if 480 <= extra.get('resolution_width', 0) <= 720:
+                log.debug('Found as dvdrip')
+                return self.setCache(hash, self.single('dvdrip'))
 
         return None