Ported Feeder(although not working on current deluge), Notifications, Scheduler, Stats, Toggle and WebUi to the deluge.plugins namespace.

deluge/plugins/Feeder/deluge/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Feeder/deluge/plugins/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Feeder/setup.py

@@ -34,7 +34,7 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 __plugin_name__ = "feeder"
 __author__ = "Fredrik Eriksson"
@@ -44,7 +44,7 @@ __url__ = ""
 __license__ = "GPLv3"
 __description__ = "A plugin for automatically downloadning torrents from a RSS-feed"
 __long_description__ = """"""
-__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
+__pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]}
 
 setup(
     name=__plugin_name__,
@@ -56,15 +56,16 @@ setup(
     license=__license__,
     long_description=__long_description__,
 
-    packages=[__plugin_name__.lower()],
+    packages=find_packages(),
+    namespace_packages = ["deluge", "deluge.plugins"],
     package_data = __pkg_data__,
 
     entry_points="""
     [deluge.plugin.core]
-    %s = %s:CorePlugin
+    %s = deluge.plugins.%s:CorePlugin
     [deluge.plugin.gtkui]
-    %s = %s:GtkUIPlugin
+    %s = deluge.plugins.%s:GtkUIPlugin
     [deluge.plugin.webui]
-    %s = %s:WebUIPlugin
+    %s = deluge.plugins.%s:WebUIPlugin
     """ % ((__plugin_name__, __plugin_name__.lower())*3)
 )

deluge/plugins/Notifications/deluge/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Notifications/deluge/plugins/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Notifications/deluge/plugins/notifications/common.py

@@ -50,7 +50,7 @@ except ImportError:
 
 def get_resource(filename):
     import pkg_resources, os
-    return pkg_resources.resource_filename("notifications",
+    return pkg_resources.resource_filename("deluge.plugins.notifications",
                                            os.path.join("data", filename))
 
 

deluge/plugins/Notifications/deluge/plugins/notifications/core.py

@@ -46,7 +46,7 @@ from deluge.plugins.pluginbase import CorePluginBase
 import deluge.configmanager
 from deluge.core.rpcserver import export
 
-from notifications.common import CustomNotifications
+from common import CustomNotifications
 
 DEFAULT_PREFS = {
     "smtp_enabled": False,

deluge/plugins/Notifications/setup.py

@@ -51,7 +51,7 @@ __long_description__ = __description__ + """\
 The plugin also allows other plugins to make use of itself for their own custom
 notifications.
 """
-__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
+__pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]}
 
 setup(
     name=__plugin_name__,
@@ -64,12 +64,13 @@ setup(
     long_description=__long_description__ if __long_description__ else __description__,
 
     packages=find_packages(exclude=['**/test.py']),
+    namespace_packages = ["deluge", "deluge.plugins"],
     package_data = __pkg_data__,
 
     entry_points="""
     [deluge.plugin.core]
-    %s = %s:CorePlugin
+    %s = deluge.plugins.%s:CorePlugin
     [deluge.plugin.gtkui]
-    %s = %s:GtkUIPlugin
+    %s = deluge.plugins.%s:GtkUIPlugin
     """ % ((__plugin_name__, __plugin_name__.lower())*2)
 )

deluge/plugins/Scheduler/deluge/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Scheduler/deluge/plugins/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Scheduler/deluge/plugins/scheduler/common.py

@@ -38,4 +38,5 @@
 
 def get_resource(filename):
     import pkg_resources, os
-    return pkg_resources.resource_filename("scheduler", os.path.join("data", filename))
+    return pkg_resources.resource_filename("deluge.plugins.scheduler",
+                                           os.path.join("data", filename))

deluge/plugins/Scheduler/deluge/plugins/scheduler/webui.py

@@ -44,5 +44,5 @@ from deluge.plugins.pluginbase import WebPluginBase
 from common import get_resource
 
 class WebUI(WebPluginBase):
-    
-    scripts = [get_resource("scheduler.js")]
+
+    scripts = [get_resource("scheduler.js")]

deluge/plugins/Scheduler/setup.py

@@ -36,7 +36,7 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 __plugin_name__ = "Scheduler"
 __author__ = "Andrew Resch"
@@ -46,7 +46,7 @@ __url__ = "http://deluge-torrent.org"
 __license__ = "GPLv3"
 __description__ = "Schedule limits on a per-hour per-day basis."
 __long_description__ = """"""
-__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
+__pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]}
 
 setup(
     name=__plugin_name__,
@@ -58,15 +58,16 @@ setup(
     license=__license__,
     long_description=__long_description__ if __long_description__ else __description__,
 
-    packages=[__plugin_name__.lower()],
+    packages=find_packages(),
+    namespace_packages = ["deluge", "deluge.plugins"],
     package_data = __pkg_data__,
 
     entry_points="""
     [deluge.plugin.core]
-    %s = %s:CorePlugin
+    %s = deluge.plugins.%s:CorePlugin
     [deluge.plugin.gtkui]
-    %s = %s:GtkUIPlugin
+    %s = deluge.plugins.%s:GtkUIPlugin
     [deluge.plugin.web]
-    %s = %s:WebUIPlugin
+    %s = deluge.plugins.%s:WebUIPlugin
     """ % ((__plugin_name__, __plugin_name__.lower())*3)
 )

deluge/plugins/Stats/deluge/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Stats/deluge/plugins/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Stats/deluge/plugins/stats/common.py

@@ -36,4 +36,5 @@ import pkg_resources
 import os.path
 
 def get_resource(filename):
-    return pkg_resources.resource_filename("stats", os.path.join("data", filename))
+    return pkg_resources.resource_filename("deluge.plugins.stats",
+                                           os.path.join("data", filename))

deluge/plugins/Stats/setup.py

@@ -45,7 +45,7 @@
 #    but you are not obligated to do so. If you do not wish to do so, delete
 #    this exception statement from your version. If you delete this exception
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 __plugin_name__ = "Stats"
 __author__ = "Martijn Voncken"
@@ -55,7 +55,7 @@ __url__ = "http://deluge-torrent.org"
 __license__ = "GPLv3"
 __description__ = ""
 __long_description__ = """"""
-__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
+__pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]}
 
 setup(
     name=__plugin_name__,
@@ -67,15 +67,16 @@ setup(
     license=__license__,
     long_description=__long_description__,
 
-    packages=[__plugin_name__.lower()],
+    packages=find_packages(),
+    namespace_packages = ["deluge", "deluge.plugins"],
     package_data = __pkg_data__,
 
     entry_points="""
     [deluge.plugin.core]
-    %s = %s:CorePlugin
+    %s = deluge.plugins.%s:CorePlugin
     [deluge.plugin.gtkui]
-    %s = %s:GtkUIPlugin
+    %s = deluge.plugins.%s:GtkUIPlugin
     [deluge.plugin.web]
-    %s = %s:WebUIPlugin
+    %s = deluge.plugins.%s:WebUIPlugin
     """ % ((__plugin_name__, __plugin_name__.lower())*3)
 )

deluge/plugins/Toggle/deluge/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Toggle/deluge/plugins/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/Toggle/deluge/plugins/toggle/common.py

@@ -39,4 +39,5 @@
 
 def get_resource(filename):
     import pkg_resources, os
-    return pkg_resources.resource_filename("toggle", os.path.join("data", filename))
+    return pkg_resources.resource_filename("deluge.plugins.toggle",
+                                           os.path.join("data", filename))

deluge/plugins/Toggle/setup.py

@@ -37,7 +37,7 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 __plugin_name__ = "Toggle"
 __author__ = "John Garland"
@@ -47,7 +47,7 @@ __url__ = "http://deluge-torrent.org"
 __license__ = "GPLv3"
 __description__ = "Toggles the session"
 __long_description__ = """"""
-__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
+__pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]}
 
 setup(
     name=__plugin_name__,
@@ -59,15 +59,16 @@ setup(
     license=__license__,
     long_description=__long_description__ if __long_description__ else __description__,
 
-    packages=[__plugin_name__.lower()],
+    packages=find_packages(),
+    namespace_packages = ["deluge", "deluge.plugins"],
     package_data = __pkg_data__,
 
     entry_points="""
     [deluge.plugin.core]
-    %s = %s:CorePlugin
+    %s = deluge.plugins.%s:CorePlugin
     [deluge.plugin.gtkui]
-    %s = %s:GtkUIPlugin
+    %s = deluge.plugins.%s:GtkUIPlugin
     [deluge.plugin.webui]
-    %s = %s:WebUIPlugin
+    %s = deluge.plugins.%s:WebUIPlugin
     """ % ((__plugin_name__, __plugin_name__.lower())*3)
 )

deluge/plugins/WebUi/deluge/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/WebUi/deluge/plugins/__init__.py

@@ -0,0 +1,3 @@
+# this is a namespace package
+import pkg_resources
+pkg_resources.declare_namespace(__name__)

deluge/plugins/WebUi/deluge/plugins/webui/common.py

@@ -38,4 +38,5 @@
 
 def get_resource(filename):
     import pkg_resources, os
-    return pkg_resources.resource_filename("webui", os.path.join("data", filename))
+    return pkg_resources.resource_filename("deluge.plugins.webui",
+                                           os.path.join("data", filename))

deluge/plugins/WebUi/setup.py

@@ -36,7 +36,7 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 __plugin_name__ = "WebUi"
 __author__ = "Damien Churchill"
@@ -46,7 +46,7 @@ __url__ = "http://deluge-torrent.org"
 __license__ = "GPLv3"
 __description__ = "Allows starting the web interface within the daemon."
 __long_description__ = """"""
-__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
+__pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]}
 
 setup(
     name=__plugin_name__,
@@ -58,13 +58,14 @@ setup(
     license=__license__,
     long_description=__long_description__ if __long_description__ else __description__,
 
-    packages=[__plugin_name__.lower()],
+    packages=find_packages(),
+    namespace_packages = ["deluge", "deluge.plugins"],
     package_data = __pkg_data__,
 
     entry_points="""
     [deluge.plugin.core]
-    %s = %s:CorePlugin
+    %s = deluge.plugins.%s:CorePlugin
     [deluge.plugin.gtkui]
-    %s = %s:GtkUIPlugin
+    %s = deluge.plugins.%s:GtkUIPlugin
     """ % ((__plugin_name__, __plugin_name__.lower())*2)
 )

deluge/scripts/create_plugin.py

@@ -360,6 +360,7 @@ GPL = """#
 # Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
 # Copyright (C) 2007-2009 Andrew Resch <andrewresch@gmail.com>
 # Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
+# Copyright (C) 2010 Pedro Algarvio <pedro@algarvio.me>
 #
 # Deluge is free software.
 #