copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

if migration fails (python2.3 for ex) Gajim shows a dialog and exit

This commit is contained in:
Yann Leboulanger 2005-12-15 12:03:57 +00:00
parent 5873a8bd9d
commit fd133716e3
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/migrate_logs_to_dot9_db.py
View File

@ -29,6 +29,7 @@ class Migration:
def __init__(self): def __init__(self):
self.constants = logger.Constants() self.constants = logger.Constants()
self.DONE = False self.DONE = False
self.PROCESSING = False
if os.path.exists(PATH_TO_DB): if os.path.exists(PATH_TO_DB):
print '%s already exists. Exiting..' % PATH_TO_DB print '%s already exists. Exiting..' % PATH_TO_DB
@ -202,6 +203,7 @@ class Migration:
self.con.commit() self.con.commit()
self.PROCESSING = True
os.path.walk(PATH_TO_LOGS_BASE_DIR, self.visit, None) os.path.walk(PATH_TO_LOGS_BASE_DIR, self.visit, None)
s = ''' s = '''

15
src/gajim.py
View File

@ -1449,6 +1449,19 @@ class Interface:
gobject.timeout_add(200, self.process_connections) gobject.timeout_add(200, self.process_connections)
gobject.timeout_add(500, self.read_sleepy) gobject.timeout_add(500, self.read_sleepy)
def test_migration(migration):
if not migration.PROCESSING:
dialog = gtk.Dialog()
#FIXME: translate these strings after 0.9
dialog = gtk.MessageDialog(None,
gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL,
gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, message_format = 'Migration failed')
dialog.format_secondary_text('Automatic migration failed. You can run it manually by doing /PATH/TO/GAJIM/src/common/migrate_logs_to_dot9_db.py.')
dialog.run()
dialog.destroy()
sys.exit()
def wait_migration(migration): def wait_migration(migration):
if not migration.DONE: if not migration.DONE:
return True # loop for ever return True # loop for ever
@ -1530,6 +1543,8 @@ if __name__ == '__main__':
t = threading.Thread(target = m.migrate, args = (q,)) t = threading.Thread(target = m.migrate, args = (q,))
t.start() t.start()
gobject.timeout_add(500, wait_migration, m) gobject.timeout_add(500, wait_migration, m)
# In 10 seconds, we test if migration began
gobject.timeout_add(10000, test_migration, m)
gtk.main() gtk.main()
# Init logger values (self.con/cur, jid_already_in) # Init logger values (self.con/cur, jid_already_in)
gajim.logger.init_vars() gajim.logger.init_vars()