Fix __type__ for crypters

Merges vuolter/pyload@48af9ab

(cherry picked from commit 4061e76e218b82503a41af1d165e5feb7baeb283)

Conflicts:
	module/plugins/Crypter.py
	module/plugins/crypter/ChipDe.py
	module/plugins/hoster/ChipDe.py
	pyload/plugins/hoster/ChipDe.py

15 files changed, 15 insertions, 15 deletions

diff --git a/pyload/plugins/crypter/C1neonCom.py b/pyload/plugins/crypter/C1neonCom.py
index da94f22f5..fd4d64d44 100644
--- a/pyload/plugins/crypter/C1neonCom.py
+++ b/pyload/plugins/crypter/C1neonCom.py
@@ -5,7 +5,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 
 class C1neonCom(DeadCrypter):
     __name__ = "C1neonCom"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(www\.)?c1neon.com/.*?"
     __version__ = "0.05"
     __description__ = """C1neon.com decrypter plugin"""
diff --git a/pyload/plugins/crypter/CryptItCom.py b/pyload/plugins/crypter/CryptItCom.py
index b57013d01..f00b3c5e6 100644
--- a/pyload/plugins/crypter/CryptItCom.py
+++ b/pyload/plugins/crypter/CryptItCom.py
@@ -5,7 +5,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 
 class CryptItCom(DeadCrypter):
     __name__ = "CryptItCom"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://[\w\.]*?crypt-it\.com/(s|e|d|c)/[\w]+"
     __version__ = "0.11"
     __description__ = """Crypt-it.com decrypter plugin"""
diff --git a/pyload/plugins/crypter/DDLMusicOrg.py b/pyload/plugins/crypter/DDLMusicOrg.py
index 9ee00a8fc..107220fd2 100644
--- a/pyload/plugins/crypter/DDLMusicOrg.py
+++ b/pyload/plugins/crypter/DDLMusicOrg.py
@@ -9,7 +9,7 @@ from module.plugins.Crypter import Crypter
 
 class DDLMusicOrg(Crypter):
     __name__ = "DDLMusicOrg"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://[\w\.]*?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+"
     __version__ = "0.3"
     __description__ = """Ddl-music.org decrypter plugin"""
diff --git a/pyload/plugins/crypter/DuckCryptInfo.py b/pyload/plugins/crypter/DuckCryptInfo.py
index b182884a1..680ddf222 100644
--- a/pyload/plugins/crypter/DuckCryptInfo.py
+++ b/pyload/plugins/crypter/DuckCryptInfo.py
@@ -7,7 +7,7 @@ from module.plugins.Crypter import Crypter
 
 class DuckCryptInfo(Crypter):
     __name__ = "DuckCryptInfo"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(?:www\.)?duckcrypt.info/(folder|wait|link)/(\w+)/?(\w*)"
     __version__ = "0.02"
     __description__ = """DuckCrypt.info decrypter plugin"""
diff --git a/pyload/plugins/crypter/FourChanOrg.py b/pyload/plugins/crypter/FourChanOrg.py
index 2cffc6ac2..34649f6df 100644
--- a/pyload/plugins/crypter/FourChanOrg.py
+++ b/pyload/plugins/crypter/FourChanOrg.py
@@ -10,7 +10,7 @@ class FourChanOrg(Crypter):
     # Based on 4chandl by Roland Beermann
     # https://gist.github.com/enkore/3492599
     __name__ = "FourChanOrg"
-    __type__ = "container"
+    __type__ = "crypter"
     __version__ = "0.3"
     __pattern__ = r"http://boards\.4chan.org/\w+/res/(\d+)"
     __description__ = """4chan.org folder decrypter plugin"""
diff --git a/pyload/plugins/crypter/HoerbuchIn.py b/pyload/plugins/crypter/HoerbuchIn.py
index 9d58873e8..2a4236de1 100644
--- a/pyload/plugins/crypter/HoerbuchIn.py
+++ b/pyload/plugins/crypter/HoerbuchIn.py
@@ -9,7 +9,7 @@ from module.lib.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
 
 class HoerbuchIn(Crypter):
     __name__ = "HoerbuchIn"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out.php\?.+|protection/folder_\d+\.html)"
     __version__ = "0.7"
     __description__ = """Hoerbuch.in Container Plugin"""
diff --git a/pyload/plugins/crypter/LixIn.py b/pyload/plugins/crypter/LixIn.py
index f180e5677..84f340d44 100644
--- a/pyload/plugins/crypter/LixIn.py
+++ b/pyload/plugins/crypter/LixIn.py
@@ -8,7 +8,7 @@ from module.plugins.Crypter import Crypter
 
 class LixIn(Crypter):
     __name__ = "LixIn"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(www.)?lix.in/(?P<id>.*)"
     __version__ = "0.22"
     __description__ = """Lix.in decrypter plugin"""
diff --git a/pyload/plugins/crypter/LofCc.py b/pyload/plugins/crypter/LofCc.py
index 173d710c6..1f0113d55 100644
--- a/pyload/plugins/crypter/LofCc.py
+++ b/pyload/plugins/crypter/LofCc.py
@@ -5,7 +5,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 
 class LofCc(DeadCrypter):
     __name__ = "LofCc"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://lof.cc/(.*)"
     __version__ = "0.21"
     __description__ = """Lof.cc decrypter plugin"""
diff --git a/pyload/plugins/crypter/MBLinkInfo.py b/pyload/plugins/crypter/MBLinkInfo.py
index a32c742f2..ee05a97bb 100644
--- a/pyload/plugins/crypter/MBLinkInfo.py
+++ b/pyload/plugins/crypter/MBLinkInfo.py
@@ -5,7 +5,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 
 class MBLinkInfo(DeadCrypter):
     __name__ = "MBLinkInfo"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(?:www\.)?mblink\.info/?\?id=(\d+)"
     __version__ = "0.03"
     __description__ = """MBLink.info decrypter plugin"""
diff --git a/pyload/plugins/crypter/Movie2kTo.py b/pyload/plugins/crypter/Movie2kTo.py
index 548f40f1c..b283e237f 100644
--- a/pyload/plugins/crypter/Movie2kTo.py
+++ b/pyload/plugins/crypter/Movie2kTo.py
@@ -5,7 +5,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 
 class Movie2kTo(DeadCrypter):
     __name__ = "Movie2kTo"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(?:www\.)?movie2k\.to/(.*)\.html"
     __version__ = "0.51"
     __description__ = """Movie2k.to decrypter plugin"""
diff --git a/pyload/plugins/crypter/OneKhDe.py b/pyload/plugins/crypter/OneKhDe.py
index f6c3aff86..141aaf27a 100644
--- a/pyload/plugins/crypter/OneKhDe.py
+++ b/pyload/plugins/crypter/OneKhDe.py
@@ -9,7 +9,7 @@ from module.plugins.Crypter import Crypter
 
 class OneKhDe(Crypter):
     __name__ = "OneKhDe"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(www\.)?1kh.de/f/"
     __version__ = "0.1"
     __description__ = """1kh.de decrypter plugin"""
diff --git a/pyload/plugins/crypter/RSLayerCom.py b/pyload/plugins/crypter/RSLayerCom.py
index d4e69b38f..320ae2186 100644
--- a/pyload/plugins/crypter/RSLayerCom.py
+++ b/pyload/plugins/crypter/RSLayerCom.py
@@ -5,7 +5,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 
 class RSLayerCom(DeadCrypter):
     __name__ = "RSLayerCom"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(www\.)?rs-layer.com/directory-"
     __version__ = "0.21"
     __description__ = """RS-Layer.com decrypter plugin"""
diff --git a/pyload/plugins/crypter/SecuredIn.py b/pyload/plugins/crypter/SecuredIn.py
index 3bb3ed8bd..299013c49 100644
--- a/pyload/plugins/crypter/SecuredIn.py
+++ b/pyload/plugins/crypter/SecuredIn.py
@@ -5,7 +5,7 @@ from module.plugins.internal.DeadCrypter import DeadCrypter
 
 class SecuredIn(DeadCrypter):
     __name__ = "SecuredIn"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://[\w\.]*?secured\.in/download-[\d]+-[\w]{8}\.html"
     __version__ = "0.21"
     __description__ = """Secured.in decrypter plugin"""
diff --git a/pyload/plugins/crypter/SerienjunkiesOrg.py b/pyload/plugins/crypter/SerienjunkiesOrg.py
index 8c6604c0a..177a83eda 100644
--- a/pyload/plugins/crypter/SerienjunkiesOrg.py
+++ b/pyload/plugins/crypter/SerienjunkiesOrg.py
@@ -12,7 +12,7 @@ from module.unescape import unescape
 
 class SerienjunkiesOrg(Crypter):
     __name__ = "SerienjunkiesOrg"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?"
     __version__ = "0.39"
     __config__ = [
diff --git a/pyload/plugins/crypter/StealthTo.py b/pyload/plugins/crypter/StealthTo.py
index 713c9376c..1afdcd50b 100644
--- a/pyload/plugins/crypter/StealthTo.py
+++ b/pyload/plugins/crypter/StealthTo.py
@@ -8,7 +8,7 @@ from module.plugins.Crypter import Crypter
 
 class StealthTo(Crypter):
     __name__ = "StealthTo"
-    __type__ = "container"
+    __type__ = "crypter"
     __pattern__ = r"http://(www\.)?stealth.to/folder/"
     __version__ = "0.1"
     __description__ = """Stealth.to decrypter plugin"""