Fix previous merge

4 files changed, 52 insertions, 3 deletions

diff --git a/pyload/plugins/crypter/FilecryptCc.py b/pyload/plugins/crypter/FilecryptCc.py
index 160253c06..ee8076b17 100644
--- a/pyload/plugins/crypter/FilecryptCc.py
+++ b/pyload/plugins/crypter/FilecryptCc.py
@@ -6,7 +6,7 @@ import re
 
 from Crypto.Cipher import AES
 
-from pyload.plugins.Crypter import Crypter
+from pyload.plugins.internal.Crypter import Crypter
 
 
 class FilecryptCc(Crypter):
diff --git a/pyload/plugins/crypter/Go4UpCom.py b/pyload/plugins/crypter/Go4UpCom.py
new file mode 100644
index 000000000..f63695912
--- /dev/null
+++ b/pyload/plugins/crypter/Go4UpCom.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from urlparse import urljoin
+
+from pyload.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
+
+
+class Go4UpCom(SimpleCrypter):
+    __name__    = "Go4UpCom"
+    __type__    = "crypter"
+    __version__ = "0.11"
+
+    __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)'
+
+    __description__ = """Go4Up.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("rlindner81", "rlindner81@gmail.com"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    LINK_PATTERN = r'(http://go4up\.com/rd/.+?)<'
+
+    NAME_PATTERN = r'<title>Download (.+?)<'
+
+    OFFLINE_PATTERN = r'>\s*(404 Page Not Found|File not Found|Mirror does not exist)'
+
+
+    def getLinks(self
+        links = []
+
+        m = re.search(r'(/download/gethosts/.+?)"')
+        if m:
+            self.html = self.load(urljoin("http://go4up.com/", m.group(1)))
+            pages = [self.load(url) for url in re.findall(self.LINK_PATTERN, self.html)]
+        else:
+            pages = [self.html]
+
+        for html in pages:
+            try:
+                links.append(re.search(r'<b><a href="(.+?)"', html).group(1))
+            except:
+                continue
+
+        return links
+
+
+getInfo = create_getInfo(Go4UpCom)
diff --git a/pyload/plugins/crypter/NCryptIn.py b/pyload/plugins/crypter/NCryptIn.py
index b5b496a3f..15cfdaa03 100644
--- a/pyload/plugins/crypter/NCryptIn.py
+++ b/pyload/plugins/crypter/NCryptIn.py
@@ -7,7 +7,7 @@ import re
 from Crypto.Cipher import AES
 
 from pyload.plugins.internal.Crypter import Crypter
-from pyload.plugins.internal.CaptchaService import ReCaptcha
+from pyload.plugins.internal.captcha import ReCaptcha
 
 
 class NCryptIn(Crypter):
diff --git a/pyload/plugins/crypter/SafelinkingNet.py b/pyload/plugins/crypter/SafelinkingNet.py
index 38eb36ea5..681e07cd1 100644
--- a/pyload/plugins/crypter/SafelinkingNet.py
+++ b/pyload/plugins/crypter/SafelinkingNet.py
@@ -8,7 +8,7 @@ from BeautifulSoup import BeautifulSoup
 
 from pyload.utils import json_loads
 from pyload.plugins.internal.Crypter import Crypter
-from pyload.plugins.internal.CaptchaService import SolveMedia
+from pyload.plugins.internal.captcha import SolveMedia
 
 
 class SafelinkingNet(Crypter):