Added 'import' command for importing one or more stations from a text…

… file
eyeonus · Nov 22, 2014 · 1174024 · 1174024
1 parent a7adac2
commit 1174024
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,10 @@
 TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
+v6.0.5 Nov 22 2014 (w/Gamma 1)
+. (kfsone) Added "import" sub-command for loading 1+ stations from a file
+. (kfsone) Added Pilot's Federation/Jameson Memorial
+
 v6.0.4 Nov 21 2014 (Beta 3.9.1)
 . (kfsone) Added "sell" command (find places to sell a specific item)
 . (kfsone) Reactive Armor changed to Reactive Armour

diff --git a/cache.py b/cache.py
@@ -826,7 +826,7 @@ def buildCache(tdenv, dbPath, sqlPath, pricesPath, importTables, defaultZero=Fal
 
 ######################################################################
 
-def importDataFromFile(tdenv, tdb, path, reset=False):
+def importDataFromFile(tdb, tdenv, path, reset=False):
     """
         Import price data from a file on a per-station basis,
         that is when a new station is encountered, delete any

diff --git a/commands/__init__.py b/commands/__init__.py
@@ -13,6 +13,7 @@
     'buildcache',
     'buy',
     'local',
+    'import',
     'nav',
     'run',
     'sell',

diff --git a/commands/update_cmd.py b/commands/update_cmd.py
@@ -250,7 +250,7 @@ def editUpdate(tdb, cmdenv, stationID):
                         "Suit you, sir! Oh!"
                     ])))
         else:
-            cache.importDataFromFile(cmdenv, tdb, tmpPath)
+            cache.importDataFromFile(tdb, cmdenv, tmpPath)
 
         tmpPath.unlink()
         tmpPath = None
@@ -269,7 +269,7 @@ def guidedUpdate(tdb, cmdenv):
     try:
         render(tdb, cmdenv, tmpPath)
         cmdenv.DEBUG0("Got results, importing")
-        cache.importDataFromFile(cmdenv, tdb, tmpPath)
+        cache.importDataFromFile(tdb, cmdenv, tmpPath)
     except Exception as e:
         print("*** ERROR ENCOUNTERED ***")
         print("*** YOUR UPDATES WILL BE SAVED AS {} ***".format(

diff --git a/tradedb.py b/tradedb.py
@@ -457,7 +457,7 @@ def reloadCache(self):
                     return
 
                 self.tdenv.DEBUG0(".prices has changed: re-importing")
-                cache.importDataFromFile(self.tdenv, self, self.pricesPath, reset=True)
+                cache.importDataFromFile(self, self.tdenv, self.pricesPath, reset=True)
                 return
 
             self.tdenv.DEBUG0("Rebuilding DB Cache [{}]", str(changedPaths))
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
         'buildcache',
         'buy',
         'local',
+        'import',
         'nav',
         'run',
         'sell',
@@ Expand Down @@