emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

profile loading/creation update, bug fixes

Browse source
This commit is contained in:
ingvar1995 2016-06-23 15:04:36 +03:00
parent a4da3a7afa
commit a714c1045d
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main.py
View file

@ -11,7 +11,6 @@ from profile import tox_factory
from callbacks import init_callbacks
from util import curr_directory
import styles.style
import locale
import toxencryptsave
from passwordscreen import PasswordScreen
import profile
@ -62,8 +61,8 @@ class Toxygen:
encrypt_save = toxencryptsave.LibToxEncryptSave()
if self.path is not None:
path = os.path.dirname(self.path.encode(locale.getpreferredencoding())) + '/'
name = os.path.basename(self.path.encode(locale.getpreferredencoding()))[:-4]
path = os.path.dirname(self.path) + '/'
name = os.path.basename(self.path)[:-4]
data = ProfileHelper(path, name).open_profile()
if encrypt_save.is_data_encrypted(data):
data = self.enter_pass(data)
@ -94,10 +93,11 @@ class Toxygen:
if not _login.t:
return
elif _login.t == 1: # create new profile
_login.name = _login.name.strip()
name = _login.name if _login.name else 'toxygen_user'
self.tox = tox_factory()
self.tox.self_set_name(_login.name if _login.name else 'Toxygen User')
self.tox.self_set_status_message('Toxing on Toxygen')
self.tox.self_set_name(bytes(_login.name, 'utf-8') if _login.name else b'Toxygen User')
self.tox.self_set_status_message(b'Toxing on Toxygen')
ProfileHelper(Settings.get_default_path(), name).save_profile(self.tox.get_savedata())
path = Settings.get_default_path()
settings = Settings(name)
@ -112,7 +112,6 @@ class Toxygen:
self.tox = tox_factory(data, settings)
else:
path, name = auto_profile
path = path.encode(locale.getpreferredencoding())
data = ProfileHelper(path, name).open_profile()
if encrypt_save.is_data_encrypted(data):
data = self.enter_pass(data)