9deb76a8ad
- Added -q, --quiet (speaks for itself) - Added -l, --loglevel subsystem=LEVEL,subsystem2=LEVEL2,... - Quell winsock 10035 error. (Equivalent of EINPROGRESS, but winsock likes to have its own error numbers.) - Hide SSL certificate debug stuff unless gajim.c.x.transports loglevel is DEBUG or lower - Avoid unicode problems if we set a profile - Move fingerprint checks from _register_handlers to _connect_success - Some enhancements to fpr checking code
122 lines
3.5 KiB
Python
122 lines
3.5 KiB
Python
import os
|
|
import sys
|
|
import tempfile
|
|
|
|
# Note on path and filename encodings:
|
|
#
|
|
# In general it is very difficult to do this correctly.
|
|
# We may pull information from environment variables, and what encoding that is
|
|
# in is anyone's guess. Any information we request directly from the file
|
|
# system will be in filesystemencoding, and (parts of) paths that we write in
|
|
# this source code will be in whatever encoding the source is in. (I hereby
|
|
# declare this file to be UTF-8 encoded.)
|
|
#
|
|
# To make things more complicated, modern Windows filesystems use UTF-16, but
|
|
# the API tends to hide this from us.
|
|
#
|
|
# I tried to minimize problems by passing Unicode strings to OS functions as
|
|
# much as possible. Hopefully this makes the function return an Unicode string
|
|
# as well. If not, we get an 8-bit string in filesystemencoding, which we can
|
|
# happily pass to functions that operate on files and directories, so we can
|
|
# just leave it as is. Since these paths are meant to be internal to Gajim and
|
|
# not displayed to the user, Unicode is not really necessary here.
|
|
#
|
|
# Update: Python stdlib seems broken, and uses sys.getdefaultencoding() instead
|
|
# of sys.getfilesystemencoding() for converting unicode paths in file operations.
|
|
# Additionally, PyGTK overrides defaultencoding to utf-8, overriding site.py.
|
|
# Therefore, we now use bytestrings and never unicode. (See #2812.)
|
|
|
|
class ConfigPaths:
|
|
def __init__(self, root=None):
|
|
self.root = root
|
|
self.paths = {}
|
|
|
|
if self.root is None:
|
|
if os.name == 'nt':
|
|
try:
|
|
# Documents and Settings\[User Name]\Application Data\Gajim
|
|
|
|
# How are we supposed to know what encoding the environment
|
|
# variable 'appdata' is in? Assuming it to be in filesystem
|
|
# encoding.
|
|
self.root = os.path.join(os.environ['appdata'], 'Gajim')
|
|
except KeyError:
|
|
# win9x, in cwd
|
|
self.root = ''
|
|
else: # Unices
|
|
self.root = os.path.expanduser('~/.gajim')
|
|
|
|
def add_from_root(self, name, path):
|
|
self.paths[name] = (True, path)
|
|
|
|
def add(self, name, path):
|
|
self.paths[name] = (False, path)
|
|
|
|
def __getitem__(self, key):
|
|
relative, path = self.paths[key]
|
|
if not relative:
|
|
return path
|
|
return os.path.join(self.root, path)
|
|
|
|
def get(self, key, default=None):
|
|
try:
|
|
return self[key]
|
|
except KeyError:
|
|
return default
|
|
|
|
def iteritems(self):
|
|
for key in self.paths.iterkeys():
|
|
yield (key, self[key])
|
|
|
|
def windowsify(s):
|
|
if os.name == 'nt':
|
|
return s.capitalize()
|
|
return s
|
|
|
|
def init():
|
|
paths = ConfigPaths()
|
|
|
|
# LOG is deprecated
|
|
k = ('LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS' )
|
|
v = ('logs', 'logs.db', 'vcards', 'avatars', 'emoticons')
|
|
|
|
if os.name == 'nt':
|
|
v = map(lambda x: x.capitalize(), v)
|
|
|
|
for n, p in zip(k, v):
|
|
paths.add_from_root(n, p)
|
|
|
|
paths.add('DATA', os.path.join('..', windowsify('data')))
|
|
paths.add('HOME', os.path.expanduser('~'))
|
|
paths.add('TMP', tempfile.gettempdir())
|
|
|
|
try:
|
|
import svn_config
|
|
svn_config.configure(paths)
|
|
except (ImportError, AttributeError):
|
|
pass
|
|
|
|
# for k, v in paths.iteritems():
|
|
# print "%s: %s" % (repr(k), repr(v))
|
|
|
|
return paths
|
|
|
|
gajimpaths = init()
|
|
|
|
def init_profile(profile, paths=gajimpaths):
|
|
# no unicode
|
|
if isinstance(profile, unicode):
|
|
profile = profile.encode(sys.getfilesystemencoding())
|
|
|
|
conffile = windowsify('config')
|
|
pidfile = windowsify('gajim')
|
|
|
|
if len(profile) > 0:
|
|
conffile += '.' + profile
|
|
pidfile += '.' + profile
|
|
pidfile += '.pid'
|
|
paths.add_from_root('CONFIG_FILE', conffile)
|
|
paths.add_from_root('PID_FILE', pidfile)
|
|
|
|
# for k, v in paths.iteritems():
|
|
# print "%s: %s" % (repr(k), repr(v))
|