Author: glen Date: Fri Apr 25 21:01:48 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated patches to 0.4.10
---- Files affected:
SOURCES:
clive-spz.patch (1.1 -> 1.2) , clive-delfi.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/clive-spz.patch
diff -u SOURCES/clive-spz.patch:1.1 SOURCES/clive-spz.patch:1.2
--- SOURCES/clive-spz.patch:1.1 Sun Jan 20 00:26:46 2008
+++ SOURCES/clive-spz.patch Fri Apr 25 23:01:43 2008
@@ -1,26 +1,18 @@
---- clive-0.4.1/clive/parse.py 2008-01-20 01:24:26.960335855 +0200
-+++ clive-0.4.1-spz/clive/parse.py 2008-01-20 01:23:07.943359159 +0200
-@@ -50,6 +50,7 @@
- ('guba.com', 'guba', self._parse_guba),
- ('stage6.', 'stage6', self._parse_stage6),
+--- 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
+@@ -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),
- ]
+ ]
- ## Parses a video page data (HTML).
-@@ -62,6 +63,7 @@
- # \param say A callback function for printing out stdout messages
- def parse(self, data, url, opts, callb_query_video_length, say):
- self._say = say
-+ self._opts = opts
-
- fmt = formatter.AbstractFormatter(formatter.NullWriter())
- p = HTMLParser(fmt)
-@@ -195,6 +197,23 @@
+ ## Parses a video page data (HTML)
+@@ -232,6 +233,23 @@
vid = md5.new(str(time.time())).hexdigest()[:8]
- return (url, vid)
+ return (url, vid, low_quality)
-+ def _parse_southparkzone(self, url, data):
++ 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
@@ -35,8 +27,8 @@
+ url = self._parse_from_to(data, "<location><![CDATA[",
"]]></location>", skip_from = 1)
+
+ vid = md5.new(str(time.time())).hexdigest()[:8]
-+ return (url, vid)
++ return (url, vid, low_quality)
+
- def _parse_from_to(self, data, _from, to, skip_from=0):
- start = data.find(_from)
- end = data.find(to, start)
+ def _random_vid(self):
+ return md5.new(str(time.time())).hexdigest()[:8]
+
================================================================
Index: SOURCES/clive-delfi.patch
diff -u SOURCES/clive-delfi.patch:1.3 SOURCES/clive-delfi.patch:1.4
--- SOURCES/clive-delfi.patch:1.3 Fri Jan 25 01:40:36 2008
+++ SOURCES/clive-delfi.patch Fri Apr 25 23:01:43 2008
@@ -1,18 +1,18 @@
---- clive-0.4.3/clive/parse.py~ 2008-01-25 02:37:04.087918332 +0200
-+++ clive-0.4.3/clive/parse.py 2008-01-25 02:37:22.658094354 +0200
+--- clive-0.4.10/src/clive/parse.py~ 2008-04-25 23:53:39.000000000 +0300
++++ clive-0.4.10/src/clive/parse.py 2008-04-25 23:55:53.000000000 +0300
@@ -50,6 +50,7 @@
- ('guba.com', 'guba', self._parse_guba),
- ('stage6.', 'stage6', self._parse_stage6),
- ('metacafe.', 'metac', self._parse_metacafe),
+ ('dailymotion.', 'dmotion', self._parse_dmotion),
+ ('guba.com', 'guba', self._parse_guba),
+ ('metacafe.', 'metac', self._parse_metacafe),
+ ('delfi.', 'delfi', self._parse_delfi),
- ]
+ ]
- ## Parses a video page data (HTML).
-@@ -184,6 +185,16 @@
+ ## Parses a video page data (HTML)
+@@ -221,6 +222,16 @@
+ url = self._parse_from_to(data, 'mediaURL=', '&', skip_from=1)
+ return (url, vid, low_quality)
- return (url, vid)
-
-+ def _parse_delfi(self, url, data):
++ def _parse_delfi(self, url, data, low_quality):
+ text = self._parse_from_to(data, "flv_url:", ",")
+ try:
+ url = urllib.unquote(text.replace("'",
"").split('flv_url: ',2)[1])
@@ -20,8 +20,8 @@
+ pass
+
+ vid = md5.new(str(time.time())).hexdigest()[:8]
-+ return (url, vid)
++ return (url, vid, low_quality)
+
- def _parse_from_to(self, data, _from, to, skip_from=0):
- start = data.find(_from)
- end = data.find(to, start)
+ def _random_vid(self):
+ return md5.new(str(time.time())).hexdigest()[:8]
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/clive-spz.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/clive-delfi.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
