Fixed the YouPorn.com Plugin

1 files changed, 17 insertions, 6 deletions

diff --git a/Plugins/YoupornCom.py b/Plugins/YoupornCom.py
index f26d237f1..08223bea5 100644
--- a/Plugins/YoupornCom.py
+++ b/Plugins/YoupornCom.py
@@ -10,7 +10,7 @@ class YoupornCom(Plugin):
         props = {}
         props['name'] = "YoupornCom"
         props['type'] = "hoster"
-        props['pattern'] = r"http://(www\.)?\youporn\.com/watch.*"
+	props['pattern'] = r"http://(www\.)?youporn\.com/watch/.+"
         props['version'] = "0.1"
         props['description'] = """Youporn.com Video Download Plugin"""
         props['author_name'] = ("willnix")
@@ -20,6 +20,15 @@ class YoupornCom(Plugin):
         self.html = None
         self.html_old = None         #time() where loaded the HTML
         self.time_plus_wait = None   #time() + wait in seconds
+    
+    def set_parent_status(self):
+        """ sets all available Statusinfos about a File in self.parent.status
+        """
+        if self.html == None:
+            self.download_html()
+        self.parent.status.filename = self.get_file_name()
+        self.parent.status.url = self.get_file_url()
+        self.parent.status.wait = self.wait_until()
         
     def download_html(self):
         url = self.parent.url
@@ -30,21 +39,23 @@ class YoupornCom(Plugin):
         """
         if self.html == None:
             self.download_html()
-        file_url = re.search(r'(http://download.youporn.com/download/\d*/\?download=1&ll=1&t=dd)">', self.html).group(1)
-        return file_url
+
+        file_url = re.search(r'(http://download.youporn.com/download/\d*/.*\?download=1&ll=1&t=dd)">', self.html).group(1)
+	print file_url
+	return file_url
         
     def get_file_name(self):
         if self.html == None:
             self.download_html()
-        file_name_pattern = r"<title>(.*) - Free Porn Videos - YouPorn.com Lite.*"
-        return re.search(file_name_pattern, self.html).group(1) + '.flv'
+       	file_name_pattern = r".*<title>(.*) - Free Porn Videos - YouPorn.com Lite \(BETA\)</title>.*"
+	return re.search(file_name_pattern, self.html).group(1) + '.flv'
         
     def file_exists(self):
         """ returns True or False 
         """
         if self.html == None:
             self.download_html()
-        if re.search(r"(.*eine fehlerhafte Video-ID\.)", self.html) != None:
+        if re.search(r"(.*invalid video_id.*)", self.html) != None:
             return False
         else:
             return True