Merge with 91d07331e1a9707a3dccb47a373ac516a7ebca8a

4 files changed, 44 insertions, 2 deletions

diff --git a/captcha/__init__.py b/captcha/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/captcha/__init__.py
diff --git a/captcha/captcha.py b/captcha/captcha.py
new file mode 100644
index 000000000..b57fa1b7e
--- /dev/null
+++ b/captcha/captcha.py
@@ -0,0 +1,25 @@
+import Image
+import ImageOps
+import subprocess
+
+class Ocr(object):
+    def __init__(self, image):
+        self.image = Image.open(image)
+        self.image_name = 'captcha_clean.png'
+        self.result_captcha = ''
+
+
+    def threshold(self, value):
+        self.image = self.image.point(lambda a: a * value +10)
+
+    def run_gocr(self):
+        self.image.save(self.image_name)
+        cmd = ['gocr', self.image_name]
+        self.result_captcha = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0].replace('\n','')
+
+    def get_captcha(self):
+        pass
+        
+if __name__ == '__main__':
+    ocr = Ocr('gigasize-com/7.jpg')
+    print  ocr.get_captcha()
diff --git a/captcha/gigasize-com.py b/captcha/gigasize-com.py
new file mode 100644
index 000000000..b48e20da4
--- /dev/null
+++ b/captcha/gigasize-com.py
@@ -0,0 +1,14 @@
+from captcha import Ocr
+
+class Gigasize(Ocr):
+    def __init__(self, image):
+        Ocr.__init__(self, image)
+        
+    def get_captcha(self):
+        self.threshold(2.8)
+        self.run_gocr()
+        return self.result_captcha
+
+if __name__ == '__main__':
+    ocr = Gigasize('gigasize-com/7.jpg')
+    print  ocr.get_captcha()
diff --git a/pyLoadGui.py b/pyLoadGui.py
index 4e17da403..0f256686f 100755
--- a/pyLoadGui.py
+++ b/pyLoadGui.py
@@ -25,6 +25,7 @@ import socket
 from time import sleep
 from threading import Thread
 from pyLoadCore import Core
+import subprocess
 
 import wxversion
 wxversion.select('2.8')
@@ -133,8 +134,10 @@ class Pyload_Main_Gui(wx.Frame):
         try:
             self.thread = SocketThread(socket_host.host.GetValue(), int(socket_host.port.GetValue()), socket_host.password.GetValue(), self)
         except socket.error:
-            self.core = _Core_Thread()
-            self.core.start()
+            #self.core = _Core_Thread()
+            #self.core.start()
+            cmd = ['python', 'pyLoadCore.py']
+            subprocess.call(cmd)
             sleep(1)
             self.thread = SocketThread(socket_host.host.GetValue(), int(socket_host.port.GetValue()), socket_host.password.GetValue(), self)