diff --git a/bin/gwinwrap-0-0-2-x64.deb b/bin/gwinwrap-0-0-2-x64.deb index 0bb7b17..b7801e9 100644 Binary files a/bin/gwinwrap-0-0-2-x64.deb and b/bin/gwinwrap-0-0-2-x64.deb differ diff --git a/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/gwinwrap b/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/gwinwrap deleted file mode 100755 index 2166a10..0000000 Binary files a/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/gwinwrap and /dev/null differ diff --git a/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/Logger.py b/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/Logger.py index c7f294e..06eed47 100644 --- a/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/Logger.py +++ b/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/Logger.py @@ -5,8 +5,8 @@ import os, logging class Logger: - def __init__(self): - pass + def __init__(self, config_path): + self._CONFIG_PATH = config_path def get_logger(self, loggerName = "NO_LOGGER_NAME_PASSED", createFile = True): """ @@ -42,8 +42,8 @@ class Logger: log.addHandler(ch) if createFile: - folder = "logs" - file = folder + "/application.log" + folder = self._CONFIG_PATH + file = f"{folder}/application.log" if not os.path.exists(folder): os.mkdir(folder) diff --git a/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/Settings.py b/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/Settings.py index e729ee4..0bf6325 100644 --- a/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/Settings.py +++ b/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/Settings.py @@ -29,7 +29,7 @@ class Settings: self._XSCREEN_SAVERS = "/usr/lib/xscreensaver/" - self._logger = Logger().get_logger() + self._logger = Logger(self._CONFIG_PATH).get_logger() self._builder = Gtk.Builder() self._main_window = None diff --git a/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/__init__.py b/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/__init__.py index 415301e..15fcd01 100644 --- a/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/__init__.py +++ b/src/debs/gwinwrap-0-0-2-x64/opt/GWinWrap/utils/__init__.py @@ -1,6 +1,2 @@ -""" - Utils module -""" - from .Logger import Logger from .Settings import Settings diff --git a/src/versions/0.0.2/GWinWrap/utils/Logger.py b/src/versions/0.0.2/GWinWrap/utils/Logger.py index c7f294e..06eed47 100644 --- a/src/versions/0.0.2/GWinWrap/utils/Logger.py +++ b/src/versions/0.0.2/GWinWrap/utils/Logger.py @@ -5,8 +5,8 @@ import os, logging class Logger: - def __init__(self): - pass + def __init__(self, config_path): + self._CONFIG_PATH = config_path def get_logger(self, loggerName = "NO_LOGGER_NAME_PASSED", createFile = True): """ @@ -42,8 +42,8 @@ class Logger: log.addHandler(ch) if createFile: - folder = "logs" - file = folder + "/application.log" + folder = self._CONFIG_PATH + file = f"{folder}/application.log" if not os.path.exists(folder): os.mkdir(folder) diff --git a/src/versions/0.0.2/GWinWrap/utils/Settings.py b/src/versions/0.0.2/GWinWrap/utils/Settings.py index e729ee4..0bf6325 100644 --- a/src/versions/0.0.2/GWinWrap/utils/Settings.py +++ b/src/versions/0.0.2/GWinWrap/utils/Settings.py @@ -29,7 +29,7 @@ class Settings: self._XSCREEN_SAVERS = "/usr/lib/xscreensaver/" - self._logger = Logger().get_logger() + self._logger = Logger(self._CONFIG_PATH).get_logger() self._builder = Gtk.Builder() self._main_window = None diff --git a/src/versions/0.0.2/GWinWrap/utils/__init__.py b/src/versions/0.0.2/GWinWrap/utils/__init__.py index 415301e..15fcd01 100644 --- a/src/versions/0.0.2/GWinWrap/utils/__init__.py +++ b/src/versions/0.0.2/GWinWrap/utils/__init__.py @@ -1,6 +1,2 @@ -""" - Utils module -""" - from .Logger import Logger from .Settings import Settings