From 766f819c0b1869daada1e788c5834ea6998eb518 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 14 Dec 2014 12:06:03 +0100 Subject: [PATCH 1/2] Userscript for RT not parsing URL correctly --- .../core/media/movie/providers/userscript/rottentomatoes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py b/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py index 902192e2..a61c3131 100644 --- a/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py +++ b/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py @@ -12,7 +12,7 @@ autoload = 'RottenTomatoes' class RottenTomatoes(UserscriptBase): - includes = ['*://www.rottentomatoes.com/m/*/'] + includes = ['*://www.rottentomatoes.com/m/*'] excludes = ['*://www.rottentomatoes.com/m/*/*/'] version = 2 From 814ddfb79f7cbbf4095d3a61679f15767cfe4c29 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 14 Dec 2014 12:33:28 +0100 Subject: [PATCH 2/2] Don't return password fields fix #4300 --- couchpotato/core/settings.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/couchpotato/core/settings.py b/couchpotato/core/settings.py index 4315ec18..ffc142ae 100644 --- a/couchpotato/core/settings.py +++ b/couchpotato/core/settings.py @@ -157,7 +157,15 @@ class Settings(object): values[section] = {} for option in self.p.items(section): (option_name, option_value) = option + + is_password = False + try: is_password = self.types[section][option_name] == 'password' + except: pass + values[section][option_name] = self.get(option_name, section) + if is_password and values[section][option_name]: + values[section][option_name] = len(values[section][option_name]) * '*' + return values def save(self):