From ea94eace93bae1f1f9a3fd27c498f1b5309de50b Mon Sep 17 00:00:00 2001
From: spoob <spoob@gmx.de>
Date: Wed, 13 Jan 2010 15:03:23 +0100
Subject: Fixed MyVideo.de (yuck)

---
 module/plugins/hoster/MyvideoDe.py | 32 +++++++-------------------------
 pyLoadCore.py                      | 10 ----------
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/module/plugins/hoster/MyvideoDe.py b/module/plugins/hoster/MyvideoDe.py
index 5e2eb0b39..f7c087091 100644
--- a/module/plugins/hoster/MyvideoDe.py
+++ b/module/plugins/hoster/MyvideoDe.py
@@ -12,40 +12,24 @@ class MyvideoDe(Plugin):
         props['name'] = "MyvideoDe"
         props['type'] = "hoster"
         props['pattern'] = r"http://(www\.)?myvideo.de/watch/"
-        props['version'] = "0.1"
-        props['description'] = """Youtube.com Video Download Plugin"""
+        props['version'] = "0.9"
+        props['description'] = """Myvideo.de Video Download Plugin"""
         props['author_name'] = ("spoob")
         props['author_mail'] = ("spoob@pyload.org")
         self.props = props
         self.parent = parent
         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()
+        self.url = self.parent.url
 
     def download_html(self):
-        url = self.parent.url
-        self.html = self.req.load(url)
+        self.html = self.req.load(self.url)
 
     def get_file_url(self):
-        """ returns the absolute downloadable filepath
-        """
         if self.html == None:
             self.download_html()
         videoId = re.search(r"addVariable\('_videoid','(.*)'\);p.addParam\('quality'", self.html).group(1)
         videoServer = re.search("rel='image_src' href='(.*)thumbs/.*' />", self.html).group(1)
         file_url = videoServer + videoId + ".flv"
-        print videoId
-        print videoServer
-        print file_url
         return file_url
 
     def get_file_name(self):
@@ -55,11 +39,9 @@ class MyvideoDe(Plugin):
         return re.search(file_name_pattern, self.html).group(1).replace("/", "") + '.flv'
 
     def file_exists(self):
-        """ returns True or False
-        """
         if self.html == None:
             self.download_html()
-        if re.search(r"(.* Das angeforderte Video ist nicht.*)", self.html) != None:
+        self.req.load(str(self.url), cookies=False, just_header=True)
+        if self.req.lastEffectiveURL == "http://www.myvideo.de/":
             return False
-        else:
-            return True
+        return True
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 0a7fef11a..cd928315a 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -267,16 +267,6 @@ class Core(object):
         self.shutdown()
         execv(executable, [executable, "pyLoadCore.py"])
 
-    #~ def update(self, file_update=None):
-        #~ try:
-            #~ if not file_update:
-                #~ tmp_zip = __import__("tempfile").NamedTemporaryFile(suffix=".zip").name
-                #~ file_update = Request().download("http://update.pyload.org/index.php?download=True", tmp_zip)
-            #~ __import__("module.Unzip", globals(), locals(), "Unzip", -1).Unzip().extract(tmp_zip,"Test/")
-            #~ self.logger.info(_("Updated pyLoad"))
-        #~ except:
-            #~ self.logger.info("Error on updating pyLoad")
-
     def create_plugin_index(self):
         plugins = glob(join(self.plugin_folder, "hoster", "*.py"))
         plugins += glob(join(self.plugin_folder, "decrypter", "*.py"))
-- 
cgit v1.2.3