refactored plugins, new plugin manager

3 files changed, 27 insertions, 36 deletions

diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
index 9d7116900..1e25ef623 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -5,22 +5,19 @@ import re
 import tempfile
 import urllib2
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Container import Container
 from module.network.MultipartPostHandler import MultipartPostHandler
 
-class CCF(Plugin):
+class CCF(Container):
+    __name__ = "CCF"
+    __version__ = "0.1"
+    __pattern__ = r"(?!http://).*\.ccf"
+    __description__ = """CCF Container Convert Plugin"""
+    __author_name__ = ("Willnix")
+    __author_mail__ = ("Willnix@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "CCF"
-        props['type'] = "container"
-        props['pattern'] = r"(?!http://).*\.ccf"
-        props['version'] = "0.1"
-        props['description'] = """CCF Container Convert Plugin"""
-        props['author_name'] = ("Willnix")
-        props['author_mail'] = ("Willnix@pyload.org")
-        self.props = props
+        Container.__init__(self, parent)
         self.parent = parent
         self.multi_dl = True
         self.links = []
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
index b45ab83d0..cadf491a9 100644
--- a/module/plugins/container/LinkList.py
+++ b/module/plugins/container/LinkList.py
@@ -2,21 +2,18 @@
 # -*- coding: utf-8 -*-
 
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Container import Container
 
-class LinkList(Plugin):
+class LinkList(Container):
+    __name__ = "LinkList"
+    __version__ = "0.1"
+    __pattern__ = r"(?!http://).*\.txt"
+    __description__ = """Read Link Lists in txt format"""
+    __author_name__ = ("spoob")
+    __author_mail__ = ("spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "LinkList"
-        props['type'] = "container"
-        props['pattern'] = r"(?!http://).*\.txt"
-        props['version'] = "0.1"
-        props['description'] = """Read Link Lists in txt format"""
-        props['author_name'] = ("Spoob")
-        props['author_mail'] = ("spoob@pyload.org")
-        self.props = props
+        Container.__init__(self, parent)
         self.parent = parent
         self.html = None
         self.read_config()
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
index 9604495fd..c906fe05a 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/container/RSDF.py
@@ -4,21 +4,18 @@
 import base64
 import binascii
 
-from module.plugins.Plugin import Plugin
+from module.plugins.Container import Container
 
-class RSDF(Plugin):
+class RSDF(Container):
+    __name__ = "RSDF"
+    __version__ = "0.2"
+    __pattern__ = r"(?!http://).*\.rsdf"
+    __description__ = """RSDF Container Decode Plugin"""
+    __author_name__ = ("RaNaN", "spoob")
+    __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org")
 
     def __init__(self, parent):
-        Plugin.__init__(self, parent)
-        props = {}
-        props['name'] = "RSDF"
-        props['type'] = "container"
-        props['pattern'] = r"(?!http://).*\.rsdf"
-        props['version'] = "0.2"
-        props['description'] = """RSDF Container Decode Plugin"""
-        props['author_name'] = ("RaNaN", "spoob")
-        props['author_mail'] = ("RaNaN@pyload.org", "spoob@pyload.org")
-        self.props = props
+        Container.__init__(self, parent)
         self.parent = parent
         self.multi_dl = True
         self.links = []