--- autodownloader-0.2.0/AutoDL.py	2007-12-05 20:49:05.000000000 +0100

+++ autodownloader-0.2.0/AutoDL.py	2007-12-05 20:45:51.000000000 +0100

@@ -1,8 +1,8 @@

 #!/usr/bin/env python

-	

+

 #----------------------------------------------------------------------

 # Copyright (C) 2007	Robbert Gorter, Maurice van de Klundert, Mark de Vries

-# Copyright (C) 2007    Hans de Goede <j.w.r.degoede@hhs.nl>

+# Copyright (C) 2007	Hans de Goede <j.w.r.degoede@hhs.nl>

 #

 #    This program is free software; you can redistribute it and/or modify

 #    it under the terms of the GNU General Public License as published by

@@ -105,30 +105,30 @@

 	def read_setting(self, content, first_tag):

 		offset = len(first_tag)

 		last_tag = '[/' + first_tag[1:]

-		

+

 		find_index_start = 0

 		find_index_end = 0

 		find_index_start = string.find(content, first_tag)

 		if find_index_start == -1:

 			raise Missing_tag(first_tag)

-			

+

 		low_index = find_index_start + offset

-			

+

 		find_index_end = string.find(content, last_tag)

 		if find_index_end == -1:

 			raise Missing_tag(last_tag)

-			

+

 		high_index = find_index_end

-			

+

 		if find_index_start > find_index_end:

 			raise Wrong_tag(first_tag)

-		

+

 		setting = content[low_index:high_index].strip()

 		for envvar in re.findall(r'\$\w+', setting):

 			setting = setting.replace(envvar,

 				os.getenv(envvar[1:], ''))

-	

+

 		return setting

 	def read_messagelist(self, content):

@@ -145,15 +145,15 @@

 				raise Missing_tag('[/MESSAGE]')

 			valid_content = content[message_boundary_low:message_boundary_high]

-			

+

 			title = self.read_setting(valid_content, '[TITLE]')

 			text = self.read_setting(valid_content, '[TEXT]')

-			

+

 			message_record = { 'title': title, 'text': text }

 			message_list.append(message_record)

 			message_boundary_low = string.find(content, '[MESSAGE]', message_boundary_high)

-		return message_list		

+		return message_list

 	def read_filelist(self, content):

@@ -182,13 +182,13 @@

 			file_boundary_low = string.find(content, '[FILE]', file_boundary_high)

-		return file_list		

+		return file_list

 	def read_urllist(self, content):

 		url_list = []

-		url_boundary_low = string.find(content, '[URL]')			

+		url_boundary_low = string.find(content, '[URL]')

 		if url_boundary_low == -1:

 			raise Missing_tag('[URL]')

@@ -264,7 +264,7 @@

 				self.caller.refresh()

 				if not os.path.exists(x['path']):

 					os.makedirs(x['path'])

-				try:	

+				try:

 					urllib.urlretrieve(x['urllist'][self.mirror_count],

 						x['path'] + '/' + x['filename'],

 						self.progress)

@@ -277,7 +277,7 @@

 					self.mirror_count+=1

 				except socket.timeout:

 					self.caller.report_broken_link(x['urllist'][self.mirror_count])

-					self.mirror_count+=1					

+					self.mirror_count+=1

 				except:

 					self.abort_download = True

 					raise

@@ -296,7 +296,7 @@

 # GUI class

 #----------------------------------------------------------------------

 class AutoDL(GladeWindow):

-	

+

 	#----------------------------------------------------------------------

@@ -350,10 +350,10 @@

 		if self.error_logger.flag():

 			top_window = 'ErrorWindow'

 			GladeWindow.__init__(self, filename, top_window, widget_list, handlers)

-			

+

 			textbuffer = gtk.TextBuffer()

 			iter = textbuffer.get_start_iter()

-	

+

 			textbuffer.insert (iter, self.error_logger.get_log())

 			self.widgets['textview3'].set_buffer(textbuffer)

@@ -363,7 +363,7 @@

 			textbuffer = gtk.TextBuffer()

 			iter = textbuffer.get_start_iter()

-	

+

 			textbuffer.insert(iter, self.settings['messagelist'][0]['text'])

 			self.widgets['message_textview'].set_buffer(textbuffer)

@@ -385,7 +385,7 @@

 	def refresh(self):

 		while gtk.events_pending():

-			gtk.main_iteration(False)		

+			gtk.main_iteration(False)

 	#----------------------------------------------------------------------

@@ -398,7 +398,7 @@

 		self.downloader.switch_mirror()

 	#----------------------------------------------------------------------

-	

+

 	def report_progress(self, bytes, filesize):

 		text_downloaded = "%s" % int (bytes/1024)

@@ -444,7 +444,7 @@

 		self.refresh()

 	#----------------------------------------------------------------------

-  	

+

 	def on_button_accept_yes_clicked(self, *args):

 		self.settings['messagelist'] = self.settings['messagelist'][1:]

 		if len(self.settings['messagelist']):

@@ -457,9 +457,9 @@

 		self.set_top_window(self.widgets['DownloadWindow'])

 		self.show()

-		self.widgets['AcceptWindow'].hide()	

-		self.widgets['Md5Window'].hide()	

-	

+		self.widgets['AcceptWindow'].hide()

+		self.widgets['Md5Window'].hide()

+

 		self.downloader = Downloader(self)

 		try:

 			self.downloader.download(self.settings['filelist'])

@@ -469,7 +469,7 @@

 			textbuffer = gtk.TextBuffer()

 			iter = textbuffer.get_start_iter()

-	

+

 			textbuffer.insert (iter, inst.value)

 			self.widgets['textview3'].set_buffer(textbuffer)

@@ -479,7 +479,7 @@

 			textbuffer = gtk.TextBuffer()

 			iter = textbuffer.get_start_iter()

-	

+

 			textbuffer.insert (iter, inst.value)

 			self.widgets['textview3'].set_buffer(textbuffer)

@@ -493,11 +493,11 @@

 			textbuffer = gtk.TextBuffer()

 			iter = textbuffer.get_start_iter()

-	

+

 			textbuffer.insert (iter, 'Unexpected error while downloading')

 			self.widgets['textview3'].set_buffer(textbuffer)

-			raise			

+			raise

 		else:

 			if 'ask_to_start' in self.settings and self.settings['ask_to_start'] == "FALSE":

 				gtk.main_quit();

@@ -505,23 +505,23 @@

 				self.set_top_window(self.widgets['SuccessWindow'])

 				self.widgets['DownloadWindow'].hide()

 				self.show()

-	

+

 	#----------------------------------------------------------------------

 	def on_button_success_no_clicked(self, *args):

 		sys.exit(2)

-		

+

 	#---------------------------------------------------------------------- 

 	def on_button_md5_yes_clicked(self, *args):

 		self.settings['filelist'] = self.downloader.remaining_files

 		self.on_button_accept_yes_clicked(args)

-	

+

 	#----------------------------------------------------------------------  

-	

+

 	def on_button_success_yes_clicked(self, *args):

 		gtk.main_quit()

-	#----------------------------------------------------------------------		

+	#----------------------------------------------------------------------

 #----------------------------------------------------------------------