Use custom urlencode function. fixes #121

couchpotato/core/plugins/base.py

@@ -1,5 +1,6 @@
 from couchpotato import addView
 from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import getExt
 from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
@@ -11,10 +12,8 @@ import glob
 import math
 import os.path
 import re
-import socket
 import time
 import traceback
-import urllib
 import urllib2
 
 log = CPLog(__name__)
@@ -114,7 +113,6 @@ class Plugin(object):
                 del self.http_failed_disabled[host]
 
         self.wait(host)
-
         try:
 
             if multipart:
@@ -127,7 +125,7 @@ class Plugin(object):
                 data = opener.open(request, timeout = timeout).read()
             else:
                 log.info('Opening url: %s, params: %s' % (url, [x for x in params.iterkeys()]))
-                data = urllib.urlencode(params) if len(params) > 0 else None
+                data = tryUrlencode(params) if len(params) > 0 else None
                 request = urllib2.Request(url, data, headers)
 
                 data = urllib2.urlopen(request, timeout = timeout).read()

couchpotato/core/plugins/library/main.py

@@ -1,6 +1,7 @@
 from couchpotato import get_session
 from couchpotato.core.event import addEvent, fireEventAsync, fireEvent
-from couchpotato.core.helpers.encoding import toUnicode, simplifyString
+from couchpotato.core.helpers.encoding import toUnicode, simplifyString, \
+    tryUrlencode
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.core.settings.model import Library, LibraryTitle, File
@@ -45,7 +46,7 @@ class LibraryPlugin(Plugin):
         # Update library info
         if update_after is not False:
             handle = fireEventAsync if update_after is 'async' else fireEvent
-            handle('library.update', identifier = l.identifier, default_title = attrs.get('title', ''))
+            handle('library.update', identifier = l.identifier, default_title = toUnicode(attrs.get('title', '')))
 
         return l.to_dict(self.default_dict)
 
@@ -86,10 +87,11 @@ class LibraryPlugin(Plugin):
             for title in titles:
                 if not title:
                     continue
+                title = toUnicode(title)
                 t = LibraryTitle(
-                    title = toUnicode(title),
+                    title = title,
                     simple_title = self.simplifyTitle(title),
-                    default = title.lower() == default_title.lower() or (default_title is '' and titles[0] == title)
+                    default = title.lower() == toUnicode(default_title.lower()) or (toUnicode(default_title) == u'' and toUnicode(titles[0]) == title)
                 )
                 library.titles.append(t)
 

couchpotato/core/plugins/movie/main.py

@@ -1,8 +1,9 @@
 from couchpotato import get_session
 from couchpotato.api import addApiView
 from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import getParams, jsonified
+from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode, \
+    simplifyString
+from couchpotato.core.helpers.request import getParams, jsonified, getParam
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.core.settings.model import Movie, Library, LibraryTitle
@@ -10,7 +11,6 @@ from couchpotato.environment import Env
 from sqlalchemy.orm import joinedload_all
 from sqlalchemy.sql.expression import or_, asc, not_
 from string import ascii_lowercase
-from urllib import urlencode
 
 log = CPLog(__name__)
 
@@ -225,7 +225,6 @@ class MoviePlugin(Plugin):
             if title.default: default_title = title.title
 
         if movie:
-            #addEvent('library.update.after', )
             fireEventAsync('library.update', identifier = movie.library.identifier, default_title = default_title, force = True)
             fireEventAsync('searcher.single', movie.to_dict(self.default_dict))
 
@@ -235,12 +234,12 @@ class MoviePlugin(Plugin):
 
     def search(self):
 
-        params = getParams()
-        cache_key = '%s/%s' % (__name__, urlencode(params))
+        q = getParam('q')
+        cache_key = u'%s/%s' % (__name__, simplifyString(q))
         movies = Env.get('cache').get(cache_key)
 
         if not movies:
-            movies = fireEvent('movie.search', q = params.get('q'), merge = True)
+            movies = fireEvent('movie.search', q = q, merge = True)
             Env.get('cache').set(cache_key, movies)
 
         return jsonified({
@@ -335,7 +334,7 @@ class MoviePlugin(Plugin):
             # Default title
             if params.get('default_title'):
                 for title in m.library.titles:
-                    title.default = params.get('default_title').lower() == title.title.lower()
+                    title.default = toUnicode(params.get('default_title', '')).lower() == toUnicode(title.title).lower()
 
             db.commit()