tradedangerous 11.0.0__py3-none-any.whl → 11.0.2__py3-none-any.whl

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/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/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/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.dist-info → tradedangerous-11.0.2.dist-info}/METADATA

@@ -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.dist-info → tradedangerous-11.0.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 tradedangerous/__init__.py,sha256=bwsbE_GyCNsuyGDKnfXAg0RD-ewsWHliySJ5QfCK7h8,1166
-tradedangerous/cache.py,sha256=gWcFrgaaBJ5ntm65qfhxrVsWco7ezOCCHq7zqU1fdOc,35958
+tradedangerous/cache.py,sha256=VH7_Bs-vz1H9KEbQah_4w3zqY3nG7HOegHZGzlKip80,36028
 tradedangerous/cli.py,sha256=4B6FFYyH8M6Z4D8CJHsrkABHsb_O7pmTrJ7M_lB2Za8,4531
 tradedangerous/corrections.py,sha256=_WLgo1IBWoskrrPFeshRwCOeJ2BeJb_x4tDQ0JdAo-s,1340
 tradedangerous/csvexport.py,sha256=0XrQKLdt1STinZsBlBN3NHGh0BT81HKVe_oi9lFlLno,8637
@@ -21,7 +21,7 @@ tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk
 tradedangerous/tradegui.py,sha256=q2HdIdoyeLUpeF2X0hVIGn7sU6T4zOzq1HN0zGvZdyE,788
 tradedangerous/transfers.py,sha256=NWdrE3gfBlvqnoSJEuWHqYbWFHUHNDd5D0YYMQkpaMY,10513
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=YUJRA3x67PwXqjbZlTlDBrP8gBZtkLZTVQHC9P-QK9Q,646
+tradedangerous/version.py,sha256=WM4xA7PmvxejHn0EFoa9NayVrOkwZG5LJisnSbHdI4o,646
 tradedangerous/commands/TEMPLATE.py,sha256=MOE69xsZPHPIMBQ-LXicfsOlCZdy-2gPX_nlnwYYil8,2026
 tradedangerous/commands/__init__.py,sha256=3gz2cnXNZNkV1gtZh0dOnCRxBkQHbeIyysRe3bM2WEE,9516
 tradedangerous/commands/buildcache_cmd.py,sha256=_8vKu9e3tQy0HEPrnG8Ts0OoQ_kF6gZPQ9EOfTUd73w,2179
@@ -62,18 +62,18 @@ tradedangerous/misc/progress.py,sha256=NKvKP1OSCTpItc1CNxDuEH2A1oGJ6aWSyCdPSAjsG
 tradedangerous/plugins/__init__.py,sha256=TL-OIptlqNENKhoFqkFeBJn_vSw8L0pVaDJgjhaTj7A,7860
 tradedangerous/plugins/edapi_plug.py,sha256=5nqBYmjUceAt-KTfiBn7IEl443R1SsGLDmfVXgbcyms,42262
 tradedangerous/plugins/edcd_plug.py,sha256=JuDtuEM_mN9Sz2H09-qYizM-9N3cuNjgvQy7Y-wHwKw,14412
-tradedangerous/plugins/eddblink_plug.py,sha256=Gxb8yYET5m82EofappsZnH168wOFYalFN6WV29_Fmm4,21975
+tradedangerous/plugins/eddblink_plug.py,sha256=pfPROnJKhvLHDNruOx_wHGK876aYS7dE8xcMVuWw1ak,21961
 tradedangerous/plugins/edmc_batch_plug.py,sha256=rrP_lFFxWsba8DPEo0WF2EdCiMoRC7tCT8z62MIvtIo,4173
 tradedangerous/plugins/journal_plug.py,sha256=5HMyoxQ7z42qj7NiL8rDxSyTN9gKikoQjyWzJLD-SYQ,23746
 tradedangerous/plugins/netlog_plug.py,sha256=yUl47l9xt3kGj9oSiY_FZaDGdnQj63oa9MBtSeIy1Zo,13469
-tradedangerous/plugins/spansh_plug.py,sha256=72_7aWQAxtb_xUEOaD_3oqB2DxEyhkCR1BY1EXn2-iw,26734
+tradedangerous/plugins/spansh_plug.py,sha256=viIlFNrVocRKjZ1rg8mNTZsHaZoSAn5_6vEGn67suVQ,26730
 tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTKibsgQ,649
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=VlQK7QGtEi2brGtWaIZDvKmbJ_vLocD4CJ8h_6kKptU,7808
-tradedangerous-11.0.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.0.0.dist-info/METADATA,sha256=x6KVRq9ei1todd1NClT969S0dMaj75HS4zky28YInUY,4435
-tradedangerous-11.0.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.0.0.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
-tradedangerous-11.0.0.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
-tradedangerous-11.0.0.dist-info/RECORD,,
+tradedangerous-11.0.2.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.0.2.dist-info/METADATA,sha256=_vaFgkOz_3wl328H1FA2rSCzopguYOklEFx_brB23ho,4435
+tradedangerous-11.0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.0.2.dist-info/entry_points.txt,sha256=pSwa-q0ob443uiKux7xFKYQl8uen66iDTnjdrQhNLx8,92
+tradedangerous-11.0.2.dist-info/top_level.txt,sha256=bF29i-oEltmNICgElEKxNsg83oahJvxg3a7YrxZi9Rk,15
+tradedangerous-11.0.2.dist-info/RECORD,,