summaryrefslogtreecommitdiffstats
path: root/module/plugins/crypter/RelinkUs.py
diff options
context:
space:
mode:
authorGravatar fragonib <devnull@localhost> 2011-06-12 18:24:51 +0200
committerGravatar fragonib <devnull@localhost> 2011-06-12 18:24:51 +0200
commit444a1f00a7fa986400095233ba75953de0fe42b8 (patch)
tree6d234ebf713d3b701069bbda6320271d689e1b38 /module/plugins/crypter/RelinkUs.py
parentul fix (diff)
downloadpyload-444a1f00a7fa986400095233ba75953de0fe42b8.tar.xz
RelinkUs, ShareLinksBiz, BitshareCom little improvements
Diffstat (limited to 'module/plugins/crypter/RelinkUs.py')
-rw-r--r--module/plugins/crypter/RelinkUs.py26
1 files changed, 17 insertions, 9 deletions
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index c2bc6c589..d00e4cc18 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -11,7 +11,7 @@ class RelinkUs(Crypter):
__name__ = "RelinkUs"
__type__ = "crypter"
__pattern__ = r"http://(www\.)?relink.us/(f/|((view|go).php\?id=))(?P<id>.+)"
- __version__ = "2.2"
+ __version__ = "2.3"
__description__ = """Relink.us Crypter Plugin"""
__author_name__ = ("fragonib")
__author_mail__ = ("fragonib[AT]yahoo[DOT]es")
@@ -91,17 +91,25 @@ class RelinkUs(Crypter):
return html
def getPackageNameAndFolder(self):
- title_re = r'<td class="top">Title</td><td class="top">\|</td><td><span class="info_view_id"><i>(?P<title>.+)</i></span></td>'
- m = re.search(title_re, self.html)
- if m is not None:
- name = folder = m.group('title')
- self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))
- return name, folder
- else:
+ # Get title from html
+ try:
+ title_re = r'<td class="top">Title</td><td class="top">\|</td><td><span class="info_view_id"><i>(?P<title>.+)</i></span></td>'
+ title = re.search(title_re, self.html).group('title')
+ if 'Title deactived by the owner' in title:
+ title = None
+ except:
+ title = None
+
+ # Set name & folder
+ if title is None:
name = self.package.name
folder = self.package.folder
self.logDebug("Package info not found, defaulting to pyfile name [%s] and folder [%s]" % (name, folder))
- return name, folder
+ else:
+ name = folder = title
+ self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))
+
+ return name, folder
def getCipherParams(self):