Runner fs encoding

CouchPotato.py

@@ -61,7 +61,7 @@ class Loader(object):
         self.log = CPLog(__name__)
 
         formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s', '%H:%M:%S')
-        hdlr = handlers.RotatingFileHandler(os.path.join(self.log_dir, 'error.log'), 'a', 500000, 10)
+        hdlr = handlers.RotatingFileHandler(os.path.join(self.log_dir, 'error.log'), 'a', 500000, 10, encoding = 'utf-8')
         hdlr.setLevel(logging.CRITICAL)
         hdlr.setFormatter(formatter)
         self.log.logger.addHandler(hdlr)

couchpotato/core/_base/_core.py

@@ -181,13 +181,13 @@ class Core(Plugin):
         return '%sapi/%s' % (self.createBaseUrl(), Env.setting('api_key'))
 
     def version(self):
-        ver = fireEvent('updater.info', single = True) or {'version': {}}
+        ver = fireEvent('updater.info', single = True)
 
         if os.name == 'nt': platf = 'windows'
         elif 'Darwin' in platform.platform(): platf = 'osx'
         else: platf = 'linux'
 
-        return '%s - %s-%s - v2' % (platf, ver.get('version').get('type') or 'unknown', ver.get('version').get('hash') or 'unknown')
+        return '%s - %s-%s - v2' % (platf, ver.get('version')['type'], ver.get('version')['hash'])
 
     def versionView(self, **kwargs):
         return {
@@ -290,7 +290,7 @@ config = [{
                 },
                 {
                     'name': 'permission_file',
-                    'default': '0644',
+                    'default': '0755',
                     'label': 'File CHMOD',
                     'description': 'See Folder CHMOD description, but for files',
                 },

couchpotato/core/_base/updater/main.py

@@ -205,28 +205,19 @@ class GitUpdater(BaseUpdater):
     def getVersion(self):
 
         if not self.version:
-
-            hash = None
-            date = None
-            branch = self.branch
-
             try:
                 output = self.repo.getHead()  # Yes, please
                 log.debug('Git version output: %s', output.hash)
-
-                hash = output.hash[:8]
-                date = output.getDate()
-                branch = self.repo.getCurrentBranch().name
+                self.version = {
+                    'repr': 'git:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, self.repo.getCurrentBranch().name or self.branch, output.hash[:8], datetime.fromtimestamp(output.getDate())),
+                    'hash': output.hash[:8],
+                    'date': output.getDate(),
+                    'type': 'git',
+                    'branch': self.repo.getCurrentBranch().name
+                }
             except Exception as e:
                 log.error('Failed using GIT updater, running from source, you need to have GIT installed. %s', e)
-
-            self.version = {
-                'repr': 'git:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, branch, hash or 'unknown_hash', datetime.fromtimestamp(date) if date else 'unknown_date'),
-                'hash': hash,
-                'date': date,
-                'type': 'git',
-                'branch': branch
-            }
+                return 'No GIT'
 
         return self.version
 

couchpotato/core/database.py

@@ -621,8 +621,6 @@ class Database(object):
 
             except OperationalError:
                 log.error('Migrating from faulty database, probably a (too) old version: %s', traceback.format_exc())
-                
-                rename_old = True
             except:
                 log.error('Migration failed: %s', traceback.format_exc())
 

couchpotato/core/downloaders/deluge.py

@@ -27,11 +27,6 @@ class Deluge(DownloaderBase):
     def connect(self, reconnect = False):
         # Load host from config and split out port.
         host = cleanHost(self.conf('host'), protocol = False).split(':')
-
-        # Force host assignment
-        if len(host) == 1:
-            host.append(80)
-
         if not isInt(host[1]):
             log.error('Config properties are not filled in correctly, port is missing.')
             return False

couchpotato/core/downloaders/transmission.py

@@ -78,14 +78,12 @@ class Transmission(DownloaderBase):
             log.error('Failed sending torrent to Transmission')
             return False
 
-        data = remote_torrent.get('torrent-added') or remote_torrent.get('torrent-duplicate')
-
         # Change settings of added torrents
         if torrent_params:
-            self.trpc.set_torrent(data['hashString'], torrent_params)
+            self.trpc.set_torrent(remote_torrent['torrent-added']['hashString'], torrent_params)
 
         log.info('Torrent sent to Transmission successfully.')
-        return self.downloadReturnId(data['hashString'])
+        return self.downloadReturnId(remote_torrent['torrent-added']['hashString'])
 
     def test(self):
         if self.connect() and self.trpc.get_session():

couchpotato/core/helpers/encoding.py

@@ -47,6 +47,17 @@ def toUnicode(original, *args):
         ascii_text = str(original).encode('string_escape')
         return toUnicode(ascii_text)
 
+def toUTF8(original):
+    try:
+        if isinstance(original, str) and len(original) > 0:
+            # Try to detect
+            detected = detect(original)
+            return original.decode(detected.get('encoding')).encode('utf-8')
+        else:
+            return original
+    except:
+        #log.error('Failed encoding to UTF8: %s', traceback.format_exc())
+        raise
 
 def ss(original, *args):
 

couchpotato/core/helpers/path.py

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

couchpotato/core/logger.py

@@ -1,5 +1,6 @@
 import logging
 import re
+import traceback
 
 
 class CPLog(object):
@@ -54,19 +55,19 @@ class CPLog(object):
 
     def safeMessage(self, msg, replace_tuple = ()):
 
-        from couchpotato.core.helpers.encoding import ss, toUnicode
+        from couchpotato.core.helpers.encoding import ss, toUTF8
 
-        msg = ss(msg)
+        msg = toUTF8(msg)
 
         try:
             if isinstance(replace_tuple, tuple):
-                msg = msg % tuple([ss(x) if not isinstance(x, (int, float)) else x for x in list(replace_tuple)])
+                msg = msg % tuple([toUTF8(x) for x in list(replace_tuple)])
             elif isinstance(replace_tuple, dict):
-                msg = msg % dict((k, ss(v) if not isinstance(v, (int, float)) else v) for k, v in replace_tuple.iteritems())
+                msg = msg % dict((k, toUTF8(v)) for k, v in replace_tuple.iteritems())
             else:
-                msg = msg % ss(replace_tuple)
-        except Exception as e:
-            self.logger.error('Failed encoding stuff to log "%s": %s' % (msg, e))
+                msg = msg % toUTF8(replace_tuple)
+        except:
+            self.logger.error('Failed encoding stuff to log "%s": %s' % (msg, traceback.format_exc()))
 
         self.setup()
         if not self.is_develop:
@@ -83,4 +84,4 @@ class CPLog(object):
             except:
                 pass
 
-        return toUnicode(msg)
+        return toUTF8(msg)

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

@@ -273,6 +273,10 @@ class MediaPlugin(MediaBase):
         for x in filter_by:
             media_ids = [n for n in media_ids if n in filter_by[x]]
 
+        total_count = len(media_ids)
+        if total_count == 0:
+            return 0, []
+
         offset = 0
         limit = -1
         if limit_offset:
@@ -302,30 +306,11 @@ class MediaPlugin(MediaBase):
             media_ids.remove(media_id)
             if len(media_ids) == 0 or len(medias) == limit: break
 
-        # Sort media by type and return result            
-        result = {}
-
-        # Create keys for media types we are listing
-        if types:
-            for media_type in types:
-                result['%ss' % media_type] = []
-        else:
-            for media_type in fireEvent('media.types', merge = True):
-                result['%ss' % media_type] = []
-
-        total_count = len(medias)
-
-        if total_count == 0:
-            return 0, result
-
-        for kind in medias:
-            result['%ss' % kind['type']].append(kind)
-
-        return total_count, result
+        return total_count, medias
 
     def listView(self, **kwargs):
 
-        total_count, result = self.list(
+        total_movies, movies = self.list(
             types = splitString(kwargs.get('type')),
             status = splitString(kwargs.get('status')),
             release_status = splitString(kwargs.get('release_status')),
@@ -336,12 +321,12 @@ class MediaPlugin(MediaBase):
             search = kwargs.get('search')
         )
 
-        results = result
-        results['success'] = True
-        results['empty'] = len(result) == 0
-        results['total'] = total_count
-
-        return results
+        return {
+            'success': True,
+            'empty': len(movies) == 0,
+            'total': total_movies,
+            'movies': movies,
+        }
 
     def addSingleListView(self):
 
@@ -471,11 +456,6 @@ class MediaPlugin(MediaBase):
                         deleted = True
                     elif new_media_status:
                         media['status'] = new_media_status
-
-                        # Remove profile (no use for in manage)
-                        if new_media_status == 'done':
-                            media['profile_id'] = None
-                        
                         db.update(media)
 
                         fireEvent('media.untag', media['_id'], 'recent', single = True)
@@ -511,7 +491,7 @@ class MediaPlugin(MediaBase):
             }
         })
 
-    def restatus(self, media_id, tag_recent = True, allowed_restatus = None):
+    def restatus(self, media_id, tag_recent = True):
 
         try:
             db = get_db()
@@ -546,7 +526,7 @@ class MediaPlugin(MediaBase):
                     m['status'] = previous_status
 
             # Only update when status has changed
-            if previous_status != m['status'] and (not allowed_restatus or m['status'] in allowed_restatus):
+            if previous_status != m['status']:
                 db.update(m)
 
                 # Tag media as recent

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

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

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

@@ -264,11 +264,3 @@
 	height: 40px;
 }
 
-@media all and (max-width: 480px) {
-    .toggle_menu h2 {
-        font-size: 16px;
-        text-align: center;
-        height: 30px;
-    }
-}
-

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

@@ -4,7 +4,6 @@ from couchpotato import tryInt
 from couchpotato.core.event import addEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.base import MovieProvider
-from requests import HTTPError
 
 
 log = CPLog(__name__)
@@ -33,14 +32,12 @@ class FanartTV(MovieProvider):
 
         try:
             url = self.urls['api'] % identifier
-            fanart_data = self.getJsonData(url, show_error = False)
+            fanart_data = self.getJsonData(url)
 
             if fanart_data:
                 log.debug('Found images for %s', fanart_data.get('name'))
                 images = self._parseMovie(fanart_data)
-        except HTTPError as e:
-            log.debug('Failed getting extra art for %s: %s',
-                      (identifier, e))
+
         except:
             log.error('Failed getting extra art for %s: %s',
                       (identifier, traceback.format_exc()))

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

@@ -1,10 +1,11 @@
 import traceback
 
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.encoding import toUnicode, ss, tryUrlencode
+from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.encoding import simplifyString, toUnicode, ss
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media.movie.providers.base import MovieProvider
+import tmdb3
 
 log = CPLog(__name__)
 
@@ -12,66 +13,54 @@ autoload = 'TheMovieDb'
 
 
 class TheMovieDb(MovieProvider):
-
-    http_time_between_calls = .35
-
-    configuration = {
-        'images': {
-            'secure_base_url': 'https://image.tmdb.org/t/p/',
-        },
-    }
+    MAX_EXTRATHUMBS = 4
 
     def __init__(self):
-        addEvent('info.search', self.search, priority = 3)
-        addEvent('movie.search', self.search, priority = 3)
         addEvent('movie.info', self.getInfo, priority = 3)
         addEvent('movie.info_by_tmdb', self.getInfo)
-        addEvent('app.load', self.config)
 
-    def config(self):
-        configuration = self.request('configuration')
-        if configuration:
-            self.configuration = configuration
+        # Configure TMDB settings
+        tmdb3.set_key(self.conf('api_key'))
+        tmdb3.set_cache('null')
 
-    def search(self, q, limit = 3):
+    def search(self, q, limit = 12):
         """ Find movie by name """
 
         if self.isDisabled():
             return False
 
-        log.debug('Searching for movie: %s', q)
+        search_string = simplifyString(q)
+        cache_key = 'tmdb.cache.%s.%s' % (search_string, limit)
+        results = self.getCache(cache_key)
 
-        raw = None
-        try:
-            name_year = fireEvent('scanner.name_year', q, single = True)
-            raw = self.request('search/movie', {
-                'query': name_year.get('name', q),
-                'year': name_year.get('year'),
-                'search_type': 'ngram' if limit > 1 else 'phrase'
-            }, return_key = 'results')
-        except:
-            log.error('Failed searching TMDB for "%s": %s', (q, traceback.format_exc()))
+        if not results:
+            log.debug('Searching for movie: %s', q)
 
-        results = []
-        if raw:
+            raw = None
             try:
-                nr = 0
+                raw = tmdb3.searchMovie(search_string)
+            except:
+                log.error('Failed searching TMDB for "%s": %s', (search_string, traceback.format_exc()))
 
-                for movie in raw:
-                    parsed_movie = self.parseMovie(movie, extended = False)
-                    if parsed_movie:
-                        results.append(parsed_movie)
+            results = []
+            if raw:
+                try:
+                    nr = 0
 
-                    nr += 1
-                    if nr == limit:
-                        break
+                    for movie in raw:
+                        results.append(self.parseMovie(movie, extended = False))
 
-                log.info('Found: %s', [result['titles'][0] + ' (' + str(result.get('year', 0)) + ')' for result in results])
+                        nr += 1
+                        if nr == limit:
+                            break
 
-                return results
-            except SyntaxError as e:
-                log.error('Failed to parse XML response: %s', e)
-                return False
+                    log.info('Found: %s', [result['titles'][0] + ' (' + str(result.get('year', 0)) + ')' for result in results])
+
+                    self.setCache(cache_key, results)
+                    return results
+                except SyntaxError as e:
+                    log.error('Failed to parse XML response: %s', e)
+                    return False
 
         return results
 
@@ -80,91 +69,101 @@ class TheMovieDb(MovieProvider):
         if not identifier:
             return {}
 
-        result = self.parseMovie({
-            'id': identifier
-        }, extended = extended)
+        cache_key = 'tmdb.cache.%s%s' % (identifier, '.ex' if extended else '')
+        result = self.getCache(cache_key)
 
-        return result or {}
+        if not result:
+            try:
+                log.debug('Getting info: %s', cache_key)
+                # noinspection PyArgumentList
+                movie = tmdb3.Movie(identifier)
+                try: exists = movie.title is not None
+                except: exists = False
+
+                if exists:
+                    result = self.parseMovie(movie, extended = extended)
+                    self.setCache(cache_key, result)
+                else:
+                    result = {}
+            except:
+                log.error('Failed getting info for %s: %s', (identifier, traceback.format_exc()))
+
+        return result
 
     def parseMovie(self, movie, extended = True):
 
-        # Do request, append other items
-        movie = self.request('movie/%s' % movie.get('id'), {
-            'append_to_response': 'alternative_titles' + (',images,casts' if extended else '')
-        })
-        if not movie:
-            return
+        cache_key = 'tmdb.cache.%s%s' % (movie.id, '.ex' if extended else '')
+        movie_data = self.getCache(cache_key)
 
-        # Images
-        poster = self.getImage(movie, type = 'poster', size = 'w154')
-        poster_original = self.getImage(movie, type = 'poster', size = 'original')
-        backdrop_original = self.getImage(movie, type = 'backdrop', size = 'original')
-        extra_thumbs = self.getMultImages(movie, type = 'backdrops', size = 'original') if extended else []
+        if not movie_data:
 
-        images = {
-            'poster': [poster] if poster else [],
-            #'backdrop': [backdrop] if backdrop else [],
-            'poster_original': [poster_original] if poster_original else [],
-            'backdrop_original': [backdrop_original] if backdrop_original else [],
-            'actors': {},
-            'extra_thumbs': extra_thumbs
-        }
+            # Images
+            poster = self.getImage(movie, type = 'poster', size = 'w154')
+            poster_original = self.getImage(movie, type = 'poster', size = 'original')
+            backdrop_original = self.getImage(movie, type = 'backdrop', size = 'original')
+            extra_thumbs = self.getMultImages(movie, type = 'backdrops', size = 'original', n = self.MAX_EXTRATHUMBS, skipfirst = True)
 
-        # Genres
-        try:
-            genres = [genre.get('name') for genre in movie.get('genres', [])]
-        except:
-            genres = []
+            images = {
+                'poster': [poster] if poster else [],
+                #'backdrop': [backdrop] if backdrop else [],
+                'poster_original': [poster_original] if poster_original else [],
+                'backdrop_original': [backdrop_original] if backdrop_original else [],
+                'actors': {},
+                'extra_thumbs': extra_thumbs
+            }
 
-        # 1900 is the same as None
-        year = str(movie.get('release_date') or '')[:4]
-        if not movie.get('release_date') or year == '1900' or year.lower() == 'none':
-            year = None
+            # Genres
+            try:
+                genres = [genre.name for genre in movie.genres]
+            except:
+                genres = []
 
-        # Gather actors data
-        actors = {}
-        if extended:
+            # 1900 is the same as None
+            year = str(movie.releasedate or '')[:4]
+            if not movie.releasedate or year == '1900' or year.lower() == 'none':
+                year = None
 
-            # Full data
-            cast = movie.get('casts', {}).get('cast', [])
+            # Gather actors data
+            actors = {}
+            if extended:
+                for cast_item in movie.cast:
+                    try:
+                        actors[toUnicode(cast_item.name)] = toUnicode(cast_item.character)
+                        images['actors'][toUnicode(cast_item.name)] = self.getImage(cast_item, type = 'profile', size = 'original')
+                    except:
+                        log.debug('Error getting cast info for %s: %s', (cast_item, traceback.format_exc()))
 
-            for cast_item in cast:
-                try:
-                    actors[toUnicode(cast_item.get('name'))] = toUnicode(cast_item.get('character'))
-                    images['actors'][toUnicode(cast_item.get('name'))] = self.getImage(cast_item, type = 'profile', size = 'original')
-                except:
-                    log.debug('Error getting cast info for %s: %s', (cast_item, traceback.format_exc()))
+            movie_data = {
+                'type': 'movie',
+                'via_tmdb': True,
+                'tmdb_id': movie.id,
+                'titles': [toUnicode(movie.title)],
+                'original_title': movie.originaltitle,
+                'images': images,
+                'imdb': movie.imdb,
+                'runtime': movie.runtime,
+                'released': str(movie.releasedate),
+                'year': tryInt(year, None),
+                'plot': movie.overview,
+                'genres': genres,
+                'collection': getattr(movie.collection, 'name', None),
+                'actor_roles': actors
+            }
 
-        movie_data = {
-            'type': 'movie',
-            'via_tmdb': True,
-            'tmdb_id': movie.get('id'),
-            'titles': [toUnicode(movie.get('title'))],
-            'original_title': movie.get('original_title'),
-            'images': images,
-            'imdb': movie.get('imdb_id'),
-            'runtime': movie.get('runtime'),
-            'released': str(movie.get('release_date')),
-            'year': tryInt(year, None),
-            'plot': movie.get('overview'),
-            'genres': genres,
-            'collection': getattr(movie.get('belongs_to_collection'), 'name', None),
-            'actor_roles': actors
-        }
+            movie_data = dict((k, v) for k, v in movie_data.items() if v)
 
-        movie_data = dict((k, v) for k, v in movie_data.items() if v)
+            # Add alternative names
+            if movie_data['original_title'] and movie_data['original_title'] not in movie_data['titles']:
+                movie_data['titles'].append(movie_data['original_title'])
 
-        # Add alternative names
-        if movie_data['original_title'] and movie_data['original_title'] not in movie_data['titles']:
-            movie_data['titles'].append(movie_data['original_title'])
+            if extended:
+                for alt in movie.alternate_titles:
+                    alt_name = alt.title
+                    if alt_name and alt_name not in movie_data['titles'] and alt_name.lower() != 'none' and alt_name is not None:
+                        movie_data['titles'].append(alt_name)
 
-        # Add alternative titles
-        alternate_titles = movie.get('alternative_titles', {}).get('titles', [])
-
-        for alt in alternate_titles:
-            alt_name = alt.get('title')
-            if alt_name and alt_name not in movie_data['titles'] and alt_name.lower() != 'none' and alt_name is not None:
-                movie_data['titles'].append(alt_name)
+            # Cache movie parsed
+            self.setCache(cache_key, movie_data)
 
         return movie_data
 
@@ -172,41 +171,36 @@ class TheMovieDb(MovieProvider):
 
         image_url = ''
         try:
-            path = movie.get('%s_path' % type)
-            image_url = '%s%s%s' % (self.configuration['images']['secure_base_url'], size, path)
+            image_url = getattr(movie, type).geturl(size = size)
         except:
             log.debug('Failed getting %s.%s for "%s"', (type, size, ss(str(movie))))
 
         return image_url
 
-    def getMultImages(self, movie, type = 'backdrops', size = 'original'):
+    def getMultImages(self, movie, type = 'backdrops', size = 'original', n = -1, skipfirst = False):
+        """
+        If n < 0, return all images.  Otherwise return n images.
+        If n > len(getattr(movie, type)), then return all images.
+        If skipfirst is True, then it will skip getattr(movie, type)[0].  This
+        is because backdrops[0] is typically backdrop.
+        """
 
         image_urls = []
         try:
-            for image in movie.get('images', {}).get(type, [])[1:5]:
-                image_urls.append(self.getImage(image, 'file', size))
+            images = getattr(movie, type)
+            if n < 0 or n > len(images):
+                num_images = len(images)
+            else:
+                num_images = n
+
+            for i in range(int(skipfirst), num_images + int(skipfirst)):
+                image_urls.append(images[i].geturl(size = size))
+
         except:
-            log.debug('Failed getting %s.%s for "%s"', (type, size, ss(str(movie))))
+            log.debug('Failed getting %i %s.%s for "%s"', (n, type, size, ss(str(movie))))
 
         return image_urls
 
-    def request(self, call = '', params = {}, return_key = None):
-
-        params = dict((k, v) for k, v in params.items() if v)
-        params = tryUrlencode(params)
-
-        try:
-            url = 'http://api.themoviedb.org/3/%s?api_key=%s%s' % (call, self.conf('api_key'), '&%s' % params if params else '')
-            data = self.getJsonData(url, show_error = False)
-        except:
-            log.debug('Movie not found: %s, %s', (call, params))
-            data = None
-
-        if data and return_key and return_key in data:
-            data = data.get(return_key)
-
-        return data
-
     def isDisabled(self):
         if self.conf('api_key') == '':
             log.error('No API key provided.')

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

@@ -0,0 +1,27 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.torrentleech import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'TorrentLeech'
+
+
+class TorrentLeech(MovieProvider, Base):
+
+    cat_ids = [
+        ([13], ['720p', '1080p', 'bd50']),
+        ([8], ['cam']),
+        ([9], ['ts', 'tc']),
+        ([10], ['r5', 'scr']),
+        ([11], ['dvdrip']),
+        ([14], ['brrip']),
+        ([12], ['dvdr']),
+    ]
+
+    def buildUrl(self, title, media, quality):
+        return (
+            tryUrlencode(title.replace(':', '')),
+            self.getCatId(quality)[0]
+        )

couchpotato/core/media/movie/searcher.py

@@ -166,8 +166,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
                 'quality': q_identifier,
                 'finish': profile['finish'][index],
                 'wait_for': tryInt(profile['wait_for'][index]),
-                '3d': profile['3d'][index] if profile.get('3d') else False,
-                'minimum_score': profile.get('minimum_score', 1),
+                '3d': profile['3d'][index] if profile.get('3d') else False
             }
 
             could_not_be_released = not self.couldBeReleased(q_identifier in pre_releases, release_dates, movie['info']['year'])
@@ -203,14 +202,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
             quality['custom'] = quality_custom
 
             results = fireEvent('searcher.search', search_protocols, movie, quality, single = True) or []
-
-            # Check if movie isn't deleted while searching
-            if not fireEvent('media.get', movie.get('_id'), single = True):
-                break
-
-            # Add them to this movie releases list
-            found_releases += fireEvent('release.create_from_search', results, movie, quality, single = True)
-            results_count = len(found_releases)
+            results_count = len(results)
             total_result_count += results_count
             if results_count == 0:
                 log.debug('Nothing found for %s in %s', (default_title, quality['label']))
@@ -218,9 +210,17 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
             # Keep track of releases found outside ETA window
             outside_eta_results += results_count if could_not_be_released else 0
 
+            # Check if movie isn't deleted while searching
+            if not fireEvent('media.get', movie.get('_id'), single = True):
+                break
+
+            # Add them to this movie releases list
+            found_releases += fireEvent('release.create_from_search', results, movie, quality, single = True)
+
             # Don't trigger download, but notify user of available releases
-            if could_not_be_released and results_count > 0:
-                log.debug('Found %s releases for "%s", but ETA isn\'t correct yet.', (results_count, default_title))
+            if could_not_be_released:
+                if results_count > 0:
+                    log.debug('Found %s releases for "%s", but ETA isn\'t correct yet.', (results_count, default_title))
 
             # Try find a valid result and download it
             if (force_download or not could_not_be_released or always_search) and fireEvent('release.try_download_result', results, movie, quality_custom, single = True):

couchpotato/core/media/show/__init__.py

@@ -1,11 +0,0 @@
-from couchpotato.core.media import MediaBase
-
-
-class ShowTypeBase(MediaBase):
-    _type = 'show'
-
-    def getType(self):
-        if hasattr(self, 'type') and self.type != self._type:
-            return '%s.%s' % (self._type, self.type)
-
-        return self._type

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

@@ -1,4 +0,0 @@
-from .main import ShowBase
-
-def autoload():
-    return ShowBase()

couchpotato/core/media/show/_base/episode.py

@@ -1,109 +0,0 @@
-from couchpotato import get_db
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.logger import CPLog
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.media import MediaBase
-
-
-log = CPLog(__name__)
-
-autoload = 'Episode'
-
-
-class Episode(MediaBase):
-
-    def __init__(self):
-        addEvent('show.episode.add', self.add)
-        addEvent('show.episode.update', self.update)
-        addEvent('show.episode.update_extras', self.updateExtras)
-
-    def add(self, parent_id, info = None, update_after = True, status = None):
-        if not info: info = {}
-
-        identifiers = info.pop('identifiers', None)
-
-        if not identifiers:
-            log.warning('Unable to add episode, missing identifiers (info provider mismatch?)')
-            return
-
-        # Add Season
-        episode_info = {
-            '_t': 'media',
-            'type': 'show.episode',
-            'identifiers': identifiers,
-            'status': status if status else 'active',
-            'parent_id': parent_id,
-            'info': info, # Returned dict by providers
-        }
-
-        # Check if season already exists
-        existing_episode = fireEvent('media.with_identifiers', identifiers, with_doc = True, single = True)
-
-        db = get_db()
-
-        if existing_episode:
-            s = existing_episode['doc']
-            s.update(episode_info)
-
-            episode = db.update(s)
-        else:
-            episode = db.insert(episode_info)
-
-        # Update library info
-        if update_after is not False:
-            handle = fireEventAsync if update_after is 'async' else fireEvent
-            handle('show.episode.update_extras', episode, info, store = True, single = True)
-
-        return episode
-
-    def update(self, media_id = None, identifiers = None, info = None):
-        if not info: info = {}
-
-        if self.shuttingDown():
-            return
-
-        db = get_db()
-
-        episode = db.get('id', media_id)
-
-        # Get new info
-        if not info:
-            season = db.get('id', episode['parent_id'])
-            show = db.get('id', season['parent_id'])
-
-            info = fireEvent(
-                'episode.info', show.get('identifiers'), {
-                    'season_identifiers': season.get('identifiers'),
-                    'season_number': season.get('info', {}).get('number'),
-
-                    'episode_identifiers': episode.get('identifiers'),
-                    'episode_number': episode.get('info', {}).get('number'),
-
-                    'absolute_number': episode.get('info', {}).get('absolute_number')
-                },
-                merge = True
-            )
-
-            info['season_number'] = season.get('info', {}).get('number')
-
-        identifiers = info.pop('identifiers', None) or identifiers
-
-        # Update/create media
-        episode['identifiers'].update(identifiers)
-        episode.update({'info': info})
-
-        self.updateExtras(episode, info)
-
-        db.update(episode)
-        return episode
-
-    def updateExtras(self, episode, info, store=False):
-        db = get_db()
-
-        # Get images
-        image_urls = info.get('images', [])
-        existing_files = episode.get('files', {})
-        self.getPoster(image_urls, existing_files)
-
-        if store:
-            db.update(episode)

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

@@ -1,291 +0,0 @@
-import time
-import traceback
-
-from couchpotato import get_db
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
-from couchpotato.core.helpers.variable import getTitle, find
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media import MediaBase
-
-
-log = CPLog(__name__)
-
-
-class ShowBase(MediaBase):
-
-    _type = 'show'
-
-    def __init__(self):
-        super(ShowBase, self).__init__()
-        self.initType()
-
-        addApiView('show.add', self.addView, docs = {
-            'desc': 'Add new show to the wanted list',
-            'params': {
-                'identifier': {'desc': 'IMDB id of the show your want to add.'},
-                'profile_id': {'desc': 'ID of quality profile you want the add the show in. If empty will use the default profile.'},
-                'category_id': {'desc': 'ID of category you want the add the show in.'},
-                'title': {'desc': 'Title of the show to use for search and renaming'},
-            }
-        })
-
-        addEvent('show.add', self.add)
-        addEvent('show.update', self.update)
-        addEvent('show.update_extras', self.updateExtras)
-
-    def addView(self, **kwargs):
-        add_dict = self.add(params = kwargs)
-
-        return {
-            'success': True if add_dict else False,
-            'show': add_dict,
-        }
-
-    def add(self, params = None, force_readd = True, search_after = True, update_after = True, notify_after = True, status = None):
-        if not params: params = {}
-
-        # Identifiers
-        if not params.get('identifiers'):
-            msg = 'Can\'t add show without at least 1 identifier.'
-            log.error(msg)
-            fireEvent('notify.frontend', type = 'show.no_identifier', message = msg)
-            return False
-
-        info = params.get('info')
-        if not info or (info and len(info.get('titles', [])) == 0):
-            info = fireEvent('show.info', merge = True, identifiers = params.get('identifiers'))
-
-        # Add Show
-        try:
-            m, added = self.create(info, params, force_readd, search_after, update_after)
-
-            result = fireEvent('media.get', m['_id'], single = True)
-
-            if added and notify_after:
-                if params.get('title'):
-                    message = 'Successfully added "%s" to your wanted list.' % params.get('title', '')
-                else:
-                    title = getTitle(m)
-                    if title:
-                        message = 'Successfully added "%s" to your wanted list.' % title
-                    else:
-                        message = 'Successfully added to your wanted list.'
-
-                fireEvent('notify.frontend', type = 'show.added', data = result, message = message)
-
-            return result
-        except:
-            log.error('Failed adding media: %s', traceback.format_exc())
-
-    def create(self, info, params = None, force_readd = True, search_after = True, update_after = True, notify_after = True, status = None):
-        # Set default title
-        def_title = self.getDefaultTitle(info)
-
-        # Default profile and category
-        default_profile = {}
-        if not params.get('profile_id'):
-            default_profile = fireEvent('profile.default', single = True)
-
-        cat_id = params.get('category_id')
-
-        media = {
-            '_t': 'media',
-            'type': 'show',
-            'title': def_title,
-            'identifiers': info.get('identifiers'),
-            'status': status if status else 'active',
-            'profile_id': params.get('profile_id', default_profile.get('_id')),
-            'category_id': cat_id if cat_id is not None and len(cat_id) > 0 and cat_id != '-1' else None
-        }
-
-        identifiers = info.pop('identifiers', {})
-        seasons = info.pop('seasons', {})
-
-        # Update media with info
-        self.updateInfo(media, info)
-
-        existing_show = fireEvent('media.with_identifiers', params.get('identifiers'), with_doc = True)
-
-        db = get_db()
-
-        if existing_show:
-            s = existing_show['doc']
-            s.update(media)
-
-            show = db.update(s)
-        else:
-            show = db.insert(media)
-
-        # Update dict to be usable
-        show.update(media)
-
-        added = True
-        do_search = False
-        search_after = search_after and self.conf('search_on_add', section = 'showsearcher')
-        onComplete = None
-
-        if existing_show:
-            if search_after:
-                onComplete = self.createOnComplete(show['_id'])
-
-            search_after = False
-        elif force_readd:
-            # Clean snatched history
-            for release in fireEvent('release.for_media', show['_id'], single = True):
-                if release.get('status') in ['downloaded', 'snatched', 'done']:
-                    if params.get('ignore_previous', False):
-                        release['status'] = 'ignored'
-                        db.update(release)
-                    else:
-                        fireEvent('release.delete', release['_id'], single = True)
-
-            show['profile_id'] = params.get('profile_id', default_profile.get('id'))
-            show['category_id'] = media.get('category_id')
-            show['last_edit'] = int(time.time())
-
-            do_search = True
-            db.update(show)
-        else:
-            params.pop('info', None)
-            log.debug('Show already exists, not updating: %s', params)
-            added = False
-
-        # Create episodes
-        self.createEpisodes(show, seasons)
-
-        # Trigger update info
-        if added and update_after:
-            # Do full update to get images etc
-            fireEventAsync('show.update_extras', show.copy(), info, store = True, on_complete = onComplete)
-
-        # Remove releases
-        for rel in fireEvent('release.for_media', show['_id'], single = True):
-            if rel['status'] is 'available':
-                db.delete(rel)
-
-        if do_search and search_after:
-            onComplete = self.createOnComplete(show['_id'])
-            onComplete()
-
-        return show, added
-
-    def createEpisodes(self, m, seasons_info):
-        # Add Seasons
-        for season_nr in seasons_info:
-            season_info = seasons_info[season_nr]
-            episodes = season_info.get('episodes', {})
-
-            season = fireEvent('show.season.add', m.get('_id'), season_info, update_after = False, single = True)
-
-            # Add Episodes
-            for episode_nr in episodes:
-                episode_info = episodes[episode_nr]
-                episode_info['season_number'] = season_nr
-
-                fireEvent('show.episode.add', season.get('_id'), episode_info, update_after = False, single = True)
-
-    def update(self, media_id = None, media = None, identifiers = None, info = None):
-        """
-        Update movie information inside media['doc']['info']
-
-        @param media_id: document id
-        @param identifiers: identifiers from multiple providers
-            {
-                'thetvdb': 123,
-                'imdb': 'tt123123',
-                ..
-            }
-        @param extended: update with extended info (parses more info, actors, images from some info providers)
-        @return: dict, with media
-        """
-
-        if not info: info = {}
-        if not identifiers: identifiers = {}
-
-        db = get_db()
-
-        if self.shuttingDown():
-            return
-
-        if media is None and media_id:
-            media = db.get('id', media_id)
-        else:
-            log.error('missing "media" and "media_id" parameters, unable to update')
-            return
-
-        if not info:
-            info = fireEvent('show.info', identifiers = media.get('identifiers'), merge = True)
-
-        try:
-            identifiers = info.pop('identifiers', {})
-            seasons = info.pop('seasons', {})
-
-            self.updateInfo(media, info)
-            self.updateEpisodes(media, seasons)
-            self.updateExtras(media, info)
-
-            db.update(media)
-            return media
-        except:
-            log.error('Failed update media: %s', traceback.format_exc())
-
-        return {}
-
-    def updateInfo(self, media, info):
-        db = get_db()
-
-        # Remove season info for later use (save separately)
-        info.pop('in_wanted', None)
-        info.pop('in_library', None)
-
-        if not info or len(info) == 0:
-            log.error('Could not update, no show info to work with: %s', media.get('identifier'))
-            return False
-
-        # Update basic info
-        media['info'] = info
-
-    def updateEpisodes(self, media, seasons):
-        # Fetch current season/episode tree
-        show_tree = fireEvent('library.tree', media_id = media['_id'], single = True)
-
-        # Update seasons
-        for season_num in seasons:
-            season_info = seasons[season_num]
-            episodes = season_info.get('episodes', {})
-
-            # Find season that matches number
-            season = find(lambda s: s.get('info', {}).get('number', 0) == season_num, show_tree.get('seasons', []))
-
-            if not season:
-                log.warning('Unable to find season "%s"', season_num)
-                continue
-
-            # Update season
-            fireEvent('show.season.update', season['_id'], info = season_info, single = True)
-
-            # Update episodes
-            for episode_num in episodes:
-                episode_info = episodes[episode_num]
-                episode_info['season_number'] = season_num
-
-                # Find episode that matches number
-                episode = find(lambda s: s.get('info', {}).get('number', 0) == episode_num, season.get('episodes', []))
-
-                if not episode:
-                    log.debug('Creating new episode %s in season %s', (episode_num, season_num))
-                    fireEvent('show.episode.add', season.get('_id'), episode_info, update_after = False, single = True)
-                    continue
-
-                fireEvent('show.episode.update', episode['_id'], info = episode_info, single = True)
-
-    def updateExtras(self, media, info, store=False):
-        db = get_db()
-
-        # Update image file
-        image_urls = info.get('images', [])
-        self.getPoster(media, image_urls)
-
-        if store:
-            db.update(media)

couchpotato/core/media/show/_base/season.py

@@ -1,94 +0,0 @@
-from couchpotato import get_db
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.logger import CPLog
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.media import MediaBase
-
-
-log = CPLog(__name__)
-
-autoload = 'Season'
-
-
-class Season(MediaBase):
-
-    def __init__(self):
-        addEvent('show.season.add', self.add)
-        addEvent('show.season.update', self.update)
-        addEvent('show.season.update_extras', self.updateExtras)
-
-    def add(self, parent_id, info = None, update_after = True, status = None):
-        if not info: info = {}
-
-        identifiers = info.pop('identifiers', None)
-        info.pop('episodes', None)
-
-        # Add Season
-        season_info = {
-            '_t': 'media',
-            'type': 'show.season',
-            'identifiers': identifiers,
-            'status': status if status else 'active',
-            'parent_id': parent_id,
-            'info': info,  # Returned dict by providers
-        }
-
-        # Check if season already exists
-        existing_season = fireEvent('media.with_identifiers', identifiers, with_doc = True, single = True)
-
-        db = get_db()
-
-        if existing_season:
-            s = existing_season['doc']
-            s.update(season_info)
-
-            season = db.update(s)
-        else:
-            season = db.insert(season_info)
-
-        # Update library info
-        if update_after is not False:
-            handle = fireEventAsync if update_after is 'async' else fireEvent
-            handle('show.season.update_extras', season, info, store = True, single = True)
-
-        return season
-
-    def update(self, media_id = None, identifiers = None, info = None):
-        if not info: info = {}
-
-        if self.shuttingDown():
-            return
-
-        db = get_db()
-
-        season = db.get('id', media_id)
-        show = db.get('id', season['parent_id'])
-
-        # Get new info
-        if not info:
-            info = fireEvent('season.info', show.get('identifiers'), {
-                'season_number': season.get('info', {}).get('number', 0)
-            }, merge = True)
-
-        identifiers = info.pop('identifiers', None) or identifiers
-        info.pop('episodes', None)
-
-        # Update/create media
-        season['identifiers'].update(identifiers)
-        season.update({'info': info})
-
-        self.updateExtras(season, info)
-
-        db.update(season)
-        return season
-
-    def updateExtras(self, season, info, store=False):
-        db = get_db()
-
-        # Get images
-        image_urls = info.get('images', [])
-        existing_files = season.get('files', {})
-        self.getPoster(image_urls, existing_files)
-
-        if store:
-            db.update(season)

couchpotato/core/media/show/_base/static/1_wanted.js

@@ -1,28 +0,0 @@
-Page.Shows = new Class({
-
-	Extends: PageBase,
-
-	name: 'shows',
-	title: 'Gimmy gimmy gimmy!',
-	folder_browser: null,
-
-	indexAction: function(){
-		var self = this;
-
-		if(!self.wanted){
-
-			// Wanted movies
-			self.wanted = new ShowList({
-				'identifier': 'wanted',
-				'status': 'active',
-				'type': 'show',
-				'actions': [MA.IMDB, MA.Trailer, MA.Release, MA.Edit, MA.Refresh, MA.Readd, MA.Delete],
-				'add_new': true,
-				'on_empty_element': App.createUserscriptButtons().addClass('empty_wanted')
-			});
-			$(self.wanted).inject(self.el);
-		}
-
-	}
-
-});

couchpotato/core/media/show/_base/static/episode.actions.js

@@ -1,474 +0,0 @@
-var EpisodeAction = new Class({
-
-    Implements: [Options],
-
-    class_name: 'item-action icon2',
-
-    initialize: function(episode, options){
-        var self = this;
-        self.setOptions(options);
-
-        self.show = episode.show;
-        self.episode = episode;
-
-        self.create();
-        if(self.el)
-            self.el.addClass(self.class_name)
-    },
-
-    create: function(){},
-
-    disable: function(){
-        if(this.el)
-            this.el.addClass('disable')
-    },
-
-    enable: function(){
-        if(this.el)
-            this.el.removeClass('disable')
-    },
-
-    getTitle: function(){
-        var self = this;
-
-        try {
-            return self.show.getTitle();
-        }
-        catch(e){
-            try {
-                return self.show.original_title ? self.show.original_title : self.show.titles[0];
-            }
-            catch(e){
-                return 'Unknown';
-            }
-        }
-    },
-
-    get: function(key){
-        var self = this;
-        try {
-            return self.show.get(key)
-        }
-        catch(e){
-            return self.show[key]
-        }
-    },
-
-    createMask: function(){
-        var self = this;
-        self.mask = new Element('div.mask', {
-            'styles': {
-                'z-index': '1'
-            }
-        }).inject(self.show, 'top').fade('hide');
-    },
-
-    toElement: function(){
-        return this.el || null
-    }
-
-});
-
-var EA = {};
-
-EA.IMDB = new Class({
-
-    Extends: EpisodeAction,
-    id: null,
-
-    create: function(){
-        var self = this;
-
-        self.id = self.show.getIdentifier ? self.show.getIdentifier() : self.get('imdb');
-
-        self.el = new Element('a.imdb', {
-            'title': 'Go to the IMDB page of ' + self.getTitle(),
-            'href': 'http://www.imdb.com/title/'+self.id+'/',
-            'target': '_blank'
-        });
-
-        if(!self.id) self.disable();
-    }
-
-});
-
-EA.Release = new Class({
-
-    Extends: EpisodeAction,
-
-    create: function(){
-        var self = this;
-
-        self.el = new Element('a.releases.download', {
-            'title': 'Show the releases that are available for ' + self.getTitle(),
-            'events': {
-                'click': self.toggle.bind(self)
-            }
-        });
-
-        self.options = new Element('div.episode-options').inject(self.episode.el);
-
-        if(!self.episode.data.releases || self.episode.data.releases.length == 0)
-            self.el.hide();
-        else
-            self.showHelper();
-
-        App.on('show.searcher.ended', function(notification){
-            if(self.show.data._id != notification.data._id) return;
-
-            self.releases = null;
-            if(self.options_container){
-                self.options_container.destroy();
-                self.options_container = null;
-            }
-        });
-
-    },
-
-    toggle: function(e){
-        var self = this;
-
-        if(self.options && self.options.hasClass('expanded')) {
-            self.close();
-        } else {
-            self.open();
-        }
-    },
-
-    open: function(e){
-        var self = this;
-
-        if(e)
-            (e).preventDefault();
-
-        self.createReleases();
-
-    },
-
-    close: function(e) {
-        var self = this;
-
-        if(e)
-            (e).preventDefault();
-
-        self.options.setStyle('height', 0)
-                    .removeClass('expanded');
-    },
-
-    createReleases: function(){
-        var self = this;
-
-        if(!self.releases_table){
-            self.options.adopt(
-                self.releases_table = new Element('div.releases.table')
-            );
-
-            // Header
-            new Element('div.item.head').adopt(
-                new Element('span.name', {'text': 'Release name'}),
-                new Element('span.status', {'text': 'Status'}),
-                new Element('span.quality', {'text': 'Quality'}),
-                new Element('span.size', {'text': 'Size'}),
-                new Element('span.age', {'text': 'Age'}),
-                new Element('span.score', {'text': 'Score'}),
-                new Element('span.provider', {'text': 'Provider'})
-            ).inject(self.releases_table);
-
-            if(self.episode.data.releases)
-                self.episode.data.releases.each(function(release){
-
-                    var quality = Quality.getQuality(release.quality) || {},
-                        info = release.info || {},
-                        provider = self.get(release, 'provider') + (info['provider_extra'] ? self.get(release, 'provider_extra') : '');
-
-                    var release_name = self.get(release, 'name');
-                    if(release.files && release.files.length > 0){
-                        try {
-                            var movie_file = release.files.filter(function(file){
-                                var type = File.Type.get(file.type_id);
-                                return type && type.identifier == 'movie'
-                            }).pick();
-                            release_name = movie_file.path.split(Api.getOption('path_sep')).getLast();
-                        }
-                        catch(e){}
-                    }
-
-                    // Create release
-                    release['el'] = new Element('div', {
-                        'class': 'item '+release.status,
-                        'id': 'release_'+release._id
-                    }).adopt(
-                            new Element('span.name', {'text': release_name, 'title': release_name}),
-                            new Element('span.status', {'text': release.status, 'class': 'status '+release.status}),
-                            new Element('span.quality', {'text': quality.label + (release.is_3d ? ' 3D' : '') || 'n/a'}),
-                            new Element('span.size', {'text': info['size'] ? Math.floor(self.get(release, 'size')) : 'n/a'}),
-                            new Element('span.age', {'text': self.get(release, 'age')}),
-                            new Element('span.score', {'text': self.get(release, 'score')}),
-                            new Element('span.provider', { 'text': provider, 'title': provider }),
-                            info['detail_url'] ? new Element('a.info.icon2', {
-                                'href': info['detail_url'],
-                                'target': '_blank'
-                            }) : new Element('a'),
-                            new Element('a.download.icon2', {
-                                'events': {
-                                    'click': function(e){
-                                        (e).preventDefault();
-                                        if(!this.hasClass('completed'))
-                                            self.download(release);
-                                    }
-                                }
-                            }),
-                            new Element('a.delete.icon2', {
-                                'events': {
-                                    'click': function(e){
-                                        (e).preventDefault();
-                                        self.ignore(release);
-                                    }
-                                }
-                            })
-                        ).inject(self.releases_table);
-
-                    if(release.status == 'ignored' || release.status == 'failed' || release.status == 'snatched'){
-                        if(!self.last_release || (self.last_release && self.last_release.status != 'snatched' && release.status == 'snatched'))
-                            self.last_release = release;
-                    }
-                    else if(!self.next_release && release.status == 'available'){
-                        self.next_release = release;
-                    }
-
-                    var update_handle = function(notification) {
-                        if(notification.data._id != release._id) return;
-
-                        var q = self.show.quality.getElement('.q_' + release.quality),
-                            new_status = notification.data.status;
-
-                        release.el.set('class', 'item ' + new_status);
-
-                        var status_el = release.el.getElement('.release_status');
-                        status_el.set('class', 'release_status ' + new_status);
-                        status_el.set('text', new_status);
-
-                        if(!q && (new_status == 'snatched' || new_status == 'seeding' || new_status == 'done'))
-                            q = self.addQuality(release.quality_id);
-
-                        if(q && !q.hasClass(new_status)) {
-                            q.removeClass(release.status).addClass(new_status);
-                            q.set('title', q.get('title').replace(release.status, new_status));
-                        }
-                    };
-
-                    App.on('release.update_status', update_handle);
-
-                });
-
-            if(self.last_release)
-                self.releases_table.getElements('#release_'+self.last_release._id).addClass('last_release');
-
-            if(self.next_release)
-                self.releases_table.getElements('#release_'+self.next_release._id).addClass('next_release');
-
-            if(self.next_release || (self.last_release && ['ignored', 'failed'].indexOf(self.last_release.status) === false)){
-
-                self.trynext_container = new Element('div.buttons.try_container').inject(self.releases_table, 'top');
-
-                var nr = self.next_release,
-                    lr = self.last_release;
-
-                self.trynext_container.adopt(
-                    new Element('span.or', {
-                        'text': 'If anything went wrong, download'
-                    }),
-                    lr ? new Element('a.button.orange', {
-                        'text': 'the same release again',
-                        'events': {
-                            'click': function(){
-                                self.download(lr);
-                            }
-                        }
-                    }) : null,
-                    nr && lr ? new Element('span.or', {
-                        'text': ','
-                    }) : null,
-                    nr ? [new Element('a.button.green', {
-                        'text': lr ? 'another release' : 'the best release',
-                        'events': {
-                            'click': function(){
-                                self.download(nr);
-                            }
-                        }
-                    }),
-                        new Element('span.or', {
-                            'text': 'or pick one below'
-                        })] : null
-                )
-            }
-
-            self.last_release = null;
-            self.next_release = null;
-
-            self.episode.el.addEvent('outerClick', function(){
-                self.close();
-            });
-        }
-
-        self.options.setStyle('height', self.releases_table.getSize().y)
-                    .addClass('expanded');
-
-    },
-
-    showHelper: function(e){
-        var self = this;
-        if(e)
-            (e).preventDefault();
-
-        var has_available = false,
-            has_snatched = false;
-
-        if(self.episode.data.releases)
-            self.episode.data.releases.each(function(release){
-                if(has_available && has_snatched) return;
-
-                if(['snatched', 'downloaded', 'seeding'].contains(release.status))
-                    has_snatched = true;
-
-                if(['available'].contains(release.status))
-                    has_available = true;
-
-            });
-
-        if(has_available || has_snatched){
-
-            self.trynext_container = new Element('div.buttons.trynext').inject(self.show.info_container);
-
-            self.trynext_container.adopt(
-                has_available ? [new Element('a.icon2.readd', {
-                    'text': has_snatched ? 'Download another release' : 'Download the best release',
-                    'events': {
-                        'click': self.tryNextRelease.bind(self)
-                    }
-                }),
-                    new Element('a.icon2.download', {
-                        'text': 'pick one yourself',
-                        'events': {
-                            'click': function(){
-                                self.show.quality.fireEvent('click');
-                            }
-                        }
-                    })] : null,
-                new Element('a.icon2.completed', {
-                    'text': 'mark this movie done',
-                    'events': {
-                        'click': self.markMovieDone.bind(self)
-                    }
-                })
-            )
-        }
-
-    },
-
-    get: function(release, type){
-        return (release.info && release.info[type] !== undefined) ? release.info[type] : 'n/a'
-    },
-
-    download: function(release){
-        var self = this;
-
-        var release_el = self.releases_table.getElement('#release_'+release._id),
-            icon = release_el.getElement('.download.icon2');
-
-        if(icon)
-            icon.addClass('icon spinner').removeClass('download');
-
-        Api.request('release.manual_download', {
-            'data': {
-                'id': release._id
-            },
-            'onComplete': function(json){
-                if(icon)
-                    icon.removeClass('icon spinner');
-
-                if(json.success){
-                    if(icon)
-                        icon.addClass('completed');
-                    release_el.getElement('.release_status').set('text', 'snatched');
-                }
-                else
-                if(icon)
-                    icon.addClass('attention').set('title', 'Something went wrong when downloading, please check logs.');
-            }
-        });
-    },
-
-    ignore: function(release){
-
-        Api.request('release.ignore', {
-            'data': {
-                'id': release._id
-            }
-        })
-
-    },
-
-    markMovieDone: function(){
-        var self = this;
-
-        Api.request('media.delete', {
-            'data': {
-                'id': self.show.get('_id'),
-                'delete_from': 'wanted'
-            },
-            'onComplete': function(){
-                var movie = $(self.show);
-                movie.set('tween', {
-                    'duration': 300,
-                    'onComplete': function(){
-                        self.show.destroy()
-                    }
-                });
-                movie.tween('height', 0);
-            }
-        });
-
-    },
-
-    tryNextRelease: function(){
-        var self = this;
-
-        Api.request('movie.searcher.try_next', {
-            'data': {
-                'media_id': self.show.get('_id')
-            }
-        });
-
-    }
-
-});
-
-EA.Refresh = new Class({
-
-    Extends: EpisodeAction,
-
-    create: function(){
-        var self = this;
-
-        self.el = new Element('a.refresh', {
-            'title': 'Refresh the movie info and do a forced search',
-            'events': {
-                'click': self.doRefresh.bind(self)
-            }
-        });
-
-    },
-
-    doRefresh: function(e){
-        var self = this;
-        (e).preventDefault();
-
-        Api.request('media.refresh', {
-            'data': {
-                'id': self.episode.get('_id')
-            }
-        });
-    }
-
-});

couchpotato/core/media/show/_base/static/episode.js

@@ -1,128 +0,0 @@
-var Episode = new Class({
-
-    Extends: BlockBase,
-
-    action: {},
-
-    initialize: function(show, options, data){
-        var self = this;
-        self.setOptions(options);
-
-        self.show = show;
-        self.options = options;
-        self.data = data;
-
-        self.profile = self.show.profile;
-
-        self.el = new Element('div.item.episode').adopt(
-            self.detail = new Element('div.item.data')
-        );
-
-        self.create();
-    },
-
-    create: function(){
-        var self = this;
-
-        self.detail.set('id', 'episode_'+self.data._id);
-
-        self.detail.adopt(
-            new Element('span.episode', {'text': (self.data.info.number || 0)}),
-            new Element('span.name', {'text': self.getTitle()}),
-            new Element('span.firstaired', {'text': self.data.info.firstaired}),
-
-            self.quality = new Element('span.quality', {
-                'events': {
-                    'click': function(e){
-                        var releases = self.detail.getElement('.item-actions .releases');
-
-                        if(releases.isVisible())
-                            releases.fireEvent('click', [e])
-                    }
-                }
-            }),
-            self.actions = new Element('div.item-actions')
-        );
-
-        // Add profile
-        if(self.profile.data) {
-            self.profile.getTypes().each(function(type){
-                var q = self.addQuality(type.get('quality'), type.get('3d'));
-
-                if((type.finish == true || type.get('finish')) && !q.hasClass('finish')){
-                    q.addClass('finish');
-                    q.set('title', q.get('title') + ' Will finish searching for this movie if this quality is found.')
-                }
-            });
-        }
-
-        // Add releases
-        self.updateReleases();
-
-        Object.each(self.options.actions, function(action, key){
-            self.action[key.toLowerCase()] = action = new self.options.actions[key](self);
-            if(action.el)
-                self.actions.adopt(action)
-        });
-    },
-
-    updateReleases: function(){
-        var self = this;
-        if(!self.data.releases || self.data.releases.length == 0) return;
-
-        self.data.releases.each(function(release){
-
-            var q = self.quality.getElement('.q_'+ release.quality+(release.is_3d ? '.is_3d' : ':not(.is_3d)')),
-                status = release.status;
-
-            if(!q && (status == 'snatched' || status == 'seeding' || status == 'done'))
-                q = self.addQuality(release.quality, release.is_3d || false);
-
-            if (q && !q.hasClass(status)){
-                q.addClass(status);
-                q.set('title', (q.get('title') ? q.get('title') : '') + ' status: '+ status)
-            }
-
-        });
-    },
-
-    addQuality: function(quality, is_3d){
-        var self = this,
-            q = Quality.getQuality(quality);
-
-        return new Element('span', {
-            'text': q.label + (is_3d ? ' 3D' : ''),
-            'class': 'q_'+q.identifier + (is_3d ? ' is_3d' : ''),
-            'title': ''
-        }).inject(self.quality);
-    },
-
-    getTitle: function(){
-        var self = this;
-
-        var title = '';
-
-        if(self.data.info.titles && self.data.info.titles.length > 0) {
-            title = self.data.info.titles[0];
-        } else {
-            title = 'Episode ' + self.data.info.number;
-        }
-
-        return title;
-    },
-
-    getIdentifier: function(){
-        var self = this;
-
-        try {
-            return self.get('identifiers').imdb;
-        }
-        catch (e){ }
-
-        return self.get('imdb');
-    },
-
-    get: function(attr){
-        return this.data[attr] || this.data.info[attr]
-    }
-});

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

@@ -1,636 +0,0 @@
-var ShowList = new Class({
-
-	Implements: [Events, Options],
-
-	options: {
-		navigation: true,
-		limit: 50,
-		load_more: true,
-		loader: true,
-		menu: [],
-		add_new: false,
-		force_view: false
-	},
-
-	movies: [],
-	movies_added: {},
-	total_movies: 0,
-	letters: {},
-	filter: null,
-
-	initialize: function(options){
-		var self = this;
-		self.setOptions(options);
-
-		self.offset = 0;
-		self.filter = self.options.filter || {
-			'starts_with': null,
-			'search': null
-		};
-
-		self.el = new Element('div.shows').adopt(
-			self.title = self.options.title ? new Element('h2', {
-				'text': self.options.title,
-				'styles': {'display': 'none'}
-			}) : null,
-			self.description = self.options.description ? new Element('div.description', {
-				'html': self.options.description,
-				'styles': {'display': 'none'}
-			}) : null,
-			self.movie_list = new Element('div.list'),
-			self.load_more = self.options.load_more ? new Element('a.load_more', {
-				'events': {
-					'click': self.loadMore.bind(self)
-				}
-			}) : null
-		);
-
-		if($(window).getSize().x <= 480 && !self.options.force_view)
-			self.changeView('list');
-		else
-			self.changeView(self.getSavedView() || self.options.view || 'details');
-
-		self.getMovies();
-
-		App.on('movie.added', self.movieAdded.bind(self));
-		App.on('movie.deleted', self.movieDeleted.bind(self))
-	},
-
-	movieDeleted: function(notification){
-		var self = this;
-
-		if(self.movies_added[notification.data._id]){
-			self.movies.each(function(movie){
-				if(movie.get('_id') == notification.data._id){
-					movie.destroy();
-					delete self.movies_added[notification.data._id];
-					self.setCounter(self.counter_count-1);
-					self.total_movies--;
-				}
-			})
-		}
-
-		self.checkIfEmpty();
-	},
-
-	movieAdded: function(notification){
-		var self = this;
-
-		self.fireEvent('movieAdded', notification);
-		if(self.options.add_new && !self.movies_added[notification.data._id] && notification.data.status == self.options.status){
-			window.scroll(0,0);
-			self.createShow(notification.data, 'top');
-			self.setCounter(self.counter_count+1);
-
-			self.checkIfEmpty();
-		}
-	},
-
-	create: function(){
-		var self = this;
-
-		// Create the alphabet nav
-		if(self.options.navigation)
-			self.createNavigation();
-
-		if(self.options.load_more)
-			self.scrollspy = new ScrollSpy({
-				min: function(){
-					var c = self.load_more.getCoordinates();
-					return c.top - window.document.getSize().y - 300
-				},
-				onEnter: self.loadMore.bind(self)
-			});
-
-		self.created = true;
-	},
-
-	addMovies: function(movies, total){
-		var self = this;
-
-		if(!self.created) self.create();
-
-		// do scrollspy
-		if(movies.length < self.options.limit && self.scrollspy){
-			self.load_more.hide();
-			self.scrollspy.stop();
-		}
-
-		Object.each(movies, function(movie){
-			self.createShow(movie);
-		});
-
-		self.total_movies += total;
-		self.setCounter(total);
-
-	},
-
-	setCounter: function(count){
-		var self = this;
-
-		if(!self.navigation_counter) return;
-
-		self.counter_count = count;
-		self.navigation_counter.set('text', (count || 0) + ' shows');
-
-		if (self.empty_message) {
-			self.empty_message.destroy();
-			self.empty_message = null;
-		}
-
-		if(self.total_movies && count == 0 && !self.empty_message){
-			var message = (self.filter.search ? 'for "'+self.filter.search+'"' : '') +
-				(self.filter.starts_with ? ' in <strong>'+self.filter.starts_with+'</strong>' : '');
-
-			self.empty_message = new Element('.message', {
-				'html': 'No shows found ' + message + '.<br/>'
-			}).grab(
-				new Element('a', {
-					'text': 'Reset filter',
-					'events': {
-						'click': function(){
-							self.filter = {
-								'starts_with': null,
-								'search': null
-							};
-							self.navigation_search_input.set('value', '');
-							self.reset();
-							self.activateLetter();
-							self.getMovies(true);
-							self.last_search_value = '';
-						}
-					}
-				})
-			).inject(self.movie_list);
-
-		}
-
-	},
-
-	createShow: function(show, inject_at){
-		var self = this;
-		var m = new Show(self, {
-			'actions': self.options.actions,
-			'view': self.current_view,
-			'onSelect': self.calculateSelected.bind(self)
-		}, show);
-
-		$(m).inject(self.movie_list, inject_at || 'bottom');
-
-		m.fireEvent('injected');
-
-		self.movies.include(m);
-		self.movies_added[show._id] = true;
-	},
-
-	createNavigation: function(){
-		var self = this;
-		var chars = '#ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
-		self.el.addClass('with_navigation');
-
-		self.navigation = new Element('div.alph_nav').adopt(
-			self.mass_edit_form = new Element('div.mass_edit_form').adopt(
-				new Element('span.select').adopt(
-					self.mass_edit_select = new Element('input[type=checkbox].inlay', {
-						'events': {
-							'change': self.massEditToggleAll.bind(self)
-						}
-					}),
-					self.mass_edit_selected = new Element('span.count', {'text': 0}),
-					self.mass_edit_selected_label = new Element('span', {'text': 'selected'})
-				),
-				new Element('div.quality').adopt(
-					self.mass_edit_quality = new Element('select'),
-					new Element('a.button.orange', {
-						'text': 'Change quality',
-						'events': {
-							'click': self.changeQualitySelected.bind(self)
-						}
-					})
-				),
-				new Element('div.delete').adopt(
-					new Element('span[text=or]'),
-					new Element('a.button.red', {
-						'text': 'Delete',
-						'events': {
-							'click': self.deleteSelected.bind(self)
-						}
-					})
-				),
-				new Element('div.refresh').adopt(
-					new Element('span[text=or]'),
-					new Element('a.button.green', {
-						'text': 'Refresh',
-						'events': {
-							'click': self.refreshSelected.bind(self)
-						}
-					})
-				)
-			),
-			new Element('div.menus').adopt(
-				self.navigation_counter = new Element('span.counter[title=Total]'),
-				self.filter_menu = new Block.Menu(self, {
-					'class': 'filter'
-				}),
-				self.navigation_actions = new Element('ul.actions', {
-					'events': {
-						'click:relay(li)': function(e, el){
-							var a = 'active';
-							self.navigation_actions.getElements('.'+a).removeClass(a);
-							self.changeView(el.get('data-view'));
-							this.addClass(a);
-
-							el.inject(el.getParent(), 'top');
-							el.getSiblings().hide();
-							setTimeout(function(){
-								el.getSiblings().setStyle('display', null);
-							}, 100)
-						}
-					}
-				}),
-				self.navigation_menu = new Block.Menu(self, {
-					'class': 'extra'
-				})
-			)
-		).inject(self.el, 'top');
-
-		// Mass edit
-		self.mass_edit_select_class = new Form.Check(self.mass_edit_select);
-		Quality.getActiveProfiles().each(function(profile){
-			new Element('option', {
-				'value': profile.get('_id'),
-				'text': profile.get('label')
-			}).inject(self.mass_edit_quality)
-		});
-
-		self.filter_menu.addLink(
-			self.navigation_search_input = new Element('input', {
-				'title': 'Search through ' + self.options.identifier,
-				'placeholder': 'Search through ' + self.options.identifier,
-				'events': {
-					'keyup': self.search.bind(self),
-					'change': self.search.bind(self)
-				}
-			})
-		).addClass('search');
-
-		var available_chars;
-		self.filter_menu.addEvent('open', function(){
-			self.navigation_search_input.focus();
-
-			// Get available chars and highlight
-			if(!available_chars && (self.navigation.isDisplayed() || self.navigation.isVisible()))
-				Api.request('media.available_chars', {
-					'data': Object.merge({
-                        'type': 'show',
-						'status': self.options.status
-					}, self.filter),
-					'onSuccess': function(json){
-						available_chars = json.chars;
-
-						available_chars.each(function(c){
-							self.letters[c.capitalize()].addClass('available')
-						})
-
-					}
-				});
-		});
-
-		self.filter_menu.addLink(
-			self.navigation_alpha = new Element('ul.numbers', {
-				'events': {
-					'click:relay(li.available)': function(e, el){
-						self.activateLetter(el.get('data-letter'));
-						self.getMovies(true)
-					}
-				}
-			})
-		);
-
-		// Actions
-		['mass_edit', 'details', 'list'].each(function(view){
-			var current = self.current_view == view;
-			new Element('li', {
-				'class': 'icon2 ' + view + (current ?  ' active ' : ''),
-				'data-view': view
-			}).inject(self.navigation_actions, current ? 'top' : 'bottom');
-		});
-
-		// All
-		self.letters['all'] = new Element('li.letter_all.available.active', {
-			'text': 'ALL'
-		}).inject(self.navigation_alpha);
-
-		// Chars
-		chars.split('').each(function(c){
-			self.letters[c] = new Element('li', {
-				'text': c,
-				'class': 'letter_'+c,
-				'data-letter': c
-			}).inject(self.navigation_alpha);
-		});
-
-		// Add menu or hide
-		if (self.options.menu.length > 0)
-			self.options.menu.each(function(menu_item){
-				self.navigation_menu.addLink(menu_item);
-			});
-		else
-			self.navigation_menu.hide();
-
-	},
-
-	calculateSelected: function(){
-		var self = this;
-
-		var selected = 0,
-			movies = self.movies.length;
-		self.movies.each(function(movie){
-			selected += movie.isSelected() ? 1 : 0
-		});
-
-		var indeterminate = selected > 0 && selected < movies,
-			checked = selected == movies && selected > 0;
-
-		self.mass_edit_select.set('indeterminate', indeterminate);
-
-		self.mass_edit_select_class[checked ? 'check' : 'uncheck']();
-		self.mass_edit_select_class.element[indeterminate ? 'addClass' : 'removeClass']('indeterminate');
-
-		self.mass_edit_selected.set('text', selected);
-	},
-
-	deleteSelected: function(){
-		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' : '') +'?', help_msg, [{
-			'text': 'Yes, delete '+(ids.length != 1 ? 'them' : 'it'),
-			'class': 'delete',
-			'events': {
-				'click': function(e){
-					(e).preventDefault();
-					this.set('text', 'Deleting..');
-					Api.request('media.delete', {
-						'method': 'post',
-						'data': {
-							'id': ids.join(','),
-							'delete_from': self.options.identifier
-						},
-						'onSuccess': function(){
-							qObj.close();
-
-							var erase_movies = [];
-							self.movies.each(function(movie){
-								if (movie.isSelected()){
-									$(movie).destroy();
-									erase_movies.include(movie);
-								}
-							});
-
-							erase_movies.each(function(movie){
-								self.movies.erase(movie);
-								movie.destroy();
-								self.setCounter(self.counter_count-1);
-								self.total_movies--;
-							});
-
-							self.calculateSelected();
-						}
-					});
-
-				}
-			}
-		}, {
-			'text': 'Cancel',
-			'cancel': true
-		}]);
-
-	},
-
-	changeQualitySelected: function(){
-		var self = this;
-		var ids = self.getSelectedMovies();
-
-		Api.request('movie.edit', {
-			'method': 'post',
-			'data': {
-				'id': ids.join(','),
-				'profile_id': self.mass_edit_quality.get('value')
-			},
-			'onSuccess': self.search.bind(self)
-		});
-	},
-
-	refreshSelected: function(){
-		var self = this;
-		var ids = self.getSelectedMovies();
-
-		Api.request('media.refresh', {
-			'method': 'post',
-			'data': {
-				'id': ids.join(',')
-			}
-		});
-	},
-
-	getSelectedMovies: function(){
-		var self = this;
-
-		var ids = [];
-		self.movies.each(function(movie){
-			if (movie.isSelected())
-				ids.include(movie.get('_id'))
-		});
-
-		return ids
-	},
-
-	massEditToggleAll: function(){
-		var self = this;
-
-		var select = self.mass_edit_select.get('checked');
-
-		self.movies.each(function(movie){
-			movie.select(select)
-		});
-
-		self.calculateSelected()
-	},
-
-	reset: function(){
-		var self = this;
-
-		self.movies = [];
-		if(self.mass_edit_select)
-			self.calculateSelected();
-		if(self.navigation_alpha)
-			self.navigation_alpha.getElements('.active').removeClass('active');
-
-		self.offset = 0;
-		if(self.scrollspy){
-			//self.load_more.show();
-			self.scrollspy.start();
-		}
-	},
-
-	activateLetter: function(letter){
-		var self = this;
-
-		self.reset();
-
-		self.letters[letter || 'all'].addClass('active');
-		self.filter.starts_with = letter;
-
-	},
-
-	changeView: function(new_view){
-		var self = this;
-
-		self.el
-			.removeClass(self.current_view+'_list')
-			.addClass(new_view+'_list');
-
-		self.current_view = new_view;
-		Cookie.write(self.options.identifier+'_view2', new_view, {duration: 1000});
-	},
-
-	getSavedView: function(){
-		var self = this;
-		return Cookie.read(self.options.identifier+'_view2');
-	},
-
-	search: function(){
-		var self = this;
-
-		if(self.search_timer) clearTimeout(self.search_timer);
-		self.search_timer = (function(){
-			var search_value = self.navigation_search_input.get('value');
-			if (search_value == self.last_search_value) return;
-
-			self.reset();
-
-			self.activateLetter();
-			self.filter.search = search_value;
-
-			self.getMovies(true);
-
-			self.last_search_value = search_value;
-
-		}).delay(250);
-
-	},
-
-	update: function(){
-		var self = this;
-
-		self.reset();
-		self.getMovies(true);
-	},
-
-	getMovies: function(reset){
-		var self = this;
-
-		if(self.scrollspy){
-			self.scrollspy.stop();
-			self.load_more.set('text', 'loading...');
-		}
-
-		if(self.movies.length == 0 && self.options.loader){
-
-			self.loader_first = new Element('div.loading').adopt(
-				new Element('div.message', {'text': self.options.title ? 'Loading \'' + self.options.title + '\'' : 'Loading...'})
-			).inject(self.el, 'top');
-
-			createSpinner(self.loader_first, {
-				radius: 4,
-				length: 4,
-				width: 1
-			});
-
-			self.el.setStyle('min-height', 93);
-
-		}
-
-		Api.request(self.options.api_call || 'media.list', {
-			'data': Object.merge({
-				'type': self.options.type || 'movie',
-				'status': self.options.status,
-				'limit_offset': self.options.limit ? self.options.limit + ',' + self.offset : null
-			}, self.filter),
-			'onSuccess': function(json){
-
-				if(reset)
-					self.movie_list.empty();
-
-				if(self.loader_first){
-					var lf = self.loader_first;
-					self.loader_first.addClass('hide');
-					self.loader_first = null;
-					setTimeout(function(){
-						lf.destroy();
-					}, 20000);
-					self.el.setStyle('min-height', null);
-				}
-
-				self.store(json.shows);
-				self.addMovies(json.shows, json.total || json.shows.length);
-				if(self.scrollspy) {
-					self.load_more.set('text', 'load more movies');
-					self.scrollspy.start();
-				}
-
-				self.checkIfEmpty();
-				self.fireEvent('loaded');
-			}
-		});
-	},
-
-	loadMore: function(){
-		var self = this;
-		if(self.offset >= self.options.limit)
-			self.getMovies()
-	},
-
-	store: function(movies){
-		var self = this;
-
-		self.offset += movies.length;
-
-	},
-
-	checkIfEmpty: function(){
-		var self = this;
-
-		var is_empty = self.movies.length == 0 && (self.total_movies == 0 || self.total_movies === undefined);
-
-		if(self.title)
-			self.title[is_empty ? 'hide' : 'show']();
-
-		if(self.description)
-			self.description.setStyle('display', [is_empty ? 'none' : '']);
-
-		if(is_empty && self.options.on_empty_element){
-			self.options.on_empty_element.inject(self.loader_first || self.title || self.movie_list, 'after');
-
-			if(self.navigation)
-				self.navigation.hide();
-
-			self.empty_element = self.options.on_empty_element;
-		}
-		else if(self.empty_element){
-			self.empty_element.destroy();
-
-			if(self.navigation)
-				self.navigation.show();
-		}
-
-	},
-
-	toElement: function(){
-		return this.el;
-	}
-
-});

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

@@ -1,230 +0,0 @@
-Block.Search.ShowItem = new Class({
-
-	Implements: [Options, Events],
-
-	initialize: function(info, options){
-		var self = this;
-		self.setOptions(options);
-
-		self.info = info;
-		self.alternative_titles = [];
-
-		self.create();
-	},
-
-	create: function(){
-		var self = this,
-			info = self.info;
-
-		self.el = new Element('div.media_result', {
-			'id': info.id
-		}).adopt(
-			self.thumbnail = info.images && info.images.poster.length > 0 ? new Element('img.thumbnail', {
-				'src': info.images.poster[0],
-				'height': null,
-				'width': null
-			}) : null,
-			self.options_el = new Element('div.options.inlay'),
-			self.data_container = new Element('div.data', {
-				'events': {
-					'click': self.showOptions.bind(self)
-				}
-			}).adopt(
-				self.info_container = new Element('div.info').adopt(
-					new Element('h2').adopt(
-						self.title = new Element('span.title', {
-							'text': info.titles && info.titles.length > 0 ? info.titles[0] : 'Unknown'
-						}),
-						self.year = info.year ? new Element('span.year', {
-							'text': info.year
-						}) : null
-					)
-				)
-			)
-		)
-
-		if(info.titles)
-			info.titles.each(function(title){
-				self.alternativeTitle({
-					'title': title
-				});
-			})
-	},
-
-	alternativeTitle: function(alternative){
-		var self = this;
-
-		self.alternative_titles.include(alternative);
-	},
-
-	getTitle: function(){
-		var self = this;
-		try {
-			return self.info.original_title ? self.info.original_title : self.info.titles[0];
-		}
-		catch(e){
-			return 'Unknown';
-		}
-	},
-
-	get: function(key){
-		return this.info[key]
-	},
-
-	showOptions: function(){
-		var self = this;
-
-		self.createOptions();
-
-		self.data_container.addClass('open');
-		self.el.addEvent('outerClick', self.closeOptions.bind(self))
-
-	},
-
-	closeOptions: function(){
-		var self = this;
-
-		self.data_container.removeClass('open');
-		self.el.removeEvents('outerClick')
-	},
-
-	add: function(e){
-		var self = this;
-
-		if(e)
-			(e).preventDefault();
-
-		self.loadingMask();
-
-		Api.request('show.add', {
-			'data': {
-				'identifiers': self.info.identifiers,
-				'type': self.info.type,
-				'title': self.title_select.get('value'),
-				'profile_id': self.profile_select.get('value'),
-				'category_id': self.category_select.get('value')
-			},
-			'onComplete': function(json){
-				self.options_el.empty();
-				self.options_el.adopt(
-					new Element('div.message', {
-						'text': json.success ? 'Show successfully added.' : 'Show didn\'t add properly. Check logs'
-					})
-				);
-				self.mask.fade('out');
-
-				self.fireEvent('added');
-			},
-			'onFailure': function(){
-				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,
-			info = self.info;
-
-		if(!self.options_el.hasClass('set')){
-
-			if(self.info.in_library){
-				var in_library = [];
-				self.info.in_library.releases.each(function(release){
-					in_library.include(release.quality.label)
-				});
-			}
-
-			self.options_el.grab(
-				new Element('div', {
-					'class': self.info.in_wanted && self.info.in_wanted.profile_id || in_library ? 'in_library_wanted' : ''
-				}).adopt(
-					self.info.in_wanted && self.info.in_wanted.profile_id ? new Element('span.in_wanted', {
-						'text': 'Already in wanted list: ' + Quality.getProfile(self.info.in_wanted.profile_id).get('label')
-					}) : (in_library ? new Element('span.in_library', {
-						'text': 'Already in library: ' + in_library.join(', ')
-					}) : null),
-					self.title_select = new Element('select', {
-						'name': 'title'
-					}),
-					self.profile_select = new Element('select', {
-						'name': 'profile'
-					}),
-					self.category_select = new Element('select', {
-						'name': 'category'
-					}).grab(
-						new Element('option', {'value': -1, 'text': 'None'})
-					),
-					self.add_button = new Element('a.button', {
-						'text': 'Add',
-						'events': {
-							'click': self.add.bind(self)
-						}
-					})
-				)
-			);
-
-			Array.each(self.alternative_titles, function(alt){
-				new Element('option', {
-					'text': alt.title
-				}).inject(self.title_select)
-			})
-
-
-			// Fill categories
-			var categories = CategoryList.getAll();
-
-			if(categories.length == 0)
-				self.category_select.hide();
-			else {
-				self.category_select.show();
-				categories.each(function(category){
-					new Element('option', {
-						'value': category.data._id,
-						'text': category.data.label
-					}).inject(self.category_select);
-				});
-			}
-
-			// Fill profiles
-			var profiles = Quality.getActiveProfiles();
-			if(profiles.length == 1)
-				self.profile_select.hide();
-
-			profiles.each(function(profile){
-				new Element('option', {
-					'value': profile.get('_id'),
-					'text': profile.get('label')
-				}).inject(self.profile_select)
-			});
-
-			self.options_el.addClass('set');
-
-			if(categories.length == 0 && self.title_select.getElements('option').length == 1 && profiles.length == 1 &&
-				!(self.info.in_wanted && self.info.in_wanted.profile_id || in_library))
-				self.add();
-
-		}
-
-	},
-
-	loadingMask: function(){
-		var self = this;
-
-		self.mask = new Element('div.mask').inject(self.el).fade('hide')
-
-		createSpinner(self.mask)
-		self.mask.fade('in')
-
-	},
-
-	toElement: function(){
-		return this.el
-	}
-
-});

couchpotato/core/media/show/_base/static/season.js

@@ -1,127 +0,0 @@
-var Season = new Class({
-
-    Extends: BlockBase,
-
-    action: {},
-
-    initialize: function(show, options, data){
-        var self = this;
-        self.setOptions(options);
-
-        self.show = show;
-        self.options = options;
-        self.data = data;
-
-        self.profile = self.show.profile;
-
-        self.el = new Element('div.item.season').adopt(
-            self.detail = new Element('div.item.data')
-        );
-
-        self.create();
-    },
-
-    create: function(){
-        var self = this;
-
-        self.detail.set('id', 'season_'+self.data._id);
-
-        self.detail.adopt(
-            new Element('span.name', {'text': self.getTitle()}),
-
-            self.quality = new Element('span.quality', {
-                'events': {
-                    'click': function(e){
-                        var releases = self.detail.getElement('.item-actions .releases');
-
-                        if(releases.isVisible())
-                            releases.fireEvent('click', [e])
-                    }
-                }
-            }),
-            self.actions = new Element('div.item-actions')
-        );
-
-        // Add profile
-        if(self.profile.data) {
-            self.profile.getTypes().each(function(type){
-                var q = self.addQuality(type.get('quality'), type.get('3d'));
-
-                if((type.finish == true || type.get('finish')) && !q.hasClass('finish')){
-                    q.addClass('finish');
-                    q.set('title', q.get('title') + ' Will finish searching for this movie if this quality is found.')
-                }
-            });
-        }
-
-        // Add releases
-        self.updateReleases();
-
-        Object.each(self.options.actions, function(action, key){
-            self.action[key.toLowerCase()] = action = new self.options.actions[key](self);
-            if(action.el)
-                self.actions.adopt(action)
-        });
-    },
-
-    updateReleases: function(){
-        var self = this;
-        if(!self.data.releases || self.data.releases.length == 0) return;
-
-        self.data.releases.each(function(release){
-
-            var q = self.quality.getElement('.q_'+ release.quality+(release.is_3d ? '.is_3d' : ':not(.is_3d)')),
-                status = release.status;
-
-            if(!q && (status == 'snatched' || status == 'seeding' || status == 'done'))
-                q = self.addQuality(release.quality, release.is_3d || false);
-
-            if (q && !q.hasClass(status)){
-                q.addClass(status);
-                q.set('title', (q.get('title') ? q.get('title') : '') + ' status: '+ status)
-            }
-
-        });
-    },
-
-    addQuality: function(quality, is_3d){
-        var self = this,
-            q = Quality.getQuality(quality);
-
-        return new Element('span', {
-            'text': q.label + (is_3d ? ' 3D' : ''),
-            'class': 'q_'+q.identifier + (is_3d ? ' is_3d' : ''),
-            'title': ''
-        }).inject(self.quality);
-    },
-
-    getTitle: function(){
-        var self = this;
-
-        var title = '';
-
-        if(self.data.info.number) {
-            title = 'Season ' + self.data.info.number;
-        } else {
-            // Season 0 / Specials
-            title = 'Specials';
-        }
-
-        return title;
-    },
-
-    getIdentifier: function(){
-        var self = this;
-
-        try {
-            return self.get('identifiers').imdb;
-        }
-        catch (e){ }
-
-        return self.get('imdb');
-    },
-
-    get: function(attr){
-        return this.data[attr] || this.data.info[attr]
-    }
-});

couchpotato/core/media/show/_base/static/show.episodes.js

@@ -1,92 +0,0 @@
-var Episodes = new Class({
-    initialize: function(show, options) {
-        var self = this;
-
-        self.show = show;
-        self.options = options;
-    },
-
-    open: function(){
-        var self = this;
-
-        if(!self.container){
-            self.container = new Element('div.options').grab(
-                self.episodes_container = new Element('div.episodes.table')
-            );
-
-            self.container.inject(self.show, 'top');
-
-            Api.request('library.tree', {
-                'data': {
-                    'media_id': self.show.data._id
-                },
-                'onComplete': function(json){
-                    self.data = json.result;
-
-                    self.createEpisodes();
-                }
-            });
-        }
-
-        self.show.slide('in', self.container, true);
-    },
-
-    createEpisodes: function() {
-        var self = this;
-
-        self.data.seasons.sort(self.sortSeasons);
-        self.data.seasons.each(function(season) {
-            self.createSeason(season);
-
-            season.episodes.sort(self.sortEpisodes);
-            season.episodes.each(function(episode) {
-                self.createEpisode(episode);
-            });
-        });
-    },
-
-    createSeason: function(season) {
-        var self = this,
-            s = new Season(self.show, self.options, season);
-
-        $(s).inject(self.episodes_container);
-    },
-
-    createEpisode: function(episode){
-        var self = this,
-            e = new Episode(self.show, self.options, episode);
-
-        $(e).inject(self.episodes_container);
-    },
-
-    sortSeasons: function(a, b) {
-        // Move "Specials" to the bottom of the list
-        if(!a.info.number) {
-            return 1;
-        }
-
-        if(!b.info.number) {
-            return -1;
-        }
-
-        // Order seasons descending
-        if(a.info.number < b.info.number)
-            return -1;
-
-        if(a.info.number > b.info.number)
-            return 1;
-
-        return 0;
-    },
-
-    sortEpisodes: function(a, b) {
-        // Order episodes descending
-        if(a.info.number <  b.info.number)
-            return -1;
-
-        if(a.info.number >  b.info.number)
-            return 1;
-
-        return 0;
-    }
-});

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

@@ -1,370 +0,0 @@
-var Show = new Class({
-
-	Extends: BlockBase,
-
-	action: {},
-
-	initialize: function(list, options, data){
-		var self = this;
-
-		self.data = data;
-		self.view = options.view || 'details';
-		self.list = list;
-
-		self.el = new Element('div.show');
-
-        self.episodes = new Episodes(self, {
-            'actions': [EA.IMDB, EA.Release, EA.Refresh]
-        });
-
-		self.profile = Quality.getProfile(data.profile_id) || {};
-		self.category = CategoryList.getCategory(data.category_id) || {};
-		self.parent(self, options);
-
-		self.addEvents();
-	},
-
-	addEvents: function(){
-		var self = this;
-
-		self.global_events = {};
-
-		// Do refresh with new data
-		self.global_events['movie.update'] = function(notification){
-			if(self.data._id != notification.data._id) return;
-
-			self.busy(false);
-			self.removeView();
-			self.update.delay(2000, self, notification);
-		};
-		App.on('movie.update', self.global_events['movie.update']);
-
-		// Add spinner on load / search
-		['media.busy', 'movie.searcher.started'].each(function(listener){
-			self.global_events[listener] = function(notification){
-				if(notification.data && (self.data._id == notification.data._id || (typeOf(notification.data._id) == 'array' && notification.data._id.indexOf(self.data._id) > -1)))
-					self.busy(true);
-			};
-			App.on(listener, self.global_events[listener]);
-		});
-
-		// Remove spinner
-		self.global_events['movie.searcher.ended'] = function(notification){
-			if(notification.data && self.data._id == notification.data._id)
-				self.busy(false)
-		};
-		App.on('movie.searcher.ended', self.global_events['movie.searcher.ended']);
-
-		// Reload when releases have updated
-		self.global_events['release.update_status'] = function(notification){
-			var data = notification.data;
-			if(data && self.data._id == data.movie_id){
-
-				if(!self.data.releases)
-					self.data.releases = [];
-
-				self.data.releases.push({'quality': data.quality, 'status': data.status});
-				self.updateReleases();
-			}
-		};
-
-		App.on('release.update_status', self.global_events['release.update_status']);
-
-	},
-
-	destroy: function(){
-		var self = this;
-
-		self.el.destroy();
-		delete self.list.movies_added[self.get('id')];
-		self.list.movies.erase(self);
-
-		self.list.checkIfEmpty();
-
-		// Remove events
-		Object.each(self.global_events, function(handle, listener){
-			App.off(listener, handle);
-		});
-	},
-
-	busy: function(set_busy, timeout){
-		var self = this;
-
-		if(!set_busy){
-			setTimeout(function(){
-				if(self.spinner){
-					self.mask.fade('out');
-					setTimeout(function(){
-						if(self.mask)
-							self.mask.destroy();
-						if(self.spinner)
-							self.spinner.el.destroy();
-						self.spinner = null;
-						self.mask = null;
-					}, timeout || 400);
-				}
-			}, timeout || 1000)
-		}
-		else if(!self.spinner) {
-			self.createMask();
-			self.spinner = createSpinner(self.mask);
-			self.mask.fade('in');
-		}
-	},
-
-	createMask: function(){
-		var self = this;
-		self.mask = new Element('div.mask', {
-			'styles': {
-				'z-index': 4
-			}
-		}).inject(self.el, 'top').fade('hide');
-	},
-
-	update: function(notification){
-		var self = this;
-
-		self.data = notification.data;
-		self.el.empty();
-		self.removeView();
-
-		self.profile = Quality.getProfile(self.data.profile_id) || {};
-		self.category = CategoryList.getCategory(self.data.category_id) || {};
-		self.create();
-
-		self.busy(false);
-	},
-
-	create: function(){
-		var self = this;
-
-		self.el.addClass('status_'+self.get('status'));
-
-        var eta = null,
-            eta_date = null,
-            now = Math.round(+new Date()/1000);
-
-        if(self.data.info.release_date)
-            [self.data.info.release_date.dvd, self.data.info.release_date.theater].each(function(timestamp){
-                if (timestamp > 0 && (eta == null || Math.abs(timestamp - now) < Math.abs(eta - now)))
-                    eta = timestamp;
-            });
-
-        if(eta){
-            eta_date = new Date(eta * 1000);
-            eta_date = eta_date.toLocaleString('en-us', { month: "long" }) + ' ' + eta_date.getFullYear();
-        }
-
-        self.el.adopt(
-			self.select_checkbox = new Element('input[type=checkbox].inlay', {
-				'events': {
-					'change': function(){
-						self.fireEvent('select')
-					}
-				}
-			}),
-			self.thumbnail = (self.data.files && self.data.files.image_poster) ? new Element('img', {
-				'class': 'type_image poster',
-				'src': Api.createUrl('file.cache') + self.data.files.image_poster[0].split(Api.getOption('path_sep')).pop()
-			}): null,
-			self.data_container = new Element('div.data.inlay.light').adopt(
-				self.info_container = new Element('div.info').adopt(
-					new Element('div.title').adopt(
-						self.title = new Element('a', {
-                            'events': {
-                                'click': function(e){
-                                    self.episodes.open();
-                                }
-                            },
-							'text': self.getTitle() || 'n/a'
-						}),
-						self.year = new Element('div.year', {
-							'text': self.data.info.year || 'n/a'
-						})
-					),
-					self.description = new Element('div.description.tiny_scroll', {
-						'text': self.data.info.plot
-					}),
-                    self.eta = eta_date && (now+8035200 > eta) ? new Element('div.eta', {
-                        'text': eta_date,
-                        'title': 'ETA'
-                    }) : null,
-					self.quality = new Element('div.quality', {
-						'events': {
-							'click': function(e){
-								var releases = self.el.getElement('.actions .releases');
-								if(releases.isVisible())
-									releases.fireEvent('click', [e])
-							}
-						}
-					})
-				),
-				self.actions = new Element('div.actions')
-			)
-		);
-
-		if(!self.thumbnail)
-			self.el.addClass('no_thumbnail');
-
-		//self.changeView(self.view);
-		self.select_checkbox_class = new Form.Check(self.select_checkbox);
-
-		// Add profile
-		if(self.profile.data)
-			self.profile.getTypes().each(function(type){
-
-				var q = self.addQuality(type.get('quality'), type.get('3d'));
-				if((type.finish == true || type.get('finish')) && !q.hasClass('finish')){
-					q.addClass('finish');
-					q.set('title', q.get('title') + ' Will finish searching for this movie if this quality is found.')
-				}
-
-			});
-
-		// Add releases
-		self.updateReleases();
-
-		Object.each(self.options.actions, function(action, key){
-			self.action[key.toLowerCase()] = action = new self.options.actions[key](self);
-			if(action.el)
-				self.actions.adopt(action)
-		});
-
-	},
-
-	updateReleases: function(){
-		var self = this;
-		if(!self.data.releases || self.data.releases.length == 0) return;
-
-		self.data.releases.each(function(release){
-
-			var q = self.quality.getElement('.q_'+ release.quality+(release.is_3d ? '.is_3d' : ':not(.is_3d)')),
-				status = release.status;
-
-			if(!q && (status == 'snatched' || status == 'seeding' || status == 'done'))
-				q = self.addQuality(release.quality, release.is_3d || false);
-
-			if (q && !q.hasClass(status)){
-				q.addClass(status);
-				q.set('title', (q.get('title') ? q.get('title') : '') + ' status: '+ status)
-			}
-
-		});
-	},
-
-	addQuality: function(quality, is_3d){
-		var self = this;
-
-		var q = Quality.getQuality(quality);
-		return new Element('span', {
-			'text': q.label + (is_3d ? ' 3D' : ''),
-			'class': 'q_'+q.identifier + (is_3d ? ' is_3d' : ''),
-			'title': ''
-		}).inject(self.quality);
-
-	},
-
-	getTitle: function(){
-		var self = this;
-
-		if(self.data.title)
-			return self.getUnprefixedTitle(self.data.title);
-		else if(self.data.info.titles.length > 0)
-			return self.getUnprefixedTitle(self.data.info.titles[0]);
-
-		return 'Unknown movie'
-	},
-
-	getUnprefixedTitle: function(t){
-		if(t.substr(0, 4).toLowerCase() == 'the ')
-			t = t.substr(4) + ', The';
-		else if(t.substr(0, 3).toLowerCase() == 'an ')
-			t = t.substr(3) + ', An';
-		else if(t.substr(0, 2).toLowerCase() == 'a ')
-			t = t.substr(2) + ', A';
-		return t;
-	},
-
-	slide: function(direction, el, expand){
-		var self = this;
-
-		if(direction == 'in'){
-			self.temp_view = self.view;
-			self.changeView('details');
-
-			self.el.addEvent('outerClick', function(){
-				self.removeView();
-				self.slide('out')
-			});
-			el.show();
-
-
-            if(expand === true) {
-                self.el.addClass('expanded');
-                self.el.getElements('.table').addClass('expanded');
-            }
-
-			self.data_container.addClass('hide_right');
-		}
-		else {
-			self.el.removeEvents('outerClick');
-
-			setTimeout(function(){
-				if(self.el)
-                {
-					self.el.getElements('> :not(.data):not(.poster):not(.movie_container)').hide();
-                    self.el.getElements('.table').removeClass('expanded');
-                }
-			}, 600);
-
-            self.el.removeClass('expanded');
-			self.data_container.removeClass('hide_right');
-		}
-	},
-
-	changeView: function(new_view){
-		var self = this;
-
-		if(self.el)
-			self.el
-				.removeClass(self.view+'_view')
-				.addClass(new_view+'_view');
-
-		self.view = new_view;
-	},
-
-	removeView: function(){
-		var self = this;
-
-		self.el.removeClass(self.view+'_view')
-	},
-
-	getIdentifier: function(){
-		var self = this;
-
-		try {
-			return self.get('identifiers').imdb;
-		}
-		catch (e){ }
-
-		return self.get('imdb');
-	},
-
-	get: function(attr){
-		return this.data[attr] || this.data.info[attr]
-	},
-
-	select: function(bool){
-		var self = this;
-		self.select_checkbox_class[bool ? 'check' : 'uncheck']()
-	},
-
-	isSelected: function(){
-		return this.select_checkbox.get('checked');
-	},
-
-	toElement: function(){
-		return this.el;
-	}
-
-});

couchpotato/core/media/show/library/episode.py

@@ -1,71 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.library.base import LibraryBase
-
-log = CPLog(__name__)
-
-autoload = 'EpisodeLibraryPlugin'
-
-
-class EpisodeLibraryPlugin(LibraryBase):
-    def __init__(self):
-        addEvent('library.query', self.query)
-        addEvent('library.identifier', self.identifier)
-
-    def query(self, media, first = True, condense = True, include_identifier = True, **kwargs):
-        if media.get('type') != 'show.episode':
-            return
-
-        related = fireEvent('library.related', media, single = True)
-
-        # Get season titles
-        titles = fireEvent(
-            'library.query', related['season'],
-
-            first = False,
-            include_identifier = include_identifier,
-            condense = condense,
-
-            single = True
-        )
-
-        # Add episode identifier to titles
-        if include_identifier:
-            identifier = fireEvent('library.identifier', media, single = True)
-
-            if identifier and identifier.get('episode'):
-                titles = [title + ('E%02d' % identifier['episode']) for title in titles]
-
-        if first:
-            return titles[0] if titles else None
-
-        return titles
-
-    def identifier(self, media):
-        if media.get('type') != 'show.episode':
-            return
-
-        identifier = {
-            'season': None,
-            'episode': None
-        }
-
-        # TODO identifier mapping
-        # scene_map = media['info'].get('map_episode', {}).get('scene')
-
-        # if scene_map:
-        #     # Use scene mappings if they are available
-        #     identifier['season'] = scene_map.get('season_nr')
-        #     identifier['episode'] = scene_map.get('episode_nr')
-        # else:
-        # Fallback to normal season/episode numbers
-        identifier['season'] = media['info'].get('season_number')
-        identifier['episode'] = media['info'].get('number')
-
-        # Cast identifiers to integers
-        # TODO this will need changing to support identifiers with trailing 'a', 'b' characters
-        identifier['season'] = tryInt(identifier['season'], None)
-        identifier['episode'] = tryInt(identifier['episode'], None)
-
-        return identifier

couchpotato/core/media/show/library/season.py

@@ -1,52 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.library.base import LibraryBase
-
-log = CPLog(__name__)
-
-autoload = 'SeasonLibraryPlugin'
-
-
-class SeasonLibraryPlugin(LibraryBase):
-    def __init__(self):
-        addEvent('library.query', self.query)
-        addEvent('library.identifier', self.identifier)
-
-    def query(self, media, first = True, condense = True, include_identifier = True, **kwargs):
-        if media.get('type') != 'show.season':
-            return
-
-        related = fireEvent('library.related', media, single = True)
-
-        # Get show titles
-        titles = fireEvent(
-            'library.query', related['show'],
-
-            first = False,
-            condense = condense,
-
-            single = True
-        )
-
-        # TODO map_names
-
-        # Add season identifier to titles
-        if include_identifier:
-            identifier = fireEvent('library.identifier', media, single = True)
-
-            if identifier and identifier.get('season') is not None:
-                titles = [title + (' S%02d' % identifier['season']) for title in titles]
-
-        if first:
-            return titles[0] if titles else None
-
-        return titles
-
-    def identifier(self, media):
-        if media.get('type') != 'show.season':
-            return
-
-        return {
-            'season': tryInt(media['info']['number'], None)
-        }

couchpotato/core/media/show/library/show.py

@@ -1,38 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import simplifyString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.library.base import LibraryBase
-from qcond import QueryCondenser
-
-log = CPLog(__name__)
-
-autoload = 'ShowLibraryPlugin'
-
-
-class ShowLibraryPlugin(LibraryBase):
-    query_condenser = QueryCondenser()
-
-    def __init__(self):
-        addEvent('library.query', self.query)
-
-    def query(self, media, first = True, condense = True, include_identifier = True, **kwargs):
-        if media.get('type') != 'show':
-            return
-
-        titles = media['info']['titles']
-
-        if condense:
-            # Use QueryCondenser to build a list of optimal search titles
-            condensed_titles = self.query_condenser.distinct(titles)
-
-            if condensed_titles:
-                # Use condensed titles if we got a valid result
-                titles = condensed_titles
-            else:
-                # Fallback to simplifying titles
-                titles = [simplifyString(title) for title in titles]
-
-        if first:
-            return titles[0] if titles else None
-
-        return titles

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

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

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

@@ -1,72 +0,0 @@
-from couchpotato import fireEvent, CPLog, tryInt
-from couchpotato.core.event import addEvent
-from couchpotato.core.media._base.matcher.base import MatcherBase
-
-log = CPLog(__name__)
-
-
-class Base(MatcherBase):
-
-    # TODO come back to this later, think this could be handled better, this is starting to get out of hand....
-    quality_map = {
-        'bluray_1080p': {'resolution': ['1080p'], 'source': ['bluray']},
-        'bluray_720p': {'resolution': ['720p'], 'source': ['bluray']},
-
-        'bdrip_1080p': {'resolution': ['1080p'], 'source': ['BDRip']},
-        'bdrip_720p': {'resolution': ['720p'], 'source': ['BDRip']},
-
-        'brrip_1080p': {'resolution': ['1080p'], 'source': ['BRRip']},
-        'brrip_720p': {'resolution': ['720p'], 'source': ['BRRip']},
-
-        'webdl_1080p': {'resolution': ['1080p'], 'source': ['webdl', ['web', 'dl']]},
-        'webdl_720p': {'resolution': ['720p'], 'source': ['webdl', ['web', 'dl']]},
-        'webdl_480p': {'resolution': ['480p'], 'source': ['webdl', ['web', 'dl']]},
-
-        'hdtv_720p': {'resolution': ['720p'], 'source': ['hdtv']},
-        'hdtv_sd': {'resolution': ['480p', None], 'source': ['hdtv']},
-    }
-
-    def __init__(self):
-        super(Base, self).__init__()
-
-        addEvent('%s.matcher.correct_identifier' % self.type, self.correctIdentifier)
-
-    def correct(self, chain, release, media, quality):
-        log.info("Checking if '%s' is valid", release['name'])
-        log.info2('Release parsed as: %s', chain.info)
-
-        if not fireEvent('matcher.correct_quality', chain, quality, self.quality_map, single = True):
-            log.info('Wrong: %s, quality does not match', release['name'])
-            return False
-
-        if not fireEvent('%s.matcher.correct_identifier' % self.type, chain, media):
-            log.info('Wrong: %s, identifier does not match', release['name'])
-            return False
-
-        if not fireEvent('matcher.correct_title', chain, media):
-            log.info("Wrong: '%s', undetermined naming.", (' '.join(chain.info['show_name'])))
-            return False
-
-        return True
-
-    def correctIdentifier(self, chain, media):
-        raise NotImplementedError()
-
-    def getChainIdentifier(self, chain):
-        if 'identifier' not in chain.info:
-            return None
-
-        identifier = self.flattenInfo(chain.info['identifier'])
-
-        # Try cast values to integers
-        for key, value in identifier.items():
-            if isinstance(value, list):
-                if len(value) <= 1:
-                    value = value[0]
-                else:
-                    log.warning('Wrong: identifier contains multiple season or episode values, unsupported')
-                    return None
-
-            identifier[key] = tryInt(value, value)
-
-        return identifier

couchpotato/core/media/show/matcher/episode.py

@@ -1,30 +0,0 @@
-from couchpotato import fireEvent, CPLog
-from couchpotato.core.media.show.matcher.base import Base
-
-log = CPLog(__name__)
-
-
-class Episode(Base):
-    type = 'show.episode'
-
-    def correctIdentifier(self, chain, media):
-        identifier = self.getChainIdentifier(chain)
-        if not identifier:
-            log.info2('Wrong: release identifier is not valid (unsupported or missing identifier)')
-            return False
-
-        # TODO - Parse episode ranges from identifier to determine if they are multi-part episodes
-        if any([x in identifier for x in ['episode_from', 'episode_to']]):
-            log.info2('Wrong: releases with identifier ranges are not supported yet')
-            return False
-
-        required = fireEvent('library.identifier', media, single = True)
-
-        # TODO - Support air by date episodes
-        # TODO - Support episode parts
-
-        if identifier != required:
-            log.info2('Wrong: required identifier (%s) does not match release identifier (%s)', (required, identifier))
-            return False
-
-        return True

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

@@ -1,9 +0,0 @@
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.matcher.episode import Episode
-from couchpotato.core.media.show.matcher.season import Season
-
-
-class ShowMatcher(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]

couchpotato/core/media/show/matcher/season.py

@@ -1,27 +0,0 @@
-from couchpotato import fireEvent, CPLog
-from couchpotato.core.media.show.matcher.base import Base
-
-log = CPLog(__name__)
-
-
-class Season(Base):
-    type = 'show.season'
-
-    def correctIdentifier(self, chain, media):
-        identifier = self.getChainIdentifier(chain)
-        if not identifier:
-            log.info2('Wrong: release identifier is not valid (unsupported or missing identifier)')
-            return False
-
-        # TODO - Parse episode ranges from identifier to determine if they are season packs
-        if any([x in identifier for x in ['episode_from', 'episode_to']]):
-            log.info2('Wrong: releases with identifier ranges are not supported yet')
-            return False
-
-        required = fireEvent('library.identifier', media, single = True)
-
-        if identifier != required:
-            log.info2('Wrong: required identifier (%s) does not match release identifier (%s)', (required, identifier))
-            return False
-
-        return True

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

@@ -1,13 +0,0 @@
-from couchpotato.core.media._base.providers.info.base import BaseInfoProvider
-
-
-class ShowProvider(BaseInfoProvider):
-    type = 'show'
-
-
-class SeasonProvider(BaseInfoProvider):
-    type = 'show.season'
-
-
-class EpisodeProvider(BaseInfoProvider):
-    type = 'show.episode'

couchpotato/core/media/show/providers/info/thetvdb.py

@@ -1,372 +0,0 @@
-from datetime import datetime
-import os
-import traceback
-
-from couchpotato import Env
-
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import simplifyString, toUnicode
-from couchpotato.core.helpers.variable import splitString, tryInt, tryFloat
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media.show.providers.base import ShowProvider
-from tvdb_api import tvdb_exceptions
-from tvdb_api.tvdb_api import Tvdb, Show
-
-log = CPLog(__name__)
-
-autoload = 'TheTVDb'
-
-
-class TheTVDb(ShowProvider):
-
-    # TODO: Consider grabbing zips to put less strain on tvdb
-    # TODO: Unicode stuff (check)
-    # TODO: Notigy frontend on error (tvdb down at monent)
-    # TODO: Expose apikey in setting so it can be changed by user
-
-    def __init__(self):
-        addEvent('show.info', self.getShowInfo, priority = 1)
-        addEvent('season.info', self.getSeasonInfo, priority = 1)
-        addEvent('episode.info', self.getEpisodeInfo, priority = 1)
-
-        self.tvdb_api_parms = {
-            'apikey': self.conf('api_key'),
-            'banners': True,
-            'language': 'en',
-            'cache': os.path.join(Env.get('cache_dir'), 'thetvdb_api'),
-        }
-        self._setup()
-
-    def _setup(self):
-        self.tvdb = Tvdb(**self.tvdb_api_parms)
-        self.valid_languages = self.tvdb.config['valid_languages']
-
-    def getShow(self, identifier = None):
-        show = None
-        try:
-            log.debug('Getting show: %s', identifier)
-            show = self.tvdb[int(identifier)]
-        except (tvdb_exceptions.tvdb_error, IOError), e:
-            log.error('Failed to getShowInfo for show id "%s": %s', (identifier, traceback.format_exc()))
-            return None
-
-        return show
-
-    def getShowInfo(self, identifiers = None):
-        """
-
-        @param identifiers: dict with identifiers per provider
-        @return: Full show info including season and episode info
-        """
-
-        if not identifiers or not identifiers.get('thetvdb'):
-            return None
-
-        identifier = tryInt(identifiers.get('thetvdb'))
-
-        cache_key = 'thetvdb.cache.show.%s' % identifier
-        result = None #self.getCache(cache_key)
-        if result:
-            return result
-
-        show = self.getShow(identifier = identifier)
-        if show:
-            result = self._parseShow(show)
-            self.setCache(cache_key, result)
-
-        return result or {}
-
-    def getSeasonInfo(self, identifiers = None, params = {}):
-        """Either return a list of all seasons or a single season by number.
-        identifier is the show 'id'
-        """
-        if not identifiers or not identifiers.get('thetvdb'):
-            return None
-
-        season_number = params.get('season_number', None)
-        identifier = tryInt(identifiers.get('thetvdb'))
-
-        cache_key = 'thetvdb.cache.%s.%s' % (identifier, season_number)
-        log.debug('Getting SeasonInfo: %s', cache_key)
-        result = self.getCache(cache_key) or {}
-        if result:
-            return result
-
-        try:
-            show = self.tvdb[int(identifier)]
-        except (tvdb_exceptions.tvdb_error, IOError), e:
-            log.error('Failed parsing TheTVDB SeasonInfo for "%s" id "%s": %s', (show, identifier, traceback.format_exc()))
-            return False
-
-        result = []
-        for number, season in show.items():
-            if season_number is not None and number == season_number:
-                result = self._parseSeason(show, number, season)
-                self.setCache(cache_key, result)
-                return result
-            else:
-                result.append(self._parseSeason(show, number, season))
-
-        self.setCache(cache_key, result)
-        return result
-
-    def getEpisodeInfo(self, identifier = None, params = {}):
-        """Either return a list of all episodes or a single episode.
-        If episode_identifer contains an episode number to search for
-        """
-        season_number = self.getIdentifier(params.get('season_number', None))
-        episode_identifier = self.getIdentifier(params.get('episode_identifiers', None))
-        identifier = self.getIdentifier(identifier)
-
-        if not identifier and season_number is None:
-            return False
-
-        # season_identifier must contain the 'show id : season number' since there is no tvdb id
-        # for season and we need a reference to both the show id and season number
-        if not identifier and season_number:
-            try:
-                identifier, season_number = season_number.split(':')
-                season_number = int(season_number)
-            except: return None
-
-        cache_key = 'thetvdb.cache.%s.%s.%s' % (identifier, episode_identifier, season_number)
-        log.debug('Getting EpisodeInfo: %s', cache_key)
-        result = self.getCache(cache_key) or {}
-        if result:
-            return result
-
-        try:
-            show = self.tvdb[int(identifier)]
-        except (tvdb_exceptions.tvdb_error, IOError), e:
-            log.error('Failed parsing TheTVDB EpisodeInfo for "%s" id "%s": %s', (show, identifier, traceback.format_exc()))
-            return False
-
-        result = []
-        for number, season in show.items():
-            if season_number is not None and number != season_number:
-                continue
-
-            for episode in season.values():
-                if episode_identifier is not None and episode['id'] == toUnicode(episode_identifier):
-                    result = self._parseEpisode(episode)
-                    self.setCache(cache_key, result)
-                    return result
-                else:
-                    result.append(self._parseEpisode(episode))
-
-        self.setCache(cache_key, result)
-        return result
-
-    def getIdentifier(self, value):
-        if type(value) is dict:
-            return value.get('thetvdb')
-
-        return value
-
-    def _parseShow(self, show):
-
-        #
-        # NOTE: show object only allows direct access via
-        # show['id'], not show.get('id')
-        #
-        def get(name):
-            return show.get(name) if not hasattr(show, 'search') else show[name]
-
-        ## Images
-        poster = get('poster')
-        backdrop = get('fanart')
-
-        genres = splitString(get('genre'), '|')
-        if get('firstaired') is not None:
-            try: year = datetime.strptime(get('firstaired'), '%Y-%m-%d').year
-            except: year = None
-        else:
-            year = None
-
-        show_data = {
-            'identifiers': {
-              'thetvdb': tryInt(get('id')),
-              'imdb': get('imdb_id'),
-              'zap2it': get('zap2it_id'),
-            },
-            'type': 'show',
-            'titles': [get('seriesname')],
-            'images': {
-                'poster': [poster] if poster else [],
-                'backdrop': [backdrop] if backdrop else [],
-                'poster_original': [],
-                'backdrop_original': [],
-            },
-            'year': year,
-            'genres': genres,
-            'network': get('network'),
-            'plot': get('overview'),
-            'networkid': get('networkid'),
-            'air_day': (get('airs_dayofweek') or '').lower(),
-            'air_time': self.parseTime(get('airs_time')),
-            'firstaired': get('firstaired'),
-            'runtime': tryInt(get('runtime')),
-            'contentrating': get('contentrating'),
-            'rating': {},
-            'actors': splitString(get('actors'), '|'),
-            'status': get('status'),
-            'language': get('language'),
-        }
-
-        if tryFloat(get('rating')):
-            show_data['rating']['thetvdb'] = [tryFloat(get('rating')), tryInt(get('ratingcount'))],
-
-        show_data = dict((k, v) for k, v in show_data.iteritems() if v)
-
-        # Only load season info when available
-        if type(show) == Show:
-
-            # Parse season and episode data
-            show_data['seasons'] = {}
-
-            for season_nr in show:
-                season = self._parseSeason(show, season_nr, show[season_nr])
-                season['episodes'] = {}
-
-                for episode_nr in show[season_nr]:
-                    season['episodes'][episode_nr] = self._parseEpisode(show[season_nr][episode_nr])
-
-                show_data['seasons'][season_nr] = season
-
-        # Add alternative titles
-        # try:
-        #     raw = self.tvdb.search(show['seriesname'])
-        #     if raw:
-        #         for show_info in raw:
-        #             print show_info
-        #             if show_info['id'] == show_data['id'] and show_info.get('aliasnames', None):
-        #                 for alt_name in show_info['aliasnames'].split('|'):
-        #                     show_data['titles'].append(toUnicode(alt_name))
-        # except (tvdb_exceptions.tvdb_error, IOError), e:
-        #     log.error('Failed searching TheTVDB for "%s": %s', (show['seriesname'], traceback.format_exc()))
-
-        return show_data
-
-    def _parseSeason(self, show, number, season):
-        """
-        contains no data
-        """
-
-        poster = []
-        try:
-            temp_poster = {}
-            for id, data in show.data['_banners']['season']['season'].items():
-                if data.get('season') == str(number) and data.get('language') == self.tvdb_api_parms['language']:
-                    temp_poster[tryFloat(data.get('rating')) * tryInt(data.get('ratingcount'))] = data.get('_bannerpath')
-                    #break
-            poster.append(temp_poster[sorted(temp_poster, reverse = True)[0]])
-        except:
-            pass
-
-        season_data = {
-            'identifiers': {
-                'thetvdb': show['id'] if show.get('id') else show[number][1]['seasonid']
-            },
-            'number': tryInt(number),
-            'images': {
-                'poster': poster,
-            },
-        }
-
-        season_data = dict((k, v) for k, v in season_data.iteritems() if v)
-        return season_data
-
-    def _parseEpisode(self, episode):
-        """
-        ('episodenumber', u'1'),
-        ('thumb_added', None),
-        ('rating', u'7.7'),
-        ('overview',
-         u'Experienced waitress Max Black meets her new co-worker, former rich-girl Caroline Channing, and puts her skills to the test at an old but re-emerging Brooklyn diner. Despite her initial distaste for Caroline, Max eventually softens and the two team up for a new business venture.'),
-        ('dvd_episodenumber', None),
-        ('dvd_discid', None),
-        ('combined_episodenumber', u'1'),
-        ('epimgflag', u'7'),
-        ('id', u'4099506'),
-        ('seasonid', u'465948'),
-        ('thumb_height', u'225'),
-        ('tms_export', u'1374789754'),
-        ('seasonnumber', u'1'),
-        ('writer', u'|Michael Patrick King|Whitney Cummings|'),
-        ('lastupdated', u'1371420338'),
-        ('filename', u'http://thetvdb.com/banners/episodes/248741/4099506.jpg'),
-        ('absolute_number', u'1'),
-        ('ratingcount', u'102'),
-        ('combined_season', u'1'),
-        ('thumb_width', u'400'),
-        ('imdb_id', u'tt1980319'),
-        ('director', u'James Burrows'),
-        ('dvd_chapter', None),
-        ('dvd_season', None),
-        ('gueststars',
-         u'|Brooke Lyons|Noah Mills|Shoshana Bush|Cale Hartmann|Adam Korson|Alex Enriquez|Matt Cook|Bill Parks|Eugene Shaw|Sergey Brusilovsky|Greg Lewis|Cocoa Brown|Nick Jameson|'),
-        ('seriesid', u'248741'),
-        ('language', u'en'),
-        ('productioncode', u'296793'),
-        ('firstaired', u'2011-09-19'),
-        ('episodename', u'Pilot')]
-        """
-
-        def get(name, default = None):
-            return episode.get(name, default)
-
-        poster = get('filename', [])
-
-        episode_data = {
-            'number': tryInt(get('episodenumber')),
-            'absolute_number': tryInt(get('absolute_number')),
-            'identifiers': {
-                'thetvdb': tryInt(episode['id'])
-            },
-            'type': 'episode',
-            'titles': [get('episodename')] if get('episodename') else [],
-            'images': {
-                'poster': [poster] if poster else [],
-            },
-            'released': get('firstaired'),
-            'plot': get('overview'),
-            'firstaired': get('firstaired'),
-            'language': get('language'),
-        }
-
-        if get('imdb_id'):
-            episode_data['identifiers']['imdb'] = get('imdb_id')
-
-        episode_data = dict((k, v) for k, v in episode_data.iteritems() if v)
-        return episode_data
-
-    def parseTime(self, time):
-        return time
-
-    def isDisabled(self):
-        if self.conf('api_key') == '':
-            log.error('No API key provided.')
-            return True
-        else:
-            return False
-
-
-config = [{
-    'name': 'thetvdb',
-    'groups': [
-        {
-            'tab': 'providers',
-            'name': 'tmdb',
-            'label': 'TheTVDB',
-            'hidden': True,
-            'description': 'Used for all calls to TheTVDB.',
-            'options': [
-                {
-                    'name': 'api_key',
-                    'default': '7966C02F860586D2',
-                    'label': 'Api Key',
-                },
-            ],
-        },
-    ],
-}]

couchpotato/core/media/show/providers/info/trakt.py

@@ -1,86 +0,0 @@
-import urllib
-
-from couchpotato.core.event import addEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media.show.providers.base import ShowProvider
-
-log = CPLog(__name__)
-
-autoload = 'Trakt'
-
-
-class Trakt(ShowProvider):
-    api_key = 'c043de5ada9d180028c10229d2a3ea5b'
-    base_url = 'http://api.trakt.tv/%%s.json/%s' % api_key
-
-    def __init__(self):
-        addEvent('info.search', self.search, priority = 1)
-        addEvent('show.search', self.search, priority = 1)
-
-    def search(self, q, limit = 12):
-        if self.isDisabled():
-            return False
-
-        # Check for cached result
-        cache_key = 'trakt.cache.search.%s.%s' % (q, limit)
-        results = self.getCache(cache_key) or []
-
-        if results:
-            return results
-
-        # Search
-        log.debug('Searching for show: "%s"', q)
-        response = self._request('search/shows', query=q, limit=limit)
-
-        if not response:
-            return []
-
-        # Parse search results
-        for show in response:
-            results.append(self._parseShow(show))
-
-        log.info('Found: %s', [result['titles'][0] + ' (' + str(result.get('year', 0)) + ')' for result in results])
-
-        self.setCache(cache_key, results)
-        return results
-
-    def _request(self, action, **kwargs):
-        url = self.base_url % action
-
-        if kwargs:
-            url += '?' + urllib.urlencode(kwargs)
-
-        return self.getJsonData(url)
-
-    def _parseShow(self, show):
-        # Images
-        images = show.get('images', {})
-
-        poster = images.get('poster')
-        backdrop = images.get('backdrop')
-
-        # Rating
-        rating = show.get('ratings', {}).get('percentage')
-
-        # Build show dict
-        show_data = {
-            'identifiers': {
-                'thetvdb': show.get('tvdb_id'),
-                'imdb': show.get('imdb_id'),
-                'tvrage': show.get('tvrage_id'),
-            },
-            'type': 'show',
-            'titles': [show.get('title')],
-            'images': {
-                'poster': [poster] if poster else [],
-                'backdrop': [backdrop] if backdrop else [],
-                'poster_original': [],
-                'backdrop_original': [],
-            },
-            'year': show.get('year'),
-            'rating': {
-                'trakt': float(rating) / 10
-            },
-        }
-
-        return dict((k, v) for k, v in show_data.iteritems() if v)

couchpotato/core/media/show/providers/info/xem.py

@@ -1,216 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.media.show.providers.base import ShowProvider
-
-log = CPLog(__name__)
-
-autoload = 'Xem'
-
-
-class Xem(ShowProvider):
-    '''
-    Mapping Information
-    ===================
-
-    Single
-    ------
-    You will need the id / identifier of the show e.g. tvdb-id for American Dad! is 73141
-    the origin is the name of the site/entity the episode, season (and/or absolute) numbers are based on
-
-    http://thexem.de/map/single?id=&origin=&episode=&season=&absolute=
-
-    episode, season and absolute are all optional but it wont work if you don't provide either episode and season OR absolute in
-    addition you can provide destination as the name of the wished destination, if not provided it will output all available
-
-    When a destination has two or more addresses another entry will be added as _ ... for now the second address gets the index "2"
-    (the first index is omitted) and so on
-
-    http://thexem.de/map/single?id=7529&origin=anidb&season=1&episode=2&destination=trakt
-    {
-     "result":"success",
-     "data":{
-            "trakt":  {"season":1,"episode":3,"absolute":3},
-            "trakt_2":{"season":1,"episode":4,"absolute":4}
-            },
-     "message":"single mapping for 7529 on anidb."
-    }
-
-    All
-    ---
-    Basically same as "single" just a little easier
-    The origin address is added into the output too!!
-
-    http://thexem.de/map/all?id=7529&origin=anidb
-
-    All Names
-    ---------
-    Get all names xem has to offer
-    non optional params: origin(an entity string like 'tvdb')
-    optional params: season, language
-    - season: a season number or a list like: 1,3,5 or a compare operator like ne,gt,ge,lt,le,eq and a season number. default would
-      return all
-    - language: a language string like 'us' or 'jp' default is all
-    - defaultNames: 1(yes) or 0(no) should the default names be added to the list ? default is 0(no)
-
-    http://thexem.de/map/allNames?origin=tvdb&season=le1
-
-    {
-    "result": "success",
-    "data": {
-            "248812": ["Dont Trust the Bitch in Apartment 23", "Don't Trust the Bitch in Apartment 23"],
-            "257571": ["Nazo no Kanojo X"],
-            "257875": ["Lupin III - Mine Fujiko to Iu Onna", "Lupin III Fujiko to Iu Onna", "Lupin the Third - Mine Fujiko to Iu Onna"]
-            },
-    "message": ""
-    }
-    '''
-
-    def __init__(self):
-        addEvent('show.info', self.getShowInfo, priority = 5)
-        addEvent('episode.info', self.getEpisodeInfo, priority = 5)
-
-        self.config = {}
-        self.config['base_url']   = "http://thexem.de"
-        self.config['url_single'] = u"%(base_url)s/map/single?" % self.config
-        self.config['url_all']    = u"%(base_url)s/map/all?" % self.config
-        self.config['url_names']  = u"%(base_url)s/map/names?" % self.config
-        self.config['url_all_names']  = u"%(base_url)s/map/allNames?" % self.config
-
-    def getShowInfo(self, identifiers = None):
-        if self.isDisabled():
-            return {}
-
-        identifier = identifiers.get('thetvdb')
-
-        if not identifier:
-            return {}
-
-        cache_key = 'xem.cache.%s' % identifier
-        log.debug('Getting showInfo: %s', cache_key)
-        result = self.getCache(cache_key) or {}
-        if result:
-            return result
-
-        result['seasons'] = {}
-
-        # Create season/episode and absolute mappings
-        url = self.config['url_all'] + "id=%s&origin=tvdb" % tryUrlencode(identifier)
-        response = self.getJsonData(url)
-
-        if response and response.get('result') == 'success':
-            data = response.get('data', None)
-            self.parseMaps(result, data)
-
-        # Create name alias mappings
-        url = self.config['url_names'] + "id=%s&origin=tvdb" % tryUrlencode(identifier)
-        response = self.getJsonData(url)
-
-        if response and response.get('result') == 'success':
-            data = response.get('data', None)
-            self.parseNames(result, data)
-
-        self.setCache(cache_key, result)
-        return result
-
-    def getEpisodeInfo(self, identifiers = None, params = {}):
-        episode_num = params.get('episode_number', None)
-        if episode_num is None:
-            return False
-
-        season_num = params.get('season_number', None)
-        if season_num is None:
-            return False
-
-        result = self.getShowInfo(identifiers)
-
-        if not result:
-            return False
-
-        # Find season
-        if season_num not in result['seasons']:
-            return False
-
-        season = result['seasons'][season_num]
-
-        # Find episode
-        if episode_num not in season['episodes']:
-            return False
-
-        return season['episodes'][episode_num]
-
-    def parseMaps(self, result, data, master = 'tvdb'):
-        '''parses xem map and returns a custom formatted dict map
-
-        To retreive map for scene:
-        if 'scene' in map['map_episode'][1][1]:
-            print map['map_episode'][1][1]['scene']['season']
-        '''
-        if not isinstance(data, list):
-            return
-
-        for episode_map in data:
-            origin = episode_map.pop(master, None)
-            if origin is None:
-                continue  # No master origin to map to
-
-            o_season = origin['season']
-            o_episode = origin['episode']
-
-            # Create season info
-            if o_season not in result['seasons']:
-                result['seasons'][o_season] = {}
-
-            season = result['seasons'][o_season]
-
-            if 'episodes' not in season:
-                season['episodes'] = {}
-
-            # Create episode info
-            if o_episode not in season['episodes']:
-                season['episodes'][o_episode] = {}
-
-            episode = season['episodes'][o_episode]
-            episode['episode_map'] = episode_map
-
-    def parseNames(self, result, data):
-        result['title_map'] = data.pop('all', None)
-
-        for season, title_map in data.items():
-            season = int(season)
-
-            # Create season info
-            if season not in result['seasons']:
-                result['seasons'][season] = {}
-
-            season = result['seasons'][season]
-            season['title_map'] = title_map
-
-    def isDisabled(self):
-        if __name__ == '__main__':
-            return False
-        if self.conf('enabled'):
-            return False
-        else:
-            return True
-
-
-config = [{
-    'name': 'xem',
-    'groups': [
-        {
-            'tab': 'providers',
-            'name': 'xem',
-            'label': 'TheXem',
-            'hidden': True,
-            'description': 'Used for all calls to TheXem.',
-            'options': [
-                {
-                    'name': 'enabled',
-                    'default': True,
-                    'label': 'Enabled',
-                },
-            ],
-        },
-    ],
-}]

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

@@ -1,51 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media._base.providers.nzb.binsearch import Base
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.environment import Env
-
-log = CPLog(__name__)
-
-autoload = 'BinSearch'
-
-
-class BinSearch(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    def buildUrl(self, media, quality):
-        query = tryUrlencode({
-            'q': fireEvent('media.search_query', media, single = True),
-            'm': 'n',
-            'max': 400,
-            'adv_age': Env.setting('retention', 'nzb'),
-            'adv_sort': 'date',
-            'adv_col': 'on',
-            'adv_nfo': 'on',
-            'minsize': quality.get('size_min'),
-            'maxsize': quality.get('size_max'),
-        })
-        return query
-
-
-class Episode(EpisodeProvider, Base):
-
-    def buildUrl(self, media, quality):
-        query = tryUrlencode({
-            'q': fireEvent('media.search_query', media, single = True),
-            'm': 'n',
-            'max': 400,
-            'adv_age': Env.setting('retention', 'nzb'),
-            'adv_sort': 'date',
-            'adv_col': 'on',
-            'adv_nfo': 'on',
-            'minsize': quality.get('size_min'),
-            'maxsize': quality.get('size_max'),
-        })
-        return query

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

@@ -1,49 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.event import fireEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media._base.providers.nzb.newznab import Base
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-
-log = CPLog(__name__)
-
-autoload = 'Newznab'
-
-
-class Newznab(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    def buildUrl(self, media, host):
-        related = fireEvent('library.related', media, single = True)
-        identifier = fireEvent('library.identifier', media, single = True)
-
-        query = tryUrlencode({
-            't': 'tvsearch',
-            'apikey': host['api_key'],
-            'q': related['show']['title'],
-            'season': identifier['season'],
-            'extended': 1
-        })
-        return query
-
-
-class Episode(EpisodeProvider, Base):
-
-    def buildUrl(self, media, host):
-        related = fireEvent('library.related', media, single = True)
-        identifier = fireEvent('library.identifier', media, single = True)
-        query = tryUrlencode({
-            't': 'tvsearch',
-            'apikey': host['api_key'],
-            'q': related['show']['title'],
-            'season': identifier['season'],
-            'ep': identifier['episode'],
-            'extended': 1
-        })
-
-        return query

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

@@ -1,52 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.nzb.nzbclub import Base
-
-log = CPLog(__name__)
-
-autoload = 'NZBClub'
-
-
-class NZBClub(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    def buildUrl(self, media):
-
-        q = tryUrlencode({
-            'q': fireEvent('media.search_query', media, single = True),
-        })
-
-        query = tryUrlencode({
-            'ig': 1,
-            'rpp': 200,
-            'st': 5,
-            'sp': 1,
-            'ns': 1,
-        })
-        return '%s&%s' % (q, query)
-
-
-class Episode(EpisodeProvider, Base):
-
-    def buildUrl(self, media):
-
-        q = tryUrlencode({
-            'q': fireEvent('media.search_query', media, single = True),
-        })
-
-        query = tryUrlencode({
-            'ig': 1,
-            'rpp': 200,
-            'st': 5,
-            'sp': 1,
-            'ns': 1,
-        })
-        return '%s&%s' % (q, query)

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

@@ -1,51 +0,0 @@
-from couchpotato import Env
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.nzb.nzbindex import Base
-
-log = CPLog(__name__)
-
-autoload = 'NzbIndex'
-
-
-class NzbIndex(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    def buildUrl(self, media, quality):
-        query = tryUrlencode({
-            'q': fireEvent('media.search_query', media, single = True),
-            'age': Env.setting('retention', 'nzb'),
-            'sort': 'agedesc',
-            'minsize': quality.get('size_min'),
-            'maxsize': quality.get('size_max'),
-            'rating': 1,
-            'max': 250,
-            'more': 1,
-            'complete': 1,
-        })
-        return query
-
-
-class Episode(EpisodeProvider, Base):
-
-    def buildUrl(self, media, quality):
-        query = tryUrlencode({
-            'q': fireEvent('media.search_query', media, single = True),
-            'age': Env.setting('retention', 'nzb'),
-            'sort': 'agedesc',
-            'minsize': quality.get('size_min'),
-            'maxsize': quality.get('size_max'),
-            'rating': 1,
-            'max': 250,
-            'more': 1,
-            'complete': 1,
-        })
-        return query

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

@@ -1,36 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.bithdtv import Base
-
-log = CPLog(__name__)
-
-autoload = 'BiTHDTV'
-
-
-class BiTHDTV(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    def buildUrl(self, media):
-        query = tryUrlencode({
-            'search': fireEvent('media.search_query', media, single = True),
-            'cat': 12 # Season cat
-        })
-        return query
-
-
-class Episode(EpisodeProvider, Base):
-
-    def buildUrl(self, media):
-        query = tryUrlencode({
-            'search': fireEvent('media.search_query', media, single = True),
-            'cat': 10 # Episode cat
-        })
-        return query

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

@@ -1,41 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.bitsoup import Base
-
-log = CPLog(__name__)
-
-autoload = 'Bitsoup'
-
-
-class Bitsoup(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-    # For season bundles, bitsoup currently only has one category
-    def buildUrl(self, media, quality):
-        query = tryUrlencode({
-            'search': fireEvent('media.search_query', media, single = True),
-            'cat': 45 # TV-Packs Category
-        })
-        return query
-
-
-class Episode(EpisodeProvider, Base):
-    cat_ids = [
-        ([42], ['hdtv_720p', 'webdl_720p', 'webdl_1080p', 'bdrip_1080p', 'bdrip_720p', 'brrip_1080p', 'brrip_720p']),
-        ([49], ['hdtv_sd', 'webdl_480p'])
-    ]
-    cat_backup_id = 0
-
-    def buildUrl(self, media, quality):
-        query = tryUrlencode({
-            'search': fireEvent('media.search_query', media, single = True),
-            'cat': self.getCatId(quality['identifier'])[0],
-        })
-        return query

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

@@ -1,37 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.iptorrents import Base
-
-log = CPLog(__name__)
-
-autoload = 'IPTorrents'
-
-
-class IPTorrents(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    # TODO come back to this later, a better quality system needs to be created
-    cat_ids = [
-        ([65], [
-            'bluray_1080p', 'bluray_720p',
-            'bdrip_1080p', 'bdrip_720p',
-            'brrip_1080p', 'brrip_720p',
-            'webdl_1080p', 'webdl_720p', 'webdl_480p',
-            'hdtv_720p', 'hdtv_sd'
-        ]),
-    ]
-
-
-class Episode(EpisodeProvider, Base):
-
-    # TODO come back to this later, a better quality system needs to be created
-    cat_ids = [
-        ([5], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-        ([4, 78, 79], ['hdtv_sd'])
-    ]

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

@@ -1,27 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.publichd import Base
-
-log = CPLog(__name__)
-
-autoload = 'PublicHD'
-
-
-class PublicHD(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    def buildUrl(self, media):
-        return fireEvent('media.search_query', media, single = True)
-
-
-class Episode(EpisodeProvider, Base):
-
-    def buildUrl(self, media):
-        return fireEvent('media.search_query', media, single = True)

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

@@ -1,60 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.event import fireEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.sceneaccess import Base
-
-
-log = CPLog(__name__)
-
-autoload = 'SceneAccess'
-
-
-class SceneAccess(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    cat_ids = [
-        ([26], ['hdtv_sd', 'hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-    ]
-
-    def buildUrl(self, media, quality):
-        url = self.urls['archive'] % (
-            self.getCatId(quality['identifier'])[0],
-            self.getCatId(quality['identifier'])[0]
-        )
-
-        arguments = tryUrlencode({
-            'search': fireEvent('media.search_query', media, single = True),
-            'method': 3,
-        })
-        query = "%s&%s" % (url, arguments)
-
-        return query
-
-
-class Episode(EpisodeProvider, Base):
-
-    cat_ids = [
-        ([27], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-        ([17, 11], ['hdtv_sd'])
-    ]
-
-    def buildUrl(self, media, quality):
-        url = self.urls['search'] % (
-            self.getCatId(quality['identifier'])[0],
-            self.getCatId(quality['identifier'])[0]
-        )
-
-        arguments = tryUrlencode({
-            'search': fireEvent('media.search_query', media, single = True),
-            'method': 3,
-        })
-        query = "%s&%s" % (url, arguments)
-
-        return query

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

@@ -1,46 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.thepiratebay import Base
-
-log = CPLog(__name__)
-
-autoload = 'ThePirateBay'
-
-
-class ThePirateBay(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    cat_ids = [
-        ([208], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-        ([205], ['hdtv_sd'])
-    ]
-
-    def buildUrl(self, media, page, cats):
-        return (
-            tryUrlencode('"%s"' % fireEvent('media.search_query', media, single = True)),
-            page,
-            ','.join(str(x) for x in cats)
-        )
-
-
-class Episode(EpisodeProvider, Base):
-
-    cat_ids = [
-        ([208], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-        ([205], ['hdtv_sd'])
-    ]
-
-    def buildUrl(self, media, page, cats):
-        return (
-            tryUrlencode('"%s"' % fireEvent('media.search_query', media, single = True)),
-            page,
-            ','.join(str(x) for x in cats)
-        )

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

@@ -1,34 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.torrentday import Base
-
-log = CPLog(__name__)
-
-autoload = 'TorrentDay'
-
-
-class TorrentDay(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    cat_ids = [
-        ([14], ['hdtv_sd', 'hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-    ]
-    def buildUrl(self, media):
-        return fireEvent('media.search_query', media, single = True)
-
-
-class Episode(EpisodeProvider, Base):
-    cat_ids = [
-        ([7], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-        ([2], [24], [26], ['hdtv_sd'])
-    ]
-    def buildUrl(self, media):
-        return fireEvent('media.search_query', media, single = True)
-

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

@@ -1,42 +0,0 @@
-from couchpotato import fireEvent
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.torrentleech import Base
-
-log = CPLog(__name__)
-
-autoload = 'TorrentLeech'
-
-
-class TorrentLeech(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    cat_ids = [
-        ([27], ['hdtv_sd', 'hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-    ]
-
-    def buildUrl(self, media, quality):
-        return (
-            tryUrlencode(fireEvent('media.search_query', media, single = True)),
-            self.getCatId(quality['identifier'])[0]
-        )
-
-class Episode(EpisodeProvider, Base):
-
-    cat_ids = [
-        ([32], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']),
-        ([26], ['hdtv_sd'])
-    ]
-
-    def buildUrl(self, media, quality):
-        return (
-            tryUrlencode(fireEvent('media.search_query', media, single = True)),
-            self.getCatId(quality['identifier'])[0]
-        )

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

@@ -1,38 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.event import fireEvent
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.torrentpotato import Base
-
-log = CPLog(__name__)
-
-autoload = 'TorrentPotato'
-
-
-class TorrentPotato(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-
-    def buildUrl(self, media, host):
-        arguments = tryUrlencode({
-            'user': host['name'],
-            'passkey': host['pass_key'],
-            'search': fireEvent('media.search_query', media, single = True)
-        })
-        return '%s?%s' % (host['host'], arguments)
-
-
-class Episode(EpisodeProvider, Base):
-
-    def buildUrl(self, media, host):
-        arguments = tryUrlencode({
-            'user': host['name'],
-            'passkey': host['pass_key'],
-            'search': fireEvent('media.search_query', media, single = True)
-        })
-        return '%s?%s' % (host['host'], arguments)

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

@@ -1,52 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.base import MultiProvider
-from couchpotato.core.media.show.providers.base import SeasonProvider, EpisodeProvider
-from couchpotato.core.media._base.providers.torrent.torrentshack import Base
-
-log = CPLog(__name__)
-
-autoload = 'TorrentShack'
-
-
-class TorrentShack(MultiProvider):
-
-    def getTypes(self):
-        return [Season, Episode]
-
-
-class Season(SeasonProvider, Base):
-    # TorrentShack tv season search categories
-    #   TV-SD Pack - 980
-    #   TV-HD Pack - 981
-    #   Full Blu-ray - 970
-    cat_ids = [
-        ([980], ['hdtv_sd']),
-        ([981], ['hdtv_720p', 'webdl_720p', 'webdl_1080p', 'bdrip_1080p', 'bdrip_720p', 'brrip_1080p', 'brrip_720p']),
-        ([970], ['bluray_1080p', 'bluray_720p']),
-    ]
-    cat_backup_id = 980
-
-    def buildUrl(self, media, quality):
-        query = (tryUrlencode(fireEvent('media.search_query', media, single = True)),
-                 self.getCatId(quality['identifier'])[0],
-                 self.getSceneOnly())
-        return query
-
-class Episode(EpisodeProvider, Base):
-    # TorrentShack tv episode search categories
-    #   TV/x264-HD - 600
-    #   TV/x264-SD - 620
-    #   TV/DVDrip - 700
-    cat_ids = [
-        ([600], ['hdtv_720p', 'webdl_720p', 'webdl_1080p', 'bdrip_1080p', 'bdrip_720p', 'brrip_1080p', 'brrip_720p']),
-        ([620], ['hdtv_sd'])
-    ]
-    cat_backup_id = 620
-
-    def buildUrl(self, media, quality):
-        query = (tryUrlencode(fireEvent('media.search_query', media, single = True)),
-                 self.getCatId(quality['identifier'])[0],
-                 self.getSceneOnly())
-        return query

couchpotato/core/media/show/searcher/episode.py

@@ -1,152 +0,0 @@
-from couchpotato import fireEvent, get_db, Env
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEventAsync
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.searcher.base import SearcherBase
-from couchpotato.core.media._base.searcher.main import SearchSetupError
-from couchpotato.core.media.show import ShowTypeBase
-
-log = CPLog(__name__)
-
-autoload = 'EpisodeSearcher'
-
-
-class EpisodeSearcher(SearcherBase, ShowTypeBase):
-    type = 'episode'
-
-    in_progress = False
-
-    def __init__(self):
-        super(EpisodeSearcher, self).__init__()
-
-        addEvent('%s.searcher.all' % self.getType(), self.searchAll)
-        addEvent('%s.searcher.single' % self.getType(), self.single)
-        addEvent('searcher.correct_release', self.correctRelease)
-
-        addApiView('%s.searcher.full_search' % self.getType(), self.searchAllView, docs = {
-            'desc': 'Starts a full search for all wanted shows',
-        })
-
-        addApiView('%s.searcher.single' % self.getType(), self.singleView)
-
-    def searchAllView(self, **kwargs):
-        fireEventAsync('%s.searcher.all' % self.getType(), manual = True)
-
-        return {
-            'success': not self.in_progress
-        }
-
-    def searchAll(self, manual = False):
-        pass
-
-    def singleView(self, media_id, **kwargs):
-        db = get_db()
-        media = db.get('id', media_id)
-
-        return {
-            'result': fireEvent('%s.searcher.single' % self.getType(), media, single = True)
-        }
-
-    def single(self, media, profile = None, quality_order = None, search_protocols = None, manual = False):
-        db = get_db()
-
-        related = fireEvent('library.related', media, single = True)
-
-        # TODO search_protocols, profile, quality_order can be moved to a base method
-        # Find out search type
-        try:
-            if not search_protocols:
-                search_protocols = fireEvent('searcher.protocols', single = True)
-        except SearchSetupError:
-            return
-
-        if not profile and related['show']['profile_id']:
-            profile = db.get('id', related['show']['profile_id'])
-
-        if not quality_order:
-            quality_order = fireEvent('quality.order', single = True)
-
-        # TODO: check episode status
-        # TODO: check air date
-        #if not self.conf('always_search') and not self.couldBeReleased(quality_type['quality']['identifier'] in pre_releases, release_dates, movie['library']['year']):
-        #    too_early_to_search.append(quality_type['quality']['identifier'])
-        #    return
-
-        ret = False
-        has_better_quality = None
-        found_releases = []
-        too_early_to_search = []
-
-        releases = fireEvent('release.for_media', media['_id'], single = True)
-        query = fireEvent('library.query', media, condense = False, single = True)
-
-        index = 0
-        for q_identifier in profile.get('qualities'):
-            quality_custom = {
-                'quality': q_identifier,
-                'finish': profile['finish'][index],
-                'wait_for': profile['wait_for'][index],
-                '3d': profile['3d'][index] if profile.get('3d') else False
-            }
-
-            has_better_quality = 0
-
-            # See if better quality is available
-            for release in releases:
-                if quality_order.index(release['quality']) <= quality_order.index(q_identifier) and release['status'] not in ['available', 'ignored', 'failed']:
-                    has_better_quality += 1
-
-            # Don't search for quality lower then already available.
-            if has_better_quality is 0:
-
-                log.info('Searching for %s in %s', (query, q_identifier))
-                quality = fireEvent('quality.single', identifier = q_identifier, single = True)
-                quality['custom'] = quality_custom
-
-                results = fireEvent('searcher.search', search_protocols, media, quality, single = True)
-                if len(results) == 0:
-                    log.debug('Nothing found for %s in %s', (query, q_identifier))
-
-                # Add them to this movie releases list
-                found_releases += fireEvent('release.create_from_search', results, media, quality, single = True)
-
-                # Try find a valid result and download it
-                if fireEvent('release.try_download_result', results, media, quality, single = True):
-                    ret = True
-
-                # Remove releases that aren't found anymore
-                for release in releases:
-                    if release.get('status') == 'available' and release.get('identifier') not in found_releases:
-                        fireEvent('release.delete', release.get('_id'), single = True)
-            else:
-                log.info('Better quality (%s) already available or snatched for %s', (q_identifier, query))
-                fireEvent('media.restatus', media['_id'])
-                break
-
-            # Break if CP wants to shut down
-            if self.shuttingDown() or ret:
-                break
-
-        if len(too_early_to_search) > 0:
-            log.info2('Too early to search for %s, %s', (too_early_to_search, query))
-
-    def correctRelease(self, release = None, media = None, quality = None, **kwargs):
-        if media.get('type') != 'show.episode':
-            return
-
-        retention = Env.setting('retention', section = 'nzb')
-
-        if release.get('seeders') is None and 0 < retention < release.get('age', 0):
-            log.info2('Wrong: Outside retention, age is %s, needs %s or lower: %s', (release['age'], retention, release['name']))
-            return False
-
-        # Check for required and ignored words
-        if not fireEvent('searcher.correct_words', release['name'], media, single = True):
-            return False
-
-        # TODO Matching is quite costly, maybe we should be caching release matches somehow? (also look at caper optimizations)
-        match = fireEvent('matcher.match', release, media, quality, single = True)
-        if match:
-            return match.weight
-
-        return False

couchpotato/core/media/show/searcher/season.py

@@ -1,172 +0,0 @@
-from couchpotato import get_db, Env
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEventAsync, fireEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.searcher.base import SearcherBase
-from couchpotato.core.media.movie.searcher import SearchSetupError
-from couchpotato.core.media.show import ShowTypeBase
-
-log = CPLog(__name__)
-
-autoload = 'SeasonSearcher'
-
-
-class SeasonSearcher(SearcherBase, ShowTypeBase):
-    type = 'season'
-
-    in_progress = False
-
-    def __init__(self):
-        super(SeasonSearcher, self).__init__()
-
-        addEvent('%s.searcher.all' % self.getType(), self.searchAll)
-        addEvent('%s.searcher.single' % self.getType(), self.single)
-        addEvent('searcher.correct_release', self.correctRelease)
-
-        addApiView('%s.searcher.full_search' % self.getType(), self.searchAllView, docs = {
-            'desc': 'Starts a full search for all wanted seasons',
-        })
-
-    def searchAllView(self, **kwargs):
-        fireEventAsync('%s.searcher.all' % self.getType(), manual = True)
-
-        return {
-            'success': not self.in_progress
-        }
-
-    def searchAll(self, manual = False):
-        pass
-
-    def single(self, media, profile = None, quality_order = None, search_protocols = None, manual = False):
-        db = get_db()
-
-        related = fireEvent('library.related', media, single = True)
-
-        # TODO search_protocols, profile, quality_order can be moved to a base method
-        # Find out search type
-        try:
-            if not search_protocols:
-                search_protocols = fireEvent('searcher.protocols', single = True)
-        except SearchSetupError:
-            return
-
-        if not profile and related['show']['profile_id']:
-            profile = db.get('id', related['show']['profile_id'])
-
-        if not quality_order:
-            quality_order = fireEvent('quality.order', single = True)
-
-        # Find 'active' episodes
-        episodes = related['episodes']
-        episodes_active = []
-
-        for episode in episodes:
-            if episode.get('status') != 'active':
-                continue
-
-            episodes_active.append(episode)
-
-        if len(episodes_active) == len(episodes):
-            # All episodes are 'active', try and search for full season
-            if self.search(media, profile, quality_order, search_protocols):
-                # Success, end season search
-                return True
-            else:
-                log.info('Unable to find season pack, searching for individual episodes...')
-
-        # Search for each episode individually
-        for episode in episodes_active:
-            fireEvent('show.episode.searcher.single', episode, profile, quality_order, search_protocols, manual)
-
-            # TODO (testing) only grab one episode
-            return True
-
-        return True
-
-    def search(self, media, profile, quality_order, search_protocols):
-        # TODO: check episode status
-        # TODO: check air date
-        #if not self.conf('always_search') and not self.couldBeReleased(quality_type['quality']['identifier'] in pre_releases, release_dates, movie['library']['year']):
-        #    too_early_to_search.append(quality_type['quality']['identifier'])
-        #    return
-
-        ret = False
-        has_better_quality = None
-        found_releases = []
-        too_early_to_search = []
-
-        releases = fireEvent('release.for_media', media['_id'], single = True)
-        query = fireEvent('library.query', media, condense = False, single = True)
-
-        index = 0
-        for q_identifier in profile.get('qualities'):
-            quality_custom = {
-                'quality': q_identifier,
-                'finish': profile['finish'][index],
-                'wait_for': profile['wait_for'][index],
-                '3d': profile['3d'][index] if profile.get('3d') else False
-            }
-
-            has_better_quality = 0
-
-            # See if better quality is available
-            for release in releases:
-                if quality_order.index(release['quality']) <= quality_order.index(q_identifier) and release['status'] not in ['available', 'ignored', 'failed']:
-                    has_better_quality += 1
-
-            # Don't search for quality lower then already available.
-            if has_better_quality is 0:
-
-                log.info('Searching for %s in %s', (query, q_identifier))
-                quality = fireEvent('quality.single', identifier = q_identifier, single = True)
-                quality['custom'] = quality_custom
-
-                results = fireEvent('searcher.search', search_protocols, media, quality, single = True)
-                if len(results) == 0:
-                    log.debug('Nothing found for %s in %s', (query, q_identifier))
-
-                # Add them to this movie releases list
-                found_releases += fireEvent('release.create_from_search', results, media, quality, single = True)
-
-                # Try find a valid result and download it
-                if fireEvent('release.try_download_result', results, media, quality, single = True):
-                    ret = True
-
-                # Remove releases that aren't found anymore
-                for release in releases:
-                    if release.get('status') == 'available' and release.get('identifier') not in found_releases:
-                        fireEvent('release.delete', release.get('_id'), single = True)
-            else:
-                log.info('Better quality (%s) already available or snatched for %s', (q_identifier, query))
-                fireEvent('media.restatus', media['_id'])
-                break
-
-            # Break if CP wants to shut down
-            if self.shuttingDown() or ret:
-                break
-
-        if len(too_early_to_search) > 0:
-            log.info2('Too early to search for %s, %s', (too_early_to_search, query))
-
-        return len(found_releases) > 0
-
-    def correctRelease(self, release = None, media = None, quality = None, **kwargs):
-        if media.get('type') != 'show.season':
-            return
-
-        retention = Env.setting('retention', section = 'nzb')
-
-        if release.get('seeders') is None and 0 < retention < release.get('age', 0):
-            log.info2('Wrong: Outside retention, age is %s, needs %s or lower: %s', (release['age'], retention, release['name']))
-            return False
-
-        # Check for required and ignored words
-        if not fireEvent('searcher.correct_words', release['name'], media, single = True):
-            return False
-
-        # TODO Matching is quite costly, maybe we should be caching release matches somehow? (also look at caper optimizations)
-        match = fireEvent('matcher.match', release, media, quality, single = True)
-        if match:
-            return match.weight
-
-        return False

couchpotato/core/media/show/searcher/show.py

@@ -1,88 +0,0 @@
-from couchpotato import get_db
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent, addEvent, fireEventAsync
-from couchpotato.core.helpers.variable import getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.searcher.base import SearcherBase
-from couchpotato.core.media._base.searcher.main import SearchSetupError
-from couchpotato.core.media.show import ShowTypeBase
-
-log = CPLog(__name__)
-
-autoload = 'ShowSearcher'
-
-
-class ShowSearcher(SearcherBase, ShowTypeBase):
-    type = 'show'
-
-    in_progress = False
-
-    def __init__(self):
-        super(ShowSearcher, self).__init__()
-
-        addEvent('%s.searcher.all' % self.getType(), self.searchAll)
-        addEvent('%s.searcher.single' % self.getType(), self.single)
-        addEvent('searcher.get_search_title', self.getSearchTitle)
-
-        addApiView('%s.searcher.full_search' % self.getType(), self.searchAllView, docs = {
-            'desc': 'Starts a full search for all wanted episodes',
-        })
-
-    def searchAllView(self, **kwargs):
-        fireEventAsync('%s.searcher.all' % self.getType(), manual = True)
-
-        return {
-            'success': not self.in_progress
-        }
-
-    def searchAll(self, manual = False):
-        pass
-
-    def single(self, media, search_protocols = None, manual = False):
-        # Find out search type
-        try:
-            if not search_protocols:
-                search_protocols = fireEvent('searcher.protocols', single = True)
-        except SearchSetupError:
-            return
-
-        if not media['profile_id'] or media['status'] == 'done':
-            log.debug('Show doesn\'t have a profile or already done, assuming in manage tab.')
-            return
-
-        show_title = fireEvent('media.search_query', media, condense = False, single = True)
-
-        fireEvent('notify.frontend', type = 'show.searcher.started.%s' % media['_id'], data = True, message = 'Searching for "%s"' % show_title)
-
-        show_tree = fireEvent('library.tree', media, single = True)
-
-        db = get_db()
-
-        profile = db.get('id', media['profile_id'])
-        quality_order = fireEvent('quality.order', single = True)
-
-        for season in show_tree.get('seasons', []):
-            if not season.get('info'):
-                continue
-
-            # Skip specials (and seasons missing 'number') for now
-            # TODO: set status for specials to skipped by default
-            if not season['info'].get('number'):
-                continue
-
-            # Check if full season can be downloaded
-            fireEvent('show.season.searcher.single', season, profile, quality_order, search_protocols, manual)
-
-            # TODO (testing) only snatch one season
-            return
-
-        fireEvent('notify.frontend', type = 'show.searcher.ended.%s' % media['_id'], data = True)
-
-    def getSearchTitle(self, media):
-        if media.get('type') != 'show':
-            related = fireEvent('library.related', media, single = True)
-            show = related['show']
-        else:
-            show = media
-
-        return getTitle(show)

couchpotato/core/notifications/notifymywp.py

@@ -0,0 +1,68 @@
+from couchpotato.core.helpers.variable import splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+from pynmwp import PyNMWP
+import six
+
+log = CPLog(__name__)
+
+autoload = 'NotifyMyWP'
+
+
+class NotifyMyWP(Notification):
+
+    def notify(self, message = '', data = None, listener = None):
+        if not data: data = {}
+
+        keys = splitString(self.conf('api_key'))
+        p = PyNMWP(keys, self.conf('dev_key'))
+
+        response = p.push(application = self.default_title, event = message, description = message, priority = self.conf('priority'), batch_mode = len(keys) > 1)
+
+        for key in keys:
+            if not response[key]['Code'] == six.u('200'):
+                log.error('Could not send notification to NotifyMyWindowsPhone (%s). %s', (key, response[key]['message']))
+                return False
+
+        return response
+
+
+config = [{
+    'name': 'notifymywp',
+    'groups': [
+        {
+            'tab': 'notifications',
+            'list': 'notification_providers',
+            'name': 'notifymywp',
+            'label': 'Windows Phone',
+            'options': [
+                {
+                    'name': 'enabled',
+                    'default': 0,
+                    'type': 'enabler',
+                },
+                {
+                    'name': 'api_key',
+                    'description': 'Multiple keys seperated by a comma. Maximum of 5.'
+                },
+                {
+                    'name': 'dev_key',
+                    'advanced': True,
+                },
+                {
+                    'name': 'priority',
+                    'default': 0,
+                    'type': 'dropdown',
+                    'values': [('Very Low', -2), ('Moderate', -1), ('Normal', 0), ('High', 1), ('Emergency', 2)],
+                },
+                {
+                    'name': 'on_snatch',
+                    'default': 0,
+                    'type': 'bool',
+                    'advanced': True,
+                    'description': 'Also send message when movie is snatched.',
+                },
+            ],
+        }
+    ],
+}]

couchpotato/core/plugins/base.py

@@ -196,7 +196,7 @@ class Plugin(object):
         headers['Host'] = headers.get('Host', None)
         headers['User-Agent'] = headers.get('User-Agent', self.user_agent)
         headers['Accept-encoding'] = headers.get('Accept-encoding', 'gzip')
-        headers['Connection'] = headers.get('Connection', 'close')
+        headers['Connection'] = headers.get('Connection', 'keep-alive')
         headers['Cache-Control'] = headers.get('Cache-Control', 'max-age=0')
 
         r = Env.get('http_opener')
@@ -279,7 +279,7 @@ class Plugin(object):
             wait = (last_use - now) + self.http_time_between_calls
 
             if wait > 0:
-                log.debug('Waiting for %s, %d seconds', (self.getName(), max(1, wait)))
+                log.debug('Waiting for %s, %d seconds', (self.getName(), wait))
                 time.sleep(min(wait, 30))
 
     def beforeCall(self, handler):

couchpotato/core/plugins/log/main.py

@@ -1,9 +1,9 @@
+import codecs
 import os
 import re
 import traceback
 
 from couchpotato.api import addApiView
-from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import tryInt, splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
@@ -103,9 +103,8 @@ class Logging(Plugin):
             if not os.path.isfile(path):
                 break
 
-            f = open(path, 'r')
-            log_content = toUnicode(f.read())
-            raw_lines = self.toList(log_content)
+            f = codecs.open(path, 'r', 'utf-8')
+            raw_lines = self.toList(f.read())
             raw_lines.reverse()
 
             brk = False
@@ -131,7 +130,7 @@ class Logging(Plugin):
 
     def toList(self, log_content = ''):
 
-        logs_raw = toUnicode(log_content).split('[0m\n')
+        logs_raw = log_content.split('[0m\n')
 
         logs = []
         for log_line in logs_raw:

couchpotato/core/plugins/manage.py

@@ -123,7 +123,7 @@ class Manage(Plugin):
                 fireEvent('notify.frontend', type = 'manage.update', data = True, message = 'Scanning for movies in "%s"' % folder)
 
                 onFound = self.createAddToLibrary(folder, added_identifiers)
-                fireEvent('scanner.scan', folder = folder, simple = True, newer_than = last_update if not full else 0, check_file_date = False, on_found = onFound, single = True)
+                fireEvent('scanner.scan', folder = folder, simple = True, newer_than = last_update if not full else 0, on_found = onFound, single = True)
 
                 # Break if CP wants to shut down
                 if self.shuttingDown():

couchpotato/core/plugins/profile/main.py

@@ -86,7 +86,6 @@ class ProfilePlugin(Plugin):
                 'label': toUnicode(kwargs.get('label')),
                 'order': tryInt(kwargs.get('order', 999)),
                 'core': kwargs.get('core', False),
-                'minimum_score': tryInt(kwargs.get('minimum_score', 1)),
                 'qualities': [],
                 'wait_for': [],
                 'stop_after': [],
@@ -218,7 +217,6 @@ class ProfilePlugin(Plugin):
                     'label': toUnicode(profile.get('label')),
                     'order': order,
                     'qualities': profile.get('qualities'),
-                    'minimum_score': 1,
                     'finish': [],
                     'wait_for': [],
                     'stop_after': [],

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

@@ -51,11 +51,6 @@
 		margin: 0 5px !important;
 	}
 
-	.profile .wait_for .minimum_score_input {
-		width: 40px !important;
-		text-align: left;
-	}
-
 	.profile .types {
 		padding: 0;
 		margin: 0 20px 0 -4px;

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

@@ -53,21 +53,12 @@ var Profile = new Class({
 				}),
 				new Element('span', {'text':'day(s) for a better quality '}),
 				new Element('span.advanced', {'text':'and keep searching'}),
-
 				// "After a checked quality is found and downloaded, continue searching for even better quality releases for the entered number of days."
 				new Element('input.inlay.xsmall.stop_after_input.advanced', {
 					'type':'text',
 					'value': data.stop_after && data.stop_after.length > 0 ? data.stop_after[0] : 0
 				}),
-				new Element('span.advanced', {'text':'day(s) for a better (checked) quality.'}),
-
-				// Minimum score of
-				new Element('span.advanced', {'html':'<br/>Releases need a minimum score of'}),
-				new Element('input.advanced.inlay.xsmall.minimum_score_input', {
-					'size': 4,
-					'type':'text',
-					'value': data.minimum_score || 1
-				})
+				new Element('span.advanced', {'text':'day(s) for a better (checked) quality.'})
 			)
 		);
 
@@ -135,7 +126,6 @@ var Profile = new Class({
 			'label' : self.el.getElement('.quality_label input').get('value'),
 			'wait_for' : self.el.getElement('.wait_for_input').get('value'),
 			'stop_after' : self.el.getElement('.stop_after_input').get('value'),
-			'minimum_score' : self.el.getElement('.minimum_score_input').get('value'),
 			'types': []
 		};
 

couchpotato/core/plugins/quality/main.py

@@ -30,28 +30,10 @@ class QualityPlugin(Plugin):
         {'identifier': 'dvdr', 'size': (3000, 10000), 'median_size': 4500, 'label': 'DVD-R', 'alternative': ['br2dvd', ('dvd', 'r')], 'allow': [], 'ext':['iso', 'img', 'vob'], 'tags': ['pal', 'ntsc', 'video_ts', 'audio_ts', ('dvd', 'r'), 'dvd9']},
         {'identifier': 'dvdrip', 'size': (600, 2400), 'median_size': 1500, 'label': 'DVD-Rip', 'width': 720, 'alternative': [('dvd', 'rip')], 'allow': [], 'ext':['avi'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]},
         {'identifier': 'scr', 'size': (600, 1600), 'median_size': 700, 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip', 'dvdscreener', 'hdscr', 'webrip', ('web', 'rip')], 'allow': ['dvdr', 'dvdrip', '720p', '1080p'], 'ext':[], 'tags': []},
-        {'identifier': 'r5', 'size': (600, 1000), 'median_size': 700, 'label': 'R5', 'alternative': ['r6'], 'allow': ['dvdr', '720p', '1080p'], 'ext':[]},
-        {'identifier': 'tc', 'size': (600, 1000), 'median_size': 700, 'label': 'TeleCine', 'alternative': ['telecine'], 'allow': ['720p', '1080p'], 'ext':[]},
-        {'identifier': 'ts', 'size': (600, 1000), 'median_size': 700, 'label': 'TeleSync', 'alternative': ['telesync', 'hdts'], 'allow': ['720p', '1080p'], 'ext':[]},
-        {'identifier': 'cam', 'size': (600, 1000), 'median_size': 700, 'label': 'Cam', 'alternative': ['camrip', 'hdcam'], 'allow': ['720p', '1080p'], 'ext':[]},
-
-        # TODO come back to this later, think this could be handled better, this is starting to get out of hand....
-        # BluRay
-        {'identifier': 'bluray_1080p', 'hd': True, 'size': (800, 5000), 'label': 'BluRay - 1080p', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        {'identifier': 'bluray_720p', 'hd': True, 'size': (800, 5000), 'label': 'BluRay - 720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        # BDRip
-        {'identifier': 'bdrip_1080p', 'hd': True, 'size': (800, 5000), 'label': 'BDRip - 1080p', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        {'identifier': 'bdrip_720p', 'hd': True, 'size': (800, 5000), 'label': 'BDRip - 720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        # BRRip
-        {'identifier': 'brrip_1080p', 'hd': True, 'size': (800, 5000), 'label': 'BRRip - 1080p', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        {'identifier': 'brrip_720p', 'hd': True, 'size': (800, 5000), 'label': 'BRRip - 720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        # WEB-DL
-        {'identifier': 'webdl_1080p', 'hd': True, 'size': (800, 5000), 'label': 'WEB-DL - 1080p', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        {'identifier': 'webdl_720p', 'hd': True, 'size': (800, 5000), 'label': 'WEB-DL - 720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        {'identifier': 'webdl_480p', 'hd': True, 'size': (100, 5000), 'label': 'WEB-DL - 480p', 'width': 720, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        # HDTV
-        {'identifier': 'hdtv_720p', 'hd': True, 'size': (800, 5000), 'label': 'HDTV - 720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv']},
-        {'identifier': 'hdtv_sd', 'hd': False, 'size': (100, 1000), 'label': 'HDTV - SD', 'width': 720, 'alternative': [], 'allow': [], 'ext':['mkv', 'mp4', 'avi']},
+        {'identifier': 'r5', 'size': (600, 1000), 'median_size': 700, 'label': 'R5', 'alternative': ['r6'], 'allow': ['dvdr', '720p'], 'ext':[]},
+        {'identifier': 'tc', 'size': (600, 1000), 'median_size': 700, 'label': 'TeleCine', 'alternative': ['telecine'], 'allow': ['720p'], 'ext':[]},
+        {'identifier': 'ts', 'size': (600, 1000), 'median_size': 700, 'label': 'TeleSync', 'alternative': ['telesync', 'hdts'], 'allow': ['720p'], 'ext':[]},
+        {'identifier': 'cam', 'size': (600, 1000), 'median_size': 700, 'label': 'Cam', 'alternative': ['camrip', 'hdcam'], 'allow': ['720p'], 'ext':[]}
     ]
     pre_releases = ['cam', 'ts', 'tc', 'r5', 'scr']
     threed_tags = {
@@ -296,8 +278,6 @@ class QualityPlugin(Plugin):
             'ext': 5,
         }
 
-        scored_on = []
-
         # Check alt and tags
         for tag_type in ['identifier', 'alternative', 'tags', 'label']:
             qualities = quality.get(tag_type, [])
@@ -309,13 +289,10 @@ class QualityPlugin(Plugin):
                         log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file))
                         score += points.get(tag_type)
 
-                if isinstance(alt, (str, unicode)) and ss(alt.lower()) in words and ss(alt.lower()) not in scored_on:
+                if isinstance(alt, (str, unicode)) and ss(alt.lower()) in words:
                     log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file))
                     score += points.get(tag_type)
 
-                    # Don't score twice on same tag
-                    scored_on.append(ss(alt).lower())
-
         # Check extention
         for ext in quality.get('ext', []):
             if ext == extension:
@@ -508,7 +485,6 @@ class QualityPlugin(Plugin):
             'Movie Name (2015).mp4': {'size': 6500, 'quality': 'brrip'},
             'Movie Name.2014.720p Web-Dl Aac2.0 h264-ReleaseGroup': {'size': 3800, 'quality': 'brrip'},
             'Movie Name.2014.720p.WEBRip.x264.AC3-ReleaseGroup': {'size': 3000, 'quality': 'scr'},
-            'Movie.Name.2014.1080p.HDCAM.-.ReleaseGroup': {'size': 5300, 'quality': 'cam'},
         }
 
         correct = 0

couchpotato/core/plugins/release/main.py

@@ -187,7 +187,7 @@ class Release(Plugin):
             release['files'] = dict((k, [toUnicode(x) for x in v]) for k, v in group['files'].items() if v)
             db.update(release)
 
-            fireEvent('media.restatus', media['_id'], allowed_restatus = ['done'], single = True)
+            fireEvent('media.restatus', media['_id'], single = True)
 
             return True
         except:
@@ -389,8 +389,8 @@ class Release(Plugin):
                 log.info('Ignored: %s', rel['name'])
                 continue
 
-            if rel['score'] < quality_custom.get('minimum_score'):
-                log.info('Ignored, score "%s" to low, need at least "%s": %s', (rel['score'], quality_custom.get('minimum_score'), rel['name']))
+            if rel['score'] <= 0:
+                log.info('Ignored, score "%s" to low: %s', (rel['score'], rel['name']))
                 continue
 
             if rel['size'] <= 50:
@@ -441,6 +441,7 @@ class Release(Plugin):
             for rel in search_results:
 
                 rel_identifier = md5(rel['url'])
+                found_releases.append(rel_identifier)
 
                 release = {
                     '_t': 'release',
@@ -481,9 +482,6 @@ class Release(Plugin):
                 # Update release in search_results
                 rel['status'] = rls.get('status')
 
-                if rel['status'] == 'available':
-                    found_releases.append(rel_identifier)
-
             return found_releases
         except:
             log.error('Failed: %s', traceback.format_exc())

couchpotato/core/plugins/renamer.py

@@ -220,14 +220,10 @@ class Renamer(Plugin):
         nfo_name = self.conf('nfo_name')
         separator = self.conf('separator')
 
-        if len(file_name) == 0:
-            log.error('Please fill in the filename option under renamer settings. Forcing it on <original>.<ext> to keep the same name as source file.')
-            file_name = '<original>.<ext>'
-
         cd_keys = ['<cd>','<cd_nr>', '<original>']
         if not any(x in folder_name for x in cd_keys) and not any(x in file_name for x in cd_keys):
-            log.error('Missing `cd` or `cd_nr` in the renamer. This will cause multi-file releases of being renamed to the same file. '
-                      'Please add it in the renamer settings. Force adding it for now.')
+            log.error('Missing `cd` or `cd_nr` in the renamer. This will cause multi-file releases of being renamed to the same file.'
+                      'Force adding it')
             file_name = '%s %s' % ('<cd>', file_name)
 
         # Tag release folder as failed_rename in case no groups were found. This prevents check_snatched from removing the release from the downloader.
@@ -795,7 +791,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
         dest = sp(dest)
         try:
 
-            if os.path.exists(dest) and os.path.isfile(dest):
+            if os.path.exists(dest):
                 raise Exception('Destination "%s" already exists' % dest)
 
             move_type = self.conf('file_action')

couchpotato/core/plugins/scanner.py

@@ -131,7 +131,7 @@ class Scanner(Plugin):
         addEvent('scanner.name_year', self.getReleaseNameYear)
         addEvent('scanner.partnumber', self.getPartNumber)
 
-    def scan(self, folder = None, files = None, release_download = None, simple = False, newer_than = 0, return_ignored = True, check_file_date = True, on_found = None):
+    def scan(self, folder = None, files = None, release_download = None, simple = False, newer_than = 0, return_ignored = True, on_found = None):
 
         folder = sp(folder)
 
@@ -145,6 +145,7 @@ class Scanner(Plugin):
 
         # Scan all files of the folder if no files are set
         if not files:
+            check_file_date = True
             try:
                 files = []
                 for root, dirs, walk_files in os.walk(folder, followlinks=True):

couchpotato/core/plugins/score/main.py

@@ -1,4 +1,4 @@
-from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import getTitle, splitString, removeDuplicate
 from couchpotato.core.logger import CPLog
@@ -16,20 +16,17 @@ class Score(Plugin):
     def __init__(self):
         addEvent('score.calculate', self.calculate)
 
-    def calculate(self, nzb, media):
+    def calculate(self, nzb, movie):
         """ Calculate the score of a NZB, used for sorting later """
 
-        # Fetch root media item (movie, show)
-        root = fireEvent('library.root', media, single = True)
-
         # Merge global and category
         preferred_words = splitString(Env.setting('preferred_words', section = 'searcher').lower())
-        try: preferred_words = removeDuplicate(preferred_words + splitString(media['category']['preferred'].lower()))
+        try: preferred_words = removeDuplicate(preferred_words + splitString(movie['category']['preferred'].lower()))
         except: pass
 
-        score = nameScore(toUnicode(nzb['name']), root['info'].get('year'), preferred_words)
+        score = nameScore(toUnicode(nzb['name']), movie['info']['year'], preferred_words)
 
-        for movie_title in root['info']['titles']:
+        for movie_title in movie['info']['titles']:
             score += nameRatioScore(toUnicode(nzb['name']), toUnicode(movie_title))
             score += namePositionScore(toUnicode(nzb['name']), toUnicode(movie_title))
 
@@ -47,15 +44,15 @@ class Score(Plugin):
         score += providerScore(nzb['provider'])
 
         # Duplicates in name
-        score += duplicateScore(nzb['name'], getTitle(root))
+        score += duplicateScore(nzb['name'], getTitle(movie))
 
         # Merge global and category
         ignored_words = splitString(Env.setting('ignored_words', section = 'searcher').lower())
-        try: ignored_words = removeDuplicate(ignored_words + splitString(media['category']['ignored'].lower()))
+        try: ignored_words = removeDuplicate(ignored_words + splitString(movie['category']['ignored'].lower()))
         except: pass
 
         # Partial ignored words
-        score += partialIgnoredScore(nzb['name'], getTitle(root), ignored_words)
+        score += partialIgnoredScore(nzb['name'], getTitle(movie), ignored_words)
 
         # Ignore single downloads from multipart
         score += halfMultipartScore(nzb['name'])

couchpotato/environment.py

@@ -14,6 +14,7 @@ class Env(object):
     ''' Environment variables '''
     _app = None
     _encoding = 'UTF-8'
+    _fs_encoding = 'UTF-8'
     _debug = False
     _dev = False
     _settings = Settings()

couchpotato/runner.py

@@ -86,6 +86,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
         encoding = 'UTF-8'
 
     Env.set('encoding', encoding)
+    Env.set('fs_encoding', sys.getfilesystemencoding())
 
     # Do db stuff
     db_path = sp(os.path.join(data_dir, 'database'))
@@ -116,8 +117,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
 
                     # Delete non zip files
                     if len(ints) != 1:
-                        try: os.remove(os.path.join(root, backup_file))
-                        except: pass
+                        os.remove(os.path.join(root, backup_file))
                     else:
                         existing_backups.append((int(ints[0]), backup_file))
             else:
@@ -205,7 +205,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
         logger.addHandler(hdlr)
 
     # To file
-    hdlr2 = handlers.RotatingFileHandler(Env.get('log_path'), 'a', 500000, 10, encoding = Env.get('encoding'))
+    hdlr2 = handlers.RotatingFileHandler(Env.get('log_path'), 'a', 500000, 10, encoding = 'utf-8')
     hdlr2.setFormatter(formatter)
     logger.addHandler(hdlr2)
 

couchpotato/static/scripts/couchpotato.js

@@ -54,22 +54,16 @@
 	},
 
 	pushState: function(e){
-		var self = this;
-
-		if((!e.meta && self.isMac()) || (!e.control && !self.isMac())){
+		if((!e.meta && Browser.platform.mac) || (!e.control && !Browser.platform.mac)){
 			(e).preventDefault();
 			var url = e.target.get('href');
-
-			// Middle click
-			if(e.event && e.event.button == 1)
-				window.open(url);
-			else if(History.getPath() != url)
+			if(History.getPath() != url)
 				History.push(url);
 		}
 	},
 
 	isMac: function(){
-		return Browser.platform == 'mac'
+		return Browser.platform.mac
 	},
 
 	createLayout: function(){
@@ -331,12 +325,11 @@
 	},
 
 	openDerefered: function(e, el){
-		var self = this;
 		(e).stop();
 
 		var url = 'http://www.dereferer.org/?' + el.get('href');
 
-		if(el.get('target') == '_blank' || (e.meta && self.isMac()) || (e.control && !self.isMac()))
+		if(el.get('target') == '_blank' || (e.meta && Browser.platform.mac) || (e.control && !Browser.platform.mac))
 			window.open(url);
 		else
 			window.location = url;

libs/pynmwp/__init__.py

@@ -0,0 +1,134 @@
+from xml.dom.minidom import parseString
+from httplib import HTTPSConnection
+from urllib import urlencode
+
+__version__ = "0.1"
+
+API_SERVER = 'notifymywindowsphone.com'
+ADD_PATH = '/publicapi/notify'
+
+USER_AGENT = "PyNMWP/v%s" % __version__
+
+def uniq_preserve(seq): # Dave Kirby
+    # Order preserving
+    seen = set()
+    return [x for x in seq if x not in seen and not seen.add(x)]
+
+def uniq(seq):
+    # Not order preserving
+    return {}.fromkeys(seq).keys()
+
+class PyNMWP(object):
+    """PyNMWP(apikey=[], developerkey=None)
+takes 2 optional arguments:
+ - (opt) apykey:      might me a string containing 1 key or an array of keys
+ - (opt) developerkey: where you can store your developer key
+"""
+
+    def __init__(self, apikey = [], developerkey = None):
+        self._developerkey = None
+        self.developerkey(developerkey)
+        if apikey:
+            if type(apikey) == str:
+                apikey = [apikey]
+        self._apikey = uniq(apikey)
+
+    def addkey(self, key):
+        "Add a key (register ?)"
+        if type(key) == str:
+            if not key in self._apikey:
+                self._apikey.append(key)
+        elif type(key) == list:
+            for k in key:
+                if not k in self._apikey:
+                    self._apikey.append(k)
+
+    def delkey(self, key):
+        "Removes a key (unregister ?)"
+        if type(key) == str:
+            if key in self._apikey:
+                self._apikey.remove(key)
+        elif type(key) == list:
+            for k in key:
+                if key in self._apikey:
+                    self._apikey.remove(k)
+
+    def developerkey(self, developerkey):
+        "Sets the developer key (and check it has the good length)"
+        if type(developerkey) == str and len(developerkey) == 48:
+            self._developerkey = developerkey
+
+    def push(self, application = "", event = "", description = "", url = "", priority = 0, batch_mode = False):
+        """Pushes a message on the registered API keys.
+takes 5 arguments:
+ - (req) application: application name [256]
+ - (req) event:       event name       [1000]
+ - (req) description: description      [10000]
+ - (opt) url:         url              [512]
+ - (opt) priority:    from -2 (lowest) to 2 (highest) (def:0)
+ - (opt) batch_mode:  call API 5 by 5 (def:False)
+
+Warning: using batch_mode will return error only if all API keys are bad
+ cf: http://nma.usk.bz/api.php
+"""
+        datas = {
+            'application': application[:256].encode('utf8'),
+            'event':       event[:1024].encode('utf8'),
+            'description': description[:10000].encode('utf8'),
+            'priority':    priority
+        }
+
+        if url:
+            datas['url'] = url[:512]
+
+        if self._developerkey:
+            datas['developerkey'] = self._developerkey
+
+        results = {}
+
+        if not batch_mode:
+            for key in self._apikey:
+                datas['apikey'] = key
+                res = self.callapi('POST', ADD_PATH, datas)
+                results[key] = res
+        else:
+            for i in range(0, len(self._apikey), 5):
+                datas['apikey'] = ",".join(self._apikey[i:i + 5])
+                res = self.callapi('POST', ADD_PATH, datas)
+                results[datas['apikey']] = res
+        return results
+
+    def callapi(self, method, path, args):
+        headers = { 'User-Agent': USER_AGENT }
+        if method == "POST":
+            headers['Content-type'] = "application/x-www-form-urlencoded"
+        http_handler = HTTPSConnection(API_SERVER)
+        http_handler.request(method, path, urlencode(args), headers)
+        resp = http_handler.getresponse()
+
+        try:
+            res = self._parse_reponse(resp.read())
+        except Exception, e:
+            res = {'type':    "pynmwperror",
+                   'code':    600,
+                   'message': str(e)
+                   }
+            pass
+
+        return res
+
+    def _parse_reponse(self, response):
+        root = parseString(response).firstChild
+        for elem in root.childNodes:
+            if elem.nodeType == elem.TEXT_NODE: continue
+            if elem.tagName == 'success':
+                res = dict(elem.attributes.items())
+                res['message'] = ""
+                res['type'] = elem.tagName
+                return res
+            if elem.tagName == 'error':
+                res = dict(elem.attributes.items())
+                res['message'] = elem.firstChild.nodeValue
+                res['type'] = elem.tagName
+                return res
+

libs/qcond/__init__.py

@@ -1,42 +0,0 @@
-# Copyright 2013 Dean Gardiner <gardiner91@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from qcond.transformers.merge import MergeTransformer
-from qcond.transformers.slice import SliceTransformer
-from qcond.transformers.strip_common import StripCommonTransformer
-
-
-__version_info__ = ('0', '1', '0')
-__version_branch__ = 'master'
-
-__version__ = "%s%s" % (
-    '.'.join(__version_info__),
-    '-' + __version_branch__ if __version_branch__ else ''
-)
-
-
-class QueryCondenser(object):
-    def __init__(self):
-        self.transformers = [
-            MergeTransformer(),
-            SliceTransformer(),
-            StripCommonTransformer()
-        ]
-
-    def distinct(self, titles):
-        for transformer in self.transformers:
-            titles = transformer.run(titles)
-
-        return titles

libs/qcond/compat.py

@@ -1,23 +0,0 @@
-# Copyright 2013 Dean Gardiner <gardiner91@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import sys
-
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    xrange = range
-else:
-    xrange = xrange

libs/qcond/helpers.py

@@ -1,84 +0,0 @@
-# Copyright 2013 Dean Gardiner <gardiner91@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from difflib import SequenceMatcher
-import re
-import sys
-from logr import Logr
-from qcond.compat import xrange
-
-
-PY3 = sys.version_info[0] == 3
-
-
-def simplify(s):
-    s = s.lower()
-    s = re.sub(r"(\w)'(\w)", r"\1\2", s)
-    return s
-
-
-def strip(s):
-    return re.sub(r"^(\W*)(.*?)(\W*)$", r"\2", s)
-
-
-def create_matcher(a, b, swap_longest = True, case_sensitive = False):
-    # Ensure longest string is a
-    if swap_longest and len(b) > len(a):
-        a_ = a
-        a = b
-        b = a_
-
-    if not case_sensitive:
-        a = a.upper()
-        b = b.upper()
-
-    return SequenceMatcher(None, a, b)
-
-
-def first(function_or_none, sequence):
-    if PY3:
-        for item in filter(function_or_none, sequence):
-            return item
-    else:
-        result = filter(function_or_none, sequence)
-        if len(result):
-            return result[0]
-
-    return None
-
-def sorted_append(sequence, item, func):
-    if not len(sequence):
-        sequence.insert(0, item)
-        return
-
-    x = 0
-    for x in xrange(len(sequence)):
-        if func(sequence[x]):
-            sequence.insert(x, item)
-            return
-
-    sequence.append(item)
-
-def itemsMatch(L1, L2):
-    return len(L1) == len(L2) and sorted(L1) == sorted(L2)
-
-def distinct(sequence):
-    result = []
-
-    for item in sequence:
-        if item not in result:
-            result.append(item)
-
-    return result

libs/qcond/transformers/base.py

@@ -1,21 +0,0 @@
-# Copyright 2013 Dean Gardiner <gardiner91@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-class Transformer(object):
-    def __init__(self):
-        pass
-
-    def run(self, titles):
-        raise NotImplementedError()

libs/qcond/transformers/merge.py

@@ -1,241 +0,0 @@
-# Copyright 2013 Dean Gardiner <gardiner91@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from operator import itemgetter
-from logr import Logr
-from qcond.helpers import simplify, strip, first, sorted_append, distinct
-from qcond.transformers.base import Transformer
-from qcond.compat import xrange
-
-
-class MergeTransformer(Transformer):
-    def __init__(self):
-        super(MergeTransformer, self).__init__()
-
-    def run(self, titles):
-        titles = distinct([simplify(title) for title in titles])
-
-        Logr.info(str(titles))
-
-        Logr.debug("------------------------------------------------------------")
-
-        root, tails = self.parse(titles)
-
-        Logr.debug("--------------------------PARSE-----------------------------")
-
-        for node in root:
-            print_tree(node)
-
-        Logr.debug("--------------------------MERGE-----------------------------")
-
-        self.merge(root)
-
-        Logr.debug("--------------------------FINAL-----------------------------")
-
-        for node in root:
-            print_tree(node)
-
-        Logr.debug("--------------------------RESULT-----------------------------")
-
-        scores = {}
-        results = []
-
-        for tail in tails:
-            score, value, original_value = tail.full_value()
-
-            if value in scores:
-                scores[value] += score
-            else:
-                results.append((value, original_value))
-                scores[value] = score
-
-                Logr.debug("%s %s %s", score, value, original_value)
-
-        sorted_results = sorted(results, key=lambda item: (scores[item[0]], item[1]), reverse = True)
-
-        return [result[0] for result in sorted_results]
-
-    def parse(self, titles):
-        root = []
-        tails = []
-
-        for title in titles:
-            Logr.debug(title)
-
-            cur = None
-            words = title.split(' ')
-
-            for wx in xrange(len(words)):
-                word = strip(words[wx])
-
-                if cur is None:
-                    cur = find_node(root, word)
-
-                    if cur is None:
-                        cur = DNode(word, None, num_children=len(words) - wx, original_value=title)
-                        root.append(cur)
-                else:
-                    parent = cur
-                    parent.weight += 1
-
-                    cur = find_node(parent.right, word)
-
-                    if cur is None:
-                        Logr.debug("%s %d", word, len(words) - wx)
-                        cur = DNode(word, parent, num_children=len(words) - wx)
-                        sorted_append(parent.right, cur, lambda a: a.num_children < cur.num_children)
-                    else:
-                        cur.weight += 1
-
-            tails.append(cur)
-
-        return root, tails
-
-    def merge(self, root):
-        for x in range(len(root)):
-            Logr.debug(root[x])
-            root[x].right = self._merge(root[x].right)
-            Logr.debug('=================================================================')
-
-        return root
-
-    def get_nodes_right(self, value):
-        if type(value) is not list:
-            value = [value]
-
-        nodes = []
-
-        for node in value:
-            nodes.append(node)
-
-            for child in self.get_nodes_right(node.right):
-                nodes.append(child)
-
-        return nodes
-
-    def destroy_nodes_right(self, value):
-        nodes = self.get_nodes_right(value)
-
-        for node in nodes:
-            node.value = None
-            node.dead = True
-
-    def _merge(self, nodes, depth = 0):
-        Logr.debug(str('\t' * depth) + str(nodes))
-
-        if not len(nodes):
-            return []
-
-        top = nodes[0]
-
-        # Merge into top
-        for x in range(len(nodes)):
-            # Merge extra results into top
-            if x > 0:
-                top.value = None
-                top.weight += nodes[x].weight
-                self.destroy_nodes_right(top.right)
-
-                if len(nodes[x].right):
-                    top.join_right(nodes[x].right)
-
-                    Logr.debug("= %s joined %s", nodes[x], top)
-
-                nodes[x].dead = True
-
-        nodes = [n for n in nodes if not n.dead]
-
-        # Traverse further
-        for node in nodes:
-            if len(node.right):
-                node.right = self._merge(node.right, depth + 1)
-
-        return nodes
-
-
-def print_tree(node, depth = 0):
-    Logr.debug(str('\t' * depth) + str(node))
-
-    if len(node.right):
-        for child in node.right:
-            print_tree(child, depth + 1)
-    else:
-        Logr.debug(node.full_value()[1])
-
-
-def find_node(node_list, value):
-    # Try find adjacent node match
-    for node in node_list:
-        if node.value == value:
-            return node
-
-    return None
-
-
-class DNode(object):
-    def __init__(self, value, parent, right=None, weight=1, num_children=None, original_value=None):
-        self.value = value
-
-        self.parent = parent
-
-        if right is None:
-            right = []
-        self.right = right
-
-        self.weight = weight
-
-        self.original_value = original_value
-        self.num_children = num_children
-
-        self.dead = False
-
-    def join_right(self, nodes):
-        for node in nodes:
-            duplicate = first(lambda x: x.value == node.value, self.right)
-
-            if duplicate:
-                duplicate.weight += node.weight
-                duplicate.join_right(node.right)
-            else:
-                node.parent = self
-                self.right.append(node)
-
-    def full_value(self):
-        words = []
-        total_score = 0
-
-        cur = self
-        root = None
-
-        while cur is not None:
-            if cur.value and not cur.dead:
-                words.insert(0, cur.value)
-                total_score += cur.weight
-
-            if cur.parent is None:
-                root = cur
-            cur = cur.parent
-
-        return float(total_score) / len(words), ' '.join(words), root.original_value if root else None
-
-    def __repr__(self):
-        return '<%s value:"%s", weight: %s, num_children: %s%s%s>' % (
-            'DNode',
-            self.value,
-            self.weight,
-            self.num_children,
-            (', original_value: %s' % self.original_value) if self.original_value else '',
-            ' REMOVING' if self.dead else ''
-        )

libs/qcond/transformers/slice.py

@@ -1,280 +0,0 @@
-# Copyright 2013 Dean Gardiner <gardiner91@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from logr import Logr
-from qcond.helpers import create_matcher
-from qcond.transformers.base import Transformer
-
-
-class SliceTransformer(Transformer):
-    def __init__(self):
-        super(SliceTransformer, self).__init__()
-
-    def run(self, titles):
-        nodes = []
-
-        # Create a node for each title
-        for title in titles:
-            nodes.append(SimNode(title))
-
-        # Calculate similarities between nodes
-        for node in nodes:
-            calculate_sim_links(node, [n for n in nodes if n != node])
-
-        kill_nodes_above(nodes, 0.90)
-
-        Logr.debug('---------------------------------------------------------------------')
-
-        print_link_tree(nodes)
-        Logr.debug('%s %s', len(nodes), [n.value for n in nodes])
-
-        Logr.debug('---------------------------------------------------------------------')
-
-        kill_trailing_nodes(nodes)
-
-        Logr.debug('---------------------------------------------------------------------')
-
-        # Sort remaining nodes by 'num_merges'
-        nodes = sorted(nodes, key=lambda n: n.num_merges, reverse=True)
-
-        print_link_tree(nodes)
-
-        Logr.debug('---------------------------------------------------------------------')
-
-        Logr.debug('%s %s', len(nodes), [n.value for n in nodes])
-
-        return [n.value for n in nodes]
-
-
-class SimLink(object):
-    def __init__(self, similarity, opcodes, stats):
-        self.similarity = similarity
-        self.opcodes = opcodes
-        self.stats = stats
-
-
-class SimNode(object):
-    def __init__(self, value):
-        self.value = value
-
-        self.dead = False
-        self.num_merges = 0
-
-        self.links = {}  # {<other SimNode>: <SimLink>}
-
-
-def kill_nodes(nodes, killed_nodes):
-    # Remove killed nodes from root list
-    for node in killed_nodes:
-        if node in nodes:
-            nodes.remove(node)
-
-    # Remove killed nodes from links
-    for killed_node in killed_nodes:
-        for node in nodes:
-            if killed_node in node.links:
-                node.links.pop(killed_node)
-
-
-def kill_nodes_above(nodes, above_sim):
-    killed_nodes = []
-
-    for node in nodes:
-        if node.dead:
-            continue
-
-        Logr.debug(node.value)
-
-        for link_node, link in node.links.items():
-            if link_node.dead:
-                continue
-
-            Logr.debug('\t%0.2f -- %s', link.similarity, link_node.value)
-
-            if link.similarity >= above_sim:
-                if len(link_node.value) > len(node.value):
-                    Logr.debug('\t\tvery similar, killed this node')
-                    link_node.dead = True
-                    node.num_merges += 1
-                    killed_nodes.append(link_node)
-                else:
-                    Logr.debug('\t\tvery similar, killed owner')
-                    node.dead = True
-                    link_node.num_merges += 1
-                    killed_nodes.append(node)
-
-    kill_nodes(nodes, killed_nodes)
-
-
-def print_link_tree(nodes):
-    for node in nodes:
-        Logr.debug(node.value)
-        Logr.debug('\tnum_merges: %s', node.num_merges)
-
-        if len(node.links):
-            Logr.debug('\t========== LINKS ==========')
-            for link_node, link in node.links.items():
-                Logr.debug('\t%0.2f -- %s', link.similarity, link_node.value)
-
-            Logr.debug('\t---------------------------')
-
-
-def kill_trailing_nodes(nodes):
-    killed_nodes = []
-
-    for node in nodes:
-        if node.dead:
-            continue
-
-        Logr.debug(node.value)
-
-        for link_node, link in node.links.items():
-            if link_node.dead:
-                continue
-
-            is_valid = link.stats.get('valid', False)
-
-            has_deletions = False
-            has_insertions = False
-            has_replacements = False
-
-            for opcode in link.opcodes:
-                if opcode[0] == 'delete':
-                    has_deletions = True
-                if opcode[0] == 'insert':
-                    has_insertions = True
-                if opcode[0] == 'replace':
-                    has_replacements = True
-
-            equal_perc = link.stats.get('equal', 0) / float(len(node.value))
-            insert_perc = link.stats.get('insert', 0) / float(len(node.value))
-
-            Logr.debug('\t({0:<24}) [{1:02d}:{2:02d} = {3:02d} {4:3.0f}% {5:3.0f}%] -- {6:<45}'.format(
-                'd:%s, i:%s, r:%s' % (has_deletions, has_insertions, has_replacements),
-                len(node.value), len(link_node.value), link.stats.get('equal', 0),
-                equal_perc * 100, insert_perc * 100,
-                '"{0}"'.format(link_node.value)
-            ))
-
-            Logr.debug('\t\t%s', link.stats)
-
-            kill = all([
-                is_valid,
-                equal_perc >= 0.5,
-                insert_perc < 2,
-                has_insertions,
-                not has_deletions,
-                not has_replacements
-            ])
-
-            if kill:
-                Logr.debug('\t\tkilled this node')
-
-                link_node.dead = True
-                node.num_merges += 1
-                killed_nodes.append(link_node)
-
-    kill_nodes(nodes, killed_nodes)
-
-stats_print_format = "\t{0:<8} ({1:2d}:{2:2d}) ({3:2d}:{4:2d})"
-
-
-def get_index_values(iterable, a, b):
-    return (
-        iterable[a] if a else None,
-        iterable[b] if b else None
-    )
-
-
-def get_indices(iterable, a, b):
-    return (
-        a if 0 < a < len(iterable) else None,
-        b if 0 < b < len(iterable) else None
-    )
-
-
-def get_opcode_stats(for_node, node, opcodes):
-    stats = {}
-
-    for tag, i1, i2, j1, j2 in opcodes:
-        Logr.debug(stats_print_format.format(
-            tag, i1, i2, j1, j2
-        ))
-
-        if tag in ['insert', 'delete']:
-            ax = None, None
-            bx = None, None
-
-            if tag == 'insert':
-                ax = get_indices(for_node.value, i1 - 1, i1)
-                bx = get_indices(node.value, j1, j2 - 1)
-
-            if tag == 'delete':
-                ax = get_indices(for_node.value, j1 - 1, j1)
-                bx = get_indices(node.value, i1, i2 - 1)
-
-            av = get_index_values(for_node.value, *ax)
-            bv = get_index_values(node.value, *bx)
-
-            Logr.debug(
-                '\t\t%s %s [%s><%s] <---> %s %s [%s><%s]',
-                ax, av, av[0], av[1],
-                bx, bv, bv[0], bv[1]
-            )
-
-            head_valid = av[0] in [None, ' '] or bv[0] in [None, ' ']
-            tail_valid = av[1] in [None, ' '] or bv[1] in [None, ' ']
-            valid = head_valid and tail_valid
-
-            if 'valid' not in stats or (stats['valid'] and not valid):
-                stats['valid'] = valid
-
-            Logr.debug('\t\t' + ('VALID' if valid else 'INVALID'))
-
-        if tag not in stats:
-            stats[tag] = 0
-
-        stats[tag] += (i2 - i1) or (j2 - j1)
-
-    return stats
-
-
-def calculate_sim_links(for_node, other_nodes):
-    for node in other_nodes:
-        if node in for_node.links:
-            continue
-
-        Logr.debug('calculating similarity between "%s" and "%s"', for_node.value, node.value)
-
-        # Get similarity
-        similarity_matcher = create_matcher(for_node.value, node.value)
-        similarity = similarity_matcher.quick_ratio()
-
-        # Get for_node -> node opcodes
-        a_opcodes_matcher = create_matcher(for_node.value, node.value, swap_longest = False)
-        a_opcodes = a_opcodes_matcher.get_opcodes()
-        a_stats = get_opcode_stats(for_node, node, a_opcodes)
-
-        Logr.debug('-' * 100)
-
-        # Get node -> for_node opcodes
-        b_opcodes_matcher = create_matcher(node.value, for_node.value, swap_longest = False)
-        b_opcodes = b_opcodes_matcher.get_opcodes()
-        b_stats = get_opcode_stats(for_node, node, b_opcodes)
-
-        for_node.links[node] = SimLink(similarity, a_opcodes, a_stats)
-        node.links[for_node] = SimLink(similarity, b_opcodes, b_stats)
-
-        #raw_input('Press ENTER to continue')

libs/qcond/transformers/strip_common.py

@@ -1,26 +0,0 @@
-# Copyright 2013 Dean Gardiner <gardiner91@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from qcond.transformers.base import Transformer
-
-
-COMMON_WORDS = [
-    'the'
-]
-
-
-class StripCommonTransformer(Transformer):
-    def run(self, titles):
-        return [title for title in titles if title.lower() not in COMMON_WORDS]

libs/requests/compat.py

@@ -4,7 +4,7 @@
 pythoncompat
 """
 
-import chardet
+from .packages import chardet
 
 import sys
 

libs/requests/packages/chardet/__init__.py

@@ -0,0 +1,32 @@
+######################## BEGIN LICENSE BLOCK ########################
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+__version__ = "2.2.1"
+from sys import version_info
+
+
+def detect(aBuf):
+    if ((version_info < (3, 0) and isinstance(aBuf, unicode)) or
+            (version_info >= (3, 0) and not isinstance(aBuf, bytes))):
+        raise ValueError('Expected a bytes object, not a unicode object')
+
+    from . import universaldetector
+    u = universaldetector.UniversalDetector()
+    u.reset()
+    u.feed(aBuf)
+    u.close()
+    return u.result

libs/requests/packages/chardet/big5freq.py

@@ -0,0 +1,925 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# Big5 frequency table
+# by Taiwan's Mandarin Promotion Council
+# <http://www.edu.tw:81/mandr/>
+#
+# 128  --> 0.42261
+# 256  --> 0.57851
+# 512  --> 0.74851
+# 1024 --> 0.89384
+# 2048 --> 0.97583
+#
+# Ideal Distribution Ratio = 0.74851/(1-0.74851) =2.98
+# Random Distribution Ration = 512/(5401-512)=0.105
+#
+# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
+
+BIG5_TYPICAL_DISTRIBUTION_RATIO = 0.75
+
+#Char to FreqOrder table
+BIG5_TABLE_SIZE = 5376
+
+Big5CharToFreqOrder = (
+   1,1801,1506, 255,1431, 198,   9,  82,   6,5008, 177, 202,3681,1256,2821, 110, #   16
+3814,  33,3274, 261,  76,  44,2114,  16,2946,2187,1176, 659,3971,  26,3451,2653, #   32
+1198,3972,3350,4202, 410,2215, 302, 590, 361,1964,   8, 204,  58,4510,5009,1932, #   48
+  63,5010,5011, 317,1614,  75, 222, 159,4203,2417,1480,5012,3555,3091, 224,2822, #   64
+3682,   3,  10,3973,1471,  29,2787,1135,2866,1940, 873, 130,3275,1123, 312,5013, #   80
+4511,2052, 507, 252, 682,5014, 142,1915, 124, 206,2947,  34,3556,3204,  64, 604, #   96
+5015,2501,1977,1978, 155,1991, 645, 641,1606,5016,3452, 337,  72, 406,5017,  80, #  112
+ 630, 238,3205,1509, 263, 939,1092,2654, 756,1440,1094,3453, 449,  69,2987, 591, #  128
+ 179,2096, 471, 115,2035,1844,  60,  50,2988, 134, 806,1869, 734,2036,3454, 180, #  144
+ 995,1607, 156, 537,2907, 688,5018, 319,1305, 779,2145, 514,2379, 298,4512, 359, #  160
+2502,  90,2716,1338, 663,  11, 906,1099,2553,  20,2441, 182, 532,1716,5019, 732, #  176
+1376,4204,1311,1420,3206,  25,2317,1056, 113, 399, 382,1950, 242,3455,2474, 529, #  192
+3276, 475,1447,3683,5020, 117,  21, 656, 810,1297,2300,2334,3557,5021, 126,4205, #  208
+ 706, 456, 150, 613,4513,  71,1118,2037,4206, 145,3092,  85, 835, 486,2115,1246, #  224
+1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,5022,2128,2359, 347,3815, 221, #  240
+3558,3135,5023,1956,1153,4207,  83, 296,1199,3093, 192, 624,  93,5024, 822,1898, #  256
+2823,3136, 795,2065, 991,1554,1542,1592,  27,  43,2867, 859, 139,1456, 860,4514, #  272
+ 437, 712,3974, 164,2397,3137, 695, 211,3037,2097, 195,3975,1608,3559,3560,3684, #  288
+3976, 234, 811,2989,2098,3977,2233,1441,3561,1615,2380, 668,2077,1638, 305, 228, #  304
+1664,4515, 467, 415,5025, 262,2099,1593, 239, 108, 300, 200,1033, 512,1247,2078, #  320
+5026,5027,2176,3207,3685,2682, 593, 845,1062,3277,  88,1723,2038,3978,1951, 212, #  336
+ 266, 152, 149, 468,1899,4208,4516,  77, 187,5028,3038,  37,   5,2990,5029,3979, #  352
+5030,5031,  39,2524,4517,2908,3208,2079,  55, 148,  74,4518, 545, 483,1474,1029, #  368
+1665, 217,1870,1531,3138,1104,2655,4209,  24, 172,3562, 900,3980,3563,3564,4519, #  384
+  32,1408,2824,1312, 329, 487,2360,2251,2717, 784,2683,   4,3039,3351,1427,1789, #  400
+ 188, 109, 499,5032,3686,1717,1790, 888,1217,3040,4520,5033,3565,5034,3352,1520, #  416
+3687,3981, 196,1034, 775,5035,5036, 929,1816, 249, 439,  38,5037,1063,5038, 794, #  432
+3982,1435,2301,  46, 178,3278,2066,5039,2381,5040, 214,1709,4521, 804,  35, 707, #  448
+ 324,3688,1601,2554, 140, 459,4210,5041,5042,1365, 839, 272, 978,2262,2580,3456, #  464
+2129,1363,3689,1423, 697, 100,3094,  48,  70,1231, 495,3139,2196,5043,1294,5044, #  480
+2080, 462, 586,1042,3279, 853, 256, 988, 185,2382,3457,1698, 434,1084,5045,3458, #  496
+ 314,2625,2788,4522,2335,2336, 569,2285, 637,1817,2525, 757,1162,1879,1616,3459, #  512
+ 287,1577,2116, 768,4523,1671,2868,3566,2526,1321,3816, 909,2418,5046,4211, 933, #  528
+3817,4212,2053,2361,1222,4524, 765,2419,1322, 786,4525,5047,1920,1462,1677,2909, #  544
+1699,5048,4526,1424,2442,3140,3690,2600,3353,1775,1941,3460,3983,4213, 309,1369, #  560
+1130,2825, 364,2234,1653,1299,3984,3567,3985,3986,2656, 525,1085,3041, 902,2001, #  576
+1475, 964,4527, 421,1845,1415,1057,2286, 940,1364,3141, 376,4528,4529,1381,   7, #  592
+2527, 983,2383, 336,1710,2684,1846, 321,3461, 559,1131,3042,2752,1809,1132,1313, #  608
+ 265,1481,1858,5049, 352,1203,2826,3280, 167,1089, 420,2827, 776, 792,1724,3568, #  624
+4214,2443,3281,5050,4215,5051, 446, 229, 333,2753, 901,3818,1200,1557,4530,2657, #  640
+1921, 395,2754,2685,3819,4216,1836, 125, 916,3209,2626,4531,5052,5053,3820,5054, #  656
+5055,5056,4532,3142,3691,1133,2555,1757,3462,1510,2318,1409,3569,5057,2146, 438, #  672
+2601,2910,2384,3354,1068, 958,3043, 461, 311,2869,2686,4217,1916,3210,4218,1979, #  688
+ 383, 750,2755,2627,4219, 274, 539, 385,1278,1442,5058,1154,1965, 384, 561, 210, #  704
+  98,1295,2556,3570,5059,1711,2420,1482,3463,3987,2911,1257, 129,5060,3821, 642, #  720
+ 523,2789,2790,2658,5061, 141,2235,1333,  68, 176, 441, 876, 907,4220, 603,2602, #  736
+ 710, 171,3464, 404, 549,  18,3143,2398,1410,3692,1666,5062,3571,4533,2912,4534, #  752
+5063,2991, 368,5064, 146, 366,  99, 871,3693,1543, 748, 807,1586,1185,  22,2263, #  768
+ 379,3822,3211,5065,3212, 505,1942,2628,1992,1382,2319,5066, 380,2362, 218, 702, #  784
+1818,1248,3465,3044,3572,3355,3282,5067,2992,3694, 930,3283,3823,5068,  59,5069, #  800
+ 585, 601,4221, 497,3466,1112,1314,4535,1802,5070,1223,1472,2177,5071, 749,1837, #  816
+ 690,1900,3824,1773,3988,1476, 429,1043,1791,2236,2117, 917,4222, 447,1086,1629, #  832
+5072, 556,5073,5074,2021,1654, 844,1090, 105, 550, 966,1758,2828,1008,1783, 686, #  848
+1095,5075,2287, 793,1602,5076,3573,2603,4536,4223,2948,2302,4537,3825, 980,2503, #  864
+ 544, 353, 527,4538, 908,2687,2913,5077, 381,2629,1943,1348,5078,1341,1252, 560, #  880
+3095,5079,3467,2870,5080,2054, 973, 886,2081, 143,4539,5081,5082, 157,3989, 496, #  896
+4224,  57, 840, 540,2039,4540,4541,3468,2118,1445, 970,2264,1748,1966,2082,4225, #  912
+3144,1234,1776,3284,2829,3695, 773,1206,2130,1066,2040,1326,3990,1738,1725,4226, #  928
+ 279,3145,  51,1544,2604, 423,1578,2131,2067, 173,4542,1880,5083,5084,1583, 264, #  944
+ 610,3696,4543,2444, 280, 154,5085,5086,5087,1739, 338,1282,3096, 693,2871,1411, #  960
+1074,3826,2445,5088,4544,5089,5090,1240, 952,2399,5091,2914,1538,2688, 685,1483, #  976
+4227,2475,1436, 953,4228,2055,4545, 671,2400,  79,4229,2446,3285, 608, 567,2689, #  992
+3469,4230,4231,1691, 393,1261,1792,2401,5092,4546,5093,5094,5095,5096,1383,1672, # 1008
+3827,3213,1464, 522,1119, 661,1150, 216, 675,4547,3991,1432,3574, 609,4548,2690, # 1024
+2402,5097,5098,5099,4232,3045,   0,5100,2476, 315, 231,2447, 301,3356,4549,2385, # 1040
+5101, 233,4233,3697,1819,4550,4551,5102,  96,1777,1315,2083,5103, 257,5104,1810, # 1056
+3698,2718,1139,1820,4234,2022,1124,2164,2791,1778,2659,5105,3097, 363,1655,3214, # 1072
+5106,2993,5107,5108,5109,3992,1567,3993, 718, 103,3215, 849,1443, 341,3357,2949, # 1088
+1484,5110,1712, 127,  67, 339,4235,2403, 679,1412, 821,5111,5112, 834, 738, 351, # 1104
+2994,2147, 846, 235,1497,1881, 418,1993,3828,2719, 186,1100,2148,2756,3575,1545, # 1120
+1355,2950,2872,1377, 583,3994,4236,2581,2995,5113,1298,3699,1078,2557,3700,2363, # 1136
+  78,3829,3830, 267,1289,2100,2002,1594,4237, 348, 369,1274,2197,2178,1838,4552, # 1152
+1821,2830,3701,2757,2288,2003,4553,2951,2758, 144,3358, 882,4554,3995,2759,3470, # 1168
+4555,2915,5114,4238,1726, 320,5115,3996,3046, 788,2996,5116,2831,1774,1327,2873, # 1184
+3997,2832,5117,1306,4556,2004,1700,3831,3576,2364,2660, 787,2023, 506, 824,3702, # 1200
+ 534, 323,4557,1044,3359,2024,1901, 946,3471,5118,1779,1500,1678,5119,1882,4558, # 1216
+ 165, 243,4559,3703,2528, 123, 683,4239, 764,4560,  36,3998,1793, 589,2916, 816, # 1232
+ 626,1667,3047,2237,1639,1555,1622,3832,3999,5120,4000,2874,1370,1228,1933, 891, # 1248
+2084,2917, 304,4240,5121, 292,2997,2720,3577, 691,2101,4241,1115,4561, 118, 662, # 1264
+5122, 611,1156, 854,2386,1316,2875,   2, 386, 515,2918,5123,5124,3286, 868,2238, # 1280
+1486, 855,2661, 785,2216,3048,5125,1040,3216,3578,5126,3146, 448,5127,1525,5128, # 1296
+2165,4562,5129,3833,5130,4242,2833,3579,3147, 503, 818,4001,3148,1568, 814, 676, # 1312
+1444, 306,1749,5131,3834,1416,1030, 197,1428, 805,2834,1501,4563,5132,5133,5134, # 1328
+1994,5135,4564,5136,5137,2198,  13,2792,3704,2998,3149,1229,1917,5138,3835,2132, # 1344
+5139,4243,4565,2404,3580,5140,2217,1511,1727,1120,5141,5142, 646,3836,2448, 307, # 1360
+5143,5144,1595,3217,5145,5146,5147,3705,1113,1356,4002,1465,2529,2530,5148, 519, # 1376
+5149, 128,2133,  92,2289,1980,5150,4003,1512, 342,3150,2199,5151,2793,2218,1981, # 1392
+3360,4244, 290,1656,1317, 789, 827,2365,5152,3837,4566, 562, 581,4004,5153, 401, # 1408
+4567,2252,  94,4568,5154,1399,2794,5155,1463,2025,4569,3218,1944,5156, 828,1105, # 1424
+4245,1262,1394,5157,4246, 605,4570,5158,1784,2876,5159,2835, 819,2102, 578,2200, # 1440
+2952,5160,1502, 436,3287,4247,3288,2836,4005,2919,3472,3473,5161,2721,2320,5162, # 1456
+5163,2337,2068,  23,4571, 193, 826,3838,2103, 699,1630,4248,3098, 390,1794,1064, # 1472
+3581,5164,1579,3099,3100,1400,5165,4249,1839,1640,2877,5166,4572,4573, 137,4250, # 1488
+ 598,3101,1967, 780, 104, 974,2953,5167, 278, 899, 253, 402, 572, 504, 493,1339, # 1504
+5168,4006,1275,4574,2582,2558,5169,3706,3049,3102,2253, 565,1334,2722, 863,  41, # 1520
+5170,5171,4575,5172,1657,2338,  19, 463,2760,4251, 606,5173,2999,3289,1087,2085, # 1536
+1323,2662,3000,5174,1631,1623,1750,4252,2691,5175,2878, 791,2723,2663,2339, 232, # 1552
+2421,5176,3001,1498,5177,2664,2630, 755,1366,3707,3290,3151,2026,1609, 119,1918, # 1568
+3474, 862,1026,4253,5178,4007,3839,4576,4008,4577,2265,1952,2477,5179,1125, 817, # 1584
+4254,4255,4009,1513,1766,2041,1487,4256,3050,3291,2837,3840,3152,5180,5181,1507, # 1600
+5182,2692, 733,  40,1632,1106,2879, 345,4257, 841,2531, 230,4578,3002,1847,3292, # 1616
+3475,5183,1263, 986,3476,5184, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562, # 1632
+4010,4011,2954, 967,2761,2665,1349, 592,2134,1692,3361,3003,1995,4258,1679,4012, # 1648
+1902,2188,5185, 739,3708,2724,1296,1290,5186,4259,2201,2202,1922,1563,2605,2559, # 1664
+1871,2762,3004,5187, 435,5188, 343,1108, 596,  17,1751,4579,2239,3477,3709,5189, # 1680
+4580, 294,3582,2955,1693, 477, 979, 281,2042,3583, 643,2043,3710,2631,2795,2266, # 1696
+1031,2340,2135,2303,3584,4581, 367,1249,2560,5190,3585,5191,4582,1283,3362,2005, # 1712
+ 240,1762,3363,4583,4584, 836,1069,3153, 474,5192,2149,2532, 268,3586,5193,3219, # 1728
+1521,1284,5194,1658,1546,4260,5195,3587,3588,5196,4261,3364,2693,1685,4262, 961, # 1744
+1673,2632, 190,2006,2203,3841,4585,4586,5197, 570,2504,3711,1490,5198,4587,2633, # 1760
+3293,1957,4588, 584,1514, 396,1045,1945,5199,4589,1968,2449,5200,5201,4590,4013, # 1776
+ 619,5202,3154,3294, 215,2007,2796,2561,3220,4591,3221,4592, 763,4263,3842,4593, # 1792
+5203,5204,1958,1767,2956,3365,3712,1174, 452,1477,4594,3366,3155,5205,2838,1253, # 1808
+2387,2189,1091,2290,4264, 492,5206, 638,1169,1825,2136,1752,4014, 648, 926,1021, # 1824
+1324,4595, 520,4596, 997, 847,1007, 892,4597,3843,2267,1872,3713,2405,1785,4598, # 1840
+1953,2957,3103,3222,1728,4265,2044,3714,4599,2008,1701,3156,1551,  30,2268,4266, # 1856
+5207,2027,4600,3589,5208, 501,5209,4267, 594,3478,2166,1822,3590,3479,3591,3223, # 1872
+ 829,2839,4268,5210,1680,3157,1225,4269,5211,3295,4601,4270,3158,2341,5212,4602, # 1888
+4271,5213,4015,4016,5214,1848,2388,2606,3367,5215,4603, 374,4017, 652,4272,4273, # 1904
+ 375,1140, 798,5216,5217,5218,2366,4604,2269, 546,1659, 138,3051,2450,4605,5219, # 1920
+2254, 612,1849, 910, 796,3844,1740,1371, 825,3845,3846,5220,2920,2562,5221, 692, # 1936
+ 444,3052,2634, 801,4606,4274,5222,1491, 244,1053,3053,4275,4276, 340,5223,4018, # 1952
+1041,3005, 293,1168,  87,1357,5224,1539, 959,5225,2240, 721, 694,4277,3847, 219, # 1968
+1478, 644,1417,3368,2666,1413,1401,1335,1389,4019,5226,5227,3006,2367,3159,1826, # 1984
+ 730,1515, 184,2840,  66,4607,5228,1660,2958, 246,3369, 378,1457, 226,3480, 975, # 2000
+4020,2959,1264,3592, 674, 696,5229, 163,5230,1141,2422,2167, 713,3593,3370,4608, # 2016
+4021,5231,5232,1186,  15,5233,1079,1070,5234,1522,3224,3594, 276,1050,2725, 758, # 2032
+1126, 653,2960,3296,5235,2342, 889,3595,4022,3104,3007, 903,1250,4609,4023,3481, # 2048
+3596,1342,1681,1718, 766,3297, 286,  89,2961,3715,5236,1713,5237,2607,3371,3008, # 2064
+5238,2962,2219,3225,2880,5239,4610,2505,2533, 181, 387,1075,4024, 731,2190,3372, # 2080
+5240,3298, 310, 313,3482,2304, 770,4278,  54,3054, 189,4611,3105,3848,4025,5241, # 2096
+1230,1617,1850, 355,3597,4279,4612,3373, 111,4280,3716,1350,3160,3483,3055,4281, # 2112
+2150,3299,3598,5242,2797,4026,4027,3009, 722,2009,5243,1071, 247,1207,2343,2478, # 2128
+1378,4613,2010, 864,1437,1214,4614, 373,3849,1142,2220, 667,4615, 442,2763,2563, # 2144
+3850,4028,1969,4282,3300,1840, 837, 170,1107, 934,1336,1883,5244,5245,2119,4283, # 2160
+2841, 743,1569,5246,4616,4284, 582,2389,1418,3484,5247,1803,5248, 357,1395,1729, # 2176
+3717,3301,2423,1564,2241,5249,3106,3851,1633,4617,1114,2086,4285,1532,5250, 482, # 2192
+2451,4618,5251,5252,1492, 833,1466,5253,2726,3599,1641,2842,5254,1526,1272,3718, # 2208
+4286,1686,1795, 416,2564,1903,1954,1804,5255,3852,2798,3853,1159,2321,5256,2881, # 2224
+4619,1610,1584,3056,2424,2764, 443,3302,1163,3161,5257,5258,4029,5259,4287,2506, # 2240
+3057,4620,4030,3162,2104,1647,3600,2011,1873,4288,5260,4289, 431,3485,5261, 250, # 2256
+  97,  81,4290,5262,1648,1851,1558, 160, 848,5263, 866, 740,1694,5264,2204,2843, # 2272
+3226,4291,4621,3719,1687, 950,2479, 426, 469,3227,3720,3721,4031,5265,5266,1188, # 2288
+ 424,1996, 861,3601,4292,3854,2205,2694, 168,1235,3602,4293,5267,2087,1674,4622, # 2304
+3374,3303, 220,2565,1009,5268,3855, 670,3010, 332,1208, 717,5269,5270,3603,2452, # 2320
+4032,3375,5271, 513,5272,1209,2882,3376,3163,4623,1080,5273,5274,5275,5276,2534, # 2336
+3722,3604, 815,1587,4033,4034,5277,3605,3486,3856,1254,4624,1328,3058,1390,4035, # 2352
+1741,4036,3857,4037,5278, 236,3858,2453,3304,5279,5280,3723,3859,1273,3860,4625, # 2368
+5281, 308,5282,4626, 245,4627,1852,2480,1307,2583, 430, 715,2137,2454,5283, 270, # 2384
+ 199,2883,4038,5284,3606,2727,1753, 761,1754, 725,1661,1841,4628,3487,3724,5285, # 2400
+5286, 587,  14,3305, 227,2608, 326, 480,2270, 943,2765,3607, 291, 650,1884,5287, # 2416
+1702,1226, 102,1547,  62,3488, 904,4629,3489,1164,4294,5288,5289,1224,1548,2766, # 2432
+ 391, 498,1493,5290,1386,1419,5291,2056,1177,4630, 813, 880,1081,2368, 566,1145, # 2448
+4631,2291,1001,1035,2566,2609,2242, 394,1286,5292,5293,2069,5294,  86,1494,1730, # 2464
+4039, 491,1588, 745, 897,2963, 843,3377,4040,2767,2884,3306,1768, 998,2221,2070, # 2480
+ 397,1827,1195,1970,3725,3011,3378, 284,5295,3861,2507,2138,2120,1904,5296,4041, # 2496
+2151,4042,4295,1036,3490,1905, 114,2567,4296, 209,1527,5297,5298,2964,2844,2635, # 2512
+2390,2728,3164, 812,2568,5299,3307,5300,1559, 737,1885,3726,1210, 885,  28,2695, # 2528
+3608,3862,5301,4297,1004,1780,4632,5302, 346,1982,2222,2696,4633,3863,1742, 797, # 2544
+1642,4043,1934,1072,1384,2152, 896,4044,3308,3727,3228,2885,3609,5303,2569,1959, # 2560
+4634,2455,1786,5304,5305,5306,4045,4298,1005,1308,3728,4299,2729,4635,4636,1528, # 2576
+2610, 161,1178,4300,1983, 987,4637,1101,4301, 631,4046,1157,3229,2425,1343,1241, # 2592
+1016,2243,2570, 372, 877,2344,2508,1160, 555,1935, 911,4047,5307, 466,1170, 169, # 2608
+1051,2921,2697,3729,2481,3012,1182,2012,2571,1251,2636,5308, 992,2345,3491,1540, # 2624
+2730,1201,2071,2406,1997,2482,5309,4638, 528,1923,2191,1503,1874,1570,2369,3379, # 2640
+3309,5310, 557,1073,5311,1828,3492,2088,2271,3165,3059,3107, 767,3108,2799,4639, # 2656
+1006,4302,4640,2346,1267,2179,3730,3230, 778,4048,3231,2731,1597,2667,5312,4641, # 2672
+5313,3493,5314,5315,5316,3310,2698,1433,3311, 131,  95,1504,4049, 723,4303,3166, # 2688
+1842,3610,2768,2192,4050,2028,2105,3731,5317,3013,4051,1218,5318,3380,3232,4052, # 2704
+4304,2584, 248,1634,3864, 912,5319,2845,3732,3060,3865, 654,  53,5320,3014,5321, # 2720
+1688,4642, 777,3494,1032,4053,1425,5322, 191, 820,2121,2846, 971,4643, 931,3233, # 2736
+ 135, 664, 783,3866,1998, 772,2922,1936,4054,3867,4644,2923,3234, 282,2732, 640, # 2752
+1372,3495,1127, 922, 325,3381,5323,5324, 711,2045,5325,5326,4055,2223,2800,1937, # 2768
+4056,3382,2224,2255,3868,2305,5327,4645,3869,1258,3312,4057,3235,2139,2965,4058, # 2784
+4059,5328,2225, 258,3236,4646, 101,1227,5329,3313,1755,5330,1391,3314,5331,2924, # 2800
+2057, 893,5332,5333,5334,1402,4305,2347,5335,5336,3237,3611,5337,5338, 878,1325, # 2816
+1781,2801,4647, 259,1385,2585, 744,1183,2272,4648,5339,4060,2509,5340, 684,1024, # 2832
+4306,5341, 472,3612,3496,1165,3315,4061,4062, 322,2153, 881, 455,1695,1152,1340, # 2848
+ 660, 554,2154,4649,1058,4650,4307, 830,1065,3383,4063,4651,1924,5342,1703,1919, # 2864
+5343, 932,2273, 122,5344,4652, 947, 677,5345,3870,2637, 297,1906,1925,2274,4653, # 2880
+2322,3316,5346,5347,4308,5348,4309,  84,4310, 112, 989,5349, 547,1059,4064, 701, # 2896
+3613,1019,5350,4311,5351,3497, 942, 639, 457,2306,2456, 993,2966, 407, 851, 494, # 2912
+4654,3384, 927,5352,1237,5353,2426,3385, 573,4312, 680, 921,2925,1279,1875, 285, # 2928
+ 790,1448,1984, 719,2168,5354,5355,4655,4065,4066,1649,5356,1541, 563,5357,1077, # 2944
+5358,3386,3061,3498, 511,3015,4067,4068,3733,4069,1268,2572,3387,3238,4656,4657, # 2960
+5359, 535,1048,1276,1189,2926,2029,3167,1438,1373,2847,2967,1134,2013,5360,4313, # 2976
+1238,2586,3109,1259,5361, 700,5362,2968,3168,3734,4314,5363,4315,1146,1876,1907, # 2992
+4658,2611,4070, 781,2427, 132,1589, 203, 147, 273,2802,2407, 898,1787,2155,4071, # 3008
+4072,5364,3871,2803,5365,5366,4659,4660,5367,3239,5368,1635,3872, 965,5369,1805, # 3024
+2699,1516,3614,1121,1082,1329,3317,4073,1449,3873,  65,1128,2848,2927,2769,1590, # 3040
+3874,5370,5371,  12,2668,  45, 976,2587,3169,4661, 517,2535,1013,1037,3240,5372, # 3056
+3875,2849,5373,3876,5374,3499,5375,2612, 614,1999,2323,3877,3110,2733,2638,5376, # 3072
+2588,4316, 599,1269,5377,1811,3735,5378,2700,3111, 759,1060, 489,1806,3388,3318, # 3088
+1358,5379,5380,2391,1387,1215,2639,2256, 490,5381,5382,4317,1759,2392,2348,5383, # 3104
+4662,3878,1908,4074,2640,1807,3241,4663,3500,3319,2770,2349, 874,5384,5385,3501, # 3120
+3736,1859,  91,2928,3737,3062,3879,4664,5386,3170,4075,2669,5387,3502,1202,1403, # 3136
+3880,2969,2536,1517,2510,4665,3503,2511,5388,4666,5389,2701,1886,1495,1731,4076, # 3152
+2370,4667,5390,2030,5391,5392,4077,2702,1216, 237,2589,4318,2324,4078,3881,4668, # 3168
+4669,2703,3615,3504, 445,4670,5393,5394,5395,5396,2771,  61,4079,3738,1823,4080, # 3184
+5397, 687,2046, 935, 925, 405,2670, 703,1096,1860,2734,4671,4081,1877,1367,2704, # 3200
+3389, 918,2106,1782,2483, 334,3320,1611,1093,4672, 564,3171,3505,3739,3390, 945, # 3216
+2641,2058,4673,5398,1926, 872,4319,5399,3506,2705,3112, 349,4320,3740,4082,4674, # 3232
+3882,4321,3741,2156,4083,4675,4676,4322,4677,2408,2047, 782,4084, 400, 251,4323, # 3248
+1624,5400,5401, 277,3742, 299,1265, 476,1191,3883,2122,4324,4325,1109, 205,5402, # 3264
+2590,1000,2157,3616,1861,5403,5404,5405,4678,5406,4679,2573, 107,2484,2158,4085, # 3280
+3507,3172,5407,1533, 541,1301, 158, 753,4326,2886,3617,5408,1696, 370,1088,4327, # 3296
+4680,3618, 579, 327, 440, 162,2244, 269,1938,1374,3508, 968,3063,  56,1396,3113, # 3312
+2107,3321,3391,5409,1927,2159,4681,3016,5410,3619,5411,5412,3743,4682,2485,5413, # 3328
+2804,5414,1650,4683,5415,2613,5416,5417,4086,2671,3392,1149,3393,4087,3884,4088, # 3344
+5418,1076,  49,5419, 951,3242,3322,3323, 450,2850, 920,5420,1812,2805,2371,4328, # 3360
+1909,1138,2372,3885,3509,5421,3243,4684,1910,1147,1518,2428,4685,3886,5422,4686, # 3376
+2393,2614, 260,1796,3244,5423,5424,3887,3324, 708,5425,3620,1704,5426,3621,1351, # 3392
+1618,3394,3017,1887, 944,4329,3395,4330,3064,3396,4331,5427,3744, 422, 413,1714, # 3408
+3325, 500,2059,2350,4332,2486,5428,1344,1911, 954,5429,1668,5430,5431,4089,2409, # 3424
+4333,3622,3888,4334,5432,2307,1318,2512,3114, 133,3115,2887,4687, 629,  31,2851, # 3440
+2706,3889,4688, 850, 949,4689,4090,2970,1732,2089,4335,1496,1853,5433,4091, 620, # 3456
+3245, 981,1242,3745,3397,1619,3746,1643,3326,2140,2457,1971,1719,3510,2169,5434, # 3472
+3246,5435,5436,3398,1829,5437,1277,4690,1565,2048,5438,1636,3623,3116,5439, 869, # 3488
+2852, 655,3890,3891,3117,4092,3018,3892,1310,3624,4691,5440,5441,5442,1733, 558, # 3504
+4692,3747, 335,1549,3065,1756,4336,3748,1946,3511,1830,1291,1192, 470,2735,2108, # 3520
+2806, 913,1054,4093,5443,1027,5444,3066,4094,4693, 982,2672,3399,3173,3512,3247, # 3536
+3248,1947,2807,5445, 571,4694,5446,1831,5447,3625,2591,1523,2429,5448,2090, 984, # 3552
+4695,3749,1960,5449,3750, 852, 923,2808,3513,3751, 969,1519, 999,2049,2325,1705, # 3568
+5450,3118, 615,1662, 151, 597,4095,2410,2326,1049, 275,4696,3752,4337, 568,3753, # 3584
+3626,2487,4338,3754,5451,2430,2275, 409,3249,5452,1566,2888,3514,1002, 769,2853, # 3600
+ 194,2091,3174,3755,2226,3327,4339, 628,1505,5453,5454,1763,2180,3019,4096, 521, # 3616
+1161,2592,1788,2206,2411,4697,4097,1625,4340,4341, 412,  42,3119, 464,5455,2642, # 3632
+4698,3400,1760,1571,2889,3515,2537,1219,2207,3893,2643,2141,2373,4699,4700,3328, # 3648
+1651,3401,3627,5456,5457,3628,2488,3516,5458,3756,5459,5460,2276,2092, 460,5461, # 3664
+4701,5462,3020, 962, 588,3629, 289,3250,2644,1116,  52,5463,3067,1797,5464,5465, # 3680
+5466,1467,5467,1598,1143,3757,4342,1985,1734,1067,4702,1280,3402, 465,4703,1572, # 3696
+ 510,5468,1928,2245,1813,1644,3630,5469,4704,3758,5470,5471,2673,1573,1534,5472, # 3712
+5473, 536,1808,1761,3517,3894,3175,2645,5474,5475,5476,4705,3518,2929,1912,2809, # 3728
+5477,3329,1122, 377,3251,5478, 360,5479,5480,4343,1529, 551,5481,2060,3759,1769, # 3744
+2431,5482,2930,4344,3330,3120,2327,2109,2031,4706,1404, 136,1468,1479, 672,1171, # 3760
+3252,2308, 271,3176,5483,2772,5484,2050, 678,2736, 865,1948,4707,5485,2014,4098, # 3776
+2971,5486,2737,2227,1397,3068,3760,4708,4709,1735,2931,3403,3631,5487,3895, 509, # 3792
+2854,2458,2890,3896,5488,5489,3177,3178,4710,4345,2538,4711,2309,1166,1010, 552, # 3808
+ 681,1888,5490,5491,2972,2973,4099,1287,1596,1862,3179, 358, 453, 736, 175, 478, # 3824
+1117, 905,1167,1097,5492,1854,1530,5493,1706,5494,2181,3519,2292,3761,3520,3632, # 3840
+4346,2093,4347,5495,3404,1193,2489,4348,1458,2193,2208,1863,1889,1421,3331,2932, # 3856
+3069,2182,3521, 595,2123,5496,4100,5497,5498,4349,1707,2646, 223,3762,1359, 751, # 3872
+3121, 183,3522,5499,2810,3021, 419,2374, 633, 704,3897,2394, 241,5500,5501,5502, # 3888
+ 838,3022,3763,2277,2773,2459,3898,1939,2051,4101,1309,3122,2246,1181,5503,1136, # 3904
+2209,3899,2375,1446,4350,2310,4712,5504,5505,4351,1055,2615, 484,3764,5506,4102, # 3920
+ 625,4352,2278,3405,1499,4353,4103,5507,4104,4354,3253,2279,2280,3523,5508,5509, # 3936
+2774, 808,2616,3765,3406,4105,4355,3123,2539, 526,3407,3900,4356, 955,5510,1620, # 3952
+4357,2647,2432,5511,1429,3766,1669,1832, 994, 928,5512,3633,1260,5513,5514,5515, # 3968
+1949,2293, 741,2933,1626,4358,2738,2460, 867,1184, 362,3408,1392,5516,5517,4106, # 3984
+4359,1770,1736,3254,2934,4713,4714,1929,2707,1459,1158,5518,3070,3409,2891,1292, # 4000
+1930,2513,2855,3767,1986,1187,2072,2015,2617,4360,5519,2574,2514,2170,3768,2490, # 4016
+3332,5520,3769,4715,5521,5522, 666,1003,3023,1022,3634,4361,5523,4716,1814,2257, # 4032
+ 574,3901,1603, 295,1535, 705,3902,4362, 283, 858, 417,5524,5525,3255,4717,4718, # 4048
+3071,1220,1890,1046,2281,2461,4107,1393,1599, 689,2575, 388,4363,5526,2491, 802, # 4064
+5527,2811,3903,2061,1405,2258,5528,4719,3904,2110,1052,1345,3256,1585,5529, 809, # 4080
+5530,5531,5532, 575,2739,3524, 956,1552,1469,1144,2328,5533,2329,1560,2462,3635, # 4096
+3257,4108, 616,2210,4364,3180,2183,2294,5534,1833,5535,3525,4720,5536,1319,3770, # 4112
+3771,1211,3636,1023,3258,1293,2812,5537,5538,5539,3905, 607,2311,3906, 762,2892, # 4128
+1439,4365,1360,4721,1485,3072,5540,4722,1038,4366,1450,2062,2648,4367,1379,4723, # 4144
+2593,5541,5542,4368,1352,1414,2330,2935,1172,5543,5544,3907,3908,4724,1798,1451, # 4160
+5545,5546,5547,5548,2936,4109,4110,2492,2351, 411,4111,4112,3637,3333,3124,4725, # 4176
+1561,2674,1452,4113,1375,5549,5550,  47,2974, 316,5551,1406,1591,2937,3181,5552, # 4192
+1025,2142,3125,3182, 354,2740, 884,2228,4369,2412, 508,3772, 726,3638, 996,2433, # 4208
+3639, 729,5553, 392,2194,1453,4114,4726,3773,5554,5555,2463,3640,2618,1675,2813, # 4224
+ 919,2352,2975,2353,1270,4727,4115,  73,5556,5557, 647,5558,3259,2856,2259,1550, # 4240
+1346,3024,5559,1332, 883,3526,5560,5561,5562,5563,3334,2775,5564,1212, 831,1347, # 4256
+4370,4728,2331,3909,1864,3073, 720,3910,4729,4730,3911,5565,4371,5566,5567,4731, # 4272
+5568,5569,1799,4732,3774,2619,4733,3641,1645,2376,4734,5570,2938, 669,2211,2675, # 4288
+2434,5571,2893,5572,5573,1028,3260,5574,4372,2413,5575,2260,1353,5576,5577,4735, # 4304
+3183, 518,5578,4116,5579,4373,1961,5580,2143,4374,5581,5582,3025,2354,2355,3912, # 4320
+ 516,1834,1454,4117,2708,4375,4736,2229,2620,1972,1129,3642,5583,2776,5584,2976, # 4336
+1422, 577,1470,3026,1524,3410,5585,5586, 432,4376,3074,3527,5587,2594,1455,2515, # 4352
+2230,1973,1175,5588,1020,2741,4118,3528,4737,5589,2742,5590,1743,1361,3075,3529, # 4368
+2649,4119,4377,4738,2295, 895, 924,4378,2171, 331,2247,3076, 166,1627,3077,1098, # 4384
+5591,1232,2894,2231,3411,4739, 657, 403,1196,2377, 542,3775,3412,1600,4379,3530, # 4400
+5592,4740,2777,3261, 576, 530,1362,4741,4742,2540,2676,3776,4120,5593, 842,3913, # 4416
+5594,2814,2032,1014,4121, 213,2709,3413, 665, 621,4380,5595,3777,2939,2435,5596, # 4432
+2436,3335,3643,3414,4743,4381,2541,4382,4744,3644,1682,4383,3531,1380,5597, 724, # 4448
+2282, 600,1670,5598,1337,1233,4745,3126,2248,5599,1621,4746,5600, 651,4384,5601, # 4464
+1612,4385,2621,5602,2857,5603,2743,2312,3078,5604, 716,2464,3079, 174,1255,2710, # 4480
+4122,3645, 548,1320,1398, 728,4123,1574,5605,1891,1197,3080,4124,5606,3081,3082, # 4496
+3778,3646,3779, 747,5607, 635,4386,4747,5608,5609,5610,4387,5611,5612,4748,5613, # 4512
+3415,4749,2437, 451,5614,3780,2542,2073,4388,2744,4389,4125,5615,1764,4750,5616, # 4528
+4390, 350,4751,2283,2395,2493,5617,4391,4126,2249,1434,4127, 488,4752, 458,4392, # 4544
+4128,3781, 771,1330,2396,3914,2576,3184,2160,2414,1553,2677,3185,4393,5618,2494, # 4560
+2895,2622,1720,2711,4394,3416,4753,5619,2543,4395,5620,3262,4396,2778,5621,2016, # 4576
+2745,5622,1155,1017,3782,3915,5623,3336,2313, 201,1865,4397,1430,5624,4129,5625, # 4592
+5626,5627,5628,5629,4398,1604,5630, 414,1866, 371,2595,4754,4755,3532,2017,3127, # 4608
+4756,1708, 960,4399, 887, 389,2172,1536,1663,1721,5631,2232,4130,2356,2940,1580, # 4624
+5632,5633,1744,4757,2544,4758,4759,5634,4760,5635,2074,5636,4761,3647,3417,2896, # 4640
+4400,5637,4401,2650,3418,2815, 673,2712,2465, 709,3533,4131,3648,4402,5638,1148, # 4656
+ 502, 634,5639,5640,1204,4762,3649,1575,4763,2623,3783,5641,3784,3128, 948,3263, # 4672
+ 121,1745,3916,1110,5642,4403,3083,2516,3027,4132,3785,1151,1771,3917,1488,4133, # 4688
+1987,5643,2438,3534,5644,5645,2094,5646,4404,3918,1213,1407,2816, 531,2746,2545, # 4704
+3264,1011,1537,4764,2779,4405,3129,1061,5647,3786,3787,1867,2897,5648,2018, 120, # 4720
+4406,4407,2063,3650,3265,2314,3919,2678,3419,1955,4765,4134,5649,3535,1047,2713, # 4736
+1266,5650,1368,4766,2858, 649,3420,3920,2546,2747,1102,2859,2679,5651,5652,2000, # 4752
+5653,1111,3651,2977,5654,2495,3921,3652,2817,1855,3421,3788,5655,5656,3422,2415, # 4768
+2898,3337,3266,3653,5657,2577,5658,3654,2818,4135,1460, 856,5659,3655,5660,2899, # 4784
+2978,5661,2900,3922,5662,4408, 632,2517, 875,3923,1697,3924,2296,5663,5664,4767, # 4800
+3028,1239, 580,4768,4409,5665, 914, 936,2075,1190,4136,1039,2124,5666,5667,5668, # 4816
+5669,3423,1473,5670,1354,4410,3925,4769,2173,3084,4137, 915,3338,4411,4412,3339, # 4832
+1605,1835,5671,2748, 398,3656,4413,3926,4138, 328,1913,2860,4139,3927,1331,4414, # 4848
+3029, 937,4415,5672,3657,4140,4141,3424,2161,4770,3425, 524, 742, 538,3085,1012, # 4864
+5673,5674,3928,2466,5675, 658,1103, 225,3929,5676,5677,4771,5678,4772,5679,3267, # 4880
+1243,5680,4142, 963,2250,4773,5681,2714,3658,3186,5682,5683,2596,2332,5684,4774, # 4896
+5685,5686,5687,3536, 957,3426,2547,2033,1931,2941,2467, 870,2019,3659,1746,2780, # 4912
+2781,2439,2468,5688,3930,5689,3789,3130,3790,3537,3427,3791,5690,1179,3086,5691, # 4928
+3187,2378,4416,3792,2548,3188,3131,2749,4143,5692,3428,1556,2549,2297, 977,2901, # 4944
+2034,4144,1205,3429,5693,1765,3430,3189,2125,1271, 714,1689,4775,3538,5694,2333, # 4960
+3931, 533,4417,3660,2184, 617,5695,2469,3340,3539,2315,5696,5697,3190,5698,5699, # 4976
+3932,1988, 618, 427,2651,3540,3431,5700,5701,1244,1690,5702,2819,4418,4776,5703, # 4992
+3541,4777,5704,2284,1576, 473,3661,4419,3432, 972,5705,3662,5706,3087,5707,5708, # 5008
+4778,4779,5709,3793,4145,4146,5710, 153,4780, 356,5711,1892,2902,4420,2144, 408, # 5024
+ 803,2357,5712,3933,5713,4421,1646,2578,2518,4781,4782,3934,5714,3935,4422,5715, # 5040
+2416,3433, 752,5716,5717,1962,3341,2979,5718, 746,3030,2470,4783,4423,3794, 698, # 5056
+4784,1893,4424,3663,2550,4785,3664,3936,5719,3191,3434,5720,1824,1302,4147,2715, # 5072
+3937,1974,4425,5721,4426,3192, 823,1303,1288,1236,2861,3542,4148,3435, 774,3938, # 5088
+5722,1581,4786,1304,2862,3939,4787,5723,2440,2162,1083,3268,4427,4149,4428, 344, # 5104
+1173, 288,2316, 454,1683,5724,5725,1461,4788,4150,2597,5726,5727,4789, 985, 894, # 5120
+5728,3436,3193,5729,1914,2942,3795,1989,5730,2111,1975,5731,4151,5732,2579,1194, # 5136
+ 425,5733,4790,3194,1245,3796,4429,5734,5735,2863,5736, 636,4791,1856,3940, 760, # 5152
+1800,5737,4430,2212,1508,4792,4152,1894,1684,2298,5738,5739,4793,4431,4432,2213, # 5168
+ 479,5740,5741, 832,5742,4153,2496,5743,2980,2497,3797, 990,3132, 627,1815,2652, # 5184
+4433,1582,4434,2126,2112,3543,4794,5744, 799,4435,3195,5745,4795,2113,1737,3031, # 5200
+1018, 543, 754,4436,3342,1676,4796,4797,4154,4798,1489,5746,3544,5747,2624,2903, # 5216
+4155,5748,5749,2981,5750,5751,5752,5753,3196,4799,4800,2185,1722,5754,3269,3270, # 5232
+1843,3665,1715, 481, 365,1976,1857,5755,5756,1963,2498,4801,5757,2127,3666,3271, # 5248
+ 433,1895,2064,2076,5758, 602,2750,5759,5760,5761,5762,5763,3032,1628,3437,5764, # 5264
+3197,4802,4156,2904,4803,2519,5765,2551,2782,5766,5767,5768,3343,4804,2905,5769, # 5280
+4805,5770,2864,4806,4807,1221,2982,4157,2520,5771,5772,5773,1868,1990,5774,5775, # 5296
+5776,1896,5777,5778,4808,1897,4158, 318,5779,2095,4159,4437,5780,5781, 485,5782, # 5312
+ 938,3941, 553,2680, 116,5783,3942,3667,5784,3545,2681,2783,3438,3344,2820,5785, # 5328
+3668,2943,4160,1747,2944,2983,5786,5787, 207,5788,4809,5789,4810,2521,5790,3033, # 5344
+ 890,3669,3943,5791,1878,3798,3439,5792,2186,2358,3440,1652,5793,5794,5795, 941, # 5360
+2299, 208,3546,4161,2020, 330,4438,3944,2906,2499,3799,4439,4811,5796,5797,5798, # 5376  #last 512
+#Everything below is of no interest for detection purpose
+2522,1613,4812,5799,3345,3945,2523,5800,4162,5801,1637,4163,2471,4813,3946,5802, # 5392
+2500,3034,3800,5803,5804,2195,4814,5805,2163,5806,5807,5808,5809,5810,5811,5812, # 5408
+5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828, # 5424
+5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844, # 5440
+5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,5859,5860, # 5456
+5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872,5873,5874,5875,5876, # 5472
+5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888,5889,5890,5891,5892, # 5488
+5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,5906,5907,5908, # 5504
+5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,5921,5922,5923,5924, # 5520
+5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936,5937,5938,5939,5940, # 5536
+5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952,5953,5954,5955,5956, # 5552
+5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968,5969,5970,5971,5972, # 5568
+5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984,5985,5986,5987,5988, # 5584
+5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004, # 5600
+6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020, # 5616
+6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032,6033,6034,6035,6036, # 5632
+6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052, # 5648
+6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068, # 5664
+6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084, # 5680
+6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100, # 5696
+6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116, # 5712
+6117,6118,6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,6132, # 5728
+6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143,6144,6145,6146,6147,6148, # 5744
+6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,6164, # 5760
+6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,6180, # 5776
+6181,6182,6183,6184,6185,6186,6187,6188,6189,6190,6191,6192,6193,6194,6195,6196, # 5792
+6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,6211,6212, # 5808
+6213,6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,3670,6224,6225,6226,6227, # 5824
+6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,6242,6243, # 5840
+6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,6254,6255,6256,6257,6258,6259, # 5856
+6260,6261,6262,6263,6264,6265,6266,6267,6268,6269,6270,6271,6272,6273,6274,6275, # 5872
+6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,4815,6286,6287,6288,6289,6290, # 5888
+6291,6292,4816,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,6303,6304,6305, # 5904
+6306,6307,6308,6309,6310,6311,4817,4818,6312,6313,6314,6315,6316,6317,6318,4819, # 5920
+6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,6334, # 5936
+6335,6336,6337,4820,6338,6339,6340,6341,6342,6343,6344,6345,6346,6347,6348,6349, # 5952
+6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,6364,6365, # 5968
+6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,6380,6381, # 5984
+6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,6396,6397, # 6000
+6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,3441,6411,6412, # 6016
+6413,6414,6415,6416,6417,6418,6419,6420,6421,6422,6423,6424,6425,4440,6426,6427, # 6032
+6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,6439,6440,6441,6442,6443, # 6048
+6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,4821,6455,6456,6457,6458, # 6064
+6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,6473,6474, # 6080
+6475,6476,6477,3947,3948,6478,6479,6480,6481,3272,4441,6482,6483,6484,6485,4442, # 6096
+6486,6487,6488,6489,6490,6491,6492,6493,6494,6495,6496,4822,6497,6498,6499,6500, # 6112
+6501,6502,6503,6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516, # 6128
+6517,6518,6519,6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532, # 6144
+6533,6534,6535,6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548, # 6160
+6549,6550,6551,6552,6553,6554,6555,6556,2784,6557,4823,6558,6559,6560,6561,6562, # 6176
+6563,6564,6565,6566,6567,6568,6569,3949,6570,6571,6572,4824,6573,6574,6575,6576, # 6192
+6577,6578,6579,6580,6581,6582,6583,4825,6584,6585,6586,3950,2785,6587,6588,6589, # 6208
+6590,6591,6592,6593,6594,6595,6596,6597,6598,6599,6600,6601,6602,6603,6604,6605, # 6224
+6606,6607,6608,6609,6610,6611,6612,4826,6613,6614,6615,4827,6616,6617,6618,6619, # 6240
+6620,6621,6622,6623,6624,6625,4164,6626,6627,6628,6629,6630,6631,6632,6633,6634, # 6256
+3547,6635,4828,6636,6637,6638,6639,6640,6641,6642,3951,2984,6643,6644,6645,6646, # 6272
+6647,6648,6649,4165,6650,4829,6651,6652,4830,6653,6654,6655,6656,6657,6658,6659, # 6288
+6660,6661,6662,4831,6663,6664,6665,6666,6667,6668,6669,6670,6671,4166,6672,4832, # 6304
+3952,6673,6674,6675,6676,4833,6677,6678,6679,4167,6680,6681,6682,3198,6683,6684, # 6320
+6685,6686,6687,6688,6689,6690,6691,6692,6693,6694,6695,6696,6697,4834,6698,6699, # 6336
+6700,6701,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,6714,6715, # 6352
+6716,6717,6718,6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,6729,6730,6731, # 6368
+6732,6733,6734,4443,6735,6736,6737,6738,6739,6740,6741,6742,6743,6744,6745,4444, # 6384
+6746,6747,6748,6749,6750,6751,6752,6753,6754,6755,6756,6757,6758,6759,6760,6761, # 6400
+6762,6763,6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777, # 6416
+6778,6779,6780,6781,4168,6782,6783,3442,6784,6785,6786,6787,6788,6789,6790,6791, # 6432
+4169,6792,6793,6794,6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806, # 6448
+6807,6808,6809,6810,6811,4835,6812,6813,6814,4445,6815,6816,4446,6817,6818,6819, # 6464
+6820,6821,6822,6823,6824,6825,6826,6827,6828,6829,6830,6831,6832,6833,6834,6835, # 6480
+3548,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6846,4836,6847,6848,6849, # 6496
+6850,6851,6852,6853,6854,3953,6855,6856,6857,6858,6859,6860,6861,6862,6863,6864, # 6512
+6865,6866,6867,6868,6869,6870,6871,6872,6873,6874,6875,6876,6877,3199,6878,6879, # 6528
+6880,6881,6882,4447,6883,6884,6885,6886,6887,6888,6889,6890,6891,6892,6893,6894, # 6544
+6895,6896,6897,6898,6899,6900,6901,6902,6903,6904,4170,6905,6906,6907,6908,6909, # 6560
+6910,6911,6912,6913,6914,6915,6916,6917,6918,6919,6920,6921,6922,6923,6924,6925, # 6576
+6926,6927,4837,6928,6929,6930,6931,6932,6933,6934,6935,6936,3346,6937,6938,4838, # 6592
+6939,6940,6941,4448,6942,6943,6944,6945,6946,4449,6947,6948,6949,6950,6951,6952, # 6608
+6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,6967,6968, # 6624
+6969,6970,6971,6972,6973,6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,6984, # 6640
+6985,6986,6987,6988,6989,6990,6991,6992,6993,6994,3671,6995,6996,6997,6998,4839, # 6656
+6999,7000,7001,7002,3549,7003,7004,7005,7006,7007,7008,7009,7010,7011,7012,7013, # 6672
+7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,7029, # 6688
+7030,4840,7031,7032,7033,7034,7035,7036,7037,7038,4841,7039,7040,7041,7042,7043, # 6704
+7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059, # 6720
+7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,2985,7071,7072,7073,7074, # 6736
+7075,7076,7077,7078,7079,7080,4842,7081,7082,7083,7084,7085,7086,7087,7088,7089, # 6752
+7090,7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105, # 6768
+7106,7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,4450,7119,7120, # 6784
+7121,7122,7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136, # 6800
+7137,7138,7139,7140,7141,7142,7143,4843,7144,7145,7146,7147,7148,7149,7150,7151, # 6816
+7152,7153,7154,7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167, # 6832
+7168,7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183, # 6848
+7184,7185,7186,7187,7188,4171,4172,7189,7190,7191,7192,7193,7194,7195,7196,7197, # 6864
+7198,7199,7200,7201,7202,7203,7204,7205,7206,7207,7208,7209,7210,7211,7212,7213, # 6880
+7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229, # 6896
+7230,7231,7232,7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245, # 6912
+7246,7247,7248,7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261, # 6928
+7262,7263,7264,7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277, # 6944
+7278,7279,7280,7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293, # 6960
+7294,7295,7296,4844,7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308, # 6976
+7309,7310,7311,7312,7313,7314,7315,7316,4451,7317,7318,7319,7320,7321,7322,7323, # 6992
+7324,7325,7326,7327,7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339, # 7008
+7340,7341,7342,7343,7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,4173,7354, # 7024
+7355,4845,7356,7357,7358,7359,7360,7361,7362,7363,7364,7365,7366,7367,7368,7369, # 7040
+7370,7371,7372,7373,7374,7375,7376,7377,7378,7379,7380,7381,7382,7383,7384,7385, # 7056
+7386,7387,7388,4846,7389,7390,7391,7392,7393,7394,7395,7396,7397,7398,7399,7400, # 7072
+7401,7402,7403,7404,7405,3672,7406,7407,7408,7409,7410,7411,7412,7413,7414,7415, # 7088
+7416,7417,7418,7419,7420,7421,7422,7423,7424,7425,7426,7427,7428,7429,7430,7431, # 7104
+7432,7433,7434,7435,7436,7437,7438,7439,7440,7441,7442,7443,7444,7445,7446,7447, # 7120
+7448,7449,7450,7451,7452,7453,4452,7454,3200,7455,7456,7457,7458,7459,7460,7461, # 7136
+7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,7472,7473,7474,4847,7475,7476, # 7152
+7477,3133,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,7488,7489,7490,7491, # 7168
+7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,3347,7503,7504,7505,7506, # 7184
+7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,4848, # 7200
+7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,7536,7537, # 7216
+7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,3801,4849,7550,7551, # 7232
+7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567, # 7248
+7568,7569,3035,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582, # 7264
+7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598, # 7280
+7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614, # 7296
+7615,7616,4850,7617,7618,3802,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628, # 7312
+7629,7630,7631,7632,4851,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643, # 7328
+7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659, # 7344
+7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7670,4453,7671,7672,7673,7674, # 7360
+7675,7676,7677,7678,7679,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690, # 7376
+7691,7692,7693,7694,7695,7696,7697,3443,7698,7699,7700,7701,7702,4454,7703,7704, # 7392
+7705,7706,7707,7708,7709,7710,7711,7712,7713,2472,7714,7715,7716,7717,7718,7719, # 7408
+7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,3954,7732,7733,7734, # 7424
+7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750, # 7440
+3134,7751,7752,4852,7753,7754,7755,4853,7756,7757,7758,7759,7760,4174,7761,7762, # 7456
+7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778, # 7472
+7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794, # 7488
+7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,4854,7806,7807,7808,7809, # 7504
+7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825, # 7520
+4855,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7536
+7841,7842,7843,7844,7845,7846,7847,3955,7848,7849,7850,7851,7852,7853,7854,7855, # 7552
+7856,7857,7858,7859,7860,3444,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870, # 7568
+7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886, # 7584
+7887,7888,7889,7890,7891,4175,7892,7893,7894,7895,7896,4856,4857,7897,7898,7899, # 7600
+7900,2598,7901,7902,7903,7904,7905,7906,7907,7908,4455,7909,7910,7911,7912,7913, # 7616
+7914,3201,7915,7916,7917,7918,7919,7920,7921,4858,7922,7923,7924,7925,7926,7927, # 7632
+7928,7929,7930,7931,7932,7933,7934,7935,7936,7937,7938,7939,7940,7941,7942,7943, # 7648
+7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7958,7959, # 7664
+7960,7961,7962,7963,7964,7965,7966,7967,7968,7969,7970,7971,7972,7973,7974,7975, # 7680
+7976,7977,7978,7979,7980,7981,4859,7982,7983,7984,7985,7986,7987,7988,7989,7990, # 7696
+7991,7992,7993,7994,7995,7996,4860,7997,7998,7999,8000,8001,8002,8003,8004,8005, # 7712
+8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,4176,8017,8018,8019,8020, # 7728
+8021,8022,8023,4861,8024,8025,8026,8027,8028,8029,8030,8031,8032,8033,8034,8035, # 7744
+8036,4862,4456,8037,8038,8039,8040,4863,8041,8042,8043,8044,8045,8046,8047,8048, # 7760
+8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,8064, # 7776
+8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080, # 7792
+8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096, # 7808
+8097,8098,8099,4864,4177,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110, # 7824
+8111,8112,8113,8114,8115,8116,8117,8118,8119,8120,4178,8121,8122,8123,8124,8125, # 7840
+8126,8127,8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141, # 7856
+8142,8143,8144,8145,4865,4866,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155, # 7872
+8156,8157,8158,8159,8160,8161,8162,8163,8164,8165,4179,8166,8167,8168,8169,8170, # 7888
+8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181,4457,8182,8183,8184,8185, # 7904
+8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201, # 7920
+8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213,8214,8215,8216,8217, # 7936
+8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229,8230,8231,8232,8233, # 7952
+8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245,8246,8247,8248,8249, # 7968
+8250,8251,8252,8253,8254,8255,8256,3445,8257,8258,8259,8260,8261,8262,4458,8263, # 7984
+8264,8265,8266,8267,8268,8269,8270,8271,8272,4459,8273,8274,8275,8276,3550,8277, # 8000
+8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,4460,8290,8291,8292, # 8016
+8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,4867, # 8032
+8308,8309,8310,8311,8312,3551,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322, # 8048
+8323,8324,8325,8326,4868,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337, # 8064
+8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353, # 8080
+8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,4869,4461,8364,8365,8366,8367, # 8096
+8368,8369,8370,4870,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382, # 8112
+8383,8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398, # 8128
+8399,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,4871,8411,8412,8413, # 8144
+8414,8415,8416,8417,8418,8419,8420,8421,8422,4462,8423,8424,8425,8426,8427,8428, # 8160
+8429,8430,8431,8432,8433,2986,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443, # 8176
+8444,8445,8446,8447,8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459, # 8192
+8460,8461,8462,8463,8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475, # 8208
+8476,8477,8478,4180,8479,8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490, # 8224
+8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506, # 8240
+8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522, # 8256
+8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538, # 8272
+8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554, # 8288
+8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,4872,8565,8566,8567,8568,8569, # 8304
+8570,8571,8572,8573,4873,8574,8575,8576,8577,8578,8579,8580,8581,8582,8583,8584, # 8320
+8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597,8598,8599,8600, # 8336
+8601,8602,8603,8604,8605,3803,8606,8607,8608,8609,8610,8611,8612,8613,4874,3804, # 8352
+8614,8615,8616,8617,8618,8619,8620,8621,3956,8622,8623,8624,8625,8626,8627,8628, # 8368
+8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,2865,8639,8640,8641,8642,8643, # 8384
+8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,4463,8657,8658, # 8400
+8659,4875,4876,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672, # 8416
+8673,8674,8675,8676,8677,8678,8679,8680,8681,4464,8682,8683,8684,8685,8686,8687, # 8432
+8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703, # 8448
+8704,8705,8706,8707,8708,8709,2261,8710,8711,8712,8713,8714,8715,8716,8717,8718, # 8464
+8719,8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,4181, # 8480
+8734,8735,8736,8737,8738,8739,8740,8741,8742,8743,8744,8745,8746,8747,8748,8749, # 8496
+8750,8751,8752,8753,8754,8755,8756,8757,8758,8759,8760,8761,8762,8763,4877,8764, # 8512
+8765,8766,8767,8768,8769,8770,8771,8772,8773,8774,8775,8776,8777,8778,8779,8780, # 8528
+8781,8782,8783,8784,8785,8786,8787,8788,4878,8789,4879,8790,8791,8792,4880,8793, # 8544
+8794,8795,8796,8797,8798,8799,8800,8801,4881,8802,8803,8804,8805,8806,8807,8808, # 8560
+8809,8810,8811,8812,8813,8814,8815,3957,8816,8817,8818,8819,8820,8821,8822,8823, # 8576
+8824,8825,8826,8827,8828,8829,8830,8831,8832,8833,8834,8835,8836,8837,8838,8839, # 8592
+8840,8841,8842,8843,8844,8845,8846,8847,4882,8848,8849,8850,8851,8852,8853,8854, # 8608
+8855,8856,8857,8858,8859,8860,8861,8862,8863,8864,8865,8866,8867,8868,8869,8870, # 8624
+8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,8884,3202,8885, # 8640
+8886,8887,8888,8889,8890,8891,8892,8893,8894,8895,8896,8897,8898,8899,8900,8901, # 8656
+8902,8903,8904,8905,8906,8907,8908,8909,8910,8911,8912,8913,8914,8915,8916,8917, # 8672
+8918,8919,8920,8921,8922,8923,8924,4465,8925,8926,8927,8928,8929,8930,8931,8932, # 8688
+4883,8933,8934,8935,8936,8937,8938,8939,8940,8941,8942,8943,2214,8944,8945,8946, # 8704
+8947,8948,8949,8950,8951,8952,8953,8954,8955,8956,8957,8958,8959,8960,8961,8962, # 8720
+8963,8964,8965,4884,8966,8967,8968,8969,8970,8971,8972,8973,8974,8975,8976,8977, # 8736
+8978,8979,8980,8981,8982,8983,8984,8985,8986,8987,8988,8989,8990,8991,8992,4885, # 8752
+8993,8994,8995,8996,8997,8998,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008, # 8768
+9009,9010,9011,9012,9013,9014,9015,9016,9017,9018,9019,9020,9021,4182,9022,9023, # 8784
+9024,9025,9026,9027,9028,9029,9030,9031,9032,9033,9034,9035,9036,9037,9038,9039, # 8800
+9040,9041,9042,9043,9044,9045,9046,9047,9048,9049,9050,9051,9052,9053,9054,9055, # 8816
+9056,9057,9058,9059,9060,9061,9062,9063,4886,9064,9065,9066,9067,9068,9069,4887, # 8832
+9070,9071,9072,9073,9074,9075,9076,9077,9078,9079,9080,9081,9082,9083,9084,9085, # 8848
+9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9101, # 8864
+9102,9103,9104,9105,9106,9107,9108,9109,9110,9111,9112,9113,9114,9115,9116,9117, # 8880
+9118,9119,9120,9121,9122,9123,9124,9125,9126,9127,9128,9129,9130,9131,9132,9133, # 8896
+9134,9135,9136,9137,9138,9139,9140,9141,3958,9142,9143,9144,9145,9146,9147,9148, # 8912
+9149,9150,9151,4888,9152,9153,9154,9155,9156,9157,9158,9159,9160,9161,9162,9163, # 8928
+9164,9165,9166,9167,9168,9169,9170,9171,9172,9173,9174,9175,4889,9176,9177,9178, # 8944
+9179,9180,9181,9182,9183,9184,9185,9186,9187,9188,9189,9190,9191,9192,9193,9194, # 8960
+9195,9196,9197,9198,9199,9200,9201,9202,9203,4890,9204,9205,9206,9207,9208,9209, # 8976
+9210,9211,9212,9213,9214,9215,9216,9217,9218,9219,9220,9221,9222,4466,9223,9224, # 8992
+9225,9226,9227,9228,9229,9230,9231,9232,9233,9234,9235,9236,9237,9238,9239,9240, # 9008
+9241,9242,9243,9244,9245,4891,9246,9247,9248,9249,9250,9251,9252,9253,9254,9255, # 9024
+9256,9257,4892,9258,9259,9260,9261,4893,4894,9262,9263,9264,9265,9266,9267,9268, # 9040
+9269,9270,9271,9272,9273,4467,9274,9275,9276,9277,9278,9279,9280,9281,9282,9283, # 9056
+9284,9285,3673,9286,9287,9288,9289,9290,9291,9292,9293,9294,9295,9296,9297,9298, # 9072
+9299,9300,9301,9302,9303,9304,9305,9306,9307,9308,9309,9310,9311,9312,9313,9314, # 9088
+9315,9316,9317,9318,9319,9320,9321,9322,4895,9323,9324,9325,9326,9327,9328,9329, # 9104
+9330,9331,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345, # 9120
+9346,9347,4468,9348,9349,9350,9351,9352,9353,9354,9355,9356,9357,9358,9359,9360, # 9136
+9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9372,9373,4896,9374,4469, # 9152
+9375,9376,9377,9378,9379,4897,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389, # 9168
+9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405, # 9184
+9406,4470,9407,2751,9408,9409,3674,3552,9410,9411,9412,9413,9414,9415,9416,9417, # 9200
+9418,9419,9420,9421,4898,9422,9423,9424,9425,9426,9427,9428,9429,3959,9430,9431, # 9216
+9432,9433,9434,9435,9436,4471,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446, # 9232
+9447,9448,9449,9450,3348,9451,9452,9453,9454,9455,9456,9457,9458,9459,9460,9461, # 9248
+9462,9463,9464,9465,9466,9467,9468,9469,9470,9471,9472,4899,9473,9474,9475,9476, # 9264
+9477,4900,9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,3349,9489,9490, # 9280
+9491,9492,9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506, # 9296
+9507,9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,4901,9521, # 9312
+9522,9523,9524,9525,9526,4902,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536, # 9328
+9537,9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,9548,9549,9550,9551,9552, # 9344
+9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568, # 9360
+9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,9582,9583,9584, # 9376
+3805,9585,9586,9587,9588,9589,9590,9591,9592,9593,9594,9595,9596,9597,9598,9599, # 9392
+9600,9601,9602,4903,9603,9604,9605,9606,9607,4904,9608,9609,9610,9611,9612,9613, # 9408
+9614,4905,9615,9616,9617,9618,9619,9620,9621,9622,9623,9624,9625,9626,9627,9628, # 9424
+9629,9630,9631,9632,4906,9633,9634,9635,9636,9637,9638,9639,9640,9641,9642,9643, # 9440
+4907,9644,9645,9646,9647,9648,9649,9650,9651,9652,9653,9654,9655,9656,9657,9658, # 9456
+9659,9660,9661,9662,9663,9664,9665,9666,9667,9668,9669,9670,9671,9672,4183,9673, # 9472
+9674,9675,9676,9677,4908,9678,9679,9680,9681,4909,9682,9683,9684,9685,9686,9687, # 9488
+9688,9689,9690,4910,9691,9692,9693,3675,9694,9695,9696,2945,9697,9698,9699,9700, # 9504
+9701,9702,9703,9704,9705,4911,9706,9707,9708,9709,9710,9711,9712,9713,9714,9715, # 9520
+9716,9717,9718,9719,9720,9721,9722,9723,9724,9725,9726,9727,9728,9729,9730,9731, # 9536
+9732,9733,9734,9735,4912,9736,9737,9738,9739,9740,4913,9741,9742,9743,9744,9745, # 9552
+9746,9747,9748,9749,9750,9751,9752,9753,9754,9755,9756,9757,9758,4914,9759,9760, # 9568
+9761,9762,9763,9764,9765,9766,9767,9768,9769,9770,9771,9772,9773,9774,9775,9776, # 9584
+9777,9778,9779,9780,9781,9782,4915,9783,9784,9785,9786,9787,9788,9789,9790,9791, # 9600
+9792,9793,4916,9794,9795,9796,9797,9798,9799,9800,9801,9802,9803,9804,9805,9806, # 9616
+9807,9808,9809,9810,9811,9812,9813,9814,9815,9816,9817,9818,9819,9820,9821,9822, # 9632
+9823,9824,9825,9826,9827,9828,9829,9830,9831,9832,9833,9834,9835,9836,9837,9838, # 9648
+9839,9840,9841,9842,9843,9844,9845,9846,9847,9848,9849,9850,9851,9852,9853,9854, # 9664
+9855,9856,9857,9858,9859,9860,9861,9862,9863,9864,9865,9866,9867,9868,4917,9869, # 9680
+9870,9871,9872,9873,9874,9875,9876,9877,9878,9879,9880,9881,9882,9883,9884,9885, # 9696
+9886,9887,9888,9889,9890,9891,9892,4472,9893,9894,9895,9896,9897,3806,9898,9899, # 9712
+9900,9901,9902,9903,9904,9905,9906,9907,9908,9909,9910,9911,9912,9913,9914,4918, # 9728
+9915,9916,9917,4919,9918,9919,9920,9921,4184,9922,9923,9924,9925,9926,9927,9928, # 9744
+9929,9930,9931,9932,9933,9934,9935,9936,9937,9938,9939,9940,9941,9942,9943,9944, # 9760
+9945,9946,4920,9947,9948,9949,9950,9951,9952,9953,9954,9955,4185,9956,9957,9958, # 9776
+9959,9960,9961,9962,9963,9964,9965,4921,9966,9967,9968,4473,9969,9970,9971,9972, # 9792
+9973,9974,9975,9976,9977,4474,9978,9979,9980,9981,9982,9983,9984,9985,9986,9987, # 9808
+9988,9989,9990,9991,9992,9993,9994,9995,9996,9997,9998,9999,10000,10001,10002,10003, # 9824
+10004,10005,10006,10007,10008,10009,10010,10011,10012,10013,10014,10015,10016,10017,10018,10019, # 9840
+10020,10021,4922,10022,4923,10023,10024,10025,10026,10027,10028,10029,10030,10031,10032,10033, # 9856
+10034,10035,10036,10037,10038,10039,10040,10041,10042,10043,10044,10045,10046,10047,10048,4924, # 9872
+10049,10050,10051,10052,10053,10054,10055,10056,10057,10058,10059,10060,10061,10062,10063,10064, # 9888
+10065,10066,10067,10068,10069,10070,10071,10072,10073,10074,10075,10076,10077,10078,10079,10080, # 9904
+10081,10082,10083,10084,10085,10086,10087,4475,10088,10089,10090,10091,10092,10093,10094,10095, # 9920
+10096,10097,4476,10098,10099,10100,10101,10102,10103,10104,10105,10106,10107,10108,10109,10110, # 9936
+10111,2174,10112,10113,10114,10115,10116,10117,10118,10119,10120,10121,10122,10123,10124,10125, # 9952
+10126,10127,10128,10129,10130,10131,10132,10133,10134,10135,10136,10137,10138,10139,10140,3807, # 9968
+4186,4925,10141,10142,10143,10144,10145,10146,10147,4477,4187,10148,10149,10150,10151,10152, # 9984
+10153,4188,10154,10155,10156,10157,10158,10159,10160,10161,4926,10162,10163,10164,10165,10166, #10000
+10167,10168,10169,10170,10171,10172,10173,10174,10175,10176,10177,10178,10179,10180,10181,10182, #10016
+10183,10184,10185,10186,10187,10188,10189,10190,10191,10192,3203,10193,10194,10195,10196,10197, #10032
+10198,10199,10200,4478,10201,10202,10203,10204,4479,10205,10206,10207,10208,10209,10210,10211, #10048
+10212,10213,10214,10215,10216,10217,10218,10219,10220,10221,10222,10223,10224,10225,10226,10227, #10064
+10228,10229,10230,10231,10232,10233,10234,4927,10235,10236,10237,10238,10239,10240,10241,10242, #10080
+10243,10244,10245,10246,10247,10248,10249,10250,10251,10252,10253,10254,10255,10256,10257,10258, #10096
+10259,10260,10261,10262,10263,10264,10265,10266,10267,10268,10269,10270,10271,10272,10273,4480, #10112
+4928,4929,10274,10275,10276,10277,10278,10279,10280,10281,10282,10283,10284,10285,10286,10287, #10128
+10288,10289,10290,10291,10292,10293,10294,10295,10296,10297,10298,10299,10300,10301,10302,10303, #10144
+10304,10305,10306,10307,10308,10309,10310,10311,10312,10313,10314,10315,10316,10317,10318,10319, #10160
+10320,10321,10322,10323,10324,10325,10326,10327,10328,10329,10330,10331,10332,10333,10334,4930, #10176
+10335,10336,10337,10338,10339,10340,10341,10342,4931,10343,10344,10345,10346,10347,10348,10349, #10192
+10350,10351,10352,10353,10354,10355,3088,10356,2786,10357,10358,10359,10360,4189,10361,10362, #10208
+10363,10364,10365,10366,10367,10368,10369,10370,10371,10372,10373,10374,10375,4932,10376,10377, #10224
+10378,10379,10380,10381,10382,10383,10384,10385,10386,10387,10388,10389,10390,10391,10392,4933, #10240
+10393,10394,10395,4934,10396,10397,10398,10399,10400,10401,10402,10403,10404,10405,10406,10407, #10256
+10408,10409,10410,10411,10412,3446,10413,10414,10415,10416,10417,10418,10419,10420,10421,10422, #10272
+10423,4935,10424,10425,10426,10427,10428,10429,10430,4936,10431,10432,10433,10434,10435,10436, #10288
+10437,10438,10439,10440,10441,10442,10443,4937,10444,10445,10446,10447,4481,10448,10449,10450, #10304
+10451,10452,10453,10454,10455,10456,10457,10458,10459,10460,10461,10462,10463,10464,10465,10466, #10320
+10467,10468,10469,10470,10471,10472,10473,10474,10475,10476,10477,10478,10479,10480,10481,10482, #10336
+10483,10484,10485,10486,10487,10488,10489,10490,10491,10492,10493,10494,10495,10496,10497,10498, #10352
+10499,10500,10501,10502,10503,10504,10505,4938,10506,10507,10508,10509,10510,2552,10511,10512, #10368
+10513,10514,10515,10516,3447,10517,10518,10519,10520,10521,10522,10523,10524,10525,10526,10527, #10384
+10528,10529,10530,10531,10532,10533,10534,10535,10536,10537,10538,10539,10540,10541,10542,10543, #10400
+4482,10544,4939,10545,10546,10547,10548,10549,10550,10551,10552,10553,10554,10555,10556,10557, #10416
+10558,10559,10560,10561,10562,10563,10564,10565,10566,10567,3676,4483,10568,10569,10570,10571, #10432
+10572,3448,10573,10574,10575,10576,10577,10578,10579,10580,10581,10582,10583,10584,10585,10586, #10448
+10587,10588,10589,10590,10591,10592,10593,10594,10595,10596,10597,10598,10599,10600,10601,10602, #10464
+10603,10604,10605,10606,10607,10608,10609,10610,10611,10612,10613,10614,10615,10616,10617,10618, #10480
+10619,10620,10621,10622,10623,10624,10625,10626,10627,4484,10628,10629,10630,10631,10632,4940, #10496
+10633,10634,10635,10636,10637,10638,10639,10640,10641,10642,10643,10644,10645,10646,10647,10648, #10512
+10649,10650,10651,10652,10653,10654,10655,10656,4941,10657,10658,10659,2599,10660,10661,10662, #10528
+10663,10664,10665,10666,3089,10667,10668,10669,10670,10671,10672,10673,10674,10675,10676,10677, #10544
+10678,10679,10680,4942,10681,10682,10683,10684,10685,10686,10687,10688,10689,10690,10691,10692, #10560
+10693,10694,10695,10696,10697,4485,10698,10699,10700,10701,10702,10703,10704,4943,10705,3677, #10576
+10706,10707,10708,10709,10710,10711,10712,4944,10713,10714,10715,10716,10717,10718,10719,10720, #10592
+10721,10722,10723,10724,10725,10726,10727,10728,4945,10729,10730,10731,10732,10733,10734,10735, #10608
+10736,10737,10738,10739,10740,10741,10742,10743,10744,10745,10746,10747,10748,10749,10750,10751, #10624
+10752,10753,10754,10755,10756,10757,10758,10759,10760,10761,4946,10762,10763,10764,10765,10766, #10640
+10767,4947,4948,10768,10769,10770,10771,10772,10773,10774,10775,10776,10777,10778,10779,10780, #10656
+10781,10782,10783,10784,10785,10786,10787,10788,10789,10790,10791,10792,10793,10794,10795,10796, #10672
+10797,10798,10799,10800,10801,10802,10803,10804,10805,10806,10807,10808,10809,10810,10811,10812, #10688
+10813,10814,10815,10816,10817,10818,10819,10820,10821,10822,10823,10824,10825,10826,10827,10828, #10704
+10829,10830,10831,10832,10833,10834,10835,10836,10837,10838,10839,10840,10841,10842,10843,10844, #10720
+10845,10846,10847,10848,10849,10850,10851,10852,10853,10854,10855,10856,10857,10858,10859,10860, #10736
+10861,10862,10863,10864,10865,10866,10867,10868,10869,10870,10871,10872,10873,10874,10875,10876, #10752
+10877,10878,4486,10879,10880,10881,10882,10883,10884,10885,4949,10886,10887,10888,10889,10890, #10768
+10891,10892,10893,10894,10895,10896,10897,10898,10899,10900,10901,10902,10903,10904,10905,10906, #10784
+10907,10908,10909,10910,10911,10912,10913,10914,10915,10916,10917,10918,10919,4487,10920,10921, #10800
+10922,10923,10924,10925,10926,10927,10928,10929,10930,10931,10932,4950,10933,10934,10935,10936, #10816
+10937,10938,10939,10940,10941,10942,10943,10944,10945,10946,10947,10948,10949,4488,10950,10951, #10832
+10952,10953,10954,10955,10956,10957,10958,10959,4190,10960,10961,10962,10963,10964,10965,10966, #10848
+10967,10968,10969,10970,10971,10972,10973,10974,10975,10976,10977,10978,10979,10980,10981,10982, #10864
+10983,10984,10985,10986,10987,10988,10989,10990,10991,10992,10993,10994,10995,10996,10997,10998, #10880
+10999,11000,11001,11002,11003,11004,11005,11006,3960,11007,11008,11009,11010,11011,11012,11013, #10896
+11014,11015,11016,11017,11018,11019,11020,11021,11022,11023,11024,11025,11026,11027,11028,11029, #10912
+11030,11031,11032,4951,11033,11034,11035,11036,11037,11038,11039,11040,11041,11042,11043,11044, #10928
+11045,11046,11047,4489,11048,11049,11050,11051,4952,11052,11053,11054,11055,11056,11057,11058, #10944
+4953,11059,11060,11061,11062,11063,11064,11065,11066,11067,11068,11069,11070,11071,4954,11072, #10960
+11073,11074,11075,11076,11077,11078,11079,11080,11081,11082,11083,11084,11085,11086,11087,11088, #10976
+11089,11090,11091,11092,11093,11094,11095,11096,11097,11098,11099,11100,11101,11102,11103,11104, #10992
+11105,11106,11107,11108,11109,11110,11111,11112,11113,11114,11115,3808,11116,11117,11118,11119, #11008
+11120,11121,11122,11123,11124,11125,11126,11127,11128,11129,11130,11131,11132,11133,11134,4955, #11024
+11135,11136,11137,11138,11139,11140,11141,11142,11143,11144,11145,11146,11147,11148,11149,11150, #11040
+11151,11152,11153,11154,11155,11156,11157,11158,11159,11160,11161,4956,11162,11163,11164,11165, #11056
+11166,11167,11168,11169,11170,11171,11172,11173,11174,11175,11176,11177,11178,11179,11180,4957, #11072
+11181,11182,11183,11184,11185,11186,4958,11187,11188,11189,11190,11191,11192,11193,11194,11195, #11088
+11196,11197,11198,11199,11200,3678,11201,11202,11203,11204,11205,11206,4191,11207,11208,11209, #11104
+11210,11211,11212,11213,11214,11215,11216,11217,11218,11219,11220,11221,11222,11223,11224,11225, #11120
+11226,11227,11228,11229,11230,11231,11232,11233,11234,11235,11236,11237,11238,11239,11240,11241, #11136
+11242,11243,11244,11245,11246,11247,11248,11249,11250,11251,4959,11252,11253,11254,11255,11256, #11152
+11257,11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,11268,11269,11270,11271,11272, #11168
+11273,11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,11286,11287,11288, #11184
+11289,11290,11291,11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304, #11200
+11305,11306,11307,11308,11309,11310,11311,11312,11313,11314,3679,11315,11316,11317,11318,4490, #11216
+11319,11320,11321,11322,11323,11324,11325,11326,11327,11328,11329,11330,11331,11332,11333,11334, #11232
+11335,11336,11337,11338,11339,11340,11341,11342,11343,11344,11345,11346,11347,4960,11348,11349, #11248
+11350,11351,11352,11353,11354,11355,11356,11357,11358,11359,11360,11361,11362,11363,11364,11365, #11264
+11366,11367,11368,11369,11370,11371,11372,11373,11374,11375,11376,11377,3961,4961,11378,11379, #11280
+11380,11381,11382,11383,11384,11385,11386,11387,11388,11389,11390,11391,11392,11393,11394,11395, #11296
+11396,11397,4192,11398,11399,11400,11401,11402,11403,11404,11405,11406,11407,11408,11409,11410, #11312
+11411,4962,11412,11413,11414,11415,11416,11417,11418,11419,11420,11421,11422,11423,11424,11425, #11328
+11426,11427,11428,11429,11430,11431,11432,11433,11434,11435,11436,11437,11438,11439,11440,11441, #11344
+11442,11443,11444,11445,11446,11447,11448,11449,11450,11451,11452,11453,11454,11455,11456,11457, #11360
+11458,11459,11460,11461,11462,11463,11464,11465,11466,11467,11468,11469,4963,11470,11471,4491, #11376
+11472,11473,11474,11475,4964,11476,11477,11478,11479,11480,11481,11482,11483,11484,11485,11486, #11392
+11487,11488,11489,11490,11491,11492,4965,11493,11494,11495,11496,11497,11498,11499,11500,11501, #11408
+11502,11503,11504,11505,11506,11507,11508,11509,11510,11511,11512,11513,11514,11515,11516,11517, #11424
+11518,11519,11520,11521,11522,11523,11524,11525,11526,11527,11528,11529,3962,11530,11531,11532, #11440
+11533,11534,11535,11536,11537,11538,11539,11540,11541,11542,11543,11544,11545,11546,11547,11548, #11456
+11549,11550,11551,11552,11553,11554,11555,11556,11557,11558,11559,11560,11561,11562,11563,11564, #11472
+4193,4194,11565,11566,11567,11568,11569,11570,11571,11572,11573,11574,11575,11576,11577,11578, #11488
+11579,11580,11581,11582,11583,11584,11585,11586,11587,11588,11589,11590,11591,4966,4195,11592, #11504
+11593,11594,11595,11596,11597,11598,11599,11600,11601,11602,11603,11604,3090,11605,11606,11607, #11520
+11608,11609,11610,4967,11611,11612,11613,11614,11615,11616,11617,11618,11619,11620,11621,11622, #11536
+11623,11624,11625,11626,11627,11628,11629,11630,11631,11632,11633,11634,11635,11636,11637,11638, #11552
+11639,11640,11641,11642,11643,11644,11645,11646,11647,11648,11649,11650,11651,11652,11653,11654, #11568
+11655,11656,11657,11658,11659,11660,11661,11662,11663,11664,11665,11666,11667,11668,11669,11670, #11584
+11671,11672,11673,11674,4968,11675,11676,11677,11678,11679,11680,11681,11682,11683,11684,11685, #11600
+11686,11687,11688,11689,11690,11691,11692,11693,3809,11694,11695,11696,11697,11698,11699,11700, #11616
+11701,11702,11703,11704,11705,11706,11707,11708,11709,11710,11711,11712,11713,11714,11715,11716, #11632
+11717,11718,3553,11719,11720,11721,11722,11723,11724,11725,11726,11727,11728,11729,11730,4969, #11648
+11731,11732,11733,11734,11735,11736,11737,11738,11739,11740,4492,11741,11742,11743,11744,11745, #11664
+11746,11747,11748,11749,11750,11751,11752,4970,11753,11754,11755,11756,11757,11758,11759,11760, #11680
+11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,11776, #11696
+11777,11778,11779,11780,11781,11782,11783,11784,11785,11786,11787,11788,11789,11790,4971,11791, #11712
+11792,11793,11794,11795,11796,11797,4972,11798,11799,11800,11801,11802,11803,11804,11805,11806, #11728
+11807,11808,11809,11810,4973,11811,11812,11813,11814,11815,11816,11817,11818,11819,11820,11821, #11744
+11822,11823,11824,11825,11826,11827,11828,11829,11830,11831,11832,11833,11834,3680,3810,11835, #11760
+11836,4974,11837,11838,11839,11840,11841,11842,11843,11844,11845,11846,11847,11848,11849,11850, #11776
+11851,11852,11853,11854,11855,11856,11857,11858,11859,11860,11861,11862,11863,11864,11865,11866, #11792
+11867,11868,11869,11870,11871,11872,11873,11874,11875,11876,11877,11878,11879,11880,11881,11882, #11808
+11883,11884,4493,11885,11886,11887,11888,11889,11890,11891,11892,11893,11894,11895,11896,11897, #11824
+11898,11899,11900,11901,11902,11903,11904,11905,11906,11907,11908,11909,11910,11911,11912,11913, #11840
+11914,11915,4975,11916,11917,11918,11919,11920,11921,11922,11923,11924,11925,11926,11927,11928, #11856
+11929,11930,11931,11932,11933,11934,11935,11936,11937,11938,11939,11940,11941,11942,11943,11944, #11872
+11945,11946,11947,11948,11949,4976,11950,11951,11952,11953,11954,11955,11956,11957,11958,11959, #11888
+11960,11961,11962,11963,11964,11965,11966,11967,11968,11969,11970,11971,11972,11973,11974,11975, #11904
+11976,11977,11978,11979,11980,11981,11982,11983,11984,11985,11986,11987,4196,11988,11989,11990, #11920
+11991,11992,4977,11993,11994,11995,11996,11997,11998,11999,12000,12001,12002,12003,12004,12005, #11936
+12006,12007,12008,12009,12010,12011,12012,12013,12014,12015,12016,12017,12018,12019,12020,12021, #11952
+12022,12023,12024,12025,12026,12027,12028,12029,12030,12031,12032,12033,12034,12035,12036,12037, #11968
+12038,12039,12040,12041,12042,12043,12044,12045,12046,12047,12048,12049,12050,12051,12052,12053, #11984
+12054,12055,12056,12057,12058,12059,12060,12061,4978,12062,12063,12064,12065,12066,12067,12068, #12000
+12069,12070,12071,12072,12073,12074,12075,12076,12077,12078,12079,12080,12081,12082,12083,12084, #12016
+12085,12086,12087,12088,12089,12090,12091,12092,12093,12094,12095,12096,12097,12098,12099,12100, #12032
+12101,12102,12103,12104,12105,12106,12107,12108,12109,12110,12111,12112,12113,12114,12115,12116, #12048
+12117,12118,12119,12120,12121,12122,12123,4979,12124,12125,12126,12127,12128,4197,12129,12130, #12064
+12131,12132,12133,12134,12135,12136,12137,12138,12139,12140,12141,12142,12143,12144,12145,12146, #12080
+12147,12148,12149,12150,12151,12152,12153,12154,4980,12155,12156,12157,12158,12159,12160,4494, #12096
+12161,12162,12163,12164,3811,12165,12166,12167,12168,12169,4495,12170,12171,4496,12172,12173, #12112
+12174,12175,12176,3812,12177,12178,12179,12180,12181,12182,12183,12184,12185,12186,12187,12188, #12128
+12189,12190,12191,12192,12193,12194,12195,12196,12197,12198,12199,12200,12201,12202,12203,12204, #12144
+12205,12206,12207,12208,12209,12210,12211,12212,12213,12214,12215,12216,12217,12218,12219,12220, #12160
+12221,4981,12222,12223,12224,12225,12226,12227,12228,12229,12230,12231,12232,12233,12234,12235, #12176
+4982,12236,12237,12238,12239,12240,12241,12242,12243,12244,12245,4983,12246,12247,12248,12249, #12192
+4984,12250,12251,12252,12253,12254,12255,12256,12257,12258,12259,12260,12261,12262,12263,12264, #12208
+4985,12265,4497,12266,12267,12268,12269,12270,12271,12272,12273,12274,12275,12276,12277,12278, #12224
+12279,12280,12281,12282,12283,12284,12285,12286,12287,4986,12288,12289,12290,12291,12292,12293, #12240
+12294,12295,12296,2473,12297,12298,12299,12300,12301,12302,12303,12304,12305,12306,12307,12308, #12256
+12309,12310,12311,12312,12313,12314,12315,12316,12317,12318,12319,3963,12320,12321,12322,12323, #12272
+12324,12325,12326,12327,12328,12329,12330,12331,12332,4987,12333,12334,12335,12336,12337,12338, #12288
+12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12351,12352,12353,12354, #12304
+12355,12356,12357,12358,12359,3964,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369, #12320
+12370,3965,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384, #12336
+12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400, #12352
+12401,12402,12403,12404,12405,12406,12407,12408,4988,12409,12410,12411,12412,12413,12414,12415, #12368
+12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431, #12384
+12432,12433,12434,12435,12436,12437,12438,3554,12439,12440,12441,12442,12443,12444,12445,12446, #12400
+12447,12448,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462, #12416
+12463,12464,4989,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477, #12432
+12478,12479,12480,4990,12481,12482,12483,12484,12485,12486,12487,12488,12489,4498,12490,12491, #12448
+12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507, #12464
+12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523, #12480
+12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,12535,12536,12537,12538,12539, #12496
+12540,12541,12542,12543,12544,12545,12546,12547,12548,12549,12550,12551,4991,12552,12553,12554, #12512
+12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570, #12528
+12571,12572,12573,12574,12575,12576,12577,12578,3036,12579,12580,12581,12582,12583,3966,12584, #12544
+12585,12586,12587,12588,12589,12590,12591,12592,12593,12594,12595,12596,12597,12598,12599,12600, #12560
+12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616, #12576
+12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632, #12592
+12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,4499,12647, #12608
+12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663, #12624
+12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679, #12640
+12680,12681,12682,12683,12684,12685,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695, #12656
+12696,12697,12698,4992,12699,12700,12701,12702,12703,12704,12705,12706,12707,12708,12709,12710, #12672
+12711,12712,12713,12714,12715,12716,12717,12718,12719,12720,12721,12722,12723,12724,12725,12726, #12688
+12727,12728,12729,12730,12731,12732,12733,12734,12735,12736,12737,12738,12739,12740,12741,12742, #12704
+12743,12744,12745,12746,12747,12748,12749,12750,12751,12752,12753,12754,12755,12756,12757,12758, #12720
+12759,12760,12761,12762,12763,12764,12765,12766,12767,12768,12769,12770,12771,12772,12773,12774, #12736
+12775,12776,12777,12778,4993,2175,12779,12780,12781,12782,12783,12784,12785,12786,4500,12787, #12752
+12788,12789,12790,12791,12792,12793,12794,12795,12796,12797,12798,12799,12800,12801,12802,12803, #12768
+12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819, #12784
+12820,12821,12822,12823,12824,12825,12826,4198,3967,12827,12828,12829,12830,12831,12832,12833, #12800
+12834,12835,12836,12837,12838,12839,12840,12841,12842,12843,12844,12845,12846,12847,12848,12849, #12816
+12850,12851,12852,12853,12854,12855,12856,12857,12858,12859,12860,12861,4199,12862,12863,12864, #12832
+12865,12866,12867,12868,12869,12870,12871,12872,12873,12874,12875,12876,12877,12878,12879,12880, #12848
+12881,12882,12883,12884,12885,12886,12887,4501,12888,12889,12890,12891,12892,12893,12894,12895, #12864
+12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911, #12880
+12912,4994,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,12924,12925,12926, #12896
+12927,12928,12929,12930,12931,12932,12933,12934,12935,12936,12937,12938,12939,12940,12941,12942, #12912
+12943,12944,12945,12946,12947,12948,12949,12950,12951,12952,12953,12954,12955,12956,1772,12957, #12928
+12958,12959,12960,12961,12962,12963,12964,12965,12966,12967,12968,12969,12970,12971,12972,12973, #12944
+12974,12975,12976,12977,12978,12979,12980,12981,12982,12983,12984,12985,12986,12987,12988,12989, #12960
+12990,12991,12992,12993,12994,12995,12996,12997,4502,12998,4503,12999,13000,13001,13002,13003, #12976
+4504,13004,13005,13006,13007,13008,13009,13010,13011,13012,13013,13014,13015,13016,13017,13018, #12992
+13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,3449,13030,13031,13032,13033, #13008
+13034,13035,13036,13037,13038,13039,13040,13041,13042,13043,13044,13045,13046,13047,13048,13049, #13024
+13050,13051,13052,13053,13054,13055,13056,13057,13058,13059,13060,13061,13062,13063,13064,13065, #13040
+13066,13067,13068,13069,13070,13071,13072,13073,13074,13075,13076,13077,13078,13079,13080,13081, #13056
+13082,13083,13084,13085,13086,13087,13088,13089,13090,13091,13092,13093,13094,13095,13096,13097, #13072
+13098,13099,13100,13101,13102,13103,13104,13105,13106,13107,13108,13109,13110,13111,13112,13113, #13088
+13114,13115,13116,13117,13118,3968,13119,4995,13120,13121,13122,13123,13124,13125,13126,13127, #13104
+4505,13128,13129,13130,13131,13132,13133,13134,4996,4506,13135,13136,13137,13138,13139,4997, #13120
+13140,13141,13142,13143,13144,13145,13146,13147,13148,13149,13150,13151,13152,13153,13154,13155, #13136
+13156,13157,13158,13159,4998,13160,13161,13162,13163,13164,13165,13166,13167,13168,13169,13170, #13152
+13171,13172,13173,13174,13175,13176,4999,13177,13178,13179,13180,13181,13182,13183,13184,13185, #13168
+13186,13187,13188,13189,13190,13191,13192,13193,13194,13195,13196,13197,13198,13199,13200,13201, #13184
+13202,13203,13204,13205,13206,5000,13207,13208,13209,13210,13211,13212,13213,13214,13215,13216, #13200
+13217,13218,13219,13220,13221,13222,13223,13224,13225,13226,13227,4200,5001,13228,13229,13230, #13216
+13231,13232,13233,13234,13235,13236,13237,13238,13239,13240,3969,13241,13242,13243,13244,3970, #13232
+13245,13246,13247,13248,13249,13250,13251,13252,13253,13254,13255,13256,13257,13258,13259,13260, #13248
+13261,13262,13263,13264,13265,13266,13267,13268,3450,13269,13270,13271,13272,13273,13274,13275, #13264
+13276,5002,13277,13278,13279,13280,13281,13282,13283,13284,13285,13286,13287,13288,13289,13290, #13280
+13291,13292,13293,13294,13295,13296,13297,13298,13299,13300,13301,13302,3813,13303,13304,13305, #13296
+13306,13307,13308,13309,13310,13311,13312,13313,13314,13315,13316,13317,13318,13319,13320,13321, #13312
+13322,13323,13324,13325,13326,13327,13328,4507,13329,13330,13331,13332,13333,13334,13335,13336, #13328
+13337,13338,13339,13340,13341,5003,13342,13343,13344,13345,13346,13347,13348,13349,13350,13351, #13344
+13352,13353,13354,13355,13356,13357,13358,13359,13360,13361,13362,13363,13364,13365,13366,13367, #13360
+5004,13368,13369,13370,13371,13372,13373,13374,13375,13376,13377,13378,13379,13380,13381,13382, #13376
+13383,13384,13385,13386,13387,13388,13389,13390,13391,13392,13393,13394,13395,13396,13397,13398, #13392
+13399,13400,13401,13402,13403,13404,13405,13406,13407,13408,13409,13410,13411,13412,13413,13414, #13408
+13415,13416,13417,13418,13419,13420,13421,13422,13423,13424,13425,13426,13427,13428,13429,13430, #13424
+13431,13432,4508,13433,13434,13435,4201,13436,13437,13438,13439,13440,13441,13442,13443,13444, #13440
+13445,13446,13447,13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,5005,13458,13459, #13456
+13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,4509,13471,13472,13473,13474, #13472
+13475,13476,13477,13478,13479,13480,13481,13482,13483,13484,13485,13486,13487,13488,13489,13490, #13488
+13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,13502,13503,13504,13505,13506, #13504
+13507,13508,13509,13510,13511,13512,13513,13514,13515,13516,13517,13518,13519,13520,13521,13522, #13520
+13523,13524,13525,13526,13527,13528,13529,13530,13531,13532,13533,13534,13535,13536,13537,13538, #13536
+13539,13540,13541,13542,13543,13544,13545,13546,13547,13548,13549,13550,13551,13552,13553,13554, #13552
+13555,13556,13557,13558,13559,13560,13561,13562,13563,13564,13565,13566,13567,13568,13569,13570, #13568
+13571,13572,13573,13574,13575,13576,13577,13578,13579,13580,13581,13582,13583,13584,13585,13586, #13584
+13587,13588,13589,13590,13591,13592,13593,13594,13595,13596,13597,13598,13599,13600,13601,13602, #13600
+13603,13604,13605,13606,13607,13608,13609,13610,13611,13612,13613,13614,13615,13616,13617,13618, #13616
+13619,13620,13621,13622,13623,13624,13625,13626,13627,13628,13629,13630,13631,13632,13633,13634, #13632
+13635,13636,13637,13638,13639,13640,13641,13642,5006,13643,13644,13645,13646,13647,13648,13649, #13648
+13650,13651,5007,13652,13653,13654,13655,13656,13657,13658,13659,13660,13661,13662,13663,13664, #13664
+13665,13666,13667,13668,13669,13670,13671,13672,13673,13674,13675,13676,13677,13678,13679,13680, #13680
+13681,13682,13683,13684,13685,13686,13687,13688,13689,13690,13691,13692,13693,13694,13695,13696, #13696
+13697,13698,13699,13700,13701,13702,13703,13704,13705,13706,13707,13708,13709,13710,13711,13712, #13712
+13713,13714,13715,13716,13717,13718,13719,13720,13721,13722,13723,13724,13725,13726,13727,13728, #13728
+13729,13730,13731,13732,13733,13734,13735,13736,13737,13738,13739,13740,13741,13742,13743,13744, #13744
+13745,13746,13747,13748,13749,13750,13751,13752,13753,13754,13755,13756,13757,13758,13759,13760, #13760
+13761,13762,13763,13764,13765,13766,13767,13768,13769,13770,13771,13772,13773,13774,3273,13775, #13776
+13776,13777,13778,13779,13780,13781,13782,13783,13784,13785,13786,13787,13788,13789,13790,13791, #13792
+13792,13793,13794,13795,13796,13797,13798,13799,13800,13801,13802,13803,13804,13805,13806,13807, #13808
+13808,13809,13810,13811,13812,13813,13814,13815,13816,13817,13818,13819,13820,13821,13822,13823, #13824
+13824,13825,13826,13827,13828,13829,13830,13831,13832,13833,13834,13835,13836,13837,13838,13839, #13840
+13840,13841,13842,13843,13844,13845,13846,13847,13848,13849,13850,13851,13852,13853,13854,13855, #13856
+13856,13857,13858,13859,13860,13861,13862,13863,13864,13865,13866,13867,13868,13869,13870,13871, #13872
+13872,13873,13874,13875,13876,13877,13878,13879,13880,13881,13882,13883,13884,13885,13886,13887, #13888
+13888,13889,13890,13891,13892,13893,13894,13895,13896,13897,13898,13899,13900,13901,13902,13903, #13904
+13904,13905,13906,13907,13908,13909,13910,13911,13912,13913,13914,13915,13916,13917,13918,13919, #13920
+13920,13921,13922,13923,13924,13925,13926,13927,13928,13929,13930,13931,13932,13933,13934,13935, #13936
+13936,13937,13938,13939,13940,13941,13942,13943,13944,13945,13946,13947,13948,13949,13950,13951, #13952
+13952,13953,13954,13955,13956,13957,13958,13959,13960,13961,13962,13963,13964,13965,13966,13967, #13968
+13968,13969,13970,13971,13972) #13973
+
+# flake8: noqa

libs/requests/packages/chardet/big5prober.py

@@ -0,0 +1,42 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import Big5DistributionAnalysis
+from .mbcssm import Big5SMModel
+
+
+class Big5Prober(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(Big5SMModel)
+        self._mDistributionAnalyzer = Big5DistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "Big5"

libs/requests/packages/chardet/chardetect.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+"""
+Script which takes one or more file paths and reports on their detected
+encodings
+
+Example::
+
+    % chardetect somefile someotherfile
+    somefile: windows-1252 with confidence 0.5
+    someotherfile: ascii with confidence 1.0
+
+If no paths are provided, it takes its input from stdin.
+
+"""
+from io import open
+from sys import argv, stdin
+
+from chardet.universaldetector import UniversalDetector
+
+
+def description_of(file, name='stdin'):
+    """Return a string describing the probable encoding of a file."""
+    u = UniversalDetector()
+    for line in file:
+        u.feed(line)
+    u.close()
+    result = u.result
+    if result['encoding']:
+        return '%s: %s with confidence %s' % (name,
+                                              result['encoding'],
+                                              result['confidence'])
+    else:
+        return '%s: no result' % name
+
+
+def main():
+    if len(argv) <= 1:
+        print(description_of(stdin))
+    else:
+        for path in argv[1:]:
+            with open(path, 'rb') as f:
+                print(description_of(f, path))
+
+
+if __name__ == '__main__':
+    main()

libs/requests/packages/chardet/chardistribution.py

@@ -0,0 +1,231 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .euctwfreq import (EUCTWCharToFreqOrder, EUCTW_TABLE_SIZE,
+                        EUCTW_TYPICAL_DISTRIBUTION_RATIO)
+from .euckrfreq import (EUCKRCharToFreqOrder, EUCKR_TABLE_SIZE,
+                        EUCKR_TYPICAL_DISTRIBUTION_RATIO)
+from .gb2312freq import (GB2312CharToFreqOrder, GB2312_TABLE_SIZE,
+                         GB2312_TYPICAL_DISTRIBUTION_RATIO)
+from .big5freq import (Big5CharToFreqOrder, BIG5_TABLE_SIZE,
+                       BIG5_TYPICAL_DISTRIBUTION_RATIO)
+from .jisfreq import (JISCharToFreqOrder, JIS_TABLE_SIZE,
+                      JIS_TYPICAL_DISTRIBUTION_RATIO)
+from .compat import wrap_ord
+
+ENOUGH_DATA_THRESHOLD = 1024
+SURE_YES = 0.99
+SURE_NO = 0.01
+MINIMUM_DATA_THRESHOLD = 3
+
+
+class CharDistributionAnalysis:
+    def __init__(self):
+        # Mapping table to get frequency order from char order (get from
+        # GetOrder())
+        self._mCharToFreqOrder = None
+        self._mTableSize = None  # Size of above table
+        # This is a constant value which varies from language to language,
+        # used in calculating confidence.  See
+        # http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html
+        # for further detail.
+        self._mTypicalDistributionRatio = None
+        self.reset()
+
+    def reset(self):
+        """reset analyser, clear any state"""
+        # If this flag is set to True, detection is done and conclusion has
+        # been made
+        self._mDone = False
+        self._mTotalChars = 0  # Total characters encountered
+        # The number of characters whose frequency order is less than 512
+        self._mFreqChars = 0
+
+    def feed(self, aBuf, aCharLen):
+        """feed a character with known length"""
+        if aCharLen == 2:
+            # we only care about 2-bytes character in our distribution analysis
+            order = self.get_order(aBuf)
+        else:
+            order = -1
+        if order >= 0:
+            self._mTotalChars += 1
+            # order is valid
+            if order < self._mTableSize:
+                if 512 > self._mCharToFreqOrder[order]:
+                    self._mFreqChars += 1
+
+    def get_confidence(self):
+        """return confidence based on existing data"""
+        # if we didn't receive any character in our consideration range,
+        # return negative answer
+        if self._mTotalChars <= 0 or self._mFreqChars <= MINIMUM_DATA_THRESHOLD:
+            return SURE_NO
+
+        if self._mTotalChars != self._mFreqChars:
+            r = (self._mFreqChars / ((self._mTotalChars - self._mFreqChars)
+                 * self._mTypicalDistributionRatio))
+            if r < SURE_YES:
+                return r
+
+        # normalize confidence (we don't want to be 100% sure)
+        return SURE_YES
+
+    def got_enough_data(self):
+        # It is not necessary to receive all data to draw conclusion.
+        # For charset detection, certain amount of data is enough
+        return self._mTotalChars > ENOUGH_DATA_THRESHOLD
+
+    def get_order(self, aBuf):
+        # We do not handle characters based on the original encoding string,
+        # but convert this encoding string to a number, here called order.
+        # This allows multiple encodings of a language to share one frequency
+        # table.
+        return -1
+
+
+class EUCTWDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = EUCTWCharToFreqOrder
+        self._mTableSize = EUCTW_TABLE_SIZE
+        self._mTypicalDistributionRatio = EUCTW_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-TW encoding, we are interested
+        #   first  byte range: 0xc4 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char = wrap_ord(aBuf[0])
+        if first_char >= 0xC4:
+            return 94 * (first_char - 0xC4) + wrap_ord(aBuf[1]) - 0xA1
+        else:
+            return -1
+
+
+class EUCKRDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = EUCKRCharToFreqOrder
+        self._mTableSize = EUCKR_TABLE_SIZE
+        self._mTypicalDistributionRatio = EUCKR_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-KR encoding, we are interested
+        #   first  byte range: 0xb0 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char = wrap_ord(aBuf[0])
+        if first_char >= 0xB0:
+            return 94 * (first_char - 0xB0) + wrap_ord(aBuf[1]) - 0xA1
+        else:
+            return -1
+
+
+class GB2312DistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = GB2312CharToFreqOrder
+        self._mTableSize = GB2312_TABLE_SIZE
+        self._mTypicalDistributionRatio = GB2312_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for GB2312 encoding, we are interested
+        #  first  byte range: 0xb0 -- 0xfe
+        #  second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if (first_char >= 0xB0) and (second_char >= 0xA1):
+            return 94 * (first_char - 0xB0) + second_char - 0xA1
+        else:
+            return -1
+
+
+class Big5DistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = Big5CharToFreqOrder
+        self._mTableSize = BIG5_TABLE_SIZE
+        self._mTypicalDistributionRatio = BIG5_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for big5 encoding, we are interested
+        #   first  byte range: 0xa4 -- 0xfe
+        #   second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if first_char >= 0xA4:
+            if second_char >= 0xA1:
+                return 157 * (first_char - 0xA4) + second_char - 0xA1 + 63
+            else:
+                return 157 * (first_char - 0xA4) + second_char - 0x40
+        else:
+            return -1
+
+
+class SJISDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = JISCharToFreqOrder
+        self._mTableSize = JIS_TABLE_SIZE
+        self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for sjis encoding, we are interested
+        #   first  byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe
+        #   second byte range: 0x40 -- 0x7e,  0x81 -- oxfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if (first_char >= 0x81) and (first_char <= 0x9F):
+            order = 188 * (first_char - 0x81)
+        elif (first_char >= 0xE0) and (first_char <= 0xEF):
+            order = 188 * (first_char - 0xE0 + 31)
+        else:
+            return -1
+        order = order + second_char - 0x40
+        if second_char > 0x7F:
+            order = -1
+        return order
+
+
+class EUCJPDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = JISCharToFreqOrder
+        self._mTableSize = JIS_TABLE_SIZE
+        self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-JP encoding, we are interested
+        #   first  byte range: 0xa0 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        char = wrap_ord(aBuf[0])
+        if char >= 0xA0:
+            return 94 * (char - 0xA1) + wrap_ord(aBuf[1]) - 0xa1
+        else:
+            return -1

libs/requests/packages/chardet/charsetgroupprober.py

@@ -0,0 +1,106 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+# 
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+import sys
+from .charsetprober import CharSetProber
+
+
+class CharSetGroupProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mActiveNum = 0
+        self._mProbers = []
+        self._mBestGuessProber = None
+
+    def reset(self):
+        CharSetProber.reset(self)
+        self._mActiveNum = 0
+        for prober in self._mProbers:
+            if prober:
+                prober.reset()
+                prober.active = True
+                self._mActiveNum += 1
+        self._mBestGuessProber = None
+
+    def get_charset_name(self):
+        if not self._mBestGuessProber:
+            self.get_confidence()
+            if not self._mBestGuessProber:
+                return None
+#                self._mBestGuessProber = self._mProbers[0]
+        return self._mBestGuessProber.get_charset_name()
+
+    def feed(self, aBuf):
+        for prober in self._mProbers:
+            if not prober:
+                continue
+            if not prober.active:
+                continue
+            st = prober.feed(aBuf)
+            if not st:
+                continue
+            if st == constants.eFoundIt:
+                self._mBestGuessProber = prober
+                return self.get_state()
+            elif st == constants.eNotMe:
+                prober.active = False
+                self._mActiveNum -= 1
+                if self._mActiveNum <= 0:
+                    self._mState = constants.eNotMe
+                    return self.get_state()
+        return self.get_state()
+
+    def get_confidence(self):
+        st = self.get_state()
+        if st == constants.eFoundIt:
+            return 0.99
+        elif st == constants.eNotMe:
+            return 0.01
+        bestConf = 0.0
+        self._mBestGuessProber = None
+        for prober in self._mProbers:
+            if not prober:
+                continue
+            if not prober.active:
+                if constants._debug:
+                    sys.stderr.write(prober.get_charset_name()
+                                     + ' not active\n')
+                continue
+            cf = prober.get_confidence()
+            if constants._debug:
+                sys.stderr.write('%s confidence = %s\n' %
+                                 (prober.get_charset_name(), cf))
+            if bestConf < cf:
+                bestConf = cf
+                self._mBestGuessProber = prober
+        if not self._mBestGuessProber:
+            return 0.0
+        return bestConf
+#        else:
+#            self._mBestGuessProber = self._mProbers[0]
+#            return self._mBestGuessProber.get_confidence()

libs/requests/packages/chardet/charsetprober.py

@@ -0,0 +1,62 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+import re
+
+
+class CharSetProber:
+    def __init__(self):
+        pass
+
+    def reset(self):
+        self._mState = constants.eDetecting
+
+    def get_charset_name(self):
+        return None
+
+    def feed(self, aBuf):
+        pass
+
+    def get_state(self):
+        return self._mState
+
+    def get_confidence(self):
+        return 0.0
+
+    def filter_high_bit_only(self, aBuf):
+        aBuf = re.sub(b'([\x00-\x7F])+', b' ', aBuf)
+        return aBuf
+
+    def filter_without_english_letters(self, aBuf):
+        aBuf = re.sub(b'([A-Za-z])+', b' ', aBuf)
+        return aBuf
+
+    def filter_with_english_letters(self, aBuf):
+        # TODO
+        return aBuf

libs/requests/packages/chardet/codingstatemachine.py

@@ -0,0 +1,61 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .constants import eStart
+from .compat import wrap_ord
+
+
+class CodingStateMachine:
+    def __init__(self, sm):
+        self._mModel = sm
+        self._mCurrentBytePos = 0
+        self._mCurrentCharLen = 0
+        self.reset()
+
+    def reset(self):
+        self._mCurrentState = eStart
+
+    def next_state(self, c):
+        # for each byte we get its class
+        # if it is first byte, we also get byte length
+        # PY3K: aBuf is a byte stream, so c is an int, not a byte
+        byteCls = self._mModel['classTable'][wrap_ord(c)]
+        if self._mCurrentState == eStart:
+            self._mCurrentBytePos = 0
+            self._mCurrentCharLen = self._mModel['charLenTable'][byteCls]
+        # from byte's class and stateTable, we get its next state
+        curr_state = (self._mCurrentState * self._mModel['classFactor']
+                      + byteCls)
+        self._mCurrentState = self._mModel['stateTable'][curr_state]
+        self._mCurrentBytePos += 1
+        return self._mCurrentState
+
+    def get_current_charlen(self):
+        return self._mCurrentCharLen
+
+    def get_coding_state_machine(self):
+        return self._mModel['name']

libs/requests/packages/chardet/compat.py

@@ -0,0 +1,34 @@
+######################## BEGIN LICENSE BLOCK ########################
+# Contributor(s):
+#   Ian Cordasco - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+
+
+if sys.version_info < (3, 0):
+    base_str = (str, unicode)
+else:
+    base_str = (bytes, str)
+
+
+def wrap_ord(a):
+    if sys.version_info < (3, 0) and isinstance(a, base_str):
+        return ord(a)
+    else:
+        return a