summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-09-27 01:38:32 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-09-27 01:38:32 +0200
commit0d220d634e512d89bda540f91c643b361c82ea8a (patch)
tree198e2be046a1d6fdbbec0b7c44f1d5563f327528 /module/plugins/crypter
parentBetter dead plugin fallback (diff)
downloadpyload-0d220d634e512d89bda540f91c643b361c82ea8a.tar.xz
Logging string cosmetics
Diffstat (limited to 'module/plugins/crypter')
-rw-r--r--module/plugins/crypter/ChipDe.py2
-rw-r--r--module/plugins/crypter/DataHuFolder.py4
-rw-r--r--module/plugins/crypter/DuckCryptInfo.py2
-rw-r--r--module/plugins/crypter/GooGl.py2
-rw-r--r--module/plugins/crypter/LinkSaveIn.py6
-rw-r--r--module/plugins/crypter/LinkdecrypterCom.py2
-rw-r--r--module/plugins/crypter/LixIn.py4
-rw-r--r--module/plugins/crypter/MediafireComFolder.py2
-rw-r--r--module/plugins/crypter/NCryptIn.py2
-rw-r--r--module/plugins/crypter/RelinkUs.py4
-rw-r--r--module/plugins/crypter/SerienjunkiesOrg.py4
-rw-r--r--module/plugins/crypter/ShareLinksBiz.py2
-rw-r--r--module/plugins/crypter/UploadedToFolder.py2
13 files changed, 19 insertions, 19 deletions
diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py
index a75cc5e0e..e545efa54 100644
--- a/module/plugins/crypter/ChipDe.py
+++ b/module/plugins/crypter/ChipDe.py
@@ -24,4 +24,4 @@ class ChipDe(Crypter):
self.fail('Failed to find the URL')
else:
self.urls = [f.group(1)]
- self.logDebug('The file URL is %s' % self.urls[0])
+ self.logDebug("The file URL is %s" % self.urls[0])
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py
index 4f6116100..a500ac796 100644
--- a/module/plugins/crypter/DataHuFolder.py
+++ b/module/plugins/crypter/DataHuFolder.py
@@ -27,7 +27,7 @@ class DataHuFolder(SimpleCrypter):
password = self.getPassword()
if password is '':
self.fail("No password specified, please set right password on Add package form and retry")
- self.logDebug('The folder is password protected', 'Using password: ' + password)
+ self.logDebug("The folder is password protected', 'Using password: " + password)
self.html = self.load(pyfile.url, post={'mappa_pass': password}, decode=True)
if u'Hib\xe1s jelsz\xf3' in self.html: # Wrong password
self.fail("Incorrect password, please set right password on Add package form and retry")
@@ -35,7 +35,7 @@ class DataHuFolder(SimpleCrypter):
package_name, folder_name = self.getPackageNameAndFolder()
package_links = re.findall(self.LINK_PATTERN, self.html)
- self.logDebug('Package has %d links' % len(package_links))
+ self.logDebug("Package has %d links" % len(package_links))
if package_links:
self.packages = [(package_name, package_links, folder_name)]
diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py
index e7a5a59e9..26b06c1c7 100644
--- a/module/plugins/crypter/DuckCryptInfo.py
+++ b/module/plugins/crypter/DuckCryptInfo.py
@@ -56,4 +56,4 @@ class DuckCryptInfo(Crypter):
soup = BeautifulSoup(src)
self.urls = [soup.find("iframe")['src']]
if not self.urls:
- self.logDebug('no links m - (Plugin out of date?)')
+ self.logDebug("No link found - (Plugin out of date?)")
diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py
index 1d9c2801f..b4f6c3ea7 100644
--- a/module/plugins/crypter/GooGl.py
+++ b/module/plugins/crypter/GooGl.py
@@ -20,7 +20,7 @@ class GooGl(Crypter):
def decrypt(self, pyfile):
rep = self.load(self.API_URL, get={'shortUrl': pyfile.url})
- self.logDebug('JSON data: ' + rep)
+ self.logDebug("JSON data: " + rep)
rep = json_loads(rep)
if 'longUrl' in rep:
diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py
index 060a434d2..e80686c02 100644
--- a/module/plugins/crypter/LinkSaveIn.py
+++ b/module/plugins/crypter/LinkSaveIn.py
@@ -136,7 +136,7 @@ class LinkSaveIn(Crypter):
package_links = []
self.logDebug("Search for Web links")
if not self.js:
- self.logDebug("no JS -> skip Web links")
+ self.logDebug("No JS -> skip Web links")
else:
#@TODO: Gather paginated web links
pattern = r'<a href="http://linksave\.in/(\w{43})"'
@@ -162,7 +162,7 @@ class LinkSaveIn(Crypter):
def handleContainer(self, type_):
package_links = []
type_ = type_.lower()
- self.logDebug('Seach for %s Container links' % type_.upper())
+ self.logDebug("Seach for %s Container links" % type_.upper())
if not type_.isalnum(): # check to prevent broken re-pattern (cnl2,rsdf,ccf,dlc,web are all alpha-numeric)
self.fail('unknown container type "%s" (this is probably a bug)' % type_)
pattern = r"\('%s_link'\).href=unescape\('(.*?\.%s)'\)" % (type_, type_)
@@ -177,7 +177,7 @@ class LinkSaveIn(Crypter):
package_links = []
self.logDebug("Search for CNL2 links")
if not self.js:
- self.logDebug("no JS -> skip CNL2 links")
+ self.logDebug("No JS -> skip CNL2 links")
elif 'cnl2_load' in self.html:
try:
(vcrypted, vjk) = self._getCipherParams()
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index 21f05b962..f9f29d5f5 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -43,7 +43,7 @@ class LinkdecrypterCom(Crypter):
if self.html.startswith('http://'):
return self.html.splitlines()
- self.logError('API', self.html)
+ self.logError("API", self.html)
if self.html == 'INTERRUPTION(PASSWORD)':
self.fail("No or incorrect password")
diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py
index cdf87eeb2..beba5ed04 100644
--- a/module/plugins/crypter/LixIn.py
+++ b/module/plugins/crypter/LixIn.py
@@ -42,12 +42,12 @@ class LixIn(Crypter):
for _ in xrange(5):
m = re.search(self.CAPTCHA_PATTERN, self.html)
if m:
- self.logDebug("trying captcha")
+ self.logDebug("Trying captcha")
captcharesult = self.decryptCaptcha("http://lix.in/" + m.group("image"))
self.html = self.req.load(url, decode=True,
post={"capt": captcharesult, "submit": "submit", "tiny": id})
else:
- self.logDebug("no captcha/captcha solved")
+ self.logDebug("No captcha/captcha solved")
else:
self.html = self.req.load(url, decode=True, post={"submit": "submit", "tiny": id})
diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py
index bb7c90722..45078c4ba 100644
--- a/module/plugins/crypter/MediafireComFolder.py
+++ b/module/plugins/crypter/MediafireComFolder.py
@@ -23,7 +23,7 @@ class MediafireComFolder(Crypter):
def decrypt(self, pyfile):
url, result = checkHTMLHeader(pyfile.url)
- self.logDebug('Location (%d): %s' % (result, url))
+ self.logDebug("Location (%d): %s" % (result, url))
if result == 0:
# load and parse html
diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 1b7b8b3d4..3937299d0 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -156,7 +156,7 @@ class NCryptIn(Crypter):
self.logDebug("CircleCaptcha protected")
captcha_img_url = "http://ncrypt.in/classes/captcha/circlecaptcha.php"
coords = self.decryptCaptcha(captcha_img_url, forceUser=True, imgtype="png", result_type='positional')
- self.logDebug("Captcha resolved, coords [%s]" % str(coords))
+ self.logDebug("Captcha resolved, coords [%s]" % coords)
postData['circle.x'] = coords[0]
postData['circle.y'] = coords[1]
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index 1b120fc77..1c1afea25 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -125,7 +125,7 @@ class RelinkUs(Crypter):
self.logDebug("Request user positional captcha resolving")
captcha_img_url = self.CAPTCHA_IMG_URL + "?id=%s" % self.fileid
coords = self.decryptCaptcha(captcha_img_url, forceUser=True, imgtype="png", result_type='positional')
- self.logDebug("Captcha resolved, coords [%s]" % str(coords))
+ self.logDebug("Captcha resolved, coords [%s]" % coords)
captcha_post_url = self.CAPTCHA_SUBMIT_URL + "?id=%s" % self.fileid
captcha_post_data = {'button.x': coords[0], 'button.y': coords[1], 'captcha': 'submit'}
self.html = self.load(captcha_post_url, post=captcha_post_data, decode=True)
@@ -189,7 +189,7 @@ class RelinkUs(Crypter):
return package_links
def handleDLCLinks(self):
- self.logDebug('Search for DLC links')
+ self.logDebug("Search for DLC links")
package_links = []
m = re.search(self.DLC_LINK_REGEX, self.html)
if m is not None:
diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py
index fe4ee4e36..1ef5b7617 100644
--- a/module/plugins/crypter/SerienjunkiesOrg.py
+++ b/module/plugins/crypter/SerienjunkiesOrg.py
@@ -304,7 +304,7 @@ class SerienjunkiesOrg(Crypter):
for Hoster in hosterlist:
if preferred == Hoster.lower().replace('.', ''):
for Part in hosterlist[Hoster]:
- self.logDebug("selected " + Part)
+ self.logDebug("Selected " + Part)
result.append(str(Part))
del (hosterlist2[Hoster])
if self.getConfig("hosterListMode") in ["OnlyOne", "OnlyPreferred(One)"]:
@@ -316,7 +316,7 @@ class SerienjunkiesOrg(Crypter):
for Hoster in hosterlist2:
if Hoster.strip().lower().replace('.', '') not in ignorelist:
for Part in hosterlist2[Hoster]:
- self.logDebug("selected2 " + Part)
+ self.logDebug("Selected2 " + Part)
result.append(str(Part))
if self.getConfig('hosterListMode') == "OnlyOne":
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index 87bb16a50..fa9739711 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -109,7 +109,7 @@ class ShareLinksBiz(Crypter):
captchaUrl = self.baseUrl + '/captcha.gif?d=%s&PHPSESSID=%s' % (m.group(1), m.group(2))
self.logDebug("Waiting user for correct position")
coords = self.decryptCaptcha(captchaUrl, forceUser=True, imgtype="gif", result_type='positional')
- self.logDebug("Captcha resolved, coords [%s]" % str(coords))
+ self.logDebug("Captcha resolved, coords [%s]" % coords)
# Resolve captcha
href = self._resolveCoords(coords, captchaMap)
diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py
index 068412062..20eb553a9 100644
--- a/module/plugins/crypter/UploadedToFolder.py
+++ b/module/plugins/crypter/UploadedToFolder.py
@@ -33,6 +33,6 @@ class UploadedToFolder(SimpleCrypter):
self.html = self.load(plain_link)
package_links = self.html.split('\n')[:-1]
- self.logDebug('Package has %d links' % len(package_links))
+ self.logDebug("Package has %d links" % len(package_links))
self.packages = [(package_name, package_links, folder_name)]