- outdated

[packages/clive.git] / clive-spz.patch

diff --git a/clive-spz.patch b/clive-spz.patch
index d115cf210a6647da7844133f8963eafd08ba8f62..376ec9d1ec8c84bcbc5c9e8c07b03c40345f7d39 100644 (file)
--- a/clive-spz.patch
+++ b/clive-spz.patch
@@ -1,33 +1,24 @@
---- clive-0.4.10/src/clive/parse.py~   2008-04-25 23:56:56.000000000 +0300
-+++ clive-0.4.10/src/clive/parse.py    2008-04-25 23:59:51.000000000 +0300
+--- clive-0.4.11/src/clive/parse.py    2008-04-26 16:06:21.000000000 +0300
++++ clive-0.4.11-spz/src/clive/parse.py        2008-04-26 16:04:07.000000000 +0300
 @@ -51,6 +51,7 @@
              ('guba.com', 'guba', self._parse_guba),
              ('metacafe.', 'metac', self._parse_metacafe),
-                       ('delfi.', 'delfi', self._parse_delfi),
-+                      ('www.southparkzone.com', 'southparkzone', self._parse_southparkzone),
+             ('delfi.', 'delfi', self._parse_delfi),
++            ('www.southparkzone.com', 'southparkzone', self._parse_southparkzone),
          ]
  
      ## Parses a video page data (HTML)
-@@ -232,6 +233,23 @@
-               vid = md5.new(str(time.time())).hexdigest()[:8]
-               return (url, vid, low_quality)
+@@ -288,6 +289,14 @@
+         vid = md5.new(str(time.time())).hexdigest()[:8]
+         return (url, vid, low_quality)
  
-+      def _parse_southparkzone(self, url, data, low_quality):
-+              mirror_id = self._parse_from_to(data, "episodeinfo.php?mirror=", "'")
-+              from urlgrabber.grabber import URLGrabber
-+              from clive.progress import Progress
-+              g = URLGrabber(
-+                      user_agent = self._opts.user_agent,
-+                      progress_obj = Progress(),
-+                      proxies = self._opts.proxy,
-+              )
-+              url = "http://www.southparkzone.com/" + mirror_id
-+              o = g.urlopen(url)
-+              data = o.read()
-+              url = self._parse_from_to(data, "<location><![CDATA[", "]]></location>", skip_from = 1)
++    def _parse_southparkzone(self, url, data, low_quality):
++        mirror_id = self._parse_from_to(data, "episodeinfo.php?mirror=", "'")
++        data = self._graburl("http://www.southparkzone.com/" + mirror_id)
++        url = self._parse_from_to(data, "<location><![CDATA[", "]]></location>", skip_from = 1)
 +
-+              vid = md5.new(str(time.time())).hexdigest()[:8]
-+              return (url, vid, low_quality)
++        vid = md5.new(str(time.time())).hexdigest()[:8]
++        return (url, vid, low_quality)
 +
      def _random_vid(self):
          return md5.new(str(time.time())).hexdigest()[:8]