Imported Debian patch 2007.10.09-1

diff --combined debian/changelog
index 97c94a2d60f8770ec866987a84bbeb20a67e4a05,0000000000000000000000000000000000000000..ac9c6f6ed4e3b5593497f4429b64ee0416b2f2b4
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,70 -1,0 +1,76 @@@
++youtube-dl (2007.10.09-1) unstable; urgency=low
++
++  * New upstream release.
++
++ -- Robert S. Edmonds <edmonds@debian.org>  Mon, 08 Oct 2007 19:22:33 -0400
++
 +youtube-dl (2007.08.24-1) unstable; urgency=low
 +
 +  * New upstream release; closes: #439363.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Fri, 24 Aug 2007 13:54:40 -0400
 +
 +youtube-dl (2007.06.22-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - regex update.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Thu, 21 Jun 2007 20:42:57 -0400
 +
 +youtube-dl (2007.06.06-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - "--title-too" command line option to print the video's title.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Thu, 07 Jun 2007 01:04:01 -0400
 +
 +youtube-dl (2007.03.27-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Progress meter.
 +    - "--literal" command line option to use the video title in the filename.
 +    - "--get-url" command line option to print the real video URL.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Mon,  2 Apr 2007 21:46:56 -0400
 +
 +youtube-dl (2007.02.18-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Diction.
 +    - Catches socket errors.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Tue, 20 Feb 2007 13:57:32 -0500
 +
 +youtube-dl (2007.01.19-1) unstable; urgency=low
 +
 +  * New upstream release, closes: #406146.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun, 28 Jan 2007 17:41:44 -0500
 +
 +youtube-dl (2006.12.07-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Use -t to name the downloaded file after the title, closes: #395184.
 +    - Parses URLs without a leading "http://", closes: #400321.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun, 10 Dec 2006 13:52:36 -0500
 +
 +youtube-dl (2006.11.12-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sat, 25 Nov 2006 16:12:03 -0500
 +
 +youtube-dl (2006.09.25-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * python >= 2.4 is now required.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Wed, 27 Sep 2006 17:43:07 -0400
 +
 +youtube-dl (2006.08.28-1) unstable; urgency=low
 +
 +  * Initial release, closes: #385748.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun,  3 Sep 2006 19:43:27 -0400
 +

diff --combined youtube-dl
index 686e5c49f4ef63a6335d3eea2d34638b402872ec,c2d195c55a655b75132c49c4f21436502e366b1c..362600613c0fb70881459fe113ad88d340883c06
--- 1/youtube-dl
--- 2/youtube-dl
+++ b/youtube-dl
@@@ -45,11 -45,12 +45,12 @@@ const_login_url_str = 'http://www.youtu
  const_login_post_str = 'current_form=loginForm&next=%%2Fwatch%%3Fv%%3D%s&username=%s&password=%s&action_login=Log+In'
  const_age_url_str = 'http://www.youtube.com/verify_age?next_url=/watch%%3Fv%%3D%s'
  const_age_post_str = 'next_url=%%2Fwatch%%3Fv%%3D%s&action_confirm=Confirm'
- const_url_t_param_re = re.compile(r'[,{]t:\'([^\']*)\'')
+ const_url_t_param_re = re.compile(r"[,{]t:'([^']*)'")
  const_video_url_real_str = 'http://www.youtube.com/get_video?video_id=%s&t=%s'
  const_video_title_re = re.compile(r'<title>YouTube - ([^<]*)</title>', re.M | re.I)
  const_1k = 1024
  const_initial_block_size = 10 * const_1k
+ const_epsilon = 0.0001
  
  # Print error message, followed by standard advice information, and then exit
  def error_advice_exit(error_text):
@@@ -142,7 -143,7 +143,7 @@@ def new_block_size(before, after, bytes
        new_min = max(bytes / 2.0, 1.0)
        new_max = max(bytes * 2.0, 1.0)
        dif = after - before
-       if dif < 0.0001:
+       if dif < const_epsilon:
                return int(new_max)
        rate = bytes / dif
        if rate > new_max:
@@@ -173,9 -174,10 +174,10 @@@ def format_bytes(num_bytes)
  
  # Calculate ETA and return it in string format as MM:SS
  def calc_eta(start, now, total, current):
-       if current == 0:
+       dif = now - start
+       if current == 0 or dif < const_epsilon:
                return '--:--'
-       rate = float(current) / (now - start)
+       rate = float(current) / dif
        eta = long((total - current) / rate)
        eta_mins = eta / 60
        eta_secs = eta % 60
@@@ -185,13 -187,14 +187,14 @@@
  
  # Calculate speed and return it in string format
  def calc_speed(start, now, bytes):
-       if bytes == 0:
+       dif = now - start
+       if bytes == 0 or dif < const_epsilon:
                return 'N/A b'
-       return format_bytes(float(bytes) / (now - start))
+       return format_bytes(float(bytes) / dif)
  
  # Create the command line options parser and parse command line
  cmdl_usage = 'usage: %prog [options] video_url'
- cmdl_version = '2007.08.24'
+ cmdl_version = '2007.10.09'
  cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve')
  cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit')
  cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit')
@@@ -323,7 -326,9 +326,9 @@@ video_url_real = const_video_url_real_s
  
  # Retrieve video data
  try:
+       cond_print('Requesting video file... ')
        video_data = perform_request(video_url_real)
+       cond_print('done.')
        cond_print('Video data found at %s\n' % video_data.geturl())
  
        if cmdl_opts.get_title:
@@@ -369,7 -374,7 +374,7 @@@
                block_size = new_block_size(before, after, dl_bytes)
  
        if video_len is not None and byte_counter != video_len:
 -              error_advice_exit('server did not send the expected ammount of data')
 +              error_advice_exit('server did not send the expected amount of data')
  
        video_file.close()
        cond_print('done.\n')