Normalize line endings to avoid line endings merge conflicts

2 files changed, 195 insertions, 195 deletions

diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py
index 3bc00d8c2..cd622b7cd 100755
--- a/module/plugins/hooks/Captcha9kw.py
+++ b/module/plugins/hooks/Captcha9kw.py
@@ -1,163 +1,163 @@
-# -*- coding: utf-8 -*-

-"""

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License,

-    or (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-    See the GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program; if not, see <http://www.gnu.org/licenses/>.

-

-    @author: mkaay, RaNaN, zoidberg

-"""

-from __future__ import with_statement

-

-from thread import start_new_thread

-from base64 import b64encode

-import cStringIO

-import pycurl

-import time

-

-from module.network.RequestFactory import getURL, getRequest

-from module.network.HTTPRequest import BadHeader

-

-from module.plugins.Hook import Hook

-

-class Captcha9kw(Hook):

-    __name__ = "Captcha9kw"

-    __version__ = "0.07"

-    __description__ = """send captchas to 9kw.eu"""

-    __config__ = [("activated", "bool", "Activated", False),

-                  ("force", "bool", "Force CT even if client is connected", True),

-                  ("https", "bool", "Enable HTTPS", "False"),

-                  ("confirm", "bool", "Confirm Captcha (Cost +6)", "False"),

-                  ("captchaperhour", "int", "Captcha per hour (max. 9999)", "9999"),

-                  ("prio", "int", "Prio 1-10 (Cost +1-10)", "0"),

-                  ("timeout", "int", "Timeout (max. 300)", "220"),                  

-                  ("passkey", "password", "API key", ""),]

-    __author_name__ = ("RaNaN")

-    __author_mail__ = ("RaNaN@pyload.org")

-

-    API_URL = "://www.9kw.eu/index.cgi"

-

-    def setup(self):

-        self.API_URL = "https"+self.API_URL if self.getConfig("https") else "http"+self.API_URL

-        self.info = {}

-

-    def getCredits(self):

-        response = getURL(self.API_URL, get = { "apikey": self.getConfig("passkey"), "pyload": "1", "source": "pyload", "action": "usercaptchaguthaben" })

-

-        if response.isdigit():

-            self.logInfo(_("%s credits left") % response)

-            self.info["credits"] = credits = int(response)

-            return credits

-        else:

-            self.logError(response)

-            return 0

-

-    def processCaptcha(self, task):

-        result = None

-

-        with open(task.captchaFile, 'rb') as f:

-            data = f.read()

-        data = b64encode(data)

-        self.logDebug("%s : %s" % (task.captchaFile, data))

-        if task.isPositional():

-            mouse = 1

-        else:

-            mouse = 0

-

-        response = getURL(self.API_URL, post = { 

-                          "apikey": self.getConfig("passkey"), 

-                          "prio": self.getConfig("prio"),

-                          "confirm": self.getConfig("confirm"),

-                          "captchaperhour": self.getConfig("captchaperhour"),

-                          "maxtimeout": self.getConfig("timeout"),

-                          "pyload": "1", 

-                          "source": "pyload", 

-                          "base64": "1", 

-                          "mouse": mouse,

-                          "file-upload-01": data, 

-                          "action": "usercaptchaupload" })

-

-        if response.isdigit():

-            self.logInfo(_("New CaptchaID from upload: %s : %s") % (response,task.captchaFile))

-

-            for i in range(1, 100, 1): 

-                response2 = getURL(self.API_URL, get = { "apikey": self.getConfig("passkey"), "id": response,"pyload": "1","source": "pyload", "action": "usercaptchacorrectdata" })

-

-                if(response2 != ""):

-                    break;

-

-                time.sleep(3)

-

-            result = response2

-            task.data["ticket"] = response

-            self.logInfo("result %s : %s" % (response, result))

-            task.setResult(result)

-        else:

-            self.logError("Bad upload: %s" % response)

-            return False

-

-    def newCaptchaTask(self, task):

-        if not task.isTextual() and not task.isPositional():

-            return False

-

-        if not self.getConfig("passkey"):

-            return False

-

-        if self.core.isClientConnected() and not self.getConfig("force"):

-            return False

-

-        if self.getCredits() > 0:

-            task.handler.append(self)

-            task.setWaiting(self.getConfig("timeout"))

-            start_new_thread(self.processCaptcha, (task,))

-

-        else:

-            self.logError(_("Your Captcha 9kw.eu Account has not enough credits"))

-

-    def captchaCorrect(self, task):

-        if "ticket" in task.data:

-

-            try:

-                response = getURL(self.API_URL, 

-                              post={ "action": "usercaptchacorrectback",

-                                     "apikey": self.getConfig("passkey"),

-                                     "api_key": self.getConfig("passkey"),

-                                     "correct": "1",

-                                     "pyload": "1",

-                                     "source": "pyload", 

-                                     "id": task.data["ticket"] }

-                              )

-                self.logInfo("Request correct: %s" % response)

-

-            except BadHeader, e:

-                self.logError("Could not send correct request.", str(e))

-        else:

-             self.logError("No CaptchaID for correct request (task %s) found." % task)

-

-    def captchaInvalid(self, task):

-        if "ticket" in task.data:

-            

-            try:

-                response = getURL(self.API_URL, 

-                              post={ "action": "usercaptchacorrectback",

-                                     "apikey": self.getConfig("passkey"),

-                                     "api_key": self.getConfig("passkey"),

-                                     "correct": "2",

-                                     "pyload": "1",

-                                     "source": "pyload", 

-                                     "id": task.data["ticket"] }

-                              )

-                self.logInfo("Request refund: %s" % response)

-

-            except BadHeader, e:

-                self.logError("Could not send refund request.", str(e))

-        else:

-            self.logError("No CaptchaID for not correct request (task %s) found." % task)

+# -*- coding: utf-8 -*-
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+    @author: mkaay, RaNaN, zoidberg
+"""
+from __future__ import with_statement
+
+from thread import start_new_thread
+from base64 import b64encode
+import cStringIO
+import pycurl
+import time
+
+from module.network.RequestFactory import getURL, getRequest
+from module.network.HTTPRequest import BadHeader
+
+from module.plugins.Hook import Hook
+
+class Captcha9kw(Hook):
+    __name__ = "Captcha9kw"
+    __version__ = "0.07"
+    __description__ = """send captchas to 9kw.eu"""
+    __config__ = [("activated", "bool", "Activated", False),
+                  ("force", "bool", "Force CT even if client is connected", True),
+                  ("https", "bool", "Enable HTTPS", "False"),
+                  ("confirm", "bool", "Confirm Captcha (Cost +6)", "False"),
+                  ("captchaperhour", "int", "Captcha per hour (max. 9999)", "9999"),
+                  ("prio", "int", "Prio 1-10 (Cost +1-10)", "0"),
+                  ("timeout", "int", "Timeout (max. 300)", "220"),                  
+                  ("passkey", "password", "API key", ""),]
+    __author_name__ = ("RaNaN")
+    __author_mail__ = ("RaNaN@pyload.org")
+
+    API_URL = "://www.9kw.eu/index.cgi"
+
+    def setup(self):
+        self.API_URL = "https"+self.API_URL if self.getConfig("https") else "http"+self.API_URL
+        self.info = {}
+
+    def getCredits(self):
+        response = getURL(self.API_URL, get = { "apikey": self.getConfig("passkey"), "pyload": "1", "source": "pyload", "action": "usercaptchaguthaben" })
+
+        if response.isdigit():
+            self.logInfo(_("%s credits left") % response)
+            self.info["credits"] = credits = int(response)
+            return credits
+        else:
+            self.logError(response)
+            return 0
+
+    def processCaptcha(self, task):
+        result = None
+
+        with open(task.captchaFile, 'rb') as f:
+            data = f.read()
+        data = b64encode(data)
+        self.logDebug("%s : %s" % (task.captchaFile, data))
+        if task.isPositional():
+            mouse = 1
+        else:
+            mouse = 0
+
+        response = getURL(self.API_URL, post = { 
+                          "apikey": self.getConfig("passkey"), 
+                          "prio": self.getConfig("prio"),
+                          "confirm": self.getConfig("confirm"),
+                          "captchaperhour": self.getConfig("captchaperhour"),
+                          "maxtimeout": self.getConfig("timeout"),
+                          "pyload": "1", 
+                          "source": "pyload", 
+                          "base64": "1", 
+                          "mouse": mouse,
+                          "file-upload-01": data, 
+                          "action": "usercaptchaupload" })
+
+        if response.isdigit():
+            self.logInfo(_("New CaptchaID from upload: %s : %s") % (response,task.captchaFile))
+
+            for i in range(1, 100, 1): 
+                response2 = getURL(self.API_URL, get = { "apikey": self.getConfig("passkey"), "id": response,"pyload": "1","source": "pyload", "action": "usercaptchacorrectdata" })
+
+                if(response2 != ""):
+                    break;
+
+                time.sleep(3)
+
+            result = response2
+            task.data["ticket"] = response
+            self.logInfo("result %s : %s" % (response, result))
+            task.setResult(result)
+        else:
+            self.logError("Bad upload: %s" % response)
+            return False
+
+    def newCaptchaTask(self, task):
+        if not task.isTextual() and not task.isPositional():
+            return False
+
+        if not self.getConfig("passkey"):
+            return False
+
+        if self.core.isClientConnected() and not self.getConfig("force"):
+            return False
+
+        if self.getCredits() > 0:
+            task.handler.append(self)
+            task.setWaiting(self.getConfig("timeout"))
+            start_new_thread(self.processCaptcha, (task,))
+
+        else:
+            self.logError(_("Your Captcha 9kw.eu Account has not enough credits"))
+
+    def captchaCorrect(self, task):
+        if "ticket" in task.data:
+
+            try:
+                response = getURL(self.API_URL, 
+                              post={ "action": "usercaptchacorrectback",
+                                     "apikey": self.getConfig("passkey"),
+                                     "api_key": self.getConfig("passkey"),
+                                     "correct": "1",
+                                     "pyload": "1",
+                                     "source": "pyload", 
+                                     "id": task.data["ticket"] }
+                              )
+                self.logInfo("Request correct: %s" % response)
+
+            except BadHeader, e:
+                self.logError("Could not send correct request.", str(e))
+        else:
+             self.logError("No CaptchaID for correct request (task %s) found." % task)
+
+    def captchaInvalid(self, task):
+        if "ticket" in task.data:
+            
+            try:
+                response = getURL(self.API_URL, 
+                              post={ "action": "usercaptchacorrectback",
+                                     "apikey": self.getConfig("passkey"),
+                                     "api_key": self.getConfig("passkey"),
+                                     "correct": "2",
+                                     "pyload": "1",
+                                     "source": "pyload", 
+                                     "id": task.data["ticket"] }
+                              )
+                self.logInfo("Request refund: %s" % response)
+
+            except BadHeader, e:
+                self.logError("Could not send refund request.", str(e))
+        else:
+            self.logError("No CaptchaID for not correct request (task %s) found." % task)
diff --git a/module/plugins/hooks/Premium4Me.py b/module/plugins/hooks/Premium4Me.py
index 16b02ce87..edbdfbdb9 100644
--- a/module/plugins/hooks/Premium4Me.py
+++ b/module/plugins/hooks/Premium4Me.py
@@ -1,33 +1,33 @@
-# -*- coding: utf-8 -*-

-

-from module.network.RequestFactory import getURL

-from module.plugins.internal.MultiHoster import MultiHoster

-

-class Premium4Me(MultiHoster):

-    __name__ = "Premium4Me"

-    __version__ = "0.03"

-    __type__ = "hook"

-

-    __config__ = [("activated", "bool", "Activated", "False"),

-        ("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"),

-        ("hosterList", "str", "Hoster list (comma separated)", "")]

-    __description__ = """Premium.to hook plugin"""

-    __author_name__ = ("RaNaN", "zoidberg", "stickell")

-    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")

-

-    def getHoster(self):

-

-        page = getURL("http://premium.to/api/hosters.php?authcode=%s" % self.account.authcode)

-        return [x.strip() for x in page.replace("\"", "").split(";")]

-

-    def coreReady(self):

-

-        self.account = self.core.accountManager.getAccountPlugin("Premium4Me")

-

-        user = self.account.selectAccount()[0]

-

-        if not user:

-            self.logError(_("Please add your premium.to account first and restart pyLoad"))

-            return

-

+# -*- coding: utf-8 -*-
+
+from module.network.RequestFactory import getURL
+from module.plugins.internal.MultiHoster import MultiHoster
+
+class Premium4Me(MultiHoster):
+    __name__ = "Premium4Me"
+    __version__ = "0.03"
+    __type__ = "hook"
+
+    __config__ = [("activated", "bool", "Activated", "False"),
+        ("hosterListMode", "all;listed;unlisted", "Use for downloads from supported hosters:", "all"),
+        ("hosterList", "str", "Hoster list (comma separated)", "")]
+    __description__ = """Premium.to hook plugin"""
+    __author_name__ = ("RaNaN", "zoidberg", "stickell")
+    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+
+    def getHoster(self):
+
+        page = getURL("http://premium.to/api/hosters.php?authcode=%s" % self.account.authcode)
+        return [x.strip() for x in page.replace("\"", "").split(";")]
+
+    def coreReady(self):
+
+        self.account = self.core.accountManager.getAccountPlugin("Premium4Me")
+
+        user = self.account.selectAccount()[0]
+
+        if not user:
+            self.logError(_("Please add your premium.to account first and restart pyLoad"))
+            return
+
         return MultiHoster.coreReady(self)
\ No newline at end of file