summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jeix <devnull@localhost> 2010-11-06 13:55:41 +0100
committerGravatar Jeix <devnull@localhost> 2010-11-06 13:55:41 +0100
commit7b17a328b6134e4642f3affd9a135579d3ce55ef (patch)
treec16e918b2cb9ad7454684f2cf449695ffe91fd1a
parentaccount cache fix (diff)
downloadpyload-7b17a328b6134e4642f3affd9a135579d3ce55ef.tar.xz
youporn fix
-rw-r--r--module/plugins/container/LinkList.py2
-rw-r--r--module/plugins/hoster/YoupornCom.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/module/plugins/container/LinkList.py b/module/plugins/container/LinkList.py
index c9e7a85a3..d352d0b49 100644
--- a/module/plugins/container/LinkList.py
+++ b/module/plugins/container/LinkList.py
@@ -32,7 +32,7 @@ class LinkList(Container):
curPack = link[1:-1]
packages[curPack] = []
continue
- packages[curPack].append(link.replace("\n", ""))
+ packages[curPack].append(link)
txt.close()
# empty packages fix
diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py
index b90da4f83..c9fa4e465 100644
--- a/module/plugins/hoster/YoupornCom.py
+++ b/module/plugins/hoster/YoupornCom.py
@@ -35,7 +35,7 @@ class YoupornCom(Hoster):
if self.html is None:
self.download_html()
- file_url = re.search(r'(http://download.youporn.com/download/\d*/(?:flv/)?.*\?save=1)">', self.html).group(1)
+ file_url = re.search(r'(http://download\.youporn\.com/download/\d+\?save=1)">', self.html).group(1)
return file_url
def get_file_name(self):