move common function into __init__

laps-client/laps_client/__init__.py

@@ -6,3 +6,11 @@
 __website__   = 'https://github.com/schorschii/LAPS4LINUX'
 
 __all__ = [__author__, __license__, __version__]
+
+
+
+import getpass
+
+
+def proposeUsername(domain):
+	return getpass.getuser() + ('@'+domain if domain else '')

laps-client/laps_client/laps_cli.py

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 
 from .__init__ import __title__, __version__, __website__, __author__, __copyright__
+from .__init__ import proposeUsername
 from .filetime import dt_to_filetime, filetime_to_dt
-from . import laps_common
 
 from pathlib import Path
 from os import path, makedirs, rename
@@ -332,7 +332,7 @@ def checkCredentialsAndConnect(self):
 
 		# ask for username and password for SIMPLE bind
 		if self.cfgUsername == '':
-			defaultUsername = laps_common.proposeUsername(self.cfgDomain)
+			defaultUsername = proposeUsername(self.cfgDomain)
 			item = input('👤 Username ['+defaultUsername+']: ') or defaultUsername
 			if item and item.strip() != '':
 				self.cfgUsername = item

laps-client/laps_client/laps_gui.py

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 
 from .__init__ import __title__, __version__, __website__, __author__, __copyright__
+from .__init__ import proposeUsername
 from .filetime import dt_to_filetime, filetime_to_dt
-from . import laps_common
 
 from PyQt5.QtWidgets import *
 from PyQt5.QtGui import *
@@ -722,7 +722,7 @@ def checkCredentialsAndConnect(self):
 				'👤 Username',
 				'Please enter the username which should be used to connect to:\n'+str(self.cfgServer),
 				QLineEdit.Normal,
-				laps_common.proposeUsername(self.cfgDomain)
+				proposeUsername(self.cfgDomain)
 			)
 			if ok and item:
 				self.cfgUsername = item