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

a file for pickling retained secrets

This commit is contained in:
Brendan Taylor 2007-07-13 22:52:23 +00:00
parent 8af883e852
commit 9d04cd0a82
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/check_paths.py
View File

@ -20,6 +20,8 @@ import stat
from common import gajim from common import gajim
import logger import logger
import pickle
# DO NOT MOVE ABOVE OF import gajim # DO NOT MOVE ABOVE OF import gajim
try: try:
import sqlite3 as sqlite # python 2.5 import sqlite3 as sqlite # python 2.5
@ -84,6 +86,7 @@ def check_and_possibly_create_paths():
LOG_DB_PATH = logger.LOG_DB_PATH LOG_DB_PATH = logger.LOG_DB_PATH
VCARD_PATH = gajim.VCARD_PATH VCARD_PATH = gajim.VCARD_PATH
AVATAR_PATH = gajim.AVATAR_PATH AVATAR_PATH = gajim.AVATAR_PATH
SECRETS_PATH = gajim.SECRETS_PATH
dot_gajim = os.path.dirname(VCARD_PATH) dot_gajim = os.path.dirname(VCARD_PATH)
if os.path.isfile(dot_gajim): if os.path.isfile(dot_gajim):
print _('%s is a file but it should be a directory') % dot_gajim print _('%s is a file but it should be a directory') % dot_gajim
@ -115,6 +118,13 @@ def check_and_possibly_create_paths():
print _('%s is a directory but should be a file') % LOG_DB_PATH print _('%s is a directory but should be a file') % LOG_DB_PATH
print _('Gajim will now exit') print _('Gajim will now exit')
sys.exit() sys.exit()
if not os.path.exists(SECRETS_PATH):
pickle.dump({}, SECRETS_PATH)
elif os.path.isdir(SECRETS_PATH):
print _('%s is a directory but should be a file') % SECRETS_PATH
print _('Gajim will now exit')
sys.exit()
else: # dot_gajim doesn't exist else: # dot_gajim doesn't exist
if dot_gajim: # is '' on win9x so avoid that if dot_gajim: # is '' on win9x so avoid that
@ -126,6 +136,8 @@ def check_and_possibly_create_paths():
if not os.path.isfile(LOG_DB_PATH): if not os.path.isfile(LOG_DB_PATH):
create_log_db() create_log_db()
gajim.logger.init_vars() gajim.logger.init_vars()
if not os.path.isfile(SECRETS_PATH):
pickle.dump({}, SECRETS_PATH)
def create_path(directory): def create_path(directory):
print _('creating %s directory') % directory print _('creating %s directory') % directory

4
src/common/configpaths.py
View File

@ -77,8 +77,8 @@ def init():
paths = ConfigPaths() paths = ConfigPaths()
# LOG is deprecated # LOG is deprecated
k = ( 'LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS' ) k = ( 'LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS', 'SECRETS' )
v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons') v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons', u'secrets')
if os.name == 'nt': if os.name == 'nt':
v = map(lambda x: x.capitalize(), v) v = map(lambda x: x.capitalize(), v)

1
src/common/gajim.py
View File

@ -71,6 +71,7 @@ LOGPATH = gajimpaths['LOG'] # deprecated
VCARD_PATH = gajimpaths['VCARD'] VCARD_PATH = gajimpaths['VCARD']
AVATAR_PATH = gajimpaths['AVATAR'] AVATAR_PATH = gajimpaths['AVATAR']
MY_EMOTS_PATH = gajimpaths['MY_EMOTS'] MY_EMOTS_PATH = gajimpaths['MY_EMOTS']
SECRETS_PATH = gajimpaths['SECRETS']
TMP = gajimpaths['TMP'] TMP = gajimpaths['TMP']
DATA_DIR = gajimpaths['DATA'] DATA_DIR = gajimpaths['DATA']
HOME_DIR = gajimpaths['HOME'] HOME_DIR = gajimpaths['HOME']