[vdown commit] r58 - trunk

[codesite...@google.com]

Author: kopfgeldjaeger
Date: Tue Nov 13 12:28:25 2007
New Revision: 58

Modified:
trunk/main.py

Log:
fixed stage6 bug

Modified: trunk/main.py
==============================================================================
--- trunk/main.py (original)
+++ trunk/main.py Tue Nov 13 12:28:25 2007
@@ -101,10 +101,9 @@
self.url = url
self.data = [None, None, None, None]
def run(self):
- if
re.match("(http://)?stage6.divx.com/[^0-9]*/video/[0-9]*/.*", self.url)
== None: # if no stage6 video
+ if re.match("(http://)?stage6.divx.com/.*/video/[0-9]*/.*",
self.url) == None: # if no stage6 video
SITE="www.videograb.de"
FILENAME="/cgi-bin/video.cgi?url="+self.url
-
con_vg=httplib.HTTPConnection(SITE)
con_vg.request("GET", FILENAME)
con_vg_info = con_vg.getresponse()
@@ -121,7 +120,8 @@
self.status = 0
self.data = [WANTEDLINK, WANTEDNAME, VIDEO_FILENAME, True]
else: # if stage6 video
- video_id =
re.match("(http://)?stage6.divx.com/[^0-9]*/video/([0-9]*)/.*", self.url).group(2)
+ print "is stage6"
+ video_id =
re.match("(http://)?stage6.divx.com/.*/video/([0-9]*)/.*", self.url).group(2)
WANTEDLINK="http://video.stage6.com/%s/.divx" % (video_id)
VIDEO_FILENAME=re.sub("$", ".divx", video_id) # add .divx
at the end
self.status = 0