diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-10-27 23:05:13 +0100 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2014-10-27 23:05:13 +0100 |
commit | aa0751bcfd995e308bcd586a6965c75e68b1274b (patch) | |
tree | 8eba27735d57ca5b7137588efe219f845734de17 /module/plugins/crypter | |
parent | [Api] Fix addPackage folder generator (diff) | |
download | pyload-aa0751bcfd995e308bcd586a6965c75e68b1274b.tar.xz |
Code cosmetics
Diffstat (limited to 'module/plugins/crypter')
-rw-r--r-- | module/plugins/crypter/CzshareComFolder.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/DataHuFolder.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/EmbeduploadCom.py | 3 | ||||
-rw-r--r-- | module/plugins/crypter/FileserveComFolder.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/LetitbitNetFolder.py | 3 | ||||
-rw-r--r-- | module/plugins/crypter/LinkSaveIn.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/LinkdecrypterCom.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/MediafireComFolder.py | 3 | ||||
-rw-r--r-- | module/plugins/crypter/MultiloadCz.py | 3 | ||||
-rw-r--r-- | module/plugins/crypter/NCryptIn.py | 5 | ||||
-rw-r--r-- | module/plugins/crypter/QuickshareCzFolder.py | 3 | ||||
-rw-r--r-- | module/plugins/crypter/RelinkUs.py | 2 | ||||
-rw-r--r-- | module/plugins/crypter/SexuriaCom.py | 4 | ||||
-rw-r--r-- | module/plugins/crypter/UlozToFolder.py | 2 |
14 files changed, 2 insertions, 36 deletions
diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py index 002d9a9c3..f88693eb0 100644 --- a/module/plugins/crypter/CzshareComFolder.py +++ b/module/plugins/crypter/CzshareComFolder.py @@ -28,5 +28,3 @@ class CzshareComFolder(Crypter): self.error(_("FOLDER_PATTERN not found")) self.urls.extend(re.findall(self.LINK_PATTERN, m.group(1))) - if not self.urls: - self.fail(_("Could not extract any links")) diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py index 8cea48062..525e201ce 100644 --- a/module/plugins/crypter/DataHuFolder.py +++ b/module/plugins/crypter/DataHuFolder.py @@ -41,5 +41,3 @@ class DataHuFolder(SimpleCrypter): if package_links: self.packages = [(package_name, package_links, folder_name)] - else: - self.fail(_("Could not extract any links")) diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py index b968bb86d..ea29891b9 100644 --- a/module/plugins/crypter/EmbeduploadCom.py +++ b/module/plugins/crypter/EmbeduploadCom.py @@ -45,9 +45,6 @@ class EmbeduploadCom(Crypter): tmp_links.extend([x[1] for x in m if x[0] not in ignored_set]) self.urls = self.getLocation(tmp_links) - if not self.urls: - self.fail(_("Could not extract any links")) - def getLocation(self, tmp_links): new_links = [] diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py index 826350f6c..d30ccb6c1 100644 --- a/module/plugins/crypter/FileserveComFolder.py +++ b/module/plugins/crypter/FileserveComFolder.py @@ -34,5 +34,3 @@ class FileserveComFolder(Crypter): if new_links: self.urls = [map(lambda s: "http://fileserve.com%s" % s, new_links)] - else: - self.fail(_("Could not extract any links")) diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py index 3a31903ae..ba40ded99 100644 --- a/module/plugins/crypter/LetitbitNetFolder.py +++ b/module/plugins/crypter/LetitbitNetFolder.py @@ -29,6 +29,3 @@ class LetitbitNetFolder(Crypter): self.error(_("FOLDER_PATTERN not found")) self.urls.extend(re.findall(self.LINK_PATTERN, folder.group(0))) - - if not self.urls: - self.fail(_("Could not extract any links")) diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py index aa340f873..644245e25 100644 --- a/module/plugins/crypter/LinkSaveIn.py +++ b/module/plugins/crypter/LinkSaveIn.py @@ -73,8 +73,6 @@ class LinkSaveIn(SimpleCrypter): # Pack if package_links: self.packages = [(package_name, package_links, folder_name)] - else: - self.fail(_("Could not extract any links")) def isOnline(self): diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py index 0848338ec..7cedf4d91 100644 --- a/module/plugins/crypter/LinkdecrypterCom.py +++ b/module/plugins/crypter/LinkdecrypterCom.py @@ -28,8 +28,6 @@ class LinkdecrypterCom(Crypter): # API not working anymore self.urls = self.decryptHTML() - if not self.urls: - self.fail(_("Could not extract any links")) def decryptAPI(self): diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index ae8f3fd44..69bfe4092 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -52,6 +52,3 @@ class MediafireComFolder(Crypter): self.offline() else: self.urls.append(url) - - if not self.urls: - self.fail(_("Could not extract any links")) diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py index e894c8c5d..5ee17225b 100644 --- a/module/plugins/crypter/MultiloadCz.py +++ b/module/plugins/crypter/MultiloadCz.py @@ -38,6 +38,3 @@ class MultiloadCz(Crypter): if not self.urls: ignored_set = set(self.getConfig("ignoredHoster").split('|')) self.urls.extend([x[1] for x in m if x[0] not in ignored_set]) - - if not self.urls: - self.fail(_("Could not extract any links")) diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py index 801afc50b..7d82cba7a 100644 --- a/module/plugins/crypter/NCryptIn.py +++ b/module/plugins/crypter/NCryptIn.py @@ -73,9 +73,8 @@ class NCryptIn(Crypter): package_links = set(package_links) # Pack and return links - if not package_links: - self.fail(_("Could not extract any links")) - self.packages = [(package_name, package_links, folder_name)] + if package_links: + self.packages = [(package_name, package_links, folder_name)] def isSingleLink(self): diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py index 7b2d336b3..d9048655e 100644 --- a/module/plugins/crypter/QuickshareCzFolder.py +++ b/module/plugins/crypter/QuickshareCzFolder.py @@ -27,6 +27,3 @@ class QuickshareCzFolder(Crypter): if m is None: self.error(_("FOLDER_PATTERN not found")) self.urls.extend(re.findall(self.LINK_PATTERN, m.group(1))) - - if not self.urls: - self.fail(_("Could not extract any links")) diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py index a71c736b5..135268dcc 100644 --- a/module/plugins/crypter/RelinkUs.py +++ b/module/plugins/crypter/RelinkUs.py @@ -93,8 +93,6 @@ class RelinkUs(Crypter): # Pack if package_links: self.packages = [(package_name, package_links, folder_name)] - else: - self.fail(_("Could not extract any links")) def initPackage(self, pyfile): diff --git a/module/plugins/crypter/SexuriaCom.py b/module/plugins/crypter/SexuriaCom.py index 6b9b2c5f6..20559e9d7 100644 --- a/module/plugins/crypter/SexuriaCom.py +++ b/module/plugins/crypter/SexuriaCom.py @@ -86,10 +86,6 @@ class SexuriaCom(Crypter): else: linklist.append(finallink) - # Inform the user if no link could been extracted - if linklist == []: - self.error(_("Could not extract any links")) - # Debug log self.logDebug("%d supported links" % len(linklist)) for i, link in enumerate(linklist): diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py index acb360ee4..feaec2e8d 100644 --- a/module/plugins/crypter/UlozToFolder.py +++ b/module/plugins/crypter/UlozToFolder.py @@ -42,5 +42,3 @@ class UlozToFolder(Crypter): if new_links: self.urls = [map(lambda s: "http://ulozto.net/%s" % s, new_links)] - else: - self.fail(_("Could not extract any links")) |