3 files changed, 4 insertions, 72 deletions
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py
index 301b033d4..ab7ff1099 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/container/CCF.py
@@ -4,13 +4,13 @@
 import re
 from urllib2 import build_opener
 
-from module.plugins.Container import Container
+from module.plugins.Crypter import Crypter
 from module.lib.MultipartPostHandler import MultipartPostHandler
 
 from os import makedirs
 from os.path import exists, join
 
-class CCF(Container):
+class CCF(Crypter):
     __name__ = "CCF"
     __version__ = "0.2"
     __pattern__ = r"(?!http://).*\.ccf$"
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
deleted file mode 100644
index fefeaf486..000000000
--- a/module/plugins/container/LinkList.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import codecs
-from module.utils import fs_encode
-from module.plugins.Container import Container
-
-class LinkList(Container):
-    __name__ = "LinkList"
-    __version__ = "0.12"
-    __pattern__ = r".+\.txt$"
-    __description__ = """Read Link Lists in txt format"""
-    __config__ = [("clear", "bool", "Clear Linklist after adding", False),
-                  ("encoding", "string", "File encoding (default utf-8)", "")]
-    __author_name__ = ("spoob", "jeix")
-    __author_mail__ = ("spoob@pyload.org", "jeix@hasnomail.com")
-
-    def decrypt(self, pyfile):
-        try:
-            file_enc = codecs.lookup(self.getConfig("encoding")).name
-        except:
-            file_enc = "utf-8"
-        
-        print repr(pyfile.url)
-        print pyfile.url
-        
-        file_name = fs_encode(pyfile.url)
-        
-        txt = codecs.open(file_name, 'r', file_enc)
-        links = txt.readlines()
-        curPack = "Parsed links from %s" % pyfile.name
-        
-        packages = {curPack:[],}
-        
-        for link in links:
-            link = link.strip()
-            if not link: continue
-            
-            if link.startswith(";"):
-                continue
-            if link.startswith("[") and link.endswith("]"):
-                # new package
-                curPack = link[1:-1]
-                packages[curPack] = []
-                continue
-            packages[curPack].append(link)
-        txt.close()
-        
-        # empty packages fix
-
-        delete = []
-        
-        for key,value in packages.iteritems():
-            if not value:
-                delete.append(key)
-                
-        for key in delete:
-            del packages[key]
-
-        if self.getConfig("clear"):
-            try:
-                txt = open(file_name, 'wb')
-                txt.close()
-            except:
-                self.log.warning(_("LinkList could not be cleared."))
-        
-        for name, links in packages.iteritems():
-            self.packages.append((name, links, name))
diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py
index ea5cd67f2..cbc9864b1 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/container/RSDF.py
@@ -5,9 +5,9 @@ import base64
 import binascii
 import re
 
-from module.plugins.Container import Container
+from module.plugins.Crypter import Crypter
 
-class RSDF(Container):
+class RSDF(Crypter):
     __name__ = "RSDF"
     __version__ = "0.21"
     __pattern__ = r".*\.rsdf"