tradedangerous 11.2.0__py3-none-any.whl → 11.2.1__py3-none-any.whl

tradedangerous/commands/parsing.py

@@ -60,7 +60,6 @@ class PadSizeArgument(int):
             'dest': 'padSize',
             'metavar': 'PADSIZES',
             'type': 'padsize',
-            'choices': 'SsMmLl?',
         }
 
 
@@ -153,7 +152,6 @@ class PlanetaryArgument(int):
             'dest': 'planetary',
             'metavar': 'PLANETARY',
             'type': 'planetary',
-            'choices': 'YyNn?',
         }
 
 
@@ -181,7 +179,6 @@ class FleetCarrierArgument(int):
             'dest': 'fleet',
             'metavar': 'FLEET',
             'type': 'fleet',
-            'choices': 'YyNn?',
         }
 
 class OdysseyArgument(int):
@@ -208,7 +205,6 @@ class OdysseyArgument(int):
             'dest': 'odyssey',
             'metavar': 'ODYSSEY',
             'type': 'odyssey',
-            'choices': 'YyNn?',
         }
 
 

tradedangerous/edscupdate.py

@@ -1,5 +1,5 @@
-# Deprecated
 #!/usr/bin/env python3.6
+# Deprecated
 
 """
 This tool looks for changes in the EDSC service since the most

tradedangerous/edsmupdate.py

@@ -1,5 +1,5 @@
-# Deprecated
 #!/usr/bin/env python3.6
+# Deprecated
 
 """
 based on edscupdate.py without the submit_distance()

tradedangerous/plugins/eddblink_plug.py

@@ -118,6 +118,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         'force':        "Force regeneration of selected items even if source file not updated since previous run. "
                         "(Useful for updating Vendor tables if they were skipped during a '-O clean' run.)",
         'purge':        "Remove any empty systems that previously had fleet carriers.",
+        'optimize':     "Optimize ('vacuum') database after processing.",
         'solo':         "Don't download crowd-sourced market data. (Implies '-O skipvend', supercedes '-O all', '-O clean', '-O listings'.)",
     }
     
@@ -197,22 +198,10 @@ class ImportPlugin(plugins.ImportPluginBase):
         db = self.tdb.getDB()
         self.tdenv.NOTE("Purging Systems with no stations: Start time = {}", self.now())
 
-        db.execute("PRAGMA foreign_keys = OFF")
-
-        self.tdenv.DEBUG0("Saving systems with stations.... " + str(self.now()) + "\t\t\t\t", end="\r")
-        db.execute("DROP TABLE IF EXISTS System_copy")
-        db.execute("""CREATE TABLE System_copy AS SELECT * FROM System
-                            WHERE system_id IN (SELECT system_id FROM Station)
-                    """)
-
-        self.tdenv.DEBUG0("Erasing table and reinserting kept systems.... " + str(self.now()) + "\t\t\t\t", end="\r")
-        db.execute("DELETE FROM System")
-        db.execute("INSERT INTO System SELECT * FROM System_copy")
-
-        self.tdenv.DEBUG0("Removing copy.... " + str(self.now()) + "\t\t\t\t", end="\r")
-        db.execute("PRAGMA foreign_keys = ON")
-        db.execute("DROP TABLE IF EXISTS System_copy")
-
+        db.execute("""
+            DELETE FROM System
+             WHERE NOT EXISTS(SELECT 1 FROM Station WHERE Station.system_id = System.system_id)
+        """)
         db.commit()
 
         self.tdenv.NOTE("Finished purging Systems. End time = {}", self.now())
@@ -349,7 +338,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         # We can probably safely assume that the plugin
         # has never been run if the db file doesn't exist.
-        if not (self.tdb.dataPath / Path("TradeDangerous.db")).exists():
+        if not self.tdb.dbPath.exists():
             self.options["clean"] = True
         
         if self.getOption("clean"):
@@ -392,8 +381,11 @@ class ImportPlugin(plugins.ImportPluginBase):
                 if rib_path.exists():
                     rib_path.unlink()
                 ri_path.rename(rib_path)
-            
+
+            self.tdb.close()
+
             self.tdb.reloadCache()
+            self.tdb.close()
             
             # Now it's safe to move RareItems back.
             if ri_path.exists():
@@ -451,7 +443,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             if self.downloadFile(self.upgradesPath) or self.getOption("force"):
                 transfers.download(self.tdenv, self.urlOutfitting, self.FDevOutfittingPath)
                 buildCache = True
-        
+
         if self.getOption("ship"):
             if self.downloadFile(self.shipPath) or self.getOption("force"):
                 transfers.download(self.tdenv, self.urlShipyard, self.FDevShipyardPath)
@@ -486,16 +478,18 @@ class ImportPlugin(plugins.ImportPluginBase):
         if buildCache:
             self.tdb.close()
             self.tdb.reloadCache()
-        
+            self.tdb.close()
+
         if self.getOption("purge"):
             self.purgeSystems()
+            self.tdb.close()
         
         if self.getOption("listings"):
             if self.downloadFile(self.listingsPath) or self.getOption("force"):
                 self.importListings(self.listingsPath)
             if self.downloadFile(self.liveListingsPath) or self.getOption("force"):
                 self.importListings(self.liveListingsPath)
-        
+
         if self.getOption("listings"):
             self.tdenv.NOTE("Regenerating .prices file.")
             cache.regeneratePricesFile(self.tdb, self.tdenv)

tradedangerous/version.py

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

{tradedangerous-11.2.0.dist-info → tradedangerous-11.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.2.0
+Version: 11.2.1
 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.2.0.dist-info → tradedangerous-11.2.1.dist-info}/RECORD

@@ -5,8 +5,8 @@ tradedangerous/cache.py,sha256=N7z1e2fov003wIh_aHkw1pdByKDPt3FkDZiH_EEPdMc,36080
 tradedangerous/cli.py,sha256=dLekZ3MTbn9XcSGtE532qZF3iSnsb5G-ddQyErwTv9o,4559
 tradedangerous/corrections.py,sha256=_WLgo1IBWoskrrPFeshRwCOeJ2BeJb_x4tDQ0JdAo-s,1340
 tradedangerous/csvexport.py,sha256=_19bGVnCGJPzvx_8DzLGOs4rqx8Asn7eCVdXKdKu92E,8653
-tradedangerous/edscupdate.py,sha256=uZpapPnGLSEGXFR0u0_DydpXD6TF2oq-FOeXsLgrcwE,17310
-tradedangerous/edsmupdate.py,sha256=n3fkY2A5EBAcAiIn7j2nt4w7icWf56ikI8yd6CiyWsk,14928
+tradedangerous/edscupdate.py,sha256=To7hL2FuR4A7A4gJfvow_jGl6mlD7aP-Drv1rEkwy-I,17310
+tradedangerous/edsmupdate.py,sha256=9IANIASA8ZKnZsLPBRAh7IArDRsa0jriL2UwjqKJ1fI,14928
 tradedangerous/formatting.py,sha256=K3XL_mZJ4cAiTTTmJmTXK7ePYzzsSxg7EoBVFh7gj60,6931
 tradedangerous/fs.py,sha256=_5OJHIRy_M-WFHEZO4g2EIgqDxdrz4s8tcdDmgG7NME,2494
 tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
@@ -21,7 +21,7 @@ tradedangerous/tradeenv.py,sha256=o956HN7-7uzIcNi9vI4zh-L1z5jwBioVARyhhiAlsRQ,11
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/transfers.py,sha256=NdPNzrpa5YuZeo2wBK6X8sy1VyFUaAXb0EtASyVXsuQ,6885
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=CIRQudWzY9CP4niZ5hY2VqrxXsnZnG_3vA77k9Otwo8,646
+tradedangerous/version.py,sha256=FcS0iiOYPOsVvc2lrO3dCSzLkb3qmtanvTPMfHGFupM,646
 tradedangerous/commands/TEMPLATE.py,sha256=MOE69xsZPHPIMBQ-LXicfsOlCZdy-2gPX_nlnwYYil8,2026
 tradedangerous/commands/__init__.py,sha256=3gz2cnXNZNkV1gtZh0dOnCRxBkQHbeIyysRe3bM2WEE,9516
 tradedangerous/commands/buildcache_cmd.py,sha256=jhNSqHX_xX43SiSUMFiKtWpB9v4oeZ0sqfNq6DCrjUs,2181
@@ -34,7 +34,7 @@ tradedangerous/commands/local_cmd.py,sha256=tf7YMGX-vaVGNO2lvQF9EvQEN3Wj7DE9-NTS
 tradedangerous/commands/market_cmd.py,sha256=Ig16zDuksywiiF3Exps6UuM-ZhqgbXqkW6Lu2s9xQf0,5411
 tradedangerous/commands/nav_cmd.py,sha256=v245L1MxiUliITUgvWeeB4cL4UdkNO8n0CiP6ztrV54,8460
 tradedangerous/commands/olddata_cmd.py,sha256=6rpPRRs4kLhV9c0sogmctVAjta7v0L0Deu999spXY2s,7888
-tradedangerous/commands/parsing.py,sha256=RUnCnML59IOXYI6jEljE5lrE_WKcDmFFqKF1JVJg9A0,6725
+tradedangerous/commands/parsing.py,sha256=_AoC41kXFWlHMHADZY8QqVmeyRNT6_VapoFhj7sSflY,6595
 tradedangerous/commands/rares_cmd.py,sha256=L_QoW2zIZTU9Jpavt_K2fZyu8T153nUSuVqIiz4uksQ,9207
 tradedangerous/commands/run_cmd.py,sha256=HtvxKfD2ef_fUCDdUzBv9yRwd2gBOqIq4hzUAOLgcyU,47650
 tradedangerous/commands/sell_cmd.py,sha256=RI8T1DWaBuQkYSy2Pjoo0Kxy5n9UgRTqtlSBE0Vg1SI,7943
@@ -62,7 +62,7 @@ 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=EOqUAwbIpQztbhLstFkgOdIgVFCyquSGYmtRr_6PYDY,21931
+tradedangerous/plugins/eddblink_plug.py,sha256=-TerJ_jKOHVuqS6P-ehKlwYDJsNNBEvu1nlpCNBsWn0,21414
 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
@@ -71,9 +71,9 @@ tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTK
 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.2.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.2.0.dist-info/METADATA,sha256=uSI0GspaqOSLmD6k3Kn3wPvlc7hsNOEPl2sRHq7LKCM,4435
-tradedangerous-11.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.2.0.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.2.0.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.2.0.dist-info/RECORD,,
+tradedangerous-11.2.1.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.2.1.dist-info/METADATA,sha256=Cyyx7ogtQbyTfD5sFCcXMD63dGvDlASdlqDN99ICMHs,4435
+tradedangerous-11.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.2.1.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.2.1.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.2.1.dist-info/RECORD,,