tradedangerous 11.0.0__tar.gz → 11.0.2__tar.gz

{tradedangerous-11.0.0/tradedangerous.egg-info → tradedangerous-11.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.0.0
+Version: 11.0.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.0.0 → tradedangerous-11.0.2}/tradedangerous/cache.py

@@ -85,23 +85,24 @@ qtyLevelFrag = r"""
 """
 newItemPriceRe = re.compile(r"""
 ^
-    {itemPriceFrag}
+    {base_f}
     (
     \s+
         # demand units and level
-        (?P<demand> {qtyLevelFrag})
+        (?P<demand> {qtylvl_f})
     \s+
         # supply units and level
-        (?P<supply> {qtyLevelFrag})
+        (?P<supply> {qtylvl_f})
         # time is optional
         (?:
         \s+
-            {timeFrag}
+            {time_f}
         )?
     )?
 \s*
 $
-""", re.IGNORECASE + re.VERBOSE)
+""".format(base_f = itemPriceFrag, qtylvl_f = qtyLevelFrag, time_f = timeFrag),
+            re.IGNORECASE + re.VERBOSE)
 
 ######################################################################
 # Exception classes

{tradedangerous-11.0.0 → tradedangerous-11.0.2}/tradedangerous/plugins/eddblink_plug.py

@@ -348,14 +348,14 @@ class ImportPlugin(plugins.ImportPluginBase):
         default = True
         for option in self.options:
             # if not option in ('force', 'fallback', 'skipvend', 'progbar'):
-            if option not in ('force', 'skipvend', 'prices'):
+            if option not in ('force', 'skipvend'):
                 default = False
         if default:
             self.options["listings"] = True
         
         # We can probably safely assume that the plugin has never been run if
         # the prices file doesn't exist, since the plugin always generates it.
-        if not (self.tdb.dataPath / Path("TradeDangerous.prices")).exists():
+        if not (self.tdb.dataPath / Path("TradeDangerous.db")).exists():
             self.options["clean"] = True
         
         if self.getOption("clean"):

{tradedangerous-11.0.0 → tradedangerous-11.0.2}/tradedangerous/plugins/spansh_plug.py

@@ -208,7 +208,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         assert not (self.url and self.file), 'Provide either url or file, not both'
         if self.file and (self.file != '-'):
             self.file = (Path(self.tdenv.cwDir, self.file)).resolve()
-        if not Path(self.tdb.dataPath, "TradeDangerous.prices").exists():
+        if not Path(self.tdb.dataPath, "TradeDangerous.db").exists():
             ri_path = Path(self.tdb.dataPath, "RareItem.csv")
             rib_path = ri_path.with_suffix(".tmp")
             if ri_path.exists():

{tradedangerous-11.0.0 → tradedangerous-11.0.2}/tradedangerous/version.py

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

{tradedangerous-11.0.0 → tradedangerous-11.0.2/tradedangerous.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.0.0
+Version: 11.0.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