One up

http://passthepopcorn.me/forums.php?action=viewthread&threadid=15602&post=68#post535328

CouchPotato.py

@@ -100,7 +100,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())

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):
 
@@ -37,3 +39,4 @@ Linux (ubuntu / debian):
 * 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/`

couchpotato/core/_base/_core/main.py

@@ -9,6 +9,7 @@ from tornado.ioloop import IOLoop
 from uuid import uuid4
 import os
 import platform
+import signal
 import time
 import traceback
 import webbrowser
@@ -51,6 +52,8 @@ 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
+        self.signalHandler()
 
     def md5Password(self, value):
         return md5(value.encode(Env.get('encoding'))) if value else ''
@@ -66,7 +69,7 @@ class Core(Plugin):
 
     def available(self):
         return jsonified({
-            'succes': True
+            'success': True
         })
 
     def shutdown(self):
@@ -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
@@ -170,3 +173,10 @@ class Core(Plugin):
         return jsonified({
             'version': self.version()
         })
+
+    def signalHandler(self):
+
+        def signal_handler(signal, frame):
+            fireEvent('app.do_shutdown')
+
+        signal.signal(signal.SIGINT, signal_handler)

couchpotato/core/_base/updater/main.py

@@ -8,11 +8,9 @@ from couchpotato.environment import Env
 from datetime import datetime
 from dateutil.parser import parse
 from git.repository import LocalRepository
-import atexit
 import json
 import os
 import shutil
-import sys
 import tarfile
 import time
 import traceback

couchpotato/core/downloaders/base.py

@@ -18,6 +18,20 @@ class Downloader(Plugin):
         'http://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.getAllDownloadStatus)

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()
@@ -16,7 +17,7 @@ config = [{
             'options': [
                 {
                     'name': 'enabled',
-                    'default': 0,
+                    'default': True,
                     'type': 'enabler',
                     'radio_group': 'nzb,torrent',
                 },
@@ -24,6 +25,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/sabnzbd/main.py

@@ -28,7 +28,7 @@ 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

couchpotato/core/downloaders/synology/__init__.py

@@ -0,0 +1,44 @@
+from .main import Synology
+
+def start():
+    return Synology()
+
+config = [{
+    'name': 'synology',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'name': 'synology',
+            'label': 'Synology',
+            'description': 'Send torrents to Synology\'s Download Station.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                    'radio_group': 'torrent',
+                },
+                {
+                    'name': 'host',
+                    'default': 'localhost:5000',
+                    'description': 'Hostname with port. Usually <strong>localhost:5000</strong>',
+                },
+                {
+                    'name': 'username',
+                },
+                {
+                    'name': 'password',
+                    'type': 'password',
+                },
+                {
+                    '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,108 @@
+from couchpotato.core.downloaders.base import Downloader
+from couchpotato.core.helpers.encoding import isInt
+from couchpotato.core.logger import CPLog
+import httplib
+import json
+import urllib
+import urllib2
+
+
+log = CPLog(__name__)
+
+class Synology(Downloader):
+
+    type = ['torrent_magnet']
+    log = CPLog(__name__)
+
+    def download(self, data, movie, manual = False, filedata = None):
+
+        if self.isDisabled(manual) or not self.isCorrectType(data.get('type')):
+            return
+
+        log.error('Sending "%s" (%s) to Synology.', (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
+
+        if data.get('type') == 'torrent':
+            log.error('Can\'t add binary torrent file')
+            return False
+
+        try:
+            # Send request to Transmission
+            srpc = SynologyRPC(host[0], host[1], self.conf('username'), self.conf('password'))
+            remote_torrent = srpc.add_torrent_uri(data.get('url'))
+            log.info('Response: %s', remote_torrent)
+            return remote_torrent['success']
+        except Exception, err:
+            log.error('Exception while adding torrent: %s', err)
+            return False
+
+
+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'] == True:
+                self.sid = response['data']['sid']
+                log.debug('Sid=%s', self.sid)
+            return response
+        elif self.username or self.password:
+            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):
+        req_url = url + '?' + urllib.urlencode(args)
+        try:
+            req_open = urllib2.urlopen(req_url)
+            response = json.loads(req_open.read())
+            if response['success'] == True:
+                log.info('Synology action successfull')
+            return response
+        except httplib.InvalidURL, err:
+            log.error('Invalid Transmission host, check your config %s', err)
+            return False
+        except urllib2.HTTPError, err:
+            log.error('SynologyRPC HTTPError: %s', err)
+            return False
+        except urllib2.URLError, err:
+            log.error('Unable to connect to Synology %s', err)
+            return False
+
+    def add_torrent_uri(self, torrent):
+        log.info('Adding torrent URL %s', torrent)
+        response = {}
+        # login
+        login = self._login()
+        if len(login) > 0 and login['success'] == True:
+            log.info('Login success, adding torrent')
+            args = {'api':'SYNO.DownloadStation.Task', 'version':1, 'method':'create', 'uri':torrent, '_sid':self.sid}
+            response = self._req(self.download_url, args)
+            self._logout()
+        else:
+            log.error('Couldn\'t login to Synology, %s', login)
+        return response
+
+

couchpotato/core/downloaders/transmission/main.py

@@ -30,9 +30,15 @@ class Transmission(Downloader):
             return False
 
         # Set parameters for Transmission
+        folder_name = self.createFileName(data, filedata, movie)[:-len(data.get('type')) - 1]
+        folder_path = os.path.join(self.conf('directory', default = ''), folder_name).rstrip(os.path.sep)
+
+        # Create the empty folder to download too
+        self.makeDir(folder_path)
+
         params = {
             'paused': self.conf('paused', default = 0),
-            'download-dir': self.conf('directory', default = '').rstrip(os.path.sep)
+            'download-dir': folder_path
         }
 
         torrent_params = {
@@ -49,6 +55,7 @@ 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)
 

couchpotato/core/downloaders/utorrent/__init__.py

@@ -0,0 +1,54 @@
+from .main import uTorrent
+
+def start():
+    return uTorrent()
+
+config = [{
+    'name': 'utorrent',
+    'groups': [
+        {
+            'tab': 'downloaders',
+            'name': 'utorrent',
+            'label': 'uTorrent',
+            'description': 'Send torrents to uTorrent.',
+            '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,138 @@
+from bencode import bencode, bdecode
+from couchpotato.core.downloaders.base import Downloader
+from couchpotato.core.helpers.encoding import isInt
+from couchpotato.core.logger import CPLog
+from hashlib import sha1
+from multipartpost import MultipartPostHandler
+import cookielib
+import httplib
+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, manual = False, filedata = None):
+
+        if self.isDisabled(manual) or not self.isCorrectType(data.get('type')):
+            return
+
+        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)
+
+        # 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 True
+        except Exception, err:
+            log.error('Failed to send torrent to uTorrent: %s', err)
+            return False
+
+
+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()
+            log.debug('response: %s', response)
+            if response:
+                log.debug('uTorrent action successfull')
+                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": (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)

couchpotato/core/event.py

@@ -63,11 +63,21 @@ def fireEvent(name, *args, **kwargs):
             except: pass
 
         e = events[name]
-        if not options['in_order']: e.lock.acquire()
+
+        # Lock this event
+        e.lock.acquire()
+
         e.asynchronous = False
-        e.in_order = options['in_order']
+
+        # 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']
+
+        # Fire
         result = e(*args, **kwargs)
-        if not options['in_order']: e.lock.release()
+
+        # Release lock for this event
+        e.lock.release()
 
         if options['single'] and not options['merge']:
             results = None

couchpotato/core/helpers/variable.py

@@ -9,15 +9,34 @@ import sys
 
 log = CPLog(__name__)
 
+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():
@@ -84,7 +103,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 +111,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
 

couchpotato/core/logger.py

@@ -17,6 +17,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))
 
@@ -53,7 +56,8 @@ class CPLog(object):
         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/notifications/xbmc/main.py

@@ -3,6 +3,7 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 from flask.helpers import json
 import base64
+import traceback
 
 log = CPLog(__name__)
 
@@ -22,9 +23,12 @@ class XBMC(Notification):
                 ('VideoLibrary.Scan', {}),
             ])
 
-            for result in response:
-                if result['result'] == "OK":
-                    successful += 1
+            try:
+                for result in response:
+                    if result['result'] == "OK":
+                        successful += 1
+            except:
+                log.error('Failed parsing results: %s', traceback.format_exc())
 
         return successful == len(hosts) * 2
 
@@ -50,10 +54,14 @@ class XBMC(Notification):
             base64string = base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password'))).replace('\n', '')
             headers['Authorization'] = 'Basic %s' % base64string
 
-        log.debug('Sending request to %s: %s', (host, data))
-        rdata = self.urlopen(server, headers = headers, params = data, multipart = True)
-        response = json.loads(rdata)
-        log.debug('Returned from request %s: %s', (host, response))
+        try:
+            log.debug('Sending request to %s: %s', (host, data))
+            rdata = self.urlopen(server, headers = headers, params = data, multipart = True)
+            response = json.loads(rdata)
+            log.debug('Returned from request %s: %s', (host, response))
 
-        return response
+            return response
+        except:
+            log.error('Failed sending request to XBMC: %s', traceback.format_exc())
+            return []
 

couchpotato/core/plugins/base.py

@@ -35,7 +35,7 @@ class Plugin(object):
     http_failed_disabled = {}
 
     def registerPlugin(self):
-        addEvent('app.shutdown', self.doShutdown)
+        addEvent('app.do_shutdown', self.doShutdown)
         addEvent('plugin.running', self.isRunning)
 
     def conf(self, attr, value = None, default = None):
@@ -114,8 +114,11 @@ class Plugin(object):
         # 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]

couchpotato/core/plugins/browser/main.py

@@ -1,5 +1,6 @@
 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
@@ -65,15 +66,7 @@ class FileBrowser(Plugin):
     def view(self):
 
         path = getParam('path', '/')
-
-        # Set proper home dir for some systems
-        try:
-            import pwd
-            os.environ['HOME'] = pwd.getpwuid(os.geteuid()).pw_dir
-        except:
-            pass
-
-        home = os.path.expanduser('~')
+        home = getUserDir()
 
         if not path:
             path = home

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

@@ -300,10 +300,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': {

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

@@ -479,29 +479,32 @@ var ReleaseAction = new Class({
 				self.release_container.getElement('#release_'+self.next_release.id).addClass('next_release');
 			}
 
-			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
-			)
+			if(self.next_release || self.last_release){
+
+				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
+				)
+			}
 
 		}
 

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

@@ -91,10 +91,15 @@
 	.movie_result {
 		overflow: hidden;
 		height: 140px;
+		position: relative;
 	}
 
 		.movie_result .options {
-			height: 140px;
+			position: absolute;
+			height: 100%;
+			width: 100%;
+			top: 0;
+			left: 0;
 			border: 1px solid transparent;
 			border-width: 1px 0;
 			border-radius: 0;
@@ -133,17 +138,21 @@
 
 		.movie_result .data {
 			padding: 0 15px;
-			width: 470px;
-			position: relative;
-			height: 140px;
+			position: absolute;
+			height: 100%;
+			width: 100%;
 			top: 0;
-			margin: -140px 0 0 0;
+			left: 0;
 			background: #5c697b;
 			cursor: pointer;
 
 			border-bottom: 1px solid #333;
 			border-top: 1px solid rgba(255,255,255, 0.15);
+			transition: all .6s cubic-bezier(0.9,0,0.1,1);
 		}
+			.movie_result .data.open {
+				left: 100%;
+			}
 
 			.movie_result:last-child .data { border-bottom: 0; }
 
@@ -193,4 +202,9 @@
 
 .search_form .mask {
 	border-radius: 3px;
+	position: absolute;
+	height: 100%;
+	width: 100%;
+	left: 0;
+	top: 0;
 }

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

@@ -19,7 +19,9 @@ Block.Search = new Class({
 								self.hideResults(false)
 						},
 						'blur': function(){
-							self.el.removeClass('focused')
+							(function(){
+								self.el.removeClass('focused')
+							}).delay(2000);
 						}
 					}
 				}),
@@ -117,7 +119,7 @@ Block.Search = new Class({
 		self.hideResults(false);
 
 		if(!cache){
-			self.positionMask().fade('in');
+			self.mask.fade('in');
 
 			if(!self.spinner)
 				self.spinner = createSpinner(self.mask);
@@ -139,7 +141,6 @@ Block.Search = new Class({
 	fill: function(q, json){
 		var self = this;
 
-		self.positionMask()
 		self.cache[q] = json
 
 		self.movies = {}
@@ -168,19 +169,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,7 +181,7 @@ Block.Search = new Class({
 
 Block.Search.Item = new Class({
 
-	initialize: function(info){
+	initialize: function(info, options){
 		var self = this;
 
 		self.info = info;
@@ -203,14 +191,13 @@ 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.options_el = new Element('div.options.inlay'),
 			self.data_container = new Element('div.data', {
 				'tween': {
 					duration: 400,
@@ -273,11 +260,7 @@ Block.Search.Item = new Class({
 
 		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,28 +285,31 @@ 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');
 			},
 			'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.hasClass('set')){
+		if(!self.options_el.hasClass('set')){
 
 			if(self.info.in_library){
 				var in_library = [];
@@ -332,10 +318,10 @@ Block.Search.Item = new Class({
 				});
 			}
 
-			self.options.adopt(
+			self.options_el.grab(
 				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],
+					self.thumbnail = (info.images && info.images.poster.length > 0) ? new Element('img.thumbnail', {
+						'src': info.images.poster[0],
 						'height': null,
 						'width': null
 					}) : null,
@@ -372,7 +358,7 @@ Block.Search.Item = new Class({
 				}).inject(self.profile_select)
 			});
 
-			self.options.addClass('set');
+			self.options_el.addClass('set');
 		}
 
 	},
@@ -380,17 +366,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('span.mask').inject(self.el).fade('hide')
 
 		createSpinner(self.mask)
 		self.mask.fade('in')

couchpotato/core/plugins/quality/main.py

@@ -22,11 +22,11 @@ class QualityPlugin(Plugin):
         {'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': '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': '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'], 'allow': ['dvdr', 'dvd'], 'ext':['avi', 'mpg', 'mpeg']},
         {'identifier': 'r5', 'size': (600, 1000), 'label': 'R5', 'alternative': [], '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']

couchpotato/core/plugins/renamer/__init__.py

@@ -82,6 +82,15 @@ config = [{
                     'unit': 'min(s)',
                     'description': 'Detect movie status every X minutes. Will start the renamer if movie is <strong>completed</strong> or handle <strong>failed</strong> download if these options are enabled',
                 },
+                {
+                    'advanced': True,
+                    'name': 'force_every',
+                    'label': 'Force every',
+                    'default': 2,
+                    'type': 'int',
+                    'unit': 'hour(s)',
+                    'description': 'Forces the renamer to scan every X hours',
+                },
                 {
                     'advanced': True,
                     'name': 'next_on_failed',

couchpotato/core/plugins/renamer/main.py

@@ -34,8 +34,11 @@ class Renamer(Plugin):
 
         addEvent('app.load', self.scan)
 
-        fireEvent('schedule.interval', 'renamer.check_snatched', self.checkSnatched, minutes = self.conf('run_every'))
-        fireEvent('schedule.interval', 'renamer.check_snatched_forced', self.scan, hours = 2)
+        if self.conf('run_every') > 0:
+            fireEvent('schedule.interval', 'renamer.check_snatched', self.checkSnatched, minutes = self.conf('run_every'))
+
+        if self.conf('force_every') > 0:
+            fireEvent('schedule.interval', 'renamer.check_snatched_forced', self.scan, hours = self.conf('force_every'))
 
     def scanView(self):
 
@@ -383,7 +386,10 @@ class Renamer(Plugin):
 
             # Notify on download, search for trailers etc
             download_message = 'Downloaded %s (%s)' % (movie_title, replacements['quality'])
-            fireEvent('renamer.after', message = download_message, group = group, in_order = True)
+            try:
+                fireEvent('renamer.after', message = download_message, group = group, in_order = True)
+            except:
+                log.error('Failed firing (some) of the renamer.after events: %s', traceback.format_exc())
 
             # Break if CP wants to shut down
             if self.shuttingDown():

couchpotato/core/plugins/scanner/main.py

@@ -23,7 +23,7 @@ class Scanner(Plugin):
         'media': 314572800, # 300MB
         'trailer': 1048576, # 1MB
     }
-    ignored_in_path = ['_unpack', '_failed_', '_unknown_', '_exists_', '_failed_remove_', '_failed_rename_', '.appledouble', '.appledb', '.appledesktop', os.path.sep + '._', '.ds_store', 'cp.cpnfo'] #unpacking, smb-crap, hidden files
+    ignored_in_path = ['extracting', '_unpack', '_failed_', '_unknown_', '_exists_', '_failed_remove_', '_failed_rename_', '.appledouble', '.appledb', '.appledesktop', os.path.sep + '._', '.ds_store', 'cp.cpnfo'] #unpacking, smb-crap, hidden files
     ignore_names = ['extract', 'extracting', 'extracted', 'movie', 'movies', 'film', 'films', 'download', 'downloads', 'video_ts', 'audio_ts', 'bdmv', 'certificate']
     extensions = {
         'movie': ['mkv', 'wmv', 'avi', 'mpg', 'mpeg', 'mp4', 'm2ts', 'iso', 'img', 'mdf', 'ts', 'm4v'],
@@ -53,6 +53,20 @@ class Scanner(Plugin):
         'video': ['x264', 'h264', 'divx', 'xvid']
     }
 
+    audio_codec_map = {
+        0x2000: 'ac3',
+        0x2001: 'dts',
+        0x0055: 'mp3',
+        0x0050: 'mp2',
+        0x0001: 'pcm',
+        0x003: 'pcm',
+        0x77a1: 'tta1',
+        0x5756: 'wav',
+        0x6750: 'vorbis',
+        0xF1AC: 'flac',
+        0x00ff: 'aac',
+    }
+
     source_media = {
         'bluray': ['bluray', 'blu-ray', 'brrip', 'br-rip'],
         'hddvd': ['hddvd', 'hd-dvd'],
@@ -331,7 +345,7 @@ class Scanner(Plugin):
                 continue
 
             log.debug('Getting metadata for %s', identifier)
-            group['meta_data'] = self.getMetaData(group)
+            group['meta_data'] = self.getMetaData(group, folder = folder)
 
             # Subtitle meta
             group['subtitle_language'] = self.getSubtitleLanguage(group) if not simple else {}
@@ -381,7 +395,7 @@ class Scanner(Plugin):
 
         return processed_movies
 
-    def getMetaData(self, group):
+    def getMetaData(self, group, folder = ''):
 
         data = {}
         files = list(group['files']['movie'])
@@ -410,7 +424,7 @@ class Scanner(Plugin):
         data['quality_type'] = 'HD' if data.get('resolution_width', 0) >= 1280 else 'SD'
 
         filename = re.sub('(.cp\(tt[0-9{7}]+\))', '', files[0])
-        data['group'] = self.getGroup(filename)
+        data['group'] = self.getGroup(filename[len(folder):])
         data['source'] = self.getSourceMedia(filename)
 
         return data
@@ -419,9 +433,18 @@ class Scanner(Plugin):
 
         try:
             p = enzyme.parse(filename)
+
+            # Video codec
+            vc = ('h264' if p.video[0].codec == 'AVC1' else p.video[0].codec).lower()
+
+            # Audio codec
+            ac = p.audio[0].codec
+            try: ac = self.audio_codec_map.get(p.audio[0].codec)
+            except: pass
+
             return {
-                'video': p.video[0].codec,
-                'audio': p.audio[0].codec,
+                'video': vc,
+                'audio': ac,
                 'resolution_width': tryInt(p.video[0].width),
                 'resolution_height': tryInt(p.video[0].height),
             }
@@ -738,8 +761,8 @@ class Scanner(Plugin):
 
     def getGroup(self, file):
         try:
-            match = re.search('-(?P<group>[A-Z0-9]+).', file, re.I)
-            return match.group('group') or ''
+            match = re.findall('\-([A-Z0-9]+)[\.\/]', file, re.I)
+            return match[-1] or ''
         except:
             return ''
 

couchpotato/core/plugins/searcher/__init__.py

@@ -24,18 +24,19 @@ config = [{
                     'name': 'required_words',
                     'label': 'Required words',
                     'default': '',
-                    'description': 'Ignore releases that don\'t contain at least one of these words.'
+                    'placeholder': 'Example: DTS, AC3 & English',
+                    'description': 'Ignore releases that don\'t contain at least one set of words. Sets are separated by "," and each word within a set must be separated with "&"'
                 },
                 {
                     'name': 'ignored_words',
                     'label': 'Ignored words',
-                    'default': 'german, dutch, french, truefrench, danish, swedish, spanish, italian, korean, dubbed, swesub, korsub',
+                    'default': 'german, dutch, french, truefrench, danish, swedish, spanish, italian, korean, dubbed, swesub, korsub, dksubs',
                 },
                 {
                     'name': 'preferred_method',
                     'label': 'First search',
                     'description': 'Which of the methods do you prefer',
-                    'default': 'nzb',
+                    'default': 'both',
                     'type': 'dropdown',
                     'values': [('usenet & torrents', 'both'), ('usenet', 'nzb'), ('torrents', 'torrent')],
                 },

couchpotato/core/plugins/searcher/main.py

@@ -3,7 +3,7 @@ from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
 from couchpotato.core.helpers.encoding import simplifyString, toUnicode
 from couchpotato.core.helpers.request import jsonified, getParam
-from couchpotato.core.helpers.variable import md5, getTitle
+from couchpotato.core.helpers.variable import md5, getTitle, splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.core.settings.model import Movie, Release, ReleaseInfo
@@ -204,6 +204,10 @@ class Searcher(Plugin):
 
 
                 for nzb in sorted_results:
+                    if not quality_type.get('finish', False) and quality_type.get('wait_for', 0) > 0 and nzb.get('age') <= quality_type.get('wait_for', 0):
+                        log.info('Ignored, waiting %s days: %s', (quality_type.get('wait_for'), nzb['name']))
+                        continue
+
                     if nzb['status_id'] == ignored_status.get('id'):
                         log.info('Ignored: %s', nzb['name'])
                         continue
@@ -239,7 +243,7 @@ class Searcher(Plugin):
         filedata = None
         if data.get('download') and (ismethod(data.get('download')) or isfunction(data.get('download'))):
             filedata = data.get('download')(url = data.get('url'), nzb_id = data.get('id'))
-            if filedata is 'try_next':
+            if filedata == 'try_next':
                 return filedata
 
         successful = fireEvent('download', data = data, movie = movie, manual = manual, filedata = filedata, single = True)
@@ -294,23 +298,28 @@ class Searcher(Plugin):
         retention = Env.setting('retention', section = 'nzb')
 
         if nzb.get('seeds') is None and 0 < retention < nzb.get('age', 0):
-            log.info('Wrong: Outside retention, age is %s, needs %s or lower: %s', (nzb['age'], retention, nzb['name']))
+            log.info2('Wrong: Outside retention, age is %s, needs %s or lower: %s', (nzb['age'], retention, nzb['name']))
             return False
 
         movie_name = getTitle(movie['library'])
         movie_words = re.split('\W+', simplifyString(movie_name))
         nzb_name = simplifyString(nzb['name'])
         nzb_words = re.split('\W+', nzb_name)
-        required_words = [x.strip().lower() for x in self.conf('required_words').lower().split(',')]
+        required_words = splitString(self.conf('required_words').lower())
 
-        if self.conf('required_words') and not list(set(nzb_words) & set(required_words)):
-            log.info("Wrong: Required word missing: %s" % nzb['name'])
+        req_match = 0
+        for req_set in required_words:
+            req = splitString(req_set, '&')
+            req_match += len(list(set(nzb_words) & set(req))) == len(req)
+
+        if self.conf('required_words') and req_match == 0:
+            log.info2("Wrong: Required word missing: %s" % nzb['name'])
             return False
 
-        ignored_words = [x.strip().lower() for x in self.conf('ignored_words').split(',')]
+        ignored_words = splitString(self.conf('ignored_words').lower())
         blacklisted = list(set(nzb_words) & set(ignored_words))
         if self.conf('ignored_words') and blacklisted:
-            log.info("Wrong: '%s' blacklisted words: %s" % (nzb['name'], ", ".join(blacklisted)))
+            log.info2("Wrong: '%s' blacklisted words: %s" % (nzb['name'], ", ".join(blacklisted)))
             return False
 
         pron_tags = ['xxx', 'sex', 'anal', 'tits', 'fuck', 'porn', 'orgy', 'milf', 'boobs', 'erotica', 'erotic']
@@ -324,18 +333,18 @@ class Searcher(Plugin):
 
         # Contains lower quality string
         if self.containsOtherQuality(nzb, movie_year = movie['library']['year'], preferred_quality = preferred_quality):
-            log.info('Wrong: %s, looking for %s', (nzb['name'], quality['label']))
+            log.info2('Wrong: %s, looking for %s', (nzb['name'], quality['label']))
             return False
 
 
         # File to small
         if nzb['size'] and preferred_quality['size_min'] > nzb['size']:
-            log.info('"%s" is too small to be %s. %sMB instead of the minimal of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_min']))
+            log.info2('Wrong: "%s" is too small to be %s. %sMB instead of the minimal of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_min']))
             return False
 
         # File to large
         if nzb['size'] and preferred_quality.get('size_max') < nzb['size']:
-            log.info('"%s" is too large to be %s. %sMB instead of the maximum of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_max']))
+            log.info2('Wrong: "%s" is too large to be %s. %sMB instead of the maximum of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_max']))
             return False
 
 
@@ -389,9 +398,14 @@ class Searcher(Plugin):
             if list(set(nzb_words) & set(quality['alternative'])):
                 found[quality['identifier']] = True
 
+        # Try guessing via quality tags
+        guess = fireEvent('quality.guess', [nzb.get('name')], single = True)
+        if guess:
+            found[guess['identifier']] = True
+
         # Hack for older movies that don't contain quality tag
         year_name = fireEvent('scanner.name_year', name, single = True)
-        if movie_year < datetime.datetime.now().year - 3 and not year_name.get('year', None):
+        if len(found) == 0 and movie_year < datetime.datetime.now().year - 3 and not year_name.get('year', None):
             if size > 3000: # Assume dvdr
                 log.info('Quality was missing in name, assuming it\'s a DVD-R based on the size: %s', (size))
                 found['dvdr'] = True

couchpotato/core/plugins/status/main.py

@@ -22,6 +22,7 @@ class StatusPlugin(Plugin):
         'failed': 'Failed',
         'deleted': 'Deleted',
         'ignored': 'Ignored',
+        'available': 'Available',
     }
 
     def __init__(self):

couchpotato/core/plugins/userscript/main.py

@@ -21,6 +21,7 @@ class Userscript(Plugin):
         addApiView('userscript.get/<random>/<path:filename>', self.getUserScript, static = True)
         addApiView('userscript', self.iFrame)
         addApiView('userscript.add_via_url', self.getViaUrl)
+        addApiView('userscript.includes', self.getIncludes)
         addApiView('userscript.bookmark', self.bookmark)
 
         addEvent('userscript.get_version', self.getVersion)
@@ -35,6 +36,13 @@ class Userscript(Plugin):
 
         return self.renderTemplate(__file__, 'bookmark.js', **params)
 
+    def getIncludes(self):
+
+        return jsonified({
+            'includes': fireEvent('userscript.get_includes', merge = True),
+            'excludes': fireEvent('userscript.get_excludes', merge = True),
+        })
+
     def getUserScript(self, random = '', filename = ''):
 
         params = {

couchpotato/core/plugins/wizard/static/wizard.js

@@ -9,7 +9,7 @@ Page.Wizard = new Class({
 	headers: {
 		'welcome': {
 			'title': 'Welcome to the new CouchPotato',
-			'description': 'To get started, fill in each of the following settings as much as your can. <br />Maybe first start with importing your movies from the previous CouchPotato',
+			'description': 'To get started, fill in each of the following settings as much as you can. <br />Maybe first start with importing your movies from the previous CouchPotato',
 			'content': new Element('div', {
 				'styles': {
 					'margin': '0 0 0 30px'
@@ -37,7 +37,7 @@ Page.Wizard = new Class({
 		},
 		'downloaders': {
 			'title': 'What download apps are you using?',
-			'description': 'CP needs an external download app to work with. Choose one below. For more downloaders check settings after you have filled in the wizard. If your download app isn\'t in the list, use Blackhole.'
+			'description': 'CP needs an external download app to work with. Choose one below. For more downloaders check settings after you have filled in the wizard. If your download app isn\'t in the list, use the default Blackhole.'
 		},
 		'providers': {
 			'title': 'Are you registered at any of these sites?',

couchpotato/core/providers/automation/imdb/main.py

@@ -1,9 +1,8 @@
 from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import md5, getImdb
+from couchpotato.core.helpers.variable import md5, getImdb, splitString, tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.providers.automation.base import Automation
 import traceback
-import xml.etree.ElementTree as XMLTree
 
 log = CPLog(__name__)
 
@@ -19,30 +18,25 @@ class IMDB(Automation, RSS):
 
         movies = []
 
-        enablers = self.conf('automation_urls_use').split(',')
+        enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
+        urls = splitString(self.conf('automation_urls'))
 
         index = -1
-        for rss_url in self.conf('automation_urls').split(','):
+        for url in urls:
 
             index += 1
             if not enablers[index]:
                 continue
-            elif 'rss.imdb' not in rss_url:
-                log.error('This isn\'t the correct url.: %s', rss_url)
-                continue
 
             try:
-                cache_key = 'imdb.rss.%s' % md5(rss_url)
+                cache_key = 'imdb.rss.%s' % md5(url)
+                rss_data = self.getCache(cache_key, url)
+                imdbs = getImdb(rss_data, multiple = True)
 
-                rss_data = self.getCache(cache_key, rss_url)
-                data = XMLTree.fromstring(rss_data)
-                rss_movies = self.getElements(data, 'channel/item')
-
-                for movie in rss_movies:
-                    imdb = getImdb(self.getTextElement(movie, "link"))
+                for imdb in imdbs:
                     movies.append(imdb)
 
             except:
-                log.error('Failed loading IMDB watchlist: %s %s', (rss_url, traceback.format_exc()))
+                log.error('Failed loading IMDB watchlist: %s %s', (url, traceback.format_exc()))
 
         return movies

couchpotato/core/providers/base.py

@@ -4,8 +4,11 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
 from urlparse import urlparse
+import cookielib
 import re
 import time
+import traceback
+import urllib2
 
 
 log = CPLog(__name__)
@@ -47,6 +50,8 @@ class YarrProvider(Provider):
     sizeMb = ['mb', 'mib']
     sizeKb = ['kb', 'kib']
 
+    login_opener = None
+
     def __init__(self):
         addEvent('provider.belongs_to', self.belongsTo)
 
@@ -55,8 +60,41 @@ class YarrProvider(Provider):
 
         addEvent('nzb.feed', self.feed)
 
+    def login(self):
+
+        try:
+            cookiejar = cookielib.CookieJar()
+            opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookiejar))
+            urllib2.install_opener(opener)
+            log.info2('Logging into %s', self.urls['login'])
+            f = opener.open(self.urls['login'], self.getLoginParams())
+            f.read()
+            f.close()
+            self.login_opener = opener
+            return True
+        except:
+            log.error('Failed to login %s: %s', (self.getName(), traceback.format_exc()))
+
+        return False
+
+    def loginDownload(self, url = '', nzb_id = ''):
+        try:
+            if not self.login_opener and not self.login():
+                log.error('Failed downloading from %s', self.getName())
+            return self.urlopen(url, opener = self.login_opener)
+        except:
+            log.error('Failed downloading from %s: %s', (self.getName(), traceback.format_exc()))
+
+    def getLoginParams(self):
+        return ''
+
     def download(self, url = '', nzb_id = ''):
-        return self.urlopen(url)
+        try:
+            return self.urlopen(url, headers = {'User-Agent': Env.getIdentifier()}, show_error = False)
+        except:
+            log.error('Failed getting nzb from %s: %s', (self.getName(), traceback.format_exc()))
+
+        return 'try_next'
 
     def feed(self):
         return []
@@ -111,4 +149,9 @@ class YarrProvider(Provider):
         return [self.cat_backup_id]
 
     def found(self, new):
-        log.info('Found: score(%(score)s) on %(provider)s: %(name)s', new)
+        if not new.get('provider_extra'):
+            new['provider_extra'] = ''
+        else:
+            new['provider_extra'] = ', %s' % new['provider_extra']
+
+        log.info('Found: score(%(score)s) on %(provider)s%(provider_extra)s: %(name)s', new)

couchpotato/core/providers/metadata/xbmc/__init__.py

@@ -31,6 +31,14 @@ config = [{
                     'advanced': True,
                     'description': '<strong>%s</strong> is the rootname of the movie. For example "/path/to/movie cd1.mkv" will be "/path/to/movie"'
                 },
+                {
+                    'name': 'meta_url_only',
+                    'label': 'Only IMDB URL',
+                    'default': False,
+                    'advanced': True,
+                    'description': 'Create a nfo with only the IMDB url inside',
+                    'type': 'bool',
+                },
                 {
                     'name': 'meta_fanart',
                     'label': 'Fanart',

couchpotato/core/providers/metadata/xbmc/main.py

@@ -28,6 +28,11 @@ class XBMC(MetaDataBase):
         return os.path.join(root, basename.replace('%s', name))
 
     def getNfo(self, movie_info = {}, data = {}):
+
+        # return imdb url only
+        if self.conf('meta_url_only'):
+            return 'http://www.imdb.com/title/%s/' % toUnicode(data['library']['identifier'])
+
         nfoxml = Element('movie')
 
         # Title

couchpotato/core/providers/nzb/ftdworld/__init__.py

@@ -1,17 +1,16 @@
-from .main import Newzbin
+from .main import FTDWorld
 
 def start():
-    return Newzbin()
+    return FTDWorld()
 
 config = [{
-    'name': 'newzbin',
+    'name': 'ftdworld',
     'groups': [
         {
             'tab': 'searcher',
             'subtab': 'nzb_providers',
-            'name': 'newzbin',
-            'description': 'See <a href="https://www.newzbin2.es/">Newzbin</a>',
-            'wizard': True,
+            'name': 'FTDWorld',
+            'description': 'Free provider, less accurate. See <a href="http://ftdworld.net">FTDWorld</a>',
             'options': [
                 {
                     'name': 'enabled',

couchpotato/core/providers/nzb/ftdworld/main.py

@@ -0,0 +1,107 @@
+from bs4 import BeautifulSoup
+from couchpotato.core.event import fireEvent
+from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode, \
+    simplifyString
+from couchpotato.core.helpers.variable import tryInt, getTitle
+from couchpotato.core.logger import CPLog
+from couchpotato.core.providers.nzb.base import NZBProvider
+from couchpotato.environment import Env
+from dateutil.parser import parse
+import re
+import time
+
+log = CPLog(__name__)
+
+
+class FTDWorld(NZBProvider):
+
+    urls = {
+        'search': 'http://ftdworld.net/category.php?%s',
+        'detail': 'http://ftdworld.net/spotinfo.php?id=%s',
+        'download': 'http://ftdworld.net/cgi-bin/nzbdown.pl?fileID=%s',
+        'login': 'http://ftdworld.net/index.php',
+    }
+
+    http_time_between_calls = 1 #seconds
+
+    cat_ids = [
+        ([4, 11], ['dvdr']),
+        ([1], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr', 'brrip']),
+        ([10, 13, 14], ['bd50', '720p', '1080p']),
+    ]
+    cat_backup_id = [1]
+
+    def search(self, movie, quality):
+
+        results = []
+        if self.isDisabled():
+            return results
+
+        q = '%s %s' % (simplifyString(getTitle(movie['library'])), movie['library']['year'])
+
+        params = {
+            'ctitle': q,
+            'customQuery': 'usr',
+            'cage': Env.setting('retention', 'nzb'),
+            'csizemin': quality.get('size_min'),
+            'csizemax': quality.get('size_max'),
+            'ccategory': 14,
+            'ctype': ','.join([str(x) for x in self.getCatId(quality['identifier'])]),
+        }
+
+        cache_key = 'ftdworld.%s.%s' % (movie['library']['identifier'], q)
+        data = self.getCache(cache_key, self.urls['search'] % tryUrlencode(params), opener = self.login_opener)
+
+        if data:
+            try:
+
+                html = BeautifulSoup(data)
+                main_table = html.find('table', attrs = {'id':'ftdresult'})
+
+                if not main_table:
+                    return results
+
+                items = main_table.find_all('tr', attrs = {'class': re.compile('tcontent')})
+
+                for item in items:
+                    tds = item.find_all('td')
+                    nzb_id = tryInt(item.attrs['data-spot'])
+
+                    up = item.find('img', attrs = {'src': re.compile('up.png')})
+                    down = item.find('img', attrs = {'src': re.compile('down.png')})
+
+                    new = {
+                        'id': nzb_id,
+                        'type': 'nzb',
+                        'provider': self.getName(),
+                        'name': toUnicode(item.find('a', attrs = {'href': re.compile('./spotinfo')}).text.strip()),
+                        'age': self.calculateAge(int(time.mktime(parse(tds[2].text).timetuple()))),
+                        'size': 0,
+                        'url': self.urls['download'] % nzb_id,
+                        'download': self.loginDownload,
+                        'detail_url': self.urls['detail'] % nzb_id,
+                        'description': '',
+                        'score': (tryInt(up.attrs['title'].split(' ')[0]) * 3) - (tryInt(down.attrs['title'].split(' ')[0]) * 3),
+                    }
+
+                    is_correct_movie = fireEvent('searcher.correct_movie',
+                                                 nzb = new, movie = movie, quality = quality,
+                                                 imdb_results = False, single = True)
+
+                    if is_correct_movie:
+                        new['score'] += fireEvent('score.calculate', new, movie, single = True)
+                        results.append(new)
+                        self.found(new)
+
+                return results
+            except SyntaxError:
+                log.error('Failed to parse XML response from NZBClub')
+
+        return results
+
+    def getLoginParams(self):
+        return tryUrlencode({
+            'userlogin': self.conf('username'),
+            'passlogin': self.conf('password'),
+            'submit': 'Log In',
+        })

couchpotato/core/providers/nzb/mysterbin/__init__.py

@@ -1,23 +0,0 @@
-from .main import Mysterbin
-
-def start():
-    return Mysterbin()
-
-config = [{
-    'name': 'mysterbin',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'subtab': 'nzb_providers',
-            'name': 'Mysterbin',
-            'description': 'Free provider, less accurate. See <a href="https://www.mysterbin.com/">Mysterbin</a>',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                    'default': False,
-                },
-            ],
-        },
-    ],
-}]

couchpotato/core/providers/nzb/mysterbin/main.py

@@ -1,102 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode, \
-    simplifyString
-from couchpotato.core.helpers.variable import tryInt, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-
-log = CPLog(__name__)
-
-
-class Mysterbin(NZBProvider):
-
-    urls = {
-        'search': 'https://www.mysterbin.com/advsearch?%s',
-        'download': 'https://www.mysterbin.com/nzb?c=%s',
-        'nfo': 'https://www.mysterbin.com/nfo?c=%s',
-    }
-
-    http_time_between_calls = 1 #seconds
-
-    def search(self, movie, quality):
-
-        results = []
-        if self.isDisabled():
-            return results
-
-        q = '"%s" %s %s' % (simplifyString(getTitle(movie['library'])), movie['library']['year'], quality.get('identifier'))
-        for ignored in Env.setting('ignored_words', 'searcher').split(','):
-            if len(q) + len(ignored.strip()) > 126:
-                break
-            q = '%s -%s' % (q, ignored.strip())
-
-        params = {
-            'q': q,
-            'match': 'normal',
-            'minSize': quality.get('size_min'),
-            'maxSize': quality.get('size_max'),
-            'complete': 2,
-            'maxAge': Env.setting('retention', 'nzb'),
-            'nopasswd': 'on',
-        }
-
-        cache_key = 'mysterbin.%s.%s.%s' % (movie['library']['identifier'], quality.get('identifier'), q)
-        data = self.getCache(cache_key, self.urls['search'] % tryUrlencode(params))
-        if data:
-
-            try:
-                html = BeautifulSoup(data)
-                resultable = html.find('table', attrs = {'class':'t'})
-                for result in resultable.find_all('tr'):
-
-                    try:
-                        myster_id = result.find('input', attrs = {'class': 'check4nzb'})['value']
-
-                        # Age
-                        age = ''
-                        for temp in result.find('td', attrs = {'class': 'cdetail'}).find_all(text = True):
-                            if 'days' in temp:
-                                age = tryInt(temp.split(' ')[0])
-                                break
-
-                        # size
-                        size = None
-                        for temp in result.find('div', attrs = {'class': 'cdetail'}).find_all(text = True):
-                            if 'gb' in temp.lower() or 'mb' in temp.lower() or 'kb' in temp.lower():
-                                size = self.parseSize(temp)
-                                break
-
-                        description = ''
-                        if result.find('a', text = 'View NFO'):
-                            description = toUnicode(self.getCache('mysterbin.%s' % myster_id, self.urls['nfo'] % myster_id, cache_timeout = 25920000))
-
-                        new = {
-                            'id': myster_id,
-                            'name': ''.join(result.find('span', attrs = {'class': 'cname'}).find_all(text = True)),
-                            'type': 'nzb',
-                            'provider': self.getName(),
-                            'age': age,
-                            'size': size,
-                            'url': self.urls['download'] % myster_id,
-                            'description': description,
-                            'download': self.download,
-                            'check_nzb': False,
-                        }
-
-                        new['score'] = fireEvent('score.calculate', new, movie, single = True)
-                        is_correct_movie = fireEvent('searcher.correct_movie',
-                                                        nzb = new, movie = movie, quality = quality,
-                                                        imdb_results = False, single = True)
-                        if is_correct_movie:
-                            results.append(new)
-                            self.found(new)
-                    except:
-                        pass
-
-                return results
-            except AttributeError:
-                log.debug('No search results found.')
-
-        return results

couchpotato/core/providers/nzb/newzbin/main.py

@@ -1,156 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from dateutil.parser import parse
-import base64
-import time
-import xml.etree.ElementTree as XMLTree
-
-log = CPLog(__name__)
-
-
-class Newzbin(NZBProvider, RSS):
-
-    urls = {
-        'download': 'https://www.newzbin2.es/api/dnzb/',
-        'search': 'https://www.newzbin2.es/search/',
-    }
-
-    format_ids = {
-        2: ['scr'],
-        1: ['cam'],
-        4: ['tc'],
-        8: ['ts'],
-        1024: ['r5'],
-    }
-    cat_ids = [
-        ([262144], ['bd50']),
-        ([2097152], ['1080p']),
-        ([524288], ['720p']),
-        ([262144], ['brrip']),
-        ([2], ['dvdr']),
-    ]
-    cat_backup_id = -1
-
-    http_time_between_calls = 3 # Seconds
-
-    def search(self, movie, quality):
-
-        results = []
-        if self.isDisabled():
-            return results
-
-        format_id = self.getFormatId(type)
-        cat_id = self.getCatId(type)
-
-        arguments = tryUrlencode({
-            'searchaction': 'Search',
-            'u_url_posts_only': '0',
-            'u_show_passworded': '0',
-            'q_url': 'imdb.com/title/' + movie['library']['identifier'],
-            'sort': 'ps_totalsize',
-            'order': 'asc',
-            'u_post_results_amt': '100',
-            'feed': 'rss',
-            'category': '6',
-            'ps_rb_video_format': str(cat_id),
-            'ps_rb_source': str(format_id),
-            'u_post_larger_than': quality.get('size_min'),
-            'u_post_smaller_than': quality.get('size_max'),
-        })
-
-        url = "%s?%s" % (self.urls['search'], arguments)
-        cache_key = str('newzbin.%s.%s.%s' % (movie['library']['identifier'], str(format_id), str(cat_id)))
-
-        data = self.getCache(cache_key)
-        if not data:
-
-            headers = {
-                'Authorization': "Basic %s" % base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password')))[:-1]
-            }
-            try:
-                data = self.urlopen(url, headers = headers)
-                self.setCache(cache_key, data)
-            except:
-                return results
-
-        if data:
-            try:
-                try:
-                    data = XMLTree.fromstring(data)
-                    nzbs = self.getElements(data, 'channel/item')
-                except Exception, e:
-                    log.debug('%s, %s', (self.getName(), e))
-                    return results
-
-                for nzb in nzbs:
-
-                    title = self.getTextElement(nzb, "title")
-                    if 'error' in title.lower(): continue
-
-                    REPORT_NS = 'http://www.newzbin2.es/DTD/2007/feeds/report/';
-
-                    # Add attributes to name
-                    try:
-                        for attr in nzb.find('{%s}attributes' % REPORT_NS):
-                            title += ' ' + attr.text
-                    except:
-                        pass
-
-                    id = int(self.getTextElement(nzb, '{%s}id' % REPORT_NS))
-                    size = str(int(self.getTextElement(nzb, '{%s}size' % REPORT_NS)) / 1024 / 1024) + ' mb'
-                    date = str(self.getTextElement(nzb, '{%s}postdate' % REPORT_NS))
-
-                    new = {
-                        'id': id,
-                        'type': 'nzb',
-                        'provider': self.getName(),
-                        'name': title,
-                        'age': self.calculateAge(int(time.mktime(parse(date).timetuple()))),
-                        'size': self.parseSize(size),
-                        'url': str(self.getTextElement(nzb, '{%s}nzb' % REPORT_NS)),
-                        'download': self.download,
-                        'detail_url': str(self.getTextElement(nzb, 'link')),
-                        'description': self.getTextElement(nzb, "description"),
-                        'check_nzb': False,
-                    }
-
-                    is_correct_movie = fireEvent('searcher.correct_movie',
-                                                 nzb = new, movie = movie, quality = quality,
-                                                 imdb_results = True, single = True)
-                    if is_correct_movie:
-                        new['score'] = fireEvent('score.calculate', new, movie, single = True)
-                        results.append(new)
-                        self.found(new)
-
-                return results
-            except SyntaxError:
-                log.error('Failed to parse XML response from newzbin')
-
-        return results
-
-    def download(self, url = '', nzb_id = ''):
-        try:
-            log.info('Download nzb from newzbin, report id: %s ', nzb_id)
-
-            return self.urlopen(self.urls['download'], params = {
-                'username' : self.conf('username'),
-                'password' : self.conf('password'),
-                'reportid' : nzb_id
-            }, show_error = False)
-        except Exception, e:
-            log.error('Failed downloading from newzbin, check credit: %s', e)
-            return False
-
-    def getFormatId(self, format):
-        for id, quality in self.format_ids.iteritems():
-            for q in quality:
-                if q == format:
-                    return id
-
-        return self.cat_backup_id
-
-    def isEnabled(self):
-        return NZBProvider.isEnabled(self) and self.conf('enabled') and self.conf('username') and self.conf('password')

couchpotato/core/providers/nzb/newznab/__init__.py

@@ -11,7 +11,9 @@ config = [{
             'subtab': 'nzb_providers',
             'name': 'newznab',
             'order': 10,
-            'description': 'Enable multiple NewzNab providers such as <a href="https://nzb.su" target="_blank">NZB.su</a> and <a href="https://nzbs.org" target="_blank">nzbs.org</a>',
+            'description': 'Enable <a href="http://newznab.com/" target="_blank">NewzNab providers</a> such as <a href="https://nzb.su" target="_blank">NZB.su</a>, \
+                <a href="https://nzbs.org" target="_blank">NZBs.org</a>, <a href="http://dognzb.cr/" target="_blank">DOGnzb.cr</a>, \
+                <a href="https://github.com/spotweb/spotweb" target="_blank">Spotweb</a>',
             'wizard': True,
             'options': [
                 {

couchpotato/core/providers/nzb/newznab/main.py

@@ -132,6 +132,7 @@ class Newznab(NZBProvider, RSS):
                     new = {
                         'id': id,
                         'provider': self.getName(),
+                        'provider_extra': host['host'],
                         'type': 'nzb',
                         'name': self.getTextElement(nzb, "title"),
                         'age': self.calculateAge(int(time.mktime(parse(date).timetuple()))),
@@ -218,4 +219,5 @@ class Newznab(NZBProvider, RSS):
                     return 'try_next'
 
             log.error('Failed download from %s', (host, traceback.format_exc()))
-            raise
+
+        return 'try_next'

couchpotato/core/providers/nzb/nzbclub/__init__.py

@@ -15,7 +15,6 @@ config = [{
                 {
                     'name': 'enabled',
                     'type': 'enabler',
-                    'default': True,
                 },
             ],
         },

couchpotato/core/providers/nzb/nzbclub/main.py

@@ -17,7 +17,7 @@ log = CPLog(__name__)
 class NZBClub(NZBProvider, RSS):
 
     urls = {
-        'search': 'https://www.nzbclub.com/nzbfeed.aspx?%s',
+        'search': 'http://www.nzbclub.com/nzbfeed.aspx?%s',
     }
 
     http_time_between_calls = 4 #seconds
@@ -29,8 +29,6 @@ class NZBClub(NZBProvider, RSS):
             return results
 
         q = '"%s %s" %s' % (simplifyString(getTitle(movie['library'])), movie['library']['year'], quality.get('identifier'))
-        for ignored in Env.setting('ignored_words', 'searcher').split(','):
-            q = '%s -%s' % (q, ignored.strip())
 
         params = {
             'q': q,

couchpotato/core/providers/nzb/nzbindex/__init__.py

@@ -15,6 +15,7 @@ config = [{
                 {
                     'name': 'enabled',
                     'type': 'enabler',
+                    'default': True,
                 },
             ],
         },

couchpotato/core/providers/nzb/nzbmatrix/__init__.py

@@ -1,39 +0,0 @@
-from .main import NZBMatrix
-
-def start():
-    return NZBMatrix()
-
-config = [{
-    'name': 'nzbmatrix',
-    'groups': [
-        {
-            'tab': 'searcher',
-            'subtab': 'nzb_providers',
-            'name': 'nzbmatrix',
-            'label': 'NZBMatrix',
-            'description': 'See <a href="https://nzbmatrix.com/">NZBMatrix</a>',
-            'wizard': True,
-            'options': [
-                {
-                    'name': 'enabled',
-                    'type': 'enabler',
-                },
-                {
-                    'name': 'username',
-                },
-                {
-                    'name': 'api_key',
-                    'default': '',
-                    'label': 'Api Key',
-                },
-                {
-                    'name': 'english_only',
-                    'default': 1,
-                    'type': 'bool',
-                    'label': 'English only',
-                    'description': 'Only search for English spoken movies on NZBMatrix',
-                },
-            ],
-        },
-    ],
-}]

couchpotato/core/providers/nzb/nzbmatrix/main.py

@@ -1,108 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-from dateutil.parser import parse
-import time
-import xml.etree.ElementTree as XMLTree
-
-log = CPLog(__name__)
-
-
-class NZBMatrix(NZBProvider, RSS):
-
-    urls = {
-        'download': 'https://api.nzbmatrix.com/v1.1/download.php?id=%s',
-        'detail': 'https://nzbmatrix.com/nzb-details.php?id=%s&hit=1',
-        'search': 'https://rss.nzbmatrix.com/rss.php',
-    }
-
-    cat_ids = [
-        ([50], ['bd50']),
-        ([42, 53], ['720p', '1080p']),
-        ([2, 9], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr']),
-        ([54], ['brrip']),
-        ([1], ['dvdr']),
-    ]
-    cat_backup_id = 2
-
-    def search(self, movie, quality):
-
-        results = []
-
-        if self.isDisabled():
-            return results
-
-        cat_ids = ','.join(['%s' % x for x in self.getCatId(quality.get('identifier'))])
-
-        arguments = tryUrlencode({
-            'term': movie['library']['identifier'],
-            'subcat': cat_ids,
-            'username': self.conf('username'),
-            'apikey': self.conf('api_key'),
-            'searchin': 'weblink',
-            'maxage': Env.setting('retention', section = 'nzb'),
-            'english': self.conf('english_only'),
-        })
-        url = "%s?%s" % (self.urls['search'], arguments)
-
-        cache_key = 'nzbmatrix.%s.%s' % (movie['library'].get('identifier'), cat_ids)
-
-        data = self.getCache(cache_key, url, cache_timeout = 1800, headers = {'User-Agent': Env.getIdentifier()})
-        if data:
-            try:
-                try:
-                    data = XMLTree.fromstring(data)
-                    nzbs = self.getElements(data, 'channel/item')
-                except Exception, e:
-                    log.debug('%s, %s', (self.getName(), e))
-                    return results
-
-                for nzb in nzbs:
-
-                    title = self.getTextElement(nzb, "title")
-                    if 'error' in title.lower(): continue
-
-                    id = int(self.getTextElement(nzb, "link").split('&')[0].partition('id=')[2])
-                    size = self.getTextElement(nzb, "description").split('<br /><b>')[2].split('> ')[1]
-                    date = str(self.getTextElement(nzb, "description").split('<br /><b>')[3].partition('Added:</b> ')[2])
-
-                    new = {
-                        'id': id,
-                        'type': 'nzb',
-                        'provider': self.getName(),
-                        'name': title,
-                        'age': self.calculateAge(int(time.mktime(parse(date).timetuple()))),
-                        'size': self.parseSize(size),
-                        'url': self.urls['download'] % id + self.getApiExt(),
-                        'download': self.download,
-                        'detail_url': self.urls['detail'] % id,
-                        'description': self.getTextElement(nzb, "description"),
-                        'check_nzb': True,
-                    }
-
-                    is_correct_movie = fireEvent('searcher.correct_movie',
-                                                 nzb = new, movie = movie, quality = quality,
-                                                 imdb_results = True, single = True)
-
-                    if is_correct_movie:
-                        new['score'] = fireEvent('score.calculate', new, movie, single = True)
-                        results.append(new)
-                        self.found(new)
-
-                return results
-            except SyntaxError:
-                log.error('Failed to parse XML response from NZBMatrix.com')
-
-        return results
-
-    def download(self, url = '', nzb_id = ''):
-        return self.urlopen(url, headers = {'User-Agent': Env.getIdentifier()})
-
-    def getApiExt(self):
-        return '&username=%s&apikey=%s' % (self.conf('username'), self.conf('api_key'))
-
-    def isEnabled(self):
-        return NZBProvider.isEnabled(self) and self.conf('username') and self.conf('api_key')

couchpotato/core/providers/nzb/nzbsrus/main.py

@@ -97,8 +97,5 @@ class Nzbsrus(NZBProvider, RSS):
 
         return results
 
-    def download(self, url = '', nzb_id = ''):
-        return self.urlopen(url, headers = {'User-Agent': Env.getIdentifier()})
-
     def getApiExt(self):
         return '/%s/' % (self.conf('userid'))

couchpotato/core/providers/torrent/base.py

@@ -1,9 +1,6 @@
 from couchpotato.core.helpers.variable import getImdb, md5
 from couchpotato.core.logger import CPLog
 from couchpotato.core.providers.base import YarrProvider
-import cookielib
-import traceback
-import urllib2
 
 log = CPLog(__name__)
 
@@ -11,7 +8,6 @@ log = CPLog(__name__)
 class TorrentProvider(YarrProvider):
 
     type = 'torrent'
-    login_opener = None
 
     def imdbMatch(self, url, imdbId):
         if getImdb(url) == imdbId:
@@ -28,30 +24,3 @@ class TorrentProvider(YarrProvider):
             return getImdb(data) == imdbId
 
         return False
-
-    def login(self):
-
-        try:
-            cookiejar = cookielib.CookieJar()
-            opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookiejar))
-            urllib2.install_opener(opener)
-            f = opener.open(self.urls['login'], self.getLoginParams())
-            f.read()
-            f.close()
-            self.login_opener = opener
-            return True
-        except:
-            log.error('Failed to login %s: %s', (self.getName(), traceback.format_exc()))
-
-        return False
-
-    def loginDownload(self, url = '', nzb_id = ''):
-        try:
-            if not self.login_opener and not self.login():
-                log.error('Failed downloading from %s', self.getName())
-            return self.urlopen(url, opener = self.login_opener)
-        except:
-            log.error('Failed downloading from %s: %s', (self.getName(), traceback.format_exc()))
-
-    def getLoginParams(self):
-        return ''

couchpotato/core/providers/torrent/kickasstorrents/__init__.py

@@ -16,7 +16,7 @@ config = [{
                 {
                     'name': 'enabled',
                     'type': 'enabler',
-                    'default': False,
+                    'default': True,
                 },
             ],
         },

couchpotato/core/providers/torrent/kickasstorrents/main.py

@@ -94,6 +94,7 @@ class KickAssTorrents(TorrentProvider):
                                 is_correct_movie = fireEvent('searcher.correct_movie',
                                                                 nzb = new, movie = movie, quality = quality,
                                                                 imdb_results = True, single = True)
+
                                 if is_correct_movie:
                                     results.append(new)
                                     self.found(new)

couchpotato/core/providers/torrent/passthepopcorn/__init__.py

@@ -31,6 +31,10 @@ config = [{
                     'name': 'password',
                     'default': '',
                     'type': 'password',
+                },
+                {
+                    'name': 'passkey',
+                    'default': '',
                 }
             ],
 }

couchpotato/core/providers/torrent/passthepopcorn/main.py

@@ -21,7 +21,7 @@ class PassThePopcorn(TorrentProvider):
          'domain': 'https://tls.passthepopcorn.me',
          'detail': 'https://tls.passthepopcorn.me/torrents.php?torrentid=%s',
          'torrent': 'https://tls.passthepopcorn.me/torrents.php',
-         'login': 'https://tls.passthepopcorn.me/login.php',
+         'login': 'https://tls.passthepopcorn.me/ajax.php?action=login',
          'search': 'https://tls.passthepopcorn.me/search/%s/0/7/%d'
     }
 
@@ -249,6 +249,7 @@ class PassThePopcorn(TorrentProvider):
         return tryUrlencode({
              'username': self.conf('username'),
              'password': self.conf('password'),
+             'passkey': self.conf('passkey'),
              'keeplogged': '1',
              'login': 'Login'
         })

couchpotato/core/providers/torrent/publichd/__init__.py

@@ -15,7 +15,7 @@ config = [{
                 {
                     'name': 'enabled',
                     'type': 'enabler',
-                    'default': False,
+                    'default': True,
                 },
             ],
         },

couchpotato/core/providers/torrent/thepiratebay/__init__.py

@@ -16,7 +16,7 @@ config = [{
                 {
                     'name': 'enabled',
                     'type': 'enabler',
-                    'default': False
+                    'default': True
                 },
                 {
                     'name': 'domain',

couchpotato/core/providers/torrent/thepiratebay/main.py

@@ -57,7 +57,7 @@ class ThePirateBay(TorrentProvider):
 
                 data = ''
                 try:
-                    data = self.urlopen(proxy, timeout = 3)
+                    data = self.urlopen(proxy, timeout = 3, show_error = False)
                 except:
                     log.debug('Failed tpb proxy %s', proxy)
 
@@ -88,12 +88,20 @@ class ThePirateBay(TorrentProvider):
             try:
                 soup = BeautifulSoup(data)
                 results_table = soup.find('table', attrs = {'id': 'searchResult'})
+
+                if not results_table:
+                    return results
+
                 entries = results_table.find_all('tr')
-                for result in entries[1:]:
+                for result in entries[2:]:
                     link = result.find(href = re.compile('torrent\/\d+\/'))
                     download = result.find(href = re.compile('magnet:'))
 
-                    size = re.search('Size (?P<size>.+),', unicode(result.select('font.detDesc')[0])).group('size')
+                    try:
+                        size = re.search('Size (?P<size>.+),', unicode(result.select('font.detDesc')[0])).group('size')
+                    except:
+                        continue
+
                     if link and download:
 
                         def extra_score(item):

couchpotato/core/providers/userscript/filmweb/__init__.py

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

couchpotato/core/providers/userscript/filmweb/main.py

@@ -0,0 +1,28 @@
+from couchpotato.core.providers.userscript.base import UserscriptBase
+import re
+
+
+class Filmweb(UserscriptBase):
+
+    includes = ['http://www.filmweb.pl/*']
+
+    def getMovie(self, url):
+
+        cookie = {'Cookie': 'welcomeScreen=welcome_screen'}
+
+        try:
+            data = self.urlopen(url, headers = cookie)
+        except:
+            return
+
+        name = re.search("<h2.*?class=\"text-large caption\">(?P<name>[^<]+)</h2>", data)
+
+        if name is None:
+            name = re.search("<a.*?property=\"v:name\".*?>(?P<name>[^<]+)</a>", data)
+
+        name = name.group('name').decode('string_escape')
+
+        year = re.search("<span.*?id=filmYear.*?>\((?P<year>[^\)]+)\).*?</span>", data)
+        year = year.group('year')
+
+        return self.search(name, year)

couchpotato/core/settings/__init__.py

@@ -90,7 +90,7 @@ class Settings(object):
     def set(self, section, option, value):
         return self.p.set(section, option, value)
 
-    def get(self, option = '', section = 'core', default = '', type = None):
+    def get(self, option = '', section = 'core', default = None, type = None):
         try:
 
             try: type = self.types[section][option]
@@ -111,7 +111,7 @@ class Settings(object):
         try:
             return self.p.getboolean(section, option)
         except:
-            return self.p.get(section, option)
+            return self.p.get(section, option) == 1
 
     def getInt(self, section, option):
         try:

couchpotato/runner.py

@@ -4,10 +4,8 @@ from couchpotato.api import api, NonBlockHandler
 from couchpotato.core.event import fireEventAsync, fireEvent
 from couchpotato.core.helpers.variable import getDataDir, tryInt
 from logging import handlers
-from tornado import autoreload
-from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop
-from tornado.web import RequestHandler, Application, FallbackHandler
+from tornado.web import Application, FallbackHandler
 from tornado.wsgi import WSGIContainer
 from werkzeug.contrib.cache import FileSystemCache
 import locale
@@ -57,10 +55,8 @@ def _log(status_code, request):
 
     if status_code < 400:
         return
-    elif status_code < 500:
-        log_method = logging.warning
     else:
-        log_method = logging.error
+        log_method = logging.debug
     request_time = 1000.0 * request.request_time()
     summary = request.method + " " + request.uri + " (" + \
         request.remote_ip + ")"
@@ -148,6 +144,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
     formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s', '%m-%d %H:%M:%S')
     level = logging.DEBUG if debug else logging.INFO
     logger.setLevel(level)
+    logging.addLevelName(19, 'INFO')
 
     # To screen
     if (debug or options.console_log) and not options.quiet and not options.daemon:

couchpotato/static/scripts/page/manage.js

@@ -46,7 +46,7 @@ Page.Manage = new Class({
 						'text': 'When you\'ve done that, hit this button → '
 					}).adopt(
 						new Element('a.button.green', {
-							'text': 'Hit me, but not to hard',
+							'text': 'Hit me, but not too hard',
 							'events':{
 								'click': self.refresh.bind(self, true)
 							}

couchpotato/static/scripts/page/settings.js

@@ -436,9 +436,14 @@ Option.String = new Class({
 			self.input = new Element('input.inlay', {
 				'type': 'text',
 				'name': self.postName(),
-				'value': self.getSettingValue()
+				'value': self.getSettingValue(),
+				'placeholder': self.getPlaceholder()
 			})
 		);
+	},
+
+	getPlaceholder: function(){
+		return this.options.placeholder
 	}
 });
 

couchpotato/templates/_desktop.html

@@ -55,6 +55,8 @@
 					'is_remote': false
 				});
 
+				$(document.body).set('data-api', window.location.protocol + '//' + window.location.host + Api.createUrl().replace('/default/', '/'));
+
 				// Catch errors
 				window.onerror = function(message, file, line){
 

init/fedora

@@ -11,11 +11,6 @@
 # Source function library.
 . /etc/init.d/functions
 
-# Source couchpotato configuration
-if [ -f /etc/sysconfig/couchpotato ]; then
-        . /etc/sysconfig/couchpotato
-fi
-
 prog=couchpotato
 lockfile=/var/lock/subsys/$prog
 
@@ -27,8 +22,13 @@ datadir=${CP_DATA-~/.couchpotato}
 pidfile=${CP_PIDFILE-/var/run/couchpotato/couchpotato.pid}
 ##
 
+# Source couchpotato configuration
+if [ -f /etc/sysconfig/couchpotato ]; then
+        . /etc/sysconfig/couchpotato
+fi
+
 pidpath=`dirname ${pidfile}`
-options=" --daemon --pid_file=${pidfile} --datadir=${datadir}"
+options=" --daemon --pid_file=${pidfile} --data_dir=${datadir}"
 
 # create PID directory if not exist and ensure the couchpotato user can write to it
 if [ ! -d $pidpath ]; then

init/ffpstick

@@ -0,0 +1,85 @@
+#!/ffp/bin/sh
+
+# PROVIDE: Couchpotato
+# REQUIRE: LOGIN
+
+. /ffp/etc/ffp.subr
+
+# script name
+NAME=couchpotato
+APP_PATH=/ffp/usr/local/CouchPotatoServer
+APP_CONFIG_DIF=/ffp/root/.couchpotato
+
+# path to python bin
+DAEMON=/ffp/bin/python
+
+# Path to store PID file
+PID_FILE=/ffp/var/run/couchpotato.pid
+PID_PATH=$(dirname $PID_FILE)
+
+# startup args
+DAEMON_OPTS=" ${APP_PATH}/CouchPotato.py --daemon --pid_file=${PID_FILE}"
+
+command=$NAME
+start_cmd="couchpotato_start"
+stop_cmd="couchpotato_stop"
+status_cmd="couchpotato_status"
+
+wait_for_status()
+{
+    counter=$2
+    while [ ${counter} -gt 0 ]; do
+        daemon_status
+        [ $? -eq $1 ] && break
+        let counter=counter-1
+        sleep 1
+    done
+}
+
+daemon_status()
+{
+    if [ -f ${PID_FILE} ] && [ -d /proc/`cat ${PID_FILE}` ]; then
+        return 0
+    fi
+        return 1
+}
+
+couchpotato_start()
+{
+    if [ -f ${PID_FILE} ] && [ -d /proc/`cat ${PID_FILE}` ]; then
+		echo "$NAME already running"
+		return 1
+    fi
+	
+	echo "Starting $NAME"
+	$DAEMON $DAEMON_OPTS
+}
+
+couchpotato_stop()
+{
+    if [ -f $PID_FILE ] ; then
+        echo "Stopping $NAME"
+        kill `cat ${PID_FILE}`
+        wait_for_status 1 20
+        rm -f ${PID_FILE}
+    else
+        echo "Cannot find $PID_FILE"
+    fi
+}
+
+couchpotato_status()
+{
+	local pid=` cat ${PID_FILE} 2>/dev/null `
+	if test -n "$pid"; then
+		if cat /proc/$pid/cmdline | grep ${APP_PATH} >/dev/null ; then
+		    [ "$1" == "silent" ] || echo "$NAME is running"
+		    return 0
+		fi
+		rm $pidfile
+	fi
+	
+	[ "$1" == "silent" ] || echo "$NAME not running"
+	return 1
+}
+
+run_rc_command "$1"

installer.iss

@@ -1,5 +1,5 @@
 #define MyAppName "CouchPotato"
-#define MyAppVer "2.0.1"
+#define MyAppVer "2.0.3"
 
 [Setup]
 AppName={#MyAppName}
@@ -25,4 +25,10 @@ Name: "{userstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppName}.exe"; Tasks: s
 Name: "startup"; Description: "Run {#MyAppName} at startup"; Flags: unchecked
 
 [UninstallDelete]
-Type: filesandordirs; Name: "{app}\*.*"
+Type: filesandordirs; Name: "{app}\appdata"
+Type: filesandordirs; Name: "{app}\Microsoft.VC90.CRT"
+Type: filesandordirs; Name: "{app}\updates"
+Type: filesandordirs; Name: "{app}\CouchPotato*"
+Type: filesandordirs; Name: "{app}\python27.dll"
+Type: filesandordirs; Name: "{app}\unins000.dat"
+Type: filesandordirs; Name: "{app}\unins000.exe"

libs/axl/axel.py

@@ -95,7 +95,6 @@ class Event(object):
                 (None, None, handler), ...      # asynchronous execution
             )
         """
-        self.in_order = False
         self.name = name
         self.asynchronous = asynch
         self.exc_info = exc_info
@@ -142,11 +141,16 @@ class Event(object):
     def fire(self, *args, **kwargs):
         """ Stores all registered handlers in a queue for processing """
         self.queue = Queue.Queue()
-        self.result = {}
+        result = {}
 
         if self.handlers:
 
-            max_threads = self._threads()
+            max_threads = 1 if kwargs.get('event_order_lock') else self._threads()
+
+            # Set global result
+            def add_to(key, value):
+                result[key] = value
+            kwargs['event_add_to_result'] = add_to
 
             for i in range(max_threads):
                 t = threading.Thread(target = self._execute,
@@ -159,17 +163,12 @@ class Event(object):
 
                 if self.asynchronous:
                     handler_, memoize, timeout = self.handlers[handler]
-                    self.result[handler] = (None, None, handler_)
+                    result[handler] = (None, None, handler_)
 
             if not self.asynchronous:
                 self.queue.join()
 
-        res = self.result or None
-
-        # Cleanup
-        self.result = {}
-
-        return res
+        return result
 
     def count(self):
         """ Returns the count of registered handlers """
@@ -181,24 +180,51 @@ class Event(object):
         self.memoize.clear()
 
     def _execute(self, *args, **kwargs):
+
+        # Remove get and set from kwargs
+        add_to_result = kwargs.get('event_add_to_result')
+        del kwargs['event_add_to_result']
+
+        # Get and remove order lock
+        order_lock = kwargs.get('event_order_lock')
+        try: del kwargs['event_order_lock']
+        except: pass
+
+        # Get and remove return on first
+        return_on_result = kwargs.get('event_return_on_result')
+        try: del kwargs['event_return_on_result']
+        except: pass
+
+        got_results = False
+
         """ Executes all handlers stored in the queue """
         while True:
+
             try:
                 h_ = self.queue.get(timeout = 2)
                 handler, memoize, timeout = self.handlers[h_]
 
-                if self.lock and self.in_order:
-                    self.lock.acquire()
+                if return_on_result and got_results:
+
+                    if not self.asynchronous:
+                        self.queue.task_done()
+
+                    continue
+
+                if order_lock:
+                    order_lock.acquire()
 
                 try:
                     r = self._memoize(memoize, timeout, handler, *args, **kwargs)
                     if not self.asynchronous:
-                        self.result[h_] = tuple(r)
+                        if not return_on_result or (return_on_result and r[1] is not None):
+                            add_to_result(h_, tuple(r))
+                            got_results = True
 
                 except Exception:
                     if not self.asynchronous:
-                        self.result[h_] = (False, self._error(sys.exc_info()),
-                                            handler)
+                        add_to_result(h_, (False, self._error(sys.exc_info()),
+                                            handler))
                     else:
                         self.error_handler(sys.exc_info())
                 finally:
@@ -206,8 +232,8 @@ class Event(object):
                     if not self.asynchronous:
                         self.queue.task_done()
 
-                    if self.lock and self.in_order:
-                        self.lock.release()
+                    if order_lock:
+                        order_lock.release()
 
                     if self.queue.empty():
                         raise Queue.Empty
@@ -257,7 +283,7 @@ class Event(object):
             args.insert(0, self.sender)
 
         if not memoize:
-            if timeout <= 0:    #no time restriction
+            if timeout <= 0: #no time restriction
                 result = [True, handler(*args, **kwargs), handler]
                 return result
 
@@ -273,7 +299,7 @@ class Event(object):
                     if args_ == args and kwargs_ == kwargs:
                         return [True, result, handler]
 
-            if timeout <= 0:    #no time restriction
+            if timeout <= 0: #no time restriction
                 result = handler(*args, **kwargs)
             else:
                 result = self._timeout(timeout, handler, *args, **kwargs)

libs/bencode/BTL.py

@@ -0,0 +1,2 @@
+class BTFailure(Exception):
+    pass

libs/bencode/LICENSE.txt

@@ -0,0 +1,143 @@
+BitTorrent Open Source License
+
+Version 1.1
+
+This BitTorrent Open Source License (the "License") applies to the BitTorrent client and related software products as well as any updates or maintenance releases of that software ("BitTorrent Products") that are distributed by BitTorrent, Inc. ("Licensor").  Any BitTorrent Product licensed pursuant to this License is a Licensed Product. Licensed Product, in its entirety, is protected by U.S. copyright law.  This License identifies the terms under which you may use, copy, distribute or modify Licensed Product. 
+
+Preamble
+
+This Preamble is intended to describe, in plain English, the nature and scope of this License.  However, this Preamble is not a part of this license.  The legal effect of this License is dependent only upon the terms of the License and not this Preamble.
+
+This License complies with the Open Source Definition and is derived from the Jabber Open Source License 1.0 (the "JOSL"), which has been approved by Open Source Initiative. Sections 4(c) and 4(f)(iii) from the JOSL have been deleted.
+
+This License provides that:
+
+1. You may use or give away the Licensed Product, alone or as a component of an aggregate software distribution containing programs from several different sources.  No royalty or other fee is required.
+
+2. Both Source Code and executable versions of the Licensed Product, including Modifications made by previous Contributors, are available for your use.  (The terms "Licensed Product," "Modifications," "Contributors" and "Source Code" are defined in the License.)
+
+3. You are allowed to make Modifications to the Licensed Product, and you can create Derivative Works from it. (The term "Derivative Works" is defined in the License.)
+
+4.  By accepting the Licensed Product under the provisions of this License, you agree that any Modifications you make to the Licensed Product and then distribute are governed by the provisions of this License.  In particular, you must make the Source Code of your Modifications available to others free of charge and without a royalty.
+
+5.  You may sell, accept donations or otherwise receive compensation for executable versions of a Licensed Product, without paying a royalty or other fee to the Licensor or any Contributor, provided that such executable versions contain your or another Contributor?s material Modifications. For the avoidance of doubt, to the extent your executable version of a Licensed Product does not contain your or another Contributor?s material Modifications, you may not sell, accept donations or otherwise receive compensation for such executable.
+
+You may use the Licensed Product for any purpose, but the Licensor is not providing you any warranty whatsoever, nor is the Licensor accepting any liability in the event that the Licensed Product doesn't work properly or causes you any injury or damages.
+
+6.      If you sublicense the Licensed Product or Derivative Works, you may charge fees for warranty or support, or for accepting indemnity or liability obligations to your customers.  You cannot charge for, sell, accept donations or otherwise receive compensation for the Source Code.
+
+7.      If you assert any patent claims against the Licensor relating to the Licensed Product, or if you breach any terms of the License, your rights to the Licensed Product under this License automatically terminate.
+
+You may use this License to distribute your own Derivative Works, in which case the provisions of this License will apply to your Derivative Works just as they do to the original Licensed Product.
+
+Alternatively, you may distribute your Derivative Works under any other OSI-approved Open Source license, or under a proprietary license of your choice.  If you use any license other than this License, however, you must continue to fulfill the requirements of this License (including the provisions relating to publishing the Source Code) for those portions of your Derivative Works that consist of the Licensed Product, including the files containing Modifications.
+
+New versions of this License may be published from time to time in connection with new versions of a Licensed Product or otherwise.  You may choose to continue to use the license terms in this version of the License for the Licensed Product that was originally licensed hereunder, however, the new versions of this License will at all times apply to new versions of the Licensed Product released by Licensor after the release of the new version of this License.  Only the Licensor has the right to change the License terms as they apply to the Licensed Product. 
+
+This License relies on precise definitions for certain terms.  Those terms are defined when they are first used, and the definitions are repeated for your convenience in a Glossary at the end of the License.
+
+License Terms
+
+1.      Grant of License From Licensor.  Subject to the terms and conditions of this License, Licensor hereby grants you a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims, to do the following:
+
+a.       Use, reproduce, modify, display, perform, sublicense and distribute any Modifications created by a Contributor or portions thereof, in both Source Code or as an executable program, either on an unmodified basis or as part of Derivative Works.
+
+b.       Under claims of patents now or hereafter owned or controlled by Contributor, to make, use, sell, offer for sale, have made, and/or otherwise dispose of Modifications or portions thereof, but solely to the extent that any such claim is necessary to enable you to make, use, sell, offer for sale, have made, and/or otherwise dispose of Modifications or portions thereof or Derivative Works thereof.
+
+2. Grant of License to Modifications From Contributor. "Modifications" means any additions to or deletions from the substance or structure of (i) a file containing a Licensed Product, or (ii) any new file that contains any part of a Licensed Product. Hereinafter in this License, the term "Licensed Product" shall include all previous Modifications that you receive from any Contributor.  Subject to the terms and conditions of this License, By application of the provisions in Section 4(a) below, each person or entity who created or contributed to the creation of, and distributed, a Modification (a "Contributor") hereby grants you a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims, to do the following:
+
+a. Use, reproduce, modify, display, perform, sublicense and distribute any Modifications created by such Contributor or portions thereof, in both Source Code or as an executable program, either on an unmodified basis or as part of Derivative Works.
+
+b. Under claims of patents now or hereafter owned or controlled by Contributor, to make, use, sell, offer for sale, have made, and/or otherwise dispose of Modifications or portions thereof, but solely to the extent that any such claim is necessary to enable you to make, use, sell, offer for sale, have made, and/or otherwise dispose of Modifications or portions thereof or Derivative Works thereof. 
+
+3.      Exclusions From License Grant.  Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor or any Contributor except as expressly stated herein. No patent license is granted separate from the Licensed Product, for code that you delete from the Licensed Product, or for combinations of the Licensed Product with other software or hardware.  No right is granted to the trademarks of Licensor or any Contributor even if such marks are included in the Licensed Product. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any code that Licensor otherwise would have a right to license.  As an express condition for your use of the Licensed Product, you hereby agree that you will not, without the prior written consent of Licensor, use any trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor or any Contributor except as expressly stated herein.  For the avoidance of doubt and without limiting the foregoing, you hereby agree that you will not use or display any trademark of Licensor or any Contributor in any domain name, directory filepath, advertisement, link or other reference to you in any manner or in any media.
+
+4.      Your Obligations Regarding Distribution. 
+
+a.       Application of This License to Your Modifications.  As an express condition for your use of the Licensed Product, you hereby agree that any Modifications that you create or to which you contribute, and which you distribute, are governed by the terms of this License including, without limitation, Section 2.  Any Modifications that you create or to which you contribute may be distributed only under the terms of this License or a future version of this License released under Section 7.  You must include a copy of this License with every copy of the Modifications you distribute.  You agree not to offer or impose any terms on any Source Code or executable version of the Licensed Product or Modifications that alter or restrict the applicable version of this License or the recipients' rights hereunder. However, you may include an additional document offering the additional rights described in Section 4(d).
+
+b.       Availability of Source Code.  You must make available, without charge, under the terms of this License, the Source Code of the Licensed Product and any Modifications that you distribute, either on the same media as you distribute any executable or other form of the Licensed Product, or via a mechanism generally accepted in the software development community for the electronic transfer of data (an "Electronic Distribution Mechanism").  The Source Code for any version of Licensed Product or Modifications that you distribute must remain available for as long as any executable or other form of the Licensed Product is distributed by you.  You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
+
+c.       Intellectual Property Matters.  
+
+                                i.            Third Party Claims.  If you have knowledge that a license to a third party's intellectual property right is required to exercise the rights granted by this License, you must include a text file with the Source Code distribution titled "LEGAL" that describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact.  If you obtain such knowledge after you make any Modifications available as described in Section 4(b), you shall promptly modify the LEGAL file in all copies you make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Licensed Product from you that new knowledge has been obtained.
+
+                               ii.            Contributor APIs.  If your Modifications include an application programming interface ("API") and you have knowledge of patent licenses that are reasonably necessary to implement that API, you must also include this information in the LEGAL file.
+
+                              iii.            Representations.  You represent that, except as disclosed pursuant to 4(c)(i) above, you believe that any Modifications you distribute are your original creations and that you have sufficient rights to grant the rights conveyed by this License.
+
+d.       Required Notices.  You must duplicate this License in any documentation you provide along with the Source Code of any Modifications you create or to which you contribute, and which you distribute, wherever you describe recipients' rights relating to Licensed Product.  You must duplicate the notice contained in Exhibit A (the "Notice") in each file of the Source Code of any copy you distribute of the Licensed Product. If you created a Modification, you may add your name as a Contributor to the Notice.  If it is not possible to put the Notice in a particular Source Code file due to its structure, then you must include such Notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice.  You may choose to offer, and charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Licensed Product. However, you may do so only on your own behalf, and not on behalf of the Licensor or any Contributor.  You must make it clear that any such warranty, support, indemnity or liability obligation is offered by you alone, and you hereby agree to indemnify the Licensor and every Contributor for any liability incurred by the Licensor or such Contributor as a result of warranty, support, indemnity or liability terms you offer.
+
+e.        Distribution of Executable Versions.  You may distribute Licensed Product as an executable program under a license of your choice that may contain terms different from this License provided (i) you have satisfied the requirements of Sections 4(a) through 4(d) for that distribution, (ii) you include a conspicuous notice in the executable version, related documentation and collateral materials stating that the Source Code version of the
+Licensed Product is available under the terms of this License, including a description of how and where you have fulfilled the obligations of Section 4(b), and (iii) you make it clear that any terms that differ from this License are offered by you alone, not by Licensor or any Contributor.  You hereby agree to indemnify the Licensor and every Contributor for any liability incurred by Licensor or such Contributor as a result of any terms you offer. 
+
+f.       Distribution of Derivative Works.  You may create Derivative Works (e.g., combinations of some or all of the Licensed Product with other code) and distribute the Derivative Works as products under any other license you select, with the proviso that the requirements of this License are fulfilled for those portions of the Derivative Works that consist of the Licensed Product or any Modifications thereto.
+
+g.	Compensation for Distribution of Executable Versions of Licensed Products, Modifications or Derivative Works.  Notwithstanding any provision of this License to the contrary, by distributing, selling, licensing, sublicensing or otherwise making available any Licensed Product, or Modification or Derivative Work thereof, you and Licensor hereby acknowledge and agree that you may sell, license or sublicense for a fee, accept donations or otherwise receive compensation for executable versions of a Licensed Product, without paying a royalty or other fee to the Licensor or any other Contributor, provided that such executable versions (i) contain your or another Contributor?s material Modifications, or (ii) are otherwise material Derivative Works.  For purposes of this License, an executable version of the Licensed Product will be deemed to contain a material Modification, or will otherwise be deemed a material Derivative Work, if (a) the Licensed Product is modified with your own or a third party?s software programs or other code, and/or the Licensed Product is combined with a number of your own or a third party?s software programs or code, respectively, and (b) such software programs or code add or contribute material value, functionality or features to the License Product.  For the avoidance of doubt, to the extent your executable version of a Licensed Product does not contain your or another Contributor?s material Modifications or is otherwise not a material Derivative Work, in each case as contemplated herein, you may not sell, license or sublicense for a fee, accept donations or otherwise receive compensation for such executable.  Additionally, without limitation of the foregoing and notwithstanding any provision of this License to the contrary, you cannot charge for, sell, license or sublicense for a fee, accept donations or otherwise receive compensation for the Source Code. 
+
+5.      Inability to Comply Due to Statute or Regulation.  If it is impossible for you to comply with any of the terms of this License with respect to some or all of the Licensed Product due to statute, judicial order, or regulation, then you must (i) comply with the terms of this License to the maximum extent possible, (ii) cite the statute or regulation that prohibits you from adhering to the License, and (iii) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 4(d), and must be included with all distributions of the Source Code.  Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill at computer programming to be able to understand it. 
+
+6.      Application of This License.  This License applies to code to which Licensor or Contributor has attached the Notice in Exhibit A, which is incorporated herein by this reference.
+
+7.      Versions of This License.
+
+a.       New Versions.  Licensor may publish from time to time revised and/or new versions of the License. 
+
+b.       Effect of New Versions.  Once Licensed Product has been published under a particular version of the License, you may always continue to use it under the terms of that version, provided that any such license be in full force and effect at the time, and has not been revoked or otherwise terminated.  You may also choose to use such Licensed Product under the terms of any subsequent version (but not any prior version) of the License published by Licensor.  No one other than Licensor has the right to modify the terms applicable to Licensed Product created under this License.
+
+c.       Derivative Works of this License.  If you create or use a modified version of this License, which you may do only in order to apply it to software that is not already a Licensed Product under this License, you must rename your license so that it is not confusingly similar to this License, and must make it clear that your license contains terms that differ from this License.  In so naming your license, you may not use any trademark of Licensor or any Contributor.
+
+8.      Disclaimer of Warranty.  LICENSED PRODUCT IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE LICENSED PRODUCT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LICENSED PRODUCT IS WITH YOU.  SHOULD LICENSED PRODUCT PROVE DEFECTIVE IN ANY RESPECT, YOU (AND NOT THE LICENSOR OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.  THIS
+DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF LICENSED PRODUCT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+9.      Termination. 
+
+a.       Automatic Termination Upon Breach.  This license and the rights granted hereunder will terminate automatically if you fail to comply with the terms herein and fail to cure such breach within ten (10) days of being notified of the breach by the Licensor.  For purposes of this provision, proof of delivery via email to the address listed in the ?WHOIS? database of the registrar for any website through which you distribute or market any Licensed Product, or to any alternate email address which you designate in writing to the Licensor, shall constitute sufficient notification. All sublicenses to the Licensed Product that are properly granted shall survive any termination of this license so long as they continue to complye with the terms of this License.  Provisions that, by their nature, must remain in effect beyond the termination of this License, shall survive.
+
+b.       Termination Upon Assertion of Patent Infringement.  If you initiate litigation by asserting a patent infringement claim (excluding declaratory judgment actions) against Licensor or a Contributor (Licensor or Contributor against whom you file such an action is referred to herein as Respondent) alleging that Licensed Product directly or indirectly infringes any patent, then any and all rights granted by such Respondent to you under Sections 1 or 2 of this License shall terminate prospectively upon sixty (60) days notice from Respondent (the "Notice Period") unless within that Notice Period you either agree in writing (i) to pay Respondent a mutually agreeable reasonably royalty for your past or future use of Licensed Product made by such Respondent, or (ii) withdraw your litigation claim with respect to Licensed Product against such Respondent.  If within said Notice Period a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Licensor to you under Sections 1 and 2 automatically terminate at the expiration of said Notice Period.
+
+c.       Reasonable Value of This License.  If you assert a patent infringement claim against Respondent alleging that Licensed Product directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by said Respondent under Sections 1 and 2 shall be taken into account in determining the amount or value of any payment or license.
+
+d.       No Retroactive Effect of Termination.  In the event of termination under Sections 9(a) or 9(b) above, all end user license agreements (excluding licenses to distributors and resellers) that have been validly granted by you or any distributor hereunder prior to termination shall survive termination.
+
+10.  Limitation of Liability.  UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE LICENSOR, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF LICENSED PRODUCT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
+
+11.  Responsibility for Claims.  As between Licensor and Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License.  You agree to work with Licensor and Contributors to distribute such responsibility on an equitable basis.  Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+12.  U.S. Government End Users.  The Licensed Product is a commercial item, as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of commercial computer software and commercial computer software documentation, as such terms are used in 48 C.F.R. 12.212 (Sept. 1995).  Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Licensed Product with only those rights set forth herein.
+
+13.  Miscellaneous.  This License represents the complete agreement concerning the subject matter hereof.  If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.  This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions.  You expressly agree that in any litigation relating to this license the losing party shall be responsible for costs including, without limitation, court costs and reasonable attorneys fees and expenses.  The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded.  Any law or regulation that provides that the language of a contract shall be construed against the drafter shall not apply to this License.
+
+14.  Definition of You in This License. You throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 7.  For legal entities, you includes any entity that controls, is controlled by, is under common control with, or affiliated with, you.  For purposes of this definition, control means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.  You are responsible for advising any affiliated entity of the terms of this License, and that any rights or privileges derived from or obtained by way of this License are subject to the restrictions outlined herein.
+
+15.  Glossary.  All defined terms in this License that are used in more than one Section of this License are repeated here, in alphabetical order, for the convenience of the reader.  The Section of this License in which each defined term is first used is shown in parentheses. 
+
+Contributor:  Each person or entity who created or contributed to the creation of, and distributed, a Modification. (See Section 2)
+
+Derivative Works: That term as used in this License is defined under U.S. copyright law.  (See Section 1(b))
+
+License:  This BitTorrent Open Source License.  (See first paragraph of License)
+
+Licensed Product:  Any BitTorrent Product licensed pursuant to this License.  The term "Licensed Product" includes all previous Modifications from any Contributor that you receive.  (See first paragraph of License and Section 2)
+
+Licensor:  BitTorrent, Inc.  (See first paragraph of License)
+
+Modifications:  Any additions to or deletions from the substance or structure of (i) a file containing Licensed Product, or (ii) any new file that contains any part of Licensed Product.  (See Section 2)
+
+Notice:  The notice contained in Exhibit A.  (See Section 4(e))
+
+Source Code: The preferred form for making modifications to the Licensed Product, including all modules contained therein, plus any associated interface definition files, scripts used to control compilation and installation of an executable program, or a list of differential comparisons against the Source Code of the Licensed Product.  (See Section 1(a))
+
+You:  This term is defined in Section 14 of this License.
+
+
+EXHIBIT A
+
+The Notice below must appear in each file of the Source Code of any copy you distribute of the Licensed Product or any hereto.  Contributors to any Modifications may add their own copyright notices to identify their own contributions.
+
+License:
+
+The contents of this file are subject to the BitTorrent Open Source License Version 1.0 (the License).  You may not copy or use this file, in either source code or executable form, except in compliance with the License.  You may obtain a copy of the License at http://www.bittorrent.com/license/.
+
+Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the License for the specific language governing rights and limitations under the License.
+

libs/bencode/__init__.py

@@ -0,0 +1 @@
+from bencode import *

libs/bencode/bencode.py

@@ -0,0 +1,131 @@
+# The contents of this file are subject to the BitTorrent Open Source License
+# Version 1.1 (the License).  You may not copy or use this file, in either
+# source code or executable form, except in compliance with the License.  You
+# may obtain a copy of the License at http://www.bittorrent.com/license/.
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the License
+# for the specific language governing rights and limitations under the
+# License.
+
+# Written by Petru Paler
+
+from BTL import BTFailure
+
+
+def decode_int(x, f):
+    f += 1
+    newf = x.index('e', f)
+    n = int(x[f:newf])
+    if x[f] == '-':
+        if x[f + 1] == '0':
+            raise ValueError
+    elif x[f] == '0' and newf != f+1:
+        raise ValueError
+    return (n, newf+1)
+
+def decode_string(x, f):
+    colon = x.index(':', f)
+    n = int(x[f:colon])
+    if x[f] == '0' and colon != f+1:
+        raise ValueError
+    colon += 1
+    return (x[colon:colon+n], colon+n)
+
+def decode_list(x, f):
+    r, f = [], f+1
+    while x[f] != 'e':
+        v, f = decode_func[x[f]](x, f)
+        r.append(v)
+    return (r, f + 1)
+
+def decode_dict(x, f):
+    r, f = {}, f+1
+    while x[f] != 'e':
+        k, f = decode_string(x, f)
+        r[k], f = decode_func[x[f]](x, f)
+    return (r, f + 1)
+
+decode_func = {}
+decode_func['l'] = decode_list
+decode_func['d'] = decode_dict
+decode_func['i'] = decode_int
+decode_func['0'] = decode_string
+decode_func['1'] = decode_string
+decode_func['2'] = decode_string
+decode_func['3'] = decode_string
+decode_func['4'] = decode_string
+decode_func['5'] = decode_string
+decode_func['6'] = decode_string
+decode_func['7'] = decode_string
+decode_func['8'] = decode_string
+decode_func['9'] = decode_string
+
+def bdecode(x):
+    try:
+        r, l = decode_func[x[0]](x, 0)
+    except (IndexError, KeyError, ValueError):
+        raise BTFailure("not a valid bencoded string")
+    if l != len(x):
+        raise BTFailure("invalid bencoded value (data after valid prefix)")
+    return r
+
+from types import StringType, IntType, LongType, DictType, ListType, TupleType
+
+
+class Bencached(object):
+
+    __slots__ = ['bencoded']
+
+    def __init__(self, s):
+        self.bencoded = s
+
+def encode_bencached(x,r):
+    r.append(x.bencoded)
+
+def encode_int(x, r):
+    r.extend(('i', str(x), 'e'))
+
+def encode_bool(x, r):
+    if x:
+        encode_int(1, r)
+    else:
+        encode_int(0, r)
+        
+def encode_string(x, r):
+    r.extend((str(len(x)), ':', x))
+
+def encode_list(x, r):
+    r.append('l')
+    for i in x:
+        encode_func[type(i)](i, r)
+    r.append('e')
+
+def encode_dict(x,r):
+    r.append('d')
+    ilist = x.items()
+    ilist.sort()
+    for k, v in ilist:
+        r.extend((str(len(k)), ':', k))
+        encode_func[type(v)](v, r)
+    r.append('e')
+
+encode_func = {}
+encode_func[Bencached] = encode_bencached
+encode_func[IntType] = encode_int
+encode_func[LongType] = encode_int
+encode_func[StringType] = encode_string
+encode_func[ListType] = encode_list
+encode_func[TupleType] = encode_list
+encode_func[DictType] = encode_dict
+
+try:
+    from types import BooleanType
+    encode_func[BooleanType] = encode_bool
+except ImportError:
+    pass
+
+def bencode(x):
+    r = []
+    encode_func[type(x)](x, r)
+    return ''.join(r)

libs/flask/__init__.py

@@ -10,7 +10,7 @@
     :license: BSD, see LICENSE for more details.
 """
 
-__version__ = '0.9-dev'
+__version__ = '0.9'
 
 # utilities we import from Werkzeug and Jinja2 that are unused
 # in the module but are exported as public interface.
@@ -22,9 +22,12 @@ from .app import Flask, Request, Response
 from .config import Config
 from .helpers import url_for, jsonify, json_available, flash, \
     send_file, send_from_directory, get_flashed_messages, \
-    get_template_attribute, make_response, safe_join
-from .globals import current_app, g, request, session, _request_ctx_stack
-from .ctx import has_request_context
+    get_template_attribute, make_response, safe_join, \
+    stream_with_context
+from .globals import current_app, g, request, session, _request_ctx_stack, \
+     _app_ctx_stack
+from .ctx import has_request_context, has_app_context, \
+     after_this_request
 from .module import Module
 from .blueprints import Blueprint
 from .templating import render_template, render_template_string

libs/flask/app.py

@@ -19,7 +19,7 @@ from itertools import chain
 from functools import update_wrapper
 
 from werkzeug.datastructures import ImmutableDict
-from werkzeug.routing import Map, Rule, RequestRedirect
+from werkzeug.routing import Map, Rule, RequestRedirect, BuildError
 from werkzeug.exceptions import HTTPException, InternalServerError, \
      MethodNotAllowed, BadRequest
 
@@ -28,14 +28,14 @@ from .helpers import _PackageBoundObject, url_for, get_flashed_messages, \
     find_package
 from .wrappers import Request, Response
 from .config import ConfigAttribute, Config
-from .ctx import RequestContext
+from .ctx import RequestContext, AppContext, _RequestGlobals
 from .globals import _request_ctx_stack, request
 from .sessions import SecureCookieSessionInterface
 from .module import blueprint_is_module
 from .templating import DispatchingJinjaLoader, Environment, \
     _default_template_ctx_processor
 from .signals import request_started, request_finished, got_request_exception, \
-    request_tearing_down
+    request_tearing_down, appcontext_tearing_down
 
 # a lock used for logger initialization
 _logger_lock = Lock()
@@ -148,6 +148,18 @@ class Flask(_PackageBoundObject):
     #: :class:`~flask.Response` for more information.
     response_class = Response
 
+    #: The class that is used for the :data:`~flask.g` instance.
+    #:
+    #: Example use cases for a custom class:
+    #:
+    #: 1. Store arbitrary attributes on flask.g.
+    #: 2. Add a property for lazy per-request database connectors.
+    #: 3. Return None instead of AttributeError on expected attributes.
+    #: 4. Raise exception if an unexpected attr is set, a "controlled" flask.g.
+    #:
+    #: .. versionadded:: 0.9
+    request_globals_class = _RequestGlobals
+
     #: The debug flag.  Set this to `True` to enable debugging of the
     #: application.  In debug mode the debugger will kick in when an unhandled
     #: exception ocurrs and the integrated server will automatically reload
@@ -249,8 +261,10 @@ class Flask(_PackageBoundObject):
         'SESSION_COOKIE_HTTPONLY':              True,
         'SESSION_COOKIE_SECURE':                False,
         'MAX_CONTENT_LENGTH':                   None,
+        'SEND_FILE_MAX_AGE_DEFAULT':            12 * 60 * 60, # 12 hours
         'TRAP_BAD_REQUEST_ERRORS':              False,
-        'TRAP_HTTP_EXCEPTIONS':                 False
+        'TRAP_HTTP_EXCEPTIONS':                 False,
+        'PREFERRED_URL_SCHEME':                 'http'
     })
 
     #: The rule object to use for URL rules created.  This is used by
@@ -327,6 +341,15 @@ class Flask(_PackageBoundObject):
         #: decorator.
         self.error_handler_spec = {None: self._error_handlers}
 
+        #: A list of functions that are called when :meth:`url_for` raises a
+        #: :exc:`~werkzeug.routing.BuildError`.  Each function registered here
+        #: is called with `error`, `endpoint` and `values`.  If a function
+        #: returns `None` or raises a `BuildError` the next function is
+        #: tried.
+        #:
+        #: .. versionadded:: 0.9
+        self.url_build_error_handlers = []
+
         #: A dictionary with lists of functions that should be called at the
         #: beginning of the request.  The key of the dictionary is the name of
         #: the blueprint this function is active for, `None` for all requests.
@@ -362,6 +385,14 @@ class Flask(_PackageBoundObject):
         #: .. versionadded:: 0.7
         self.teardown_request_funcs = {}
 
+        #: A list of functions that are called when the application context
+        #: is destroyed.  Since the application context is also torn down
+        #: if the request ends this is the place to store code that disconnects
+        #: from databases.
+        #:
+        #: .. versionadded:: 0.9
+        self.teardown_appcontext_funcs = []
+
         #: A dictionary with lists of functions that can be used as URL
         #: value processor functions.  Whenever a URL is built these functions
         #: are called to modify the dictionary of values in place.  The key
@@ -884,6 +915,10 @@ class Flask(_PackageBoundObject):
         # a tuple of only `GET` as default.
         if methods is None:
             methods = getattr(view_func, 'methods', None) or ('GET',)
+        methods = set(methods)
+
+        # Methods that should always be added
+        required_methods = set(getattr(view_func, 'required_methods', ()))
 
         # starting with Flask 0.8 the view_func object can disable and
         # force-enable the automatic options handling.
@@ -892,11 +927,14 @@ class Flask(_PackageBoundObject):
 
         if provide_automatic_options is None:
             if 'OPTIONS' not in methods:
-                methods = tuple(methods) + ('OPTIONS',)
                 provide_automatic_options = True
+                required_methods.add('OPTIONS')
             else:
                 provide_automatic_options = False
 
+        # Add the required methods now.
+        methods |= required_methods
+
         # due to a werkzeug bug we need to make sure that the defaults are
         # None if they are an empty dictionary.  This should not be necessary
         # with Werkzeug 0.7
@@ -1098,10 +1136,42 @@ class Flask(_PackageBoundObject):
         that they will fail.  If they do execute code that might fail they
         will have to surround the execution of these code by try/except
         statements and log ocurring errors.
+
+        When a teardown function was called because of a exception it will
+        be passed an error object.
         """
         self.teardown_request_funcs.setdefault(None, []).append(f)
         return f
 
+    @setupmethod
+    def teardown_appcontext(self, f):
+        """Registers a function to be called when the application context
+        ends.  These functions are typically also called when the request
+        context is popped.
+
+        Example::
+
+            ctx = app.app_context()
+            ctx.push()
+            ...
+            ctx.pop()
+
+        When ``ctx.pop()`` is executed in the above example, the teardown
+        functions are called just before the app context moves from the
+        stack of active contexts.  This becomes relevant if you are using
+        such constructs in tests.
+
+        Since a request context typically also manages an application
+        context it would also be called when you pop a request context.
+
+        When a teardown function was called because of an exception it will
+        be passed an error object.
+
+        .. versionadded:: 0.9
+        """
+        self.teardown_appcontext_funcs.append(f)
+        return f
+
     @setupmethod
     def context_processor(self, f):
         """Registers a template context processor function."""
@@ -1312,7 +1382,7 @@ class Flask(_PackageBoundObject):
     def make_default_options_response(self):
         """This method is called to create the default `OPTIONS` response.
         This can be changed through subclassing to change the default
-        behaviour of `OPTIONS` responses.
+        behavior of `OPTIONS` responses.
 
         .. versionadded:: 0.7
         """
@@ -1346,23 +1416,48 @@ class Flask(_PackageBoundObject):
                                 string as body
         :class:`unicode`        a response object is created with the
                                 string encoded to utf-8 as body
-        :class:`tuple`          the response object is created with the
-                                contents of the tuple as arguments
         a WSGI function         the function is called as WSGI application
                                 and buffered as response object
+        :class:`tuple`          A tuple in the form ``(response, status,
+                                headers)`` where `response` is any of the
+                                types defined here, `status` is a string
+                                or an integer and `headers` is a list of
+                                a dictionary with header values.
         ======================= ===========================================
 
         :param rv: the return value from the view function
+
+        .. versionchanged:: 0.9
+           Previously a tuple was interpreted as the arguments for the
+           response object.
         """
+        status = headers = None
+        if isinstance(rv, tuple):
+            rv, status, headers = rv + (None,) * (3 - len(rv))
+
         if rv is None:
             raise ValueError('View function did not return a response')
-        if isinstance(rv, self.response_class):
-            return rv
-        if isinstance(rv, basestring):
-            return self.response_class(rv)
-        if isinstance(rv, tuple):
-            return self.response_class(*rv)
-        return self.response_class.force_type(rv, request.environ)
+
+        if not isinstance(rv, self.response_class):
+            # When we create a response object directly, we let the constructor
+            # set the headers and status.  We do this because there can be
+            # some extra logic involved when creating these objects with
+            # specific values (like defualt content type selection).
+            if isinstance(rv, basestring):
+                rv = self.response_class(rv, headers=headers, status=status)
+                headers = status = None
+            else:
+                rv = self.response_class.force_type(rv, request.environ)
+
+        if status is not None:
+            if isinstance(status, basestring):
+                rv.status = status
+            else:
+                rv.status_code = status
+        if headers:
+            rv.headers.extend(headers)
+
+        return rv
 
     def create_url_adapter(self, request):
         """Creates a URL adapter for the given request.  The URL adapter
@@ -1370,9 +1465,21 @@ class Flask(_PackageBoundObject):
         so the request is passed explicitly.
 
         .. versionadded:: 0.6
+
+        .. versionchanged:: 0.9
+           This can now also be called without a request object when the
+           UR adapter is created for the application context.
         """
-        return self.url_map.bind_to_environ(request.environ,
-            server_name=self.config['SERVER_NAME'])
+        if request is not None:
+            return self.url_map.bind_to_environ(request.environ,
+                server_name=self.config['SERVER_NAME'])
+        # We need at the very least the server name to be set for this
+        # to work.
+        if self.config['SERVER_NAME'] is not None:
+            return self.url_map.bind(
+                self.config['SERVER_NAME'],
+                script_name=self.config['APPLICATION_ROOT'] or '/',
+                url_scheme=self.config['PREFERRED_URL_SCHEME'])
 
     def inject_url_defaults(self, endpoint, values):
         """Injects the URL defaults for the given endpoint directly into
@@ -1383,11 +1490,30 @@ class Flask(_PackageBoundObject):
         """
         funcs = self.url_default_functions.get(None, ())
         if '.' in endpoint:
-            bp = endpoint.split('.', 1)[0]
+            bp = endpoint.rsplit('.', 1)[0]
             funcs = chain(funcs, self.url_default_functions.get(bp, ()))
         for func in funcs:
             func(endpoint, values)
 
+    def handle_url_build_error(self, error, endpoint, values):
+        """Handle :class:`~werkzeug.routing.BuildError` on :meth:`url_for`.
+        """
+        exc_type, exc_value, tb = sys.exc_info()
+        for handler in self.url_build_error_handlers:
+            try:
+                rv = handler(error, endpoint, values)
+                if rv is not None:
+                    return rv
+            except BuildError, error:
+                pass
+
+        # At this point we want to reraise the exception.  If the error is
+        # still the same one we can reraise it with the original traceback,
+        # otherwise we raise it from here.
+        if error is exc_value:
+            raise exc_type, exc_value, tb
+        raise error
+
     def preprocess_request(self):
         """Called before the actual request dispatching and will
         call every as :meth:`before_request` decorated function.
@@ -1429,7 +1555,7 @@ class Flask(_PackageBoundObject):
         """
         ctx = _request_ctx_stack.top
         bp = ctx.request.blueprint
-        funcs = ()
+        funcs = ctx._after_request_functions
         if bp is not None and bp in self.after_request_funcs:
             funcs = reversed(self.after_request_funcs[bp])
         if None in self.after_request_funcs:
@@ -1440,23 +1566,54 @@ class Flask(_PackageBoundObject):
             self.save_session(ctx.session, response)
         return response
 
-    def do_teardown_request(self):
+    def do_teardown_request(self, exc=None):
         """Called after the actual request dispatching and will
         call every as :meth:`teardown_request` decorated function.  This is
         not actually called by the :class:`Flask` object itself but is always
         triggered when the request context is popped.  That way we have a
         tighter control over certain resources under testing environments.
+
+        .. versionchanged:: 0.9
+           Added the `exc` argument.  Previously this was always using the
+           current exception information.
         """
+        if exc is None:
+            exc = sys.exc_info()[1]
         funcs = reversed(self.teardown_request_funcs.get(None, ()))
         bp = _request_ctx_stack.top.request.blueprint
         if bp is not None and bp in self.teardown_request_funcs:
             funcs = chain(funcs, reversed(self.teardown_request_funcs[bp]))
-        exc = sys.exc_info()[1]
         for func in funcs:
             rv = func(exc)
-            if rv is not None:
-                return rv
-        request_tearing_down.send(self)
+        request_tearing_down.send(self, exc=exc)
+
+    def do_teardown_appcontext(self, exc=None):
+        """Called when an application context is popped.  This works pretty
+        much the same as :meth:`do_teardown_request` but for the application
+        context.
+
+        .. versionadded:: 0.9
+        """
+        if exc is None:
+            exc = sys.exc_info()[1]
+        for func in reversed(self.teardown_appcontext_funcs):
+            func(exc)
+        appcontext_tearing_down.send(self, exc=exc)
+
+    def app_context(self):
+        """Binds the application only.  For as long as the application is bound
+        to the current context the :data:`flask.current_app` points to that
+        application.  An application context is automatically created when a
+        request context is pushed if necessary.
+
+        Example usage::
+
+            with app.app_context():
+                ...
+
+        .. versionadded:: 0.9
+        """
+        return AppContext(self)
 
     def request_context(self, environ):
         """Creates a :class:`~flask.ctx.RequestContext` from the given

libs/flask/blueprints.py

@@ -25,7 +25,7 @@ class BlueprintSetupState(object):
         #: a reference to the current application
         self.app = app
 
-        #: a reference to the blurprint that created this setup state.
+        #: a reference to the blueprint that created this setup state.
         self.blueprint = blueprint
 
         #: a dictionary with all options that were passed to the

libs/flask/config.py

@@ -106,8 +106,7 @@ class Config(dict):
                                'loaded.  Set this variable and make it '
                                'point to a configuration file' %
                                variable_name)
-        self.from_pyfile(rv)
-        return True
+        return self.from_pyfile(rv, silent=silent)
 
     def from_pyfile(self, filename, silent=False):
         """Updates the values in the config from a Python file.  This function

libs/flask/ctx.py

@@ -9,16 +9,44 @@
     :license: BSD, see LICENSE for more details.
 """
 
+import sys
+
 from werkzeug.exceptions import HTTPException
 
-from .globals import _request_ctx_stack
+from .globals import _request_ctx_stack, _app_ctx_stack
 from .module import blueprint_is_module
 
 
 class _RequestGlobals(object):
+    """A plain object."""
     pass
 
 
+def after_this_request(f):
+    """Executes a function after this request.  This is useful to modify
+    response objects.  The function is passed the response object and has
+    to return the same or a new one.
+
+    Example::
+
+        @app.route('/')
+        def index():
+            @after_this_request
+            def add_header(response):
+                response.headers['X-Foo'] = 'Parachute'
+                return response
+            return 'Hello World!'
+
+    This is more useful if a function other than the view function wants to
+    modify a response.  For instance think of a decorator that wants to add
+    some headers without converting the return value into a response object.
+
+    .. versionadded:: 0.9
+    """
+    _request_ctx_stack.top._after_request_functions.append(f)
+    return f
+
+
 def has_request_context():
     """If you have code that wants to test if a request context is there or
     not this function can be used.  For instance, you may want to take advantage
@@ -51,6 +79,57 @@ def has_request_context():
     return _request_ctx_stack.top is not None
 
 
+def has_app_context():
+    """Works like :func:`has_request_context` but for the application
+    context.  You can also just do a boolean check on the
+    :data:`current_app` object instead.
+
+    .. versionadded:: 0.9
+    """
+    return _app_ctx_stack.top is not None
+
+
+class AppContext(object):
+    """The application context binds an application object implicitly
+    to the current thread or greenlet, similar to how the
+    :class:`RequestContext` binds request information.  The application
+    context is also implicitly created if a request context is created
+    but the application is not on top of the individual application
+    context.
+    """
+
+    def __init__(self, app):
+        self.app = app
+        self.url_adapter = app.create_url_adapter(None)
+
+        # Like request context, app contexts can be pushed multiple times
+        # but there a basic "refcount" is enough to track them.
+        self._refcnt = 0
+
+    def push(self):
+        """Binds the app context to the current context."""
+        self._refcnt += 1
+        _app_ctx_stack.push(self)
+
+    def pop(self, exc=None):
+        """Pops the app context."""
+        self._refcnt -= 1
+        if self._refcnt <= 0:
+            if exc is None:
+                exc = sys.exc_info()[1]
+            self.app.do_teardown_appcontext(exc)
+        rv = _app_ctx_stack.pop()
+        assert rv is self, 'Popped wrong app context.  (%r instead of %r)' \
+            % (rv, self)
+
+    def __enter__(self):
+        self.push()
+        return self
+
+    def __exit__(self, exc_type, exc_value, tb):
+        self.pop(exc_value)
+
+
 class RequestContext(object):
     """The request context contains all request relevant information.  It is
     created at the beginning of the request and pushed to the
@@ -85,17 +164,28 @@ class RequestContext(object):
         self.app = app
         self.request = app.request_class(environ)
         self.url_adapter = app.create_url_adapter(self.request)
-        self.g = _RequestGlobals()
+        self.g = app.request_globals_class()
         self.flashes = None
         self.session = None
 
+        # Request contexts can be pushed multiple times and interleaved with
+        # other request contexts.  Now only if the last level is popped we
+        # get rid of them.  Additionally if an application context is missing
+        # one is created implicitly so for each level we add this information
+        self._implicit_app_ctx_stack = []
+
         # indicator if the context was preserved.  Next time another context
         # is pushed the preserved context is popped.
         self.preserved = False
 
+        # Functions that should be executed after the request on the response
+        # object.  These will be called before the regular "after_request"
+        # functions.
+        self._after_request_functions = []
+
         self.match_request()
 
-        # XXX: Support for deprecated functionality.  This is doing away with
+        # XXX: Support for deprecated functionality.  This is going away with
         # Flask 1.0
         blueprint = self.request.blueprint
         if blueprint is not None:
@@ -130,6 +220,16 @@ class RequestContext(object):
         if top is not None and top.preserved:
             top.pop()
 
+        # Before we push the request context we have to ensure that there
+        # is an application context.
+        app_ctx = _app_ctx_stack.top
+        if app_ctx is None or app_ctx.app != self.app:
+            app_ctx = self.app.app_context()
+            app_ctx.push()
+            self._implicit_app_ctx_stack.append(app_ctx)
+        else:
+            self._implicit_app_ctx_stack.append(None)
+
         _request_ctx_stack.push(self)
 
         # Open the session at the moment that the request context is
@@ -139,20 +239,36 @@ class RequestContext(object):
         if self.session is None:
             self.session = self.app.make_null_session()
 
-    def pop(self):
+    def pop(self, exc=None):
         """Pops the request context and unbinds it by doing that.  This will
         also trigger the execution of functions registered by the
         :meth:`~flask.Flask.teardown_request` decorator.
+
+        .. versionchanged:: 0.9
+           Added the `exc` argument.
         """
-        self.preserved = False
-        self.app.do_teardown_request()
+        app_ctx = self._implicit_app_ctx_stack.pop()
+
+        clear_request = False
+        if not self._implicit_app_ctx_stack:
+            self.preserved = False
+            if exc is None:
+                exc = sys.exc_info()[1]
+            self.app.do_teardown_request(exc)
+            clear_request = True
+
         rv = _request_ctx_stack.pop()
         assert rv is self, 'Popped wrong request context.  (%r instead of %r)' \
             % (rv, self)
 
         # get rid of circular dependencies at the end of the request
         # so that we don't require the GC to be active.
-        rv.request.environ['werkzeug.request'] = None
+        if clear_request:
+            rv.request.environ['werkzeug.request'] = None
+
+        # Get rid of the app as well if necessary.
+        if app_ctx is not None:
+            app_ctx.pop(exc)
 
     def __enter__(self):
         self.push()
@@ -168,7 +284,7 @@ class RequestContext(object):
            (tb is not None and self.app.preserve_context_on_exception):
             self.preserved = True
         else:
-            self.pop()
+            self.pop(exc_value)
 
     def __repr__(self):
         return '<%s \'%s\' [%s] of %s>' % (

libs/flask/exceptions.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+"""
+    flask.exceptions
+    ~~~~~~~~~~~~
+
+    Flask specific additions to :class:`~werkzeug.exceptions.HTTPException`
+
+    :copyright: (c) 2011 by Armin Ronacher.
+    :license: BSD, see LICENSE for more details.
+"""
+from werkzeug.exceptions import HTTPException, BadRequest
+from .helpers import json
+
+
+class JSONHTTPException(HTTPException):
+    """A base class for HTTP exceptions with ``Content-Type:
+    application/json``.
+
+    The ``description`` attribute of this class must set to a string (*not* an
+    HTML string) which describes the error.
+
+    """
+
+    def get_body(self, environ):
+        """Overrides :meth:`werkzeug.exceptions.HTTPException.get_body` to
+        return the description of this error in JSON format instead of HTML.
+
+        """
+        return json.dumps(dict(description=self.get_description(environ)))
+
+    def get_headers(self, environ):
+        """Returns a list of headers including ``Content-Type:
+        application/json``.
+
+        """
+        return [('Content-Type', 'application/json')]
+
+
+class JSONBadRequest(JSONHTTPException, BadRequest):
+    """Represents an HTTP ``400 Bad Request`` error whose body contains an
+    error message in JSON format instead of HTML format (as in the superclass).
+
+    """
+
+    #: The description of the error which occurred as a string.
+    description = (
+        'The browser (or proxy) sent a request that this server could not '
+        'understand.'
+    )

libs/flask/globals.py

@@ -20,9 +20,17 @@ def _lookup_object(name):
     return getattr(top, name)
 
 
+def _find_app():
+    top = _app_ctx_stack.top
+    if top is None:
+        raise RuntimeError('working outside of application context')
+    return top.app
+
+
 # context locals
 _request_ctx_stack = LocalStack()
-current_app = LocalProxy(partial(_lookup_object, 'app'))
+_app_ctx_stack = LocalStack()
+current_app = LocalProxy(_find_app)
 request = LocalProxy(partial(_lookup_object, 'request'))
 session = LocalProxy(partial(_lookup_object, 'session'))
 g = LocalProxy(partial(_lookup_object, 'g'))

libs/flask/helpers.py

@@ -11,7 +11,6 @@
 
 from __future__ import with_statement
 
-import imp
 import os
 import sys
 import pkgutil
@@ -20,7 +19,9 @@ import mimetypes
 from time import time
 from zlib import adler32
 from threading import RLock
+from werkzeug.routing import BuildError
 from werkzeug.urls import url_quote
+from functools import update_wrapper
 
 # try to load the best simplejson implementation available.  If JSON
 # is not installed, we add a failing class.
@@ -50,7 +51,8 @@ except ImportError:
 
 from jinja2 import FileSystemLoader
 
-from .globals import session, _request_ctx_stack, current_app, request
+from .globals import session, _request_ctx_stack, _app_ctx_stack, \
+     current_app, request
 
 
 def _assert_have_json():
@@ -59,7 +61,7 @@ def _assert_have_json():
         raise RuntimeError('simplejson not installed')
 
 
-# figure out if simplejson escapes slashes.  This behaviour was changed
+# figure out if simplejson escapes slashes.  This behavior was changed
 # from one version to another without reason.
 if not json_available or '\\/' not in json.dumps('/'):
 
@@ -91,6 +93,78 @@ def _endpoint_from_view_func(view_func):
     return view_func.__name__
 
 
+def stream_with_context(generator_or_function):
+    """Request contexts disappear when the response is started on the server.
+    This is done for efficiency reasons and to make it less likely to encounter
+    memory leaks with badly written WSGI middlewares.  The downside is that if
+    you are using streamed responses, the generator cannot access request bound
+    information any more.
+
+    This function however can help you keep the context around for longer::
+
+        from flask import stream_with_context, request, Response
+
+        @app.route('/stream')
+        def streamed_response():
+            @stream_with_context
+            def generate():
+                yield 'Hello '
+                yield request.args['name']
+                yield '!'
+            return Response(generate())
+
+    Alternatively it can also be used around a specific generator:
+
+        from flask import stream_with_context, request, Response
+
+        @app.route('/stream')
+        def streamed_response():
+            def generate():
+                yield 'Hello '
+                yield request.args['name']
+                yield '!'
+            return Response(stream_with_context(generate()))
+
+    .. versionadded:: 0.9
+    """
+    try:
+        gen = iter(generator_or_function)
+    except TypeError:
+        def decorator(*args, **kwargs):
+            gen = generator_or_function()
+            return stream_with_context(gen)
+        return update_wrapper(decorator, generator_or_function)
+
+    def generator():
+        ctx = _request_ctx_stack.top
+        if ctx is None:
+            raise RuntimeError('Attempted to stream with context but '
+                'there was no context in the first place to keep around.')
+        with ctx:
+            # Dummy sentinel.  Has to be inside the context block or we're
+            # not actually keeping the context around.
+            yield None
+
+            # The try/finally is here so that if someone passes a WSGI level
+            # iterator in we're still running the cleanup logic.  Generators
+            # don't need that because they are closed on their destruction
+            # automatically.
+            try:
+                for item in gen:
+                    yield item
+            finally:
+                if hasattr(gen, 'close'):
+                    gen.close()
+
+    # The trick is to start the generator.  Then the code execution runs until
+    # the first dummy None is yielded at which point the context was already
+    # pushed.  This item is discarded.  Then when the iteration continues the
+    # real generator is executed.
+    wrapped_g = generator()
+    wrapped_g.next()
+    return wrapped_g
+
+
 def jsonify(*args, **kwargs):
     """Creates a :class:`~flask.Response` with the JSON representation of
     the given arguments with an `application/json` mimetype.  The arguments
@@ -188,36 +262,106 @@ def url_for(endpoint, **values):
 
     For more information, head over to the :ref:`Quickstart <url-building>`.
 
+    To integrate applications, :class:`Flask` has a hook to intercept URL build
+    errors through :attr:`Flask.build_error_handler`.  The `url_for` function
+    results in a :exc:`~werkzeug.routing.BuildError` when the current app does
+    not have a URL for the given endpoint and values.  When it does, the
+    :data:`~flask.current_app` calls its :attr:`~Flask.build_error_handler` if
+    it is not `None`, which can return a string to use as the result of
+    `url_for` (instead of `url_for`'s default to raise the
+    :exc:`~werkzeug.routing.BuildError` exception) or re-raise the exception.
+    An example::
+
+        def external_url_handler(error, endpoint, **values):
+            "Looks up an external URL when `url_for` cannot build a URL."
+            # This is an example of hooking the build_error_handler.
+            # Here, lookup_url is some utility function you've built
+            # which looks up the endpoint in some external URL registry.
+            url = lookup_url(endpoint, **values)
+            if url is None:
+                # External lookup did not have a URL.
+                # Re-raise the BuildError, in context of original traceback.
+                exc_type, exc_value, tb = sys.exc_info()
+                if exc_value is error:
+                    raise exc_type, exc_value, tb
+                else:
+                    raise error
+            # url_for will use this result, instead of raising BuildError.
+            return url
+
+        app.build_error_handler = external_url_handler
+
+    Here, `error` is the instance of :exc:`~werkzeug.routing.BuildError`, and
+    `endpoint` and `**values` are the arguments passed into `url_for`.  Note
+    that this is for building URLs outside the current application, and not for
+    handling 404 NotFound errors.
+
     .. versionadded:: 0.9
        The `_anchor` and `_method` parameters were added.
 
+    .. versionadded:: 0.9
+       Calls :meth:`Flask.handle_build_error` on
+       :exc:`~werkzeug.routing.BuildError`.
+
     :param endpoint: the endpoint of the URL (name of the function)
     :param values: the variable arguments of the URL rule
     :param _external: if set to `True`, an absolute URL is generated.
     :param _anchor: if provided this is added as anchor to the URL.
     :param _method: if provided this explicitly specifies an HTTP method.
     """
-    ctx = _request_ctx_stack.top
-    blueprint_name = request.blueprint
-    if not ctx.request._is_old_module:
-        if endpoint[:1] == '.':
-            if blueprint_name is not None:
-                endpoint = blueprint_name + endpoint
-            else:
+    appctx = _app_ctx_stack.top
+    reqctx = _request_ctx_stack.top
+    if appctx is None:
+        raise RuntimeError('Attempted to generate a URL with the application '
+                           'context being pushed.  This has to be executed ')
+
+    # If request specific information is available we have some extra
+    # features that support "relative" urls.
+    if reqctx is not None:
+        url_adapter = reqctx.url_adapter
+        blueprint_name = request.blueprint
+        if not reqctx.request._is_old_module:
+            if endpoint[:1] == '.':
+                if blueprint_name is not None:
+                    endpoint = blueprint_name + endpoint
+                else:
+                    endpoint = endpoint[1:]
+        else:
+            # TODO: get rid of this deprecated functionality in 1.0
+            if '.' not in endpoint:
+                if blueprint_name is not None:
+                    endpoint = blueprint_name + '.' + endpoint
+            elif endpoint.startswith('.'):
                 endpoint = endpoint[1:]
+        external = values.pop('_external', False)
+
+    # Otherwise go with the url adapter from the appctx and make
+    # the urls external by default.
     else:
-        # TODO: get rid of this deprecated functionality in 1.0
-        if '.' not in endpoint:
-            if blueprint_name is not None:
-                endpoint = blueprint_name + '.' + endpoint
-        elif endpoint.startswith('.'):
-            endpoint = endpoint[1:]
-    external = values.pop('_external', False)
+        url_adapter = appctx.url_adapter
+        if url_adapter is None:
+            raise RuntimeError('Application was not able to create a URL '
+                               'adapter for request independent URL generation. '
+                               'You might be able to fix this by setting '
+                               'the SERVER_NAME config variable.')
+        external = values.pop('_external', True)
+
     anchor = values.pop('_anchor', None)
     method = values.pop('_method', None)
-    ctx.app.inject_url_defaults(endpoint, values)
-    rv = ctx.url_adapter.build(endpoint, values, method=method,
+    appctx.app.inject_url_defaults(endpoint, values)
+    try:
+        rv = url_adapter.build(endpoint, values, method=method,
                                force_external=external)
+    except BuildError, error:
+        # We need to inject the values again so that the app callback can
+        # deal with that sort of stuff.
+        values['_external'] = external
+        values['_anchor'] = anchor
+        values['_method'] = method
+        return appctx.app.handle_url_build_error(error, endpoint, values)
+
+    rv = url_adapter.build(endpoint, values, method=method,
+                           force_external=external)
     if anchor is not None:
         rv += '#' + url_quote(anchor)
     return rv
@@ -261,7 +405,16 @@ def flash(message, category='message'):
                      messages and ``'warning'`` for warnings.  However any
                      kind of string can be used as category.
     """
-    session.setdefault('_flashes', []).append((category, message))
+    # Original implementation:
+    #
+    #     session.setdefault('_flashes', []).append((category, message))
+    #
+    # This assumed that changes made to mutable structures in the session are
+    # are always in sync with the sess on object, which is not true for session
+    # implementations that use external storage for keeping their keys/values.
+    flashes = session.get('_flashes', [])
+    flashes.append((category, message))
+    session['_flashes'] = flashes
 
 
 def get_flashed_messages(with_categories=False, category_filter=[]):
@@ -305,7 +458,7 @@ def get_flashed_messages(with_categories=False, category_filter=[]):
 
 def send_file(filename_or_fp, mimetype=None, as_attachment=False,
               attachment_filename=None, add_etags=True,
-              cache_timeout=60 * 60 * 12, conditional=False):
+              cache_timeout=None, conditional=False):
     """Sends the contents of a file to the client.  This will use the
     most efficient method available and configured.  By default it will
     try to use the WSGI server's file_wrapper support.  Alternatively
@@ -330,7 +483,7 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
 
     .. versionadded:: 0.5
        The `add_etags`, `cache_timeout` and `conditional` parameters were
-       added.  The default behaviour is now to attach etags.
+       added.  The default behavior is now to attach etags.
 
     .. versionchanged:: 0.7
        mimetype guessing and etag support for file objects was
@@ -338,6 +491,9 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
        able to, otherwise attach an etag yourself.  This functionality
        will be removed in Flask 1.0
 
+    .. versionchanged:: 0.9
+       cache_timeout pulls its default from application config, when None.
+
     :param filename_or_fp: the filename of the file to send.  This is
                            relative to the :attr:`~Flask.root_path` if a
                            relative path is specified.
@@ -354,7 +510,11 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
                                 differs from the file's filename.
     :param add_etags: set to `False` to disable attaching of etags.
     :param conditional: set to `True` to enable conditional responses.
-    :param cache_timeout: the timeout in seconds for the headers.
+
+    :param cache_timeout: the timeout in seconds for the headers. When `None`
+                          (default), this value is set by
+                          :meth:`~Flask.get_send_file_max_age` of
+                          :data:`~flask.current_app`.
     """
     mtime = None
     if isinstance(filename_or_fp, basestring):
@@ -365,7 +525,7 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
         file = filename_or_fp
         filename = getattr(file, 'name', None)
 
-        # XXX: this behaviour is now deprecated because it was unreliable.
+        # XXX: this behavior is now deprecated because it was unreliable.
         # removed in Flask 1.0
         if not attachment_filename and not mimetype \
            and isinstance(filename, basestring):
@@ -376,7 +536,7 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
         if add_etags:
             warn(DeprecationWarning('In future flask releases etags will no '
                 'longer be generated for file objects passed to the send_file '
-                'function because this behaviour was unreliable.  Pass '
+                'function because this behavior was unreliable.  Pass '
                 'filenames instead if possible, otherwise attach an etag '
                 'yourself based on another value'), stacklevel=2)
 
@@ -418,7 +578,9 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
         rv.last_modified = int(mtime)
 
     rv.cache_control.public = True
-    if cache_timeout:
+    if cache_timeout is None:
+        cache_timeout = current_app.get_send_file_max_age(filename)
+    if cache_timeout is not None:
         rv.cache_control.max_age = cache_timeout
         rv.expires = int(time() + cache_timeout)
 
@@ -495,7 +657,8 @@ def send_from_directory(directory, filename, **options):
     filename = safe_join(directory, filename)
     if not os.path.isfile(filename):
         raise NotFound()
-    return send_file(filename, conditional=True, **options)
+    options.setdefault('conditional', True)
+    return send_file(filename, **options)
 
 
 def get_root_path(import_name):
@@ -504,17 +667,29 @@ def get_root_path(import_name):
 
     Not to be confused with the package path returned by :func:`find_package`.
     """
+    # Module already imported and has a file attribute.  Use that first.
+    mod = sys.modules.get(import_name)
+    if mod is not None and hasattr(mod, '__file__'):
+        return os.path.dirname(os.path.abspath(mod.__file__))
+
+    # Next attempt: check the loader.
     loader = pkgutil.get_loader(import_name)
+
+    # Loader does not exist or we're referring to an unloaded main module
+    # or a main module without path (interactive sessions), go with the
+    # current working directory.
     if loader is None or import_name == '__main__':
-        # import name is not found, or interactive/main module
         return os.getcwd()
+
     # For .egg, zipimporter does not have get_filename until Python 2.7.
+    # Some other loaders might exhibit the same behavior.
     if hasattr(loader, 'get_filename'):
         filepath = loader.get_filename(import_name)
     else:
         # Fall back to imports.
         __import__(import_name)
         filepath = sys.modules[import_name].__file__
+
     # filepath is import_name.py for a module, or __init__.py for a package.
     return os.path.dirname(os.path.abspath(filepath))
 
@@ -651,6 +826,32 @@ class _PackageBoundObject(object):
             return FileSystemLoader(os.path.join(self.root_path,
                                                  self.template_folder))
 
+    def get_send_file_max_age(self, filename):
+        """Provides default cache_timeout for the :func:`send_file` functions.
+
+        By default, this function returns ``SEND_FILE_MAX_AGE_DEFAULT`` from
+        the configuration of :data:`~flask.current_app`.
+
+        Static file functions such as :func:`send_from_directory` use this
+        function, and :func:`send_file` calls this function on
+        :data:`~flask.current_app` when the given cache_timeout is `None`. If a
+        cache_timeout is given in :func:`send_file`, that timeout is used;
+        otherwise, this method is called.
+
+        This allows subclasses to change the behavior when sending files based
+        on the filename.  For example, to set the cache timeout for .js files
+        to 60 seconds::
+
+            class MyFlask(flask.Flask):
+                def get_send_file_max_age(self, name):
+                    if name.lower().endswith('.js'):
+                        return 60
+                    return flask.Flask.get_send_file_max_age(self, name)
+
+        .. versionadded:: 0.9
+        """
+        return current_app.config['SEND_FILE_MAX_AGE_DEFAULT']
+
     def send_static_file(self, filename):
         """Function used internally to send static files from the static
         folder to the browser.
@@ -659,7 +860,11 @@ class _PackageBoundObject(object):
         """
         if not self.has_static_folder:
             raise RuntimeError('No static folder for this object')
-        return send_from_directory(self.static_folder, filename)
+        # Ensure get_send_file_max_age is called in all cases.
+        # Here, we ensure get_send_file_max_age is called for Blueprints.
+        cache_timeout = self.get_send_file_max_age(filename)
+        return send_from_directory(self.static_folder, filename,
+                                   cache_timeout=cache_timeout)
 
     def open_resource(self, resource, mode='rb'):
         """Opens a resource from the application's resource folder.  To see

libs/flask/signals.py

@@ -49,3 +49,4 @@ request_started = _signals.signal('request-started')
 request_finished = _signals.signal('request-finished')
 request_tearing_down = _signals.signal('request-tearing-down')
 got_request_exception = _signals.signal('got-request-exception')
+appcontext_tearing_down = _signals.signal('appcontext-tearing-down')

libs/flask/templating.py

@@ -109,17 +109,19 @@ def _render(template, context, app):
     return rv
 
 
-def render_template(template_name, **context):
+def render_template(template_name_or_list, **context):
     """Renders a template from the template folder with the given
     context.
 
-    :param template_name: the name of the template to be rendered
+    :param template_name_or_list: the name of the template to be
+                                  rendered, or an iterable with template names
+                                  the first one existing will be rendered
     :param context: the variables that should be available in the
                     context of the template.
     """
     ctx = _request_ctx_stack.top
     ctx.app.update_template_context(context)
-    return _render(ctx.app.jinja_env.get_template(template_name),
+    return _render(ctx.app.jinja_env.get_or_select_template(template_name_or_list),
                    context, ctx.app)
 
 

libs/flask/views.py

@@ -107,7 +107,7 @@ class MethodViewType(type):
         rv = type.__new__(cls, name, bases, d)
         if 'methods' not in d:
             methods = set(rv.methods or [])
-            for key, value in d.iteritems():
+            for key in d:
                 if key in http_method_funcs:
                     methods.add(key.upper())
             # if we have no method at all in there we don't want to

libs/flask/wrappers.py

@@ -10,9 +10,9 @@
 """
 
 from werkzeug.wrappers import Request as RequestBase, Response as ResponseBase
-from werkzeug.exceptions import BadRequest
 from werkzeug.utils import cached_property
 
+from .exceptions import JSONBadRequest
 from .debughelpers import attach_enctype_error_multidict
 from .helpers import json, _assert_have_json
 from .globals import _request_ctx_stack
@@ -108,12 +108,22 @@ class Request(RequestBase):
 
     def on_json_loading_failed(self, e):
         """Called if decoding of the JSON data failed.  The return value of
-        this method is used by :attr:`json` when an error ocurred.  The
-        default implementation raises a :class:`~werkzeug.exceptions.BadRequest`.
+        this method is used by :attr:`json` when an error ocurred.  The default
+        implementation raises a :class:`JSONBadRequest`, which is a subclass of
+        :class:`~werkzeug.exceptions.BadRequest` which sets the
+        ``Content-Type`` to ``application/json`` and provides a JSON-formatted
+        error description::
+
+            {"description": "The browser (or proxy) sent a request that \
+                             this server could not understand."}
+
+        .. versionchanged:: 0.9
+           Return a :class:`JSONBadRequest` instead of a
+           :class:`~werkzeug.exceptions.BadRequest` by default.
 
         .. versionadded:: 0.8
         """
-        raise BadRequest()
+        raise JSONBadRequest()
 
     def _load_form_data(self):
         RequestBase._load_form_data(self)

libs/jinja2/__init__.py

@@ -27,7 +27,7 @@
     :license: BSD, see LICENSE for more details.
 """
 __docformat__ = 'restructuredtext en'
-__version__ = '2.7-dev'
+__version__ = '2.6'
 
 # high level interface
 from jinja2.environment import Environment, Template