if installed_tbb_version == current_tbb_version:
# current version is tbb is installed, launch it
- subprocess.call([self.paths['file']['start']])
+ self.run(False)
launch_gui = False
elif installed_tbb_version < self.current_tbb_version:
# there is a tbb upgrade available
'dir': {
'data': tbb_data,
'download': tbb_data+'/download',
- 'tbb': tbb_data+'/tbb/'+self.architecture
+ 'tbb': tbb_data+'/tbb/'+self.architecture,
+ 'gpg': tbb_data+'/gpgtmp'
},
'file': {
'version': tbb_data+'/version',
'start': tbb_data+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser',
'tarball': tbb_data+'/download/'+tarball_filename,
- 'tarball_sig': tbb_data+'/download/'+tarball_filename+'.asc'
+ 'tarball_sig': tbb_data+'/download/'+tarball_filename+'.asc',
+ 'verify': '/usr/share/torbrowser-launcher/verify.sh'
},
'url': {
#'tarball': 'https://www.torproject.org/dist/torbrowser/linux/'+tarball_filename,
# progress bar
self.progressbar = gtk.ProgressBar(adjustment=None)
self.progressbar.set_orientation(gtk.PROGRESS_LEFT_TO_RIGHT)
+ self.progressbar.set_pulse_step(0.1)
+ self.progressbar_is_pulsing = False
self.box.pack_start(self.progressbar, True, True, 0)
# button box
self.button_box.add(self.exit_button)
self.exit_button.show()
- # statusbar
- self.statusbar = gtk.Label('')
- self.statusbar.set_line_wrap(True)
- self.box.pack_start(self.statusbar, True, True, 0)
-
self.box.show()
self.window.show();
def start(self, widget, data=None):
# disable the start button
self.start_button.set_sensitive(False)
+
+ # start running tasks
+ self.gui_task_i = 0
+ self.run_task()
+
+ # run the next task in the task list
+ def run_task(self):
+ if self.gui_task_i >= len(self.gui_tasks):
+ self.destroy(False)
+ return
+
+ task = self.gui_tasks[self.gui_task_i]
- # show the statusbar
- #self.statusbar.show()
+ # get ready for the next task
+ self.gui_task_i += 1
+
+ if task == 'download_tarball':
+ print 'Downloading '+self.paths['url']['tarball']
+ self.download('tarball', self.paths['url']['tarball'], self.paths['file']['tarball'])
- # loop through tasks
- for task in self.gui_tasks:
- if task == 'download_tarball':
- print 'Downloading '+self.paths['url']['tarball']
- if not self.download('tarball', self.paths['url']['tarball'], self.paths['file']['tarball']):
- self.start_button.set_sensitive(True)
- break
+ elif task == 'download_tarball_sig':
+ print 'Downloading '+self.paths['url']['tarball_sig']
+ self.download('signature', self.paths['url']['tarball_sig'], self.paths['file']['tarball_sig'])
- elif task == 'download_tarball_sig':
- print 'Downloading '+self.paths['url']['tarball_sig']
- if not self.download('signature', self.paths['url']['tarball_sig'], self.paths['file']['tarball_sig']):
- self.start_button.set_sensitive(True)
- break
+ elif task == 'verify':
+ print 'Verifying signature'
+ self.verify()
- elif task == 'verify':
- print 'Verifying signature'
+ elif task == 'extract':
+ print 'Extracting '+self.paths['filename']['tarball']
+ self.extract()
- elif task == 'extract':
- print 'Extracting '+self.paths['filename']['tarball']
+ elif task == 'run':
+ print 'Running '+self.paths['file']['start']
+ self.run()
- elif task == 'run':
- print 'Running '+self.paths['file']['start']
def download(self, name, url, path):
# initialize the progress bar
self.dl_bytes_so_far = 0
# set a timer to download more chunks
- self.timer = gobject.timeout_add(1, self.download_chunk)
+ self.timer = gobject.timeout_add(1, self.download_chunk, name)
# open a file to write to
self.file_download = open(path, 'w')
- def download_chunk(self):
+ def download_chunk(self, name):
# download 10kb a time
chunk = self.dl_response.read(10240)
self.dl_bytes_so_far += len(chunk)
if not chunk:
self.file_download.close()
+ # next task!
+ self.run_task()
return False
percent = float(self.dl_bytes_so_far) / self.dl_total_size
self.progressbar.set_fraction(percent)
percent = round(percent*100, 2)
- self.progressbar.set_text("Downloaded %d" % (percent) + '%')
+ self.progressbar.set_text("Downloaded %d%% of %s" % (percent, name))
sys.stdout.write("Downloaded %d of %d bytes (%0.2f%%)\r" % (self.dl_bytes_so_far, self.dl_total_size, percent))
return True
+ def progressbar_pulse(self):
+ print 'pulse'
+ if self.progressbar_is_pulsing:
+ self.progressbar.pulse()
+ return True
+ else:
+ return False
+
+ def verify(self):
+ # initialize the progress bar
+ self.progressbar.set_fraction(0)
+ self.progressbar.set_text('Verifying Signature')
+ self.progressbar.show()
+ self.progressbar_is_pulsing = True
+ self.timer = gobject.timeout_add(1, self.progressbar_pulse)
+
+ error = False
+
+ verify_output = subprocess.check_output([self.paths['file']['verify'], self.paths['dir']['gpg'], self.paths['file']['tarball_sig']], stderr=subprocess.STDOUT)
+ if 'Good signature' in verify_output:
+ self.progressbar_is_pulsing = False
+ self.run_task();
+ else:
+ error = True
+
+ if error:
+ self.progressbar_is_pulsing = False
+ self.label = "Signature verification failed!"
+
+ def extract(self):
+ # initialize the progress bar
+ self.progressbar.set_fraction(0)
+ self.progressbar.set_text('Installing')
+ self.progressbar.show()
+ self.progressbar_is_pulsing = True
+ self.timer = gobject.timeout_add(1, self.progressbar_pulse)
+
+ subprocess.call(['tar', '-xf', self.paths['file']['tarball'], '-C', self.paths['dir']['tbb']])
+
+ self.progressbar_is_pulsing = False
+ self.run_task();
+
+ def run(self, run_next_task = True):
+ subprocess.Popen([self.paths['file']['start']])
+ if run_next_task:
+ self.run_task();
+
# exit
def delete_event(self, widget, event, data=None):
return False
projects / torbrowser-launcher.git / blobdiff