tradedangerous 11.1.0__tar.gz → 11.1.2__tar.gz

{tradedangerous-11.1.0/tradedangerous.egg-info → tradedangerous-11.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.1.0
+Version: 11.1.2
 Summary: Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, organized around one of the most powerful trade run optimizers available.
 Home-page: https://github.com/eyeonus/Trade-Dangerous
 Author: eyeonus

{tradedangerous-11.1.0 → tradedangerous-11.1.2}/tradedangerous/cache.py

@@ -991,6 +991,8 @@ def buildCache(tdb, tdenv):
                 importName
             )
     
+    tempDB.commit()
+    
     # Parse the prices file
     if pricesPath.exists():
         processPricesFile(tdenv, tempDB, pricesPath)
@@ -1000,9 +1002,8 @@ def buildCache(tdb, tdenv):
                     pricesPath,
                     stderr=True,
         )
+        tempDB.close()
     
-    tempDB.commit()
-    tempDB.close()
     tdb.close()
     
     tdenv.DEBUG0("Swapping out db files")

{tradedangerous-11.1.0 → tradedangerous-11.1.2}/tradedangerous/plugins/eddblink_plug.py

@@ -12,6 +12,7 @@ import sqlite3
 import ssl
 import time
 import typing
+import locale
 
 from urllib import request
 from pathlib import Path
@@ -25,7 +26,27 @@ if typing.TYPE_CHECKING:
     from typing import Optional
     from .. tradeenv import TradeEnv
 
-
+# Find the first English UTF-8 locale for use in parsing timestamps.
+LOCALE = None
+import platform
+if platform.system() == 'Windows':
+    for lang in locale.windows_locale.values():
+        if "en" in lang:
+            LOCALE = lang
+            break
+else:
+    # for other operating systems
+    for lang in locale.locale_alias.values():
+        if "en" in lang and "UTF-8" in lang:
+            LOCALE = lang
+            break
+if not LOCALE:
+    raise PluginException(
+        "Unable to find compatible locale.\n" +
+        "This plugin needs an English, UTF-8 compatible " +
+        "locale installed in order to function correctly.\n" + 
+        "Please refer to your OS for instructions installing one."
+    )
 # Constants
 BASE_URL = os.environ.get('TD_SERVER') or "https://elite.tromador.com/files/"
 CONTEXT=ssl.create_default_context(cafile=certifi.where())
@@ -159,7 +180,6 @@ class ImportPlugin(plugins.ImportPluginBase):
         """
         Fetch the latest dumpfile from the website if newer than local copy.
         """
-        
         def openURL(url):
             return _request_url(url, headers = {'User-Agent': 'Trade-Dangerous'})
         
@@ -178,7 +198,9 @@ class ImportPlugin(plugins.ImportPluginBase):
             return False
         
         url_time = response.getheader("Last-Modified")
+        locale.setlocale(locale.LC_ALL, LOCALE)
         dumpModded = datetime.datetime.strptime(url_time, "%a, %d %b %Y %H:%M:%S %Z").timestamp()
+        locale.setlocale(locale.LC_ALL, '')
         
         if Path.exists(localPath):
             localModded = localPath.stat().st_mtime
@@ -331,6 +353,8 @@ class ImportPlugin(plugins.ImportPluginBase):
         self.tdenv.NOTE("Finished processing market data. End time = {}", self.now())
     
     def run(self):
+        self.tdenv.DEBUG2(f'Using "{LOCALE}" locale for parsing modified timestamps. Please include this information in any error reports.')
+        
         # Create the /eddb folder for downloading the source files if it doesn't exist.
         try:
             Path(str(self.dataPath)).mkdir()

{tradedangerous-11.1.0 → tradedangerous-11.1.2}/tradedangerous/version.py

@@ -12,5 +12,5 @@
 """just keeper of current version"""
 
 # TODO: remember to update tests when version changes
-__version__ = '11.1.0'
+__version__ = '11.1.2'
 

{tradedangerous-11.1.0 → tradedangerous-11.1.2/tradedangerous.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.1.0
+Version: 11.1.2
 Summary: Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, organized around one of the most powerful trade run optimizers available.
 Home-page: https://github.com/eyeonus/Trade-Dangerous
 Author: eyeonus