rpms/autodownloader/F-8 autodownloader-0.2.0-check-existing-files.patch, NONE, 1.1 autodownloader.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/autodownloader/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17374

Modified Files:
	autodownloader.spec 
Added Files:
	autodownloader-0.2.0-check-existing-files.patch 
Log Message:
* Thu Oct  4 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.0-4
- Check if files exist (and have the correct md5sum) from a previous download
  and skip downloading them (bz 309381)


autodownloader-0.2.0-check-existing-files.patch:

--- NEW FILE autodownloader-0.2.0-check-existing-files.patch ---
diff -up autodownloader-0.2.0/AutoDL.py.orig autodownloader-0.2.0/AutoDL.py
--- autodownloader-0.2.0/AutoDL.py.orig	2007-10-04 13:34:39.000000000 +0200
+++ autodownloader-0.2.0/AutoDL.py	2007-10-04 14:28:50.000000000 +0200
@@ -244,7 +244,8 @@ class Downloader:
 		fs.write(md5 + "  " + filename)
 		fs.close()
 
-		check_result = os.system("md5sum --status -c " + fname)
+		check_result = os.system("md5sum --status -c " + fname +
+						" 2> /dev/null")
 		os.remove(fname)
 
 		if check_result == 0:
@@ -256,6 +257,10 @@ class Downloader:
 		self.remaining_files = filelist
 		for x in filelist:
 			download_complete = False
+			
+			if self.md5_check(x['path'] + '/' + x['filename'], x['md5']):
+				self.remaining_files = self.remaining_files[1:]
+				download_complete = True
 
 			self.mirror_count = 0
 			self.mirror_total = len (x['urllist'])


Index: autodownloader.spec
===================================================================
RCS file: /cvs/extras/rpms/autodownloader/F-8/autodownloader.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autodownloader.spec	5 Aug 2007 18:37:05 -0000	1.3
+++ autodownloader.spec	15 Nov 2007 13:32:46 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           autodownloader
 Version:        0.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GUI-tool to automate the download of certain files
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://sourceforge.net/projects/autodownloader
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         autodownloader-0.2.0-timeout.patch
+Patch1:         autodownloader-0.2.0-check-existing-files.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       pygtk2-libglade
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -52,6 +54,10 @@
 
 
 %changelog
+* Thu Oct  4 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.0-4
+- Check if files exist (and have the correct md5sum) from a previous download
+  and skip downloading them (bz 309381)
+
 * Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2.0-3
 - Update License tag for new Licensing Guidelines compliance