summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/Container.py18
-rw-r--r--module/plugins/Crypter.py10
-rw-r--r--module/plugins/container/LinkList.py5
3 files changed, 14 insertions, 19 deletions
diff --git a/module/plugins/Container.py b/module/plugins/Container.py
index 794c52508..729dc11e1 100644
--- a/module/plugins/Container.py
+++ b/module/plugins/Container.py
@@ -17,9 +17,11 @@
@author: mkaay
"""
-from module.plugins.Plugin import Plugin
+### can be left blank and removed in future, no seperation of crypter and container needed atm.
-class Container(Plugin):
+from module.plugins.Crypter import Crypter
+
+class Container(Crypter):
__name__ = "Container"
__version__ = "0.1"
__pattern__ = None
@@ -27,15 +29,3 @@ class Container(Plugin):
__description__ = """Base container plugin"""
__author_name__ = ("mkaay")
__author_mail__ = ("mkaay@mkaay.de")
-
- def decrypt(self):
- pass
-
- def createNewPackage(self):
- return False
-
- def getPackages(self):
- return []
-
- def getLinks(self):
- return []
diff --git a/module/plugins/Crypter.py b/module/plugins/Crypter.py
index 09558ad0b..e0459c714 100644
--- a/module/plugins/Crypter.py
+++ b/module/plugins/Crypter.py
@@ -27,3 +27,13 @@ class Crypter(Plugin):
__description__ = """Base crypter plugin"""
__author_name__ = ("mkaay")
__author_mail__ = ("mkaay@mkaay.de")
+
+ #----------------------------------------------------------------------
+ def createPackage(self, name, urls):
+ """ create a new package """
+ pass
+
+ def fillCurrentPackage(self, name, urls):
+ """ rename current package and fill with urls"""
+ pass
+ \ No newline at end of file
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
index 9321c658f..3ffeeb193 100644
--- a/module/plugins/container/LinkList.py
+++ b/module/plugins/container/LinkList.py
@@ -12,11 +12,6 @@ class LinkList(Container):
__author_name__ = ("spoob", "jeix")
__author_mail__ = ("spoob@pyload.org", "jeix@hasnomail.com")
- def __init__(self, parent):
- Container.__init__(self, parent)
- self.parent = parent
- self.html = None
- self.read_config()
def proceed(self, linkList, location):
txt = open(linkList, 'r')