From: James Bunton <jamesbunton@fastmail.fm>
Date: Mon, 18 Jul 2011 14:38:33 +0000 (+1000)
Subject: Small improvements
X-Git-Url: https://code.delx.au/monosys/commitdiff_plain/73f35d0d3344acf8372329b75e69d1251fc320c4

Small improvements
---

diff --git a/scripts/sbs-downloader b/scripts/sbs-downloader
index f3a0385..1c3d9fb 100755
--- a/scripts/sbs-downloader
+++ b/scripts/sbs-downloader
@@ -64,7 +64,7 @@ def get_video_list(playlist_url):
 	playlist = grab_xml(playlist_url)
 	for video_desc in playlist.xpath("//video"):
 		video_desc_url = video_desc.xpath("@src")[0]
-		title = video_desc.xpath("title/text()")[0]
+		title = video_desc.xpath("title/text()")[0].strip()
 		video_list[title] = (title, video_desc_url)
 	return video_list
 
@@ -107,11 +107,15 @@ def download_rtmp(filename, vbase, vpath):
 
 def download_urllib(filename, url):
 	print "Downloading: %s -> %s" % (url, filename)
-	src = urllib.urlopen(url)
-	dst = open(filename, "w")
-	shutil.copyfileobj(src, dst)
-	src.close()
-	dst.close()
+	try:
+		src = urllib.urlopen(url)
+		dst = open(filename, "w")
+		shutil.copyfileobj(src, dst)
+	except KeyboardInterrupt:
+		print "\nCancelled", url
+	finally:
+		src.close()
+		dst.close()
 
 def main():
 	while True: