5 files changed, 60 insertions, 14 deletions
diff --git a/module/plugins/captcha/GigasizeCom.py b/module/plugins/captcha/GigasizeCom.py
index 2d0837257..d5bcacc5a 100644
--- a/module/plugins/captcha/GigasizeCom.py
+++ b/module/plugins/captcha/GigasizeCom.py
@@ -2,7 +2,17 @@
 
 from captcha import OCR
 
+
 class GigasizeCom(OCR):
+    __name__ = "GigasizeCom"
+    __version__ = "0.1"
+    __type__ = "ocr"
+
+    __description__ = """Gigasize.com ocr plugin"""
+    __author_name__ = "pyLoad Team"
+    __author_mail__ = "admin@pyload.org"
+
+
     def __init__(self):
         OCR.__init__(self)
 
@@ -12,9 +22,10 @@ class GigasizeCom(OCR):
         self.run_tesser(True, False, False, True)
         return self.result_captcha
 
+
 if __name__ == '__main__':
-    ocr = GigasizeCom()
     import urllib
-    urllib.urlretrieve('http://www.gigasize.com/randomImage.php', "gigasize_tmp.jpg")
 
+    ocr = GigasizeCom()
+    urllib.urlretrieve('http://www.gigasize.com/randomImage.php', "gigasize_tmp.jpg")
     print ocr.get_captcha('gigasize_tmp.jpg')
diff --git a/module/plugins/captcha/LinksaveIn.py b/module/plugins/captcha/LinksaveIn.py
index 8ce26fbac..383c4b906 100644
--- a/module/plugins/captcha/LinksaveIn.py
+++ b/module/plugins/captcha/LinksaveIn.py
@@ -1,15 +1,23 @@
 # -*- coding: utf-8 -*-
 
-from captcha import OCR
-import Image
-from os import sep
-from os.path import dirname
-from os.path import abspath
+from PIL import Image
 from glob import glob
+from os import sep
+from os.path import abspath, dirname
+
+from module.plugins.OCR import OCR
 
 
 class LinksaveIn(OCR):
     __name__ = "LinksaveIn"
+    __version__ = "0.1"
+    __type__ = "ocr"
+
+    __description__ = """Linksave.in ocr plugin"""
+    __author_name__ = "pyLoad Team"
+    __author_mail__ = "admin@pyload.org"
+
+
     def __init__(self):
         OCR.__init__(self)
         self.data_dir = dirname(abspath(__file__)) + sep + "LinksaveIn" + sep
@@ -140,10 +148,11 @@ class LinksaveIn(OCR):
 
         return final
 
+
 if __name__ == '__main__':
     import urllib
+
     ocr = LinksaveIn()
     testurl = "http://linksave.in/captcha/cap.php?hsh=2229185&code=ZzHdhl3UffV3lXTH5U4b7nShXj%2Bwma1vyoNBcbc6lcc%3D"
     urllib.urlretrieve(testurl, ocr.data_dir+"captcha.gif")
-
     print ocr.get_captcha(ocr.data_dir+'captcha.gif')
diff --git a/module/plugins/captcha/NetloadIn.py b/module/plugins/captcha/NetloadIn.py
index 733fe99db..9fb3b5c31 100644
--- a/module/plugins/captcha/NetloadIn.py
+++ b/module/plugins/captcha/NetloadIn.py
@@ -2,8 +2,17 @@
 
 from captcha import OCR
 
+
 class NetloadIn(OCR):
     __name__ = "NetloadIn"
+    __version__ = "0.1"
+    __type__ = "ocr"
+
+    __description__ = """Netload.in ocr plugin"""
+    __author_name__ = "pyLoad Team"
+    __author_mail__ = "admin@pyload.org"
+
+
     def __init__(self):
         OCR.__init__(self)
 
@@ -18,9 +27,10 @@ class NetloadIn(OCR):
 
         return self.result_captcha
 
+
 if __name__ == '__main__':
     import urllib
+
     ocr = NetloadIn()
     urllib.urlretrieve("http://netload.in/share/includes/captcha.php", "captcha.png")
-
-    print  ocr.get_captcha('captcha.png')
+    print ocr.get_captcha('captcha.png')
diff --git a/module/plugins/captcha/ShareonlineBiz.py b/module/plugins/captcha/ShareonlineBiz.py
index 0c87b636d..7b739c295 100644
--- a/module/plugins/captcha/ShareonlineBiz.py
+++ b/module/plugins/captcha/ShareonlineBiz.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 #
 #Copyright (C) 2009 kingzero, RaNaN
 #
@@ -17,10 +16,19 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 ###
-from captcha import OCR
+
+from module.plugins.OCR import OCR
+
 
 class ShareonlineBiz(OCR):
     __name__ = "ShareonlineBiz"
+    __version__ = "0.1"
+    __type__ = "ocr"
+
+    __description__ = """Shareonline.biz ocr plugin"""
+    __author_name__ = "RaNaN"
+    __author_mail__ = "RaNaN@pyload.org"
+
 
     def __init__(self):
         OCR.__init__(self)
@@ -46,8 +54,10 @@ class ShareonlineBiz(OCR):
 
         #tesseract at 60%
 
+
 if __name__ == '__main__':
     import urllib
+
     ocr = ShareonlineBiz()
     urllib.urlretrieve("http://www.share-online.biz/captcha.php", "captcha.jpeg")
-    print  ocr.get_captcha('captcha.jpeg')
+    print ocr.get_captcha('captcha.jpeg')
diff --git a/module/plugins/captcha/captcha.py b/module/plugins/captcha/captcha.py
index 74b3205b4..aa84a1a75 100644
--- a/module/plugins/captcha/captcha.py
+++ b/module/plugins/captcha/captcha.py
@@ -33,8 +33,14 @@ import JpegImagePlugin
 
 
 class OCR(object):
-
     __name__ = "OCR"
+    __type__ = "ocr"
+    __version__ = "0.1"
+
+    __description__ = """OCR base plugin"""
+    __author_name__ = "pyLoad Team"
+    __author_mail__ = "admin@pyload.org"
+
 
     def __init__(self):
         self.logger = logging.getLogger("log")