From d79a25bb5b380019f49d6d131ec69cc69d8fd361 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Tue, 27 Sep 2011 07:43:21 +0200
Subject: [PATCH] Extension -> Userscript

---
 couchpotato/core/loader.py                    | 22 +++++++++----------
 .../{extension => userscript}/__init__.py     |  0
 .../plugins/{extension => userscript}/main.py | 10 ++++-----
 .../{extension => userscript}/template.js     |  2 +-
 .../{extension => userscript}/__init__.py     |  0
 .../allocine/__init__.py                      |  0
 .../allocine/main.py                          |  4 ++--
 .../appletrailers/__init__.py                 |  0
 .../appletrailers/main.py                     |  4 ++--
 .../{extension => userscript}/base.py         | 10 ++++-----
 .../imdb/__init__.py                          |  0
 .../{extension => userscript}/imdb/main.py    |  4 ++--
 .../moviemeter/__init__.py                    |  0
 .../moviemeter/main.py                        |  4 ++--
 .../sharethe/__init__.py                      |  0
 .../sharethe/main.py                          |  4 ++--
 .../tmdb/__init__.py                          |  0
 .../{extension => userscript}/tmdb/main.py    |  4 ++--
 .../trakt/__init__.py                         |  0
 .../{extension => userscript}/trakt/main.py   |  4 ++--
 .../whiwa/__init__.py                         |  0
 .../{extension => userscript}/whiwa/main.py   |  4 ++--
 22 files changed, 38 insertions(+), 38 deletions(-)
 rename couchpotato/core/plugins/{extension => userscript}/__init__.py (100%)
 rename couchpotato/core/plugins/{extension => userscript}/main.py (69%)
 rename couchpotato/core/plugins/{extension => userscript}/template.js (98%)
 rename couchpotato/core/providers/{extension => userscript}/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/allocine/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/allocine/main.py (87%)
 rename couchpotato/core/providers/{extension => userscript}/appletrailers/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/appletrailers/main.py (84%)
 rename couchpotato/core/providers/{extension => userscript}/base.py (62%)
 rename couchpotato/core/providers/{extension => userscript}/imdb/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/imdb/main.py (95%)
 rename couchpotato/core/providers/{extension => userscript}/moviemeter/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/moviemeter/main.py (90%)
 rename couchpotato/core/providers/{extension => userscript}/sharethe/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/sharethe/main.py (89%)
 rename couchpotato/core/providers/{extension => userscript}/tmdb/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/tmdb/main.py (84%)
 rename couchpotato/core/providers/{extension => userscript}/trakt/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/trakt/main.py (88%)
 rename couchpotato/core/providers/{extension => userscript}/whiwa/__init__.py (100%)
 rename couchpotato/core/providers/{extension => userscript}/whiwa/main.py (90%)

diff --git a/couchpotato/core/loader.py b/couchpotato/core/loader.py
index e249efb5..f215c7ed 100644
--- a/couchpotato/core/loader.py
+++ b/couchpotato/core/loader.py
@@ -19,17 +19,17 @@ class Loader:
         providers = os.path.join(root, 'couchpotato', 'core', 'providers')
 
         self.paths = {
-            'core' : (0, 'couchpotato.core._base', os.path.join(core, '_base')),
-            'plugin' : (1, 'couchpotato.core.plugins', os.path.join(core, 'plugins')),
-            'notifications' : (20, 'couchpotato.core.notifications', os.path.join(core, 'notifications')),
-            'downloaders' : (20, 'couchpotato.core.downloaders', os.path.join(core, 'downloaders')),
-            'movie_provider' : (20, 'couchpotato.core.providers.movie', os.path.join(providers, 'movie')),
-            'nzb_provider' : (20, 'couchpotato.core.providers.nzb', os.path.join(providers, 'nzb')),
-            'torrent_provider' : (20, 'couchpotato.core.providers.torrent', os.path.join(providers, 'torrent')),
-            'trailer_provider' : (20, 'couchpotato.core.providers.trailer', os.path.join(providers, 'trailer')),
-            'subtitle_provider' : (20, 'couchpotato.core.providers.subtitle', os.path.join(providers, 'subtitle')),
-            'metadata_provider' : (25, 'couchpotato.core.providers.metadata', os.path.join(providers, 'metadata')),
-            'extension_provider' : (25, 'couchpotato.core.providers.extension', os.path.join(providers, 'extension')),
+            'core': (0, 'couchpotato.core._base', os.path.join(core, '_base')),
+            'plugin': (1, 'couchpotato.core.plugins', os.path.join(core, 'plugins')),
+            'notifications': (20, 'couchpotato.core.notifications', os.path.join(core, 'notifications')),
+            'downloaders': (20, 'couchpotato.core.downloaders', os.path.join(core, 'downloaders')),
+            'movie_provider': (20, 'couchpotato.core.providers.movie', os.path.join(providers, 'movie')),
+            'nzb_provider': (20, 'couchpotato.core.providers.nzb', os.path.join(providers, 'nzb')),
+            'torrent_provider': (20, 'couchpotato.core.providers.torrent', os.path.join(providers, 'torrent')),
+            'trailer_provider': (20, 'couchpotato.core.providers.trailer', os.path.join(providers, 'trailer')),
+            'subtitle_provider': (20, 'couchpotato.core.providers.subtitle', os.path.join(providers, 'subtitle')),
+            'metadata_provider': (25, 'couchpotato.core.providers.metadata', os.path.join(providers, 'metadata')),
+            'userscript_provider': (25, 'couchpotato.core.providers.userscript', os.path.join(providers, 'userscript')),
         }
 
         for type, tuple in self.paths.iteritems():
diff --git a/couchpotato/core/plugins/extension/__init__.py b/couchpotato/core/plugins/userscript/__init__.py
similarity index 100%
rename from couchpotato/core/plugins/extension/__init__.py
rename to couchpotato/core/plugins/userscript/__init__.py
diff --git a/couchpotato/core/plugins/extension/main.py b/couchpotato/core/plugins/userscript/main.py
similarity index 69%
rename from couchpotato/core/plugins/extension/main.py
rename to couchpotato/core/plugins/userscript/main.py
index 3d9bf2fc..2efd9baa 100644
--- a/couchpotato/core/plugins/extension/main.py
+++ b/couchpotato/core/plugins/userscript/main.py
@@ -10,15 +10,15 @@ import os
 class Extension(Plugin):
 
     def __init__(self):
-        addApiView('extension', self.getExtension)
+        addApiView('userscript', self.getExtension)
 
     def getExtension(self):
 
         params = {
-            'includes': fireEvent('extension.get_includes', merge = True),
-            'excludes': fireEvent('extension.get_excludes', merge = True),
+            'includes': fireEvent('userscript.get_includes', merge = True),
+            'excludes': fireEvent('userscript.get_excludes', merge = True),
             'version': self.getVersion(),
-            'host': '%s%sextension.add_via_url/' % (request.host_url.rstrip('/'), url_for('api.index')),
+            'host': '%s%userscript.add_via_url/' % (request.host_url.rstrip('/'), url_for('api.index')),
         }
 
         template = open(os.path.join(os.path.dirname(__file__), 'template.js'), 'r').read()
@@ -26,7 +26,7 @@ class Extension(Plugin):
 
     def getVersion(self):
 
-        versions = fireEvent('extension.get_version')
+        versions = fireEvent('userscript.get_version')
 
         version = 0
         for v in versions:
diff --git a/couchpotato/core/plugins/extension/template.js b/couchpotato/core/plugins/userscript/template.js
similarity index 98%
rename from couchpotato/core/plugins/extension/template.js
rename to couchpotato/core/plugins/userscript/template.js
index ab97f74e..4b6e0f6d 100644
--- a/couchpotato/core/plugins/extension/template.js
+++ b/couchpotato/core/plugins/userscript/template.js
@@ -67,7 +67,7 @@ var osd = function(){
     var navbar, newElement;
 
     var iFrame = create('iframe', {
-        'src': cpLocation + "extension.add_via_url/?url=" + escape(document.location),
+        'src': cpLocation + "userscript.add_via_url/?url=" + escape(document.location),
         'frameborder': 0,
         'scrolling': 'no'
     });
diff --git a/couchpotato/core/providers/extension/__init__.py b/couchpotato/core/providers/userscript/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/__init__.py
rename to couchpotato/core/providers/userscript/__init__.py
diff --git a/couchpotato/core/providers/extension/allocine/__init__.py b/couchpotato/core/providers/userscript/allocine/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/allocine/__init__.py
rename to couchpotato/core/providers/userscript/allocine/__init__.py
diff --git a/couchpotato/core/providers/extension/allocine/main.py b/couchpotato/core/providers/userscript/allocine/main.py
similarity index 87%
rename from couchpotato/core/providers/extension/allocine/main.py
rename to couchpotato/core/providers/userscript/allocine/main.py
index 11e357ad..84afee18 100644
--- a/couchpotato/core/providers/extension/allocine/main.py
+++ b/couchpotato/core/providers/userscript/allocine/main.py
@@ -1,7 +1,7 @@
-from couchpotato.core.providers.extension.base import ExtensionBase
+from couchpotato.core.providers.userscript.base import UserscriptBase
 
 
-class AlloCine(ExtensionBase):
+class AlloCine(UserscriptBase):
 
     includes = ['http://www.allocine.fr/film/*']
 
diff --git a/couchpotato/core/providers/extension/appletrailers/__init__.py b/couchpotato/core/providers/userscript/appletrailers/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/appletrailers/__init__.py
rename to couchpotato/core/providers/userscript/appletrailers/__init__.py
diff --git a/couchpotato/core/providers/extension/appletrailers/main.py b/couchpotato/core/providers/userscript/appletrailers/main.py
similarity index 84%
rename from couchpotato/core/providers/extension/appletrailers/main.py
rename to couchpotato/core/providers/userscript/appletrailers/main.py
index f77db065..88f9f047 100644
--- a/couchpotato/core/providers/extension/appletrailers/main.py
+++ b/couchpotato/core/providers/userscript/appletrailers/main.py
@@ -1,7 +1,7 @@
-from couchpotato.core.providers.extension.base import ExtensionBase
+from couchpotato.core.providers.userscript.base import UserscriptBase
 
 
-class AppleTrailers(ExtensionBase):
+class AppleTrailers(UserscriptBase):
 
     includes = ['http://trailers.apple.com/trailers/*']
 
diff --git a/couchpotato/core/providers/extension/base.py b/couchpotato/core/providers/userscript/base.py
similarity index 62%
rename from couchpotato/core/providers/extension/base.py
rename to couchpotato/core/providers/userscript/base.py
index d80e9938..8c68070e 100644
--- a/couchpotato/core/providers/extension/base.py
+++ b/couchpotato/core/providers/userscript/base.py
@@ -5,7 +5,7 @@ from couchpotato.core.plugins.base import Plugin
 log = CPLog(__name__)
 
 
-class ExtensionBase(Plugin):
+class UserscriptBase(Plugin):
 
     version = 1
 
@@ -13,11 +13,11 @@ class ExtensionBase(Plugin):
     excludes = []
 
     def __init__(self):
-        addEvent('extension.add_via_url', self.addViaUrl)
-        addEvent('extension.get_includes', self.getInclude)
-        addEvent('extension.get_excludes', self.getExclude)
+        addEvent('userscript.add_via_url', self.addViaUrl)
+        addEvent('userscript.get_includes', self.getInclude)
+        addEvent('userscript.get_excludes', self.getExclude)
 
-        addEvent('extension.get_version', self.getVersion)
+        addEvent('userscript.get_version', self.getVersion)
 
     def addViaUrl(self):
         pass
diff --git a/couchpotato/core/providers/extension/imdb/__init__.py b/couchpotato/core/providers/userscript/imdb/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/imdb/__init__.py
rename to couchpotato/core/providers/userscript/imdb/__init__.py
diff --git a/couchpotato/core/providers/extension/imdb/main.py b/couchpotato/core/providers/userscript/imdb/main.py
similarity index 95%
rename from couchpotato/core/providers/extension/imdb/main.py
rename to couchpotato/core/providers/userscript/imdb/main.py
index 2734c039..b4722531 100644
--- a/couchpotato/core/providers/extension/imdb/main.py
+++ b/couchpotato/core/providers/userscript/imdb/main.py
@@ -1,9 +1,9 @@
 from beautifulsoup import BeautifulSoup
-from couchpotato.core.providers.extension.base import ExtensionBase
+from couchpotato.core.providers.userscript.base import UserscriptBase
 import re
 
 
-class IMDB(ExtensionBase):
+class IMDB(UserscriptBase):
 
     includes = ['http*://*.imdb.com/title/tt*', 'http*://imdb.com/title/tt*']
 
diff --git a/couchpotato/core/providers/extension/moviemeter/__init__.py b/couchpotato/core/providers/userscript/moviemeter/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/moviemeter/__init__.py
rename to couchpotato/core/providers/userscript/moviemeter/__init__.py
diff --git a/couchpotato/core/providers/extension/moviemeter/main.py b/couchpotato/core/providers/userscript/moviemeter/main.py
similarity index 90%
rename from couchpotato/core/providers/extension/moviemeter/main.py
rename to couchpotato/core/providers/userscript/moviemeter/main.py
index 7c45abab..f5ecb898 100644
--- a/couchpotato/core/providers/extension/moviemeter/main.py
+++ b/couchpotato/core/providers/userscript/moviemeter/main.py
@@ -1,7 +1,7 @@
-from couchpotato.core.providers.extension.base import ExtensionBase
+from couchpotato.core.providers.userscript.base import UserscriptBase
 
 
-class MovieMeter(ExtensionBase):
+class MovieMeter(UserscriptBase):
 
     includes = ['http://*.moviemeter.nl/film/*', 'http://moviemeter.nl/film/*']
 
diff --git a/couchpotato/core/providers/extension/sharethe/__init__.py b/couchpotato/core/providers/userscript/sharethe/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/sharethe/__init__.py
rename to couchpotato/core/providers/userscript/sharethe/__init__.py
diff --git a/couchpotato/core/providers/extension/sharethe/main.py b/couchpotato/core/providers/userscript/sharethe/main.py
similarity index 89%
rename from couchpotato/core/providers/extension/sharethe/main.py
rename to couchpotato/core/providers/userscript/sharethe/main.py
index 0cfe968e..9320bf86 100644
--- a/couchpotato/core/providers/extension/sharethe/main.py
+++ b/couchpotato/core/providers/userscript/sharethe/main.py
@@ -1,7 +1,7 @@
-from couchpotato.core.providers.extension.base import ExtensionBase
+from couchpotato.core.providers.userscript.base import UserscriptBase
 
 
-class ShareThe(ExtensionBase):
+class ShareThe(UserscriptBase):
 
     includes = ['http://*.sharethe.tv/movies/*', 'http://sharethe.tv/movies/*']
 
diff --git a/couchpotato/core/providers/extension/tmdb/__init__.py b/couchpotato/core/providers/userscript/tmdb/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/tmdb/__init__.py
rename to couchpotato/core/providers/userscript/tmdb/__init__.py
diff --git a/couchpotato/core/providers/extension/tmdb/main.py b/couchpotato/core/providers/userscript/tmdb/main.py
similarity index 84%
rename from couchpotato/core/providers/extension/tmdb/main.py
rename to couchpotato/core/providers/userscript/tmdb/main.py
index 133a7c6f..90207c93 100644
--- a/couchpotato/core/providers/extension/tmdb/main.py
+++ b/couchpotato/core/providers/userscript/tmdb/main.py
@@ -1,7 +1,7 @@
-from couchpotato.core.providers.extension.base import ExtensionBase
+from couchpotato.core.providers.userscript.base import UserscriptBase
 
 
-class TMDB(ExtensionBase):
+class TMDB(UserscriptBase):
 
     includes = ['http://www.themoviedb.org/movie/*']
 
diff --git a/couchpotato/core/providers/extension/trakt/__init__.py b/couchpotato/core/providers/userscript/trakt/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/trakt/__init__.py
rename to couchpotato/core/providers/userscript/trakt/__init__.py
diff --git a/couchpotato/core/providers/extension/trakt/main.py b/couchpotato/core/providers/userscript/trakt/main.py
similarity index 88%
rename from couchpotato/core/providers/extension/trakt/main.py
rename to couchpotato/core/providers/userscript/trakt/main.py
index 99bb20fe..3c0570b9 100644
--- a/couchpotato/core/providers/extension/trakt/main.py
+++ b/couchpotato/core/providers/userscript/trakt/main.py
@@ -1,7 +1,7 @@
-from couchpotato.core.providers.extension.base import ExtensionBase
+from couchpotato.core.providers.userscript.base import UserscriptBase
 
 
-class Trakt(ExtensionBase):
+class Trakt(UserscriptBase):
 
     includes = ['http://trakt.tv/movie/*', 'http://*.trakt.tv/movie/*']
     excludes = ['http://trakt.tv/movie/*/*', 'http://*.trakt.tv/movie/*/*']
diff --git a/couchpotato/core/providers/extension/whiwa/__init__.py b/couchpotato/core/providers/userscript/whiwa/__init__.py
similarity index 100%
rename from couchpotato/core/providers/extension/whiwa/__init__.py
rename to couchpotato/core/providers/userscript/whiwa/__init__.py
diff --git a/couchpotato/core/providers/extension/whiwa/main.py b/couchpotato/core/providers/userscript/whiwa/main.py
similarity index 90%
rename from couchpotato/core/providers/extension/whiwa/main.py
rename to couchpotato/core/providers/userscript/whiwa/main.py
index 57a6a678..86617e0f 100644
--- a/couchpotato/core/providers/extension/whiwa/main.py
+++ b/couchpotato/core/providers/userscript/whiwa/main.py
@@ -1,7 +1,7 @@
-from couchpotato.core.providers.extension.base import ExtensionBase
+from couchpotato.core.providers.userscript.base import UserscriptBase
 
 
-class WHiWA(ExtensionBase):
+class WHiWA(UserscriptBase):
 
     includes = ['http://whiwa.net/stats/movie/*']