From 36d82253891bad27191c96a83104c906d1cc6a32 Mon Sep 17 00:00:00 2001 From: Ruud Date: Tue, 10 Jun 2014 21:02:48 +0200 Subject: [PATCH 1/3] Trigger search change on paste. fix #3416 --- couchpotato/core/media/_base/search/static/search.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/couchpotato/core/media/_base/search/static/search.js b/couchpotato/core/media/_base/search/static/search.js index 1892ad1e..a7cd3640 100644 --- a/couchpotato/core/media/_base/search/static/search.js +++ b/couchpotato/core/media/_base/search/static/search.js @@ -13,6 +13,9 @@ Block.Search = new Class({ self.input = new Element('input', { 'placeholder': 'Search & add a new media', 'events': { + 'input': self.keyup.bind(self), + 'paste': self.keyup.bind(self), + 'change': self.keyup.bind(self), 'keyup': self.keyup.bind(self), 'focus': function(){ if(focus_timer) clearTimeout(focus_timer); From 699c562d3446985d6b39d016e0f1f366266ec7f3 Mon Sep 17 00:00:00 2001 From: Ruud Date: Tue, 10 Jun 2014 22:47:23 +0200 Subject: [PATCH 2/3] Return default resolution if nothing found --- couchpotato/core/plugins/scanner.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/couchpotato/core/plugins/scanner.py b/couchpotato/core/plugins/scanner.py index 2b8d1bd1..b75f0bcc 100644 --- a/couchpotato/core/plugins/scanner.py +++ b/couchpotato/core/plugins/scanner.py @@ -850,7 +850,9 @@ class Scanner(Plugin): if key in filename.lower() and key != 'default': return self.resolutions[key] except: - return self.resolutions['default'] + pass + + return self.resolutions['default'] def getGroup(self, file): try: From d7f6fad3dddb12e05785143219edc90515263faf Mon Sep 17 00:00:00 2001 From: Ruud Date: Tue, 10 Jun 2014 22:51:15 +0200 Subject: [PATCH 3/3] Unicode filenames before saving release. fix #3383 --- couchpotato/core/plugins/release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index d84f3941..0d22c165 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -7,7 +7,7 @@ from CodernityDB.database import RecordDeleted from couchpotato import md5, get_db from couchpotato.api import addApiView from couchpotato.core.event import fireEvent, addEvent -from couchpotato.core.helpers.encoding import ss, toUnicode, sp +from couchpotato.core.helpers.encoding import toUnicode, sp from couchpotato.core.helpers.variable import getTitle from couchpotato.core.logger import CPLog from couchpotato.core.plugins.base import Plugin @@ -143,7 +143,7 @@ class Release(Plugin): }) # Empty out empty file groups - release['files'] = dict((k, v) for k, v in group['files'].items() if v) + 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'])