[vdown commit] r57 - trunk
codesite...@google.com
Date: Sun Nov 11 05:39:58 2007
New Revision: 57
Modified:
trunk/cli.py
trunk/gui.py
trunk/main.py
Log:
added stage6 support
Modified: trunk/cli.py
==============================================================================
--- trunk/cli.py (original)
+++ trunk/cli.py Sun Nov 11 05:39:58 2007
@@ -114,7 +114,7 @@
putWinString = True
if(progress == 100.0):
sys.stdout.write(_("\rDownload finished...
\n"))
- if config.getboolean("general", "convert"):
+ if config.getboolean("general", "convert") and data.data[3]:
print _("Converting file...")
output = fconvert(saveAs,
config.get("general", "convert_filename_extension"), config.get("general", "convertcmd"))
output.start()
Modified: trunk/gui.py
==============================================================================
--- trunk/gui.py (original)
+++ trunk/gui.py Sun Nov 11 05:39:58 2007
@@ -143,7 +143,7 @@
gtk.main_iteration_do(True)
pb.set_fraction(1)
pb.set_text(_("Download finished."))
- if self.config.getboolean("general", "convert"):
+ if self.config.getboolean("general", "convert") and data.data[3]:
pb.set_text(_("Converting file"))
output = convert(saveAs,
self.config.get("general", "convert_filename_extension"), self.config.get("general", "convertcmd"))
output.start()
@@ -250,7 +250,7 @@
pb.set_fraction(1)
pb.set_text(_("Finished download #%(number)s") %
{"number" : v_no})
successful += 1
- if self.config.getboolean("general", "convert"):
+ if self.config.getboolean("general", "convert") and data.data[3]:
pb.set_text(_("Converting file"))
output = convert(saveAs,
self.config.get("general", "convert_filename_extension"), self.config.get("general", "convertcmd"))
output.start()
Modified: trunk/main.py
==============================================================================
--- trunk/main.py (original)
+++ trunk/main.py Sun Nov 11 05:39:58 2007
@@ -99,26 +99,33 @@
threading.Thread.__init__(self)
self.status = -1
self.url = url
- self.data = [None, None, None]
+ self.data = [None, None, None, None]
def run(self):
- SITE="www.videograb.de"
- FILENAME="/cgi-bin/video.cgi?url="+self.url
+ if
re.match("(http://)?stage6.divx.com/[^0-9]*/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()
- con_vg_data=con_vg_info.read()
+ con_vg=httplib.HTTPConnection(SITE)
+ con_vg.request("GET", FILENAME)
+ con_vg_info = con_vg.getresponse()
+ con_vg_data=con_vg_info.read()
- try:
- WANTEDLINE=[ l for l in con_vg_data.splitlines()
if ">Download von " in l][0] # echo "rabfoo \nfoobar" | grep bar
- except IndexError:
- self.status = 1
- else:
- WANTEDLINK=re.sub(">Download$", "", re.sub("\"", "",
re.sub("href\=", "", re.split(" ", WANTEDLINE)[1])))
- WANTEDNAME=re.sub("<br>$", "", re.split("</a>: ", WANTEDLINE)[1])
- VIDEO_FILENAME=re.sub("(?i).flv.flv", ".flv", WANTEDNAME+".flv")
+ try:
+ WANTEDLINE=[ l for l in con_vg_data.splitlines()
if ">Download von " in l][0] # echo "rabfoo \nfoobar" | grep bar
+ except IndexError:
+ self.status = 1
+ else:
+ WANTEDLINK=re.sub(">Download$", "", re.sub("\"", "",
re.sub("href\=", "", re.split(" ", WANTEDLINE)[1])))
+ WANTEDNAME=re.sub("<br>$", "", re.split("</a>: ", WANTEDLINE)[1])
+ VIDEO_FILENAME=re.sub("(?i).flv.flv", ".flv", WANTEDNAME+".flv")
+ 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)
+ WANTEDLINK="http://video.stage6.com/%s/.divx" % (video_id)
+ VIDEO_FILENAME=re.sub("$", ".divx", video_id) # add .divx
at the end
self.status = 0
- self.data = [WANTEDLINK, WANTEDNAME, VIDEO_FILENAME]
+ self.data = [WANTEDLINK, video_id, VIDEO_FILENAME, False]
def folder_is_writable(dir):
"""