Fix default log file path on Windows when using PyInstaller

Also avoid repeated recreation of the GUI menu on startup

Author: simonrob

README.md

@@ -100,7 +100,7 @@ If this argument is not provided, the proxy will look for `emailproxy.config` in
 The value of this argument can either be the full path to a local file (which must be writable), or an identifier for an external store such as a secrets manager (see the [documentation below](#advanced-configuration)).
 If this argument is not provided, credentials will be cached in the current configuration file.
 
-- `--log-file` allows you to specify the location of a file to send log output to.
+- `--log-file` allows you to specify the location of a file to send log output to (full path required).
 Log files are rotated at 32MB and 10 older log files are kept.
 This option overrides the proxy's default behaviour, which varies by platform (see [below](#troubleshooting) for details).
 

emailproxy.py

@@ -6,7 +6,7 @@
 __author__ = 'Simon Robinson'
 __copyright__ = 'Copyright (c) 2022 Simon Robinson'
 __license__ = 'Apache 2.0'
-__version__ = '2023-03-27'  # ISO 8601 (YYYY-MM-DD)
+__version__ = '2023-03-28'  # ISO 8601 (YYYY-MM-DD)
 
 import abc
 import argparse
@@ -212,7 +212,8 @@ def initialise(log_file=None):
         Log._LOGGER = logging.getLogger(APP_NAME)
         if log_file or sys.platform == 'win32':
             handler = logging.handlers.RotatingFileHandler(
-                log_file or '%s/%s.log' % (os.path.dirname(os.path.realpath(__file__)), APP_SHORT_NAME),
+                log_file or '%s/%s.log' % (os.path.dirname(sys.executable if getattr(sys, 'frozen', False) else
+                                                           os.path.realpath(__file__)), APP_SHORT_NAME),
                 maxBytes=LOG_FILE_MAX_SIZE, backupCount=LOG_FILE_MAX_BACKUPS)
             handler.setFormatter(logging.Formatter('%(asctime)s: %(message)s'))
         elif sys.platform == 'darwin':
@@ -2313,10 +2314,8 @@ def get_icon_size(text, font_size):
     def create_config_menu(self):
         items = []
         if len(self.proxies) <= 0:
-            # note that we don't actually allow no servers when loading config, but just in case that behaviour changes
-            items.append(pystray.MenuItem('Servers:', None, enabled=False))
-            items.append(pystray.MenuItem('    No servers configured', None, enabled=False))
-            items.append(pystray.Menu.SEPARATOR)
+            # note that we don't actually allow no servers when loading the config, so no need to generate a menu
+            return items  # (avoids creating and then immediately regenerating the menu when servers are loaded)
         else:
             for server_type in ['IMAP', 'POP', 'SMTP']:
                 items.extend(App.get_config_menu_servers(self.proxies, server_type))