Ignore price tables for standard export. Use '--all-tables' if you re…

…ally want them.
eyeonus · Dec 18, 2014 · b864cbc · b864cbc
1 parent 94576a2
commit b864cbc
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 25 deletions.
diff --git a/README.txt b/README.txt
@@ -596,11 +596,13 @@ LOCAL sub-command:
 EXPORT sub-command:
 
   This command generates the CSV data files of the current database. It
-  defaults to export all tables and overwrites the files in the data directory.
-  CAUTION: If you have changed any CSV file and didn't rebuild the database, they
-           will be lost. Use the 'buildcache' command first to rebuild the database.
+  defaults to export all (except the price) tables and overwrites the files
+  in the data directory.
+  CAUTION: If you have changed any CSV file and didn't rebuild the database,
+           they will be lost. Use the 'buildcache' command first to rebuild
+           the database.
 
-  trade.py export [-q | -v] [--path PATH] [--tables TABLE[,TABLE,...]]
+  trade.py export [-q | -v] [--path PATH] [--tables TABLE[,TABLE,...] | --all-tables ]
 
     --path PATH
       Specify the save location of the CSV files. Default to './data'
@@ -609,31 +611,33 @@ EXPORT sub-command:
     -T TABLE[,TABLE,...]
       Specify a comma separated list of tablenames to export.
 
+	--all-tables
+	  Include the price tables for export.
+
     --delete-empty
       Delete CSV files without content.
 
   Examples:
     > trade.py export --path misc
     Using database './data/TradeDangerous.db'
-    Export Table 'Added' to 'misc\Added.csv'
-    Export Table 'AltItemNames' to 'misc\AltItemNames.csv'
-    Export Table 'Category' to 'misc\Category.csv'
-    Export Table 'Item' to 'misc\Item.csv'
-    Export Table 'Ship' to 'misc\Ship.csv'
-    Export Table 'ShipVendor' to 'misc\ShipVendor.csv'
-    Export Table 'Station' to 'misc\Station.csv'
-    Export Table 'StationBuying' to 'misc\StationBuying.csv'
-    Export Table 'StationItem' to 'misc\StationItem.csv'
-    Ignore Table 'StationLink'
-    Export Table 'StationSelling' to 'misc\StationSelling.csv'
-    Export Table 'System' to 'misc\System.csv'
-    Export Table 'Upgrade' to 'misc\Upgrade.csv'
-    Export Table 'UpgradeVendor' to 'misc\UpgradeVendor.csv'
+    Export Table 'Added' to 'misc/Added.csv'
+    Export Table 'AltItemNames' to 'misc/AltItemNames.csv'
+    Export Table 'Category' to 'misc/Category.csv'
+    Export Table 'Item' to 'misc/Item.csv'
+    Export Table 'Ship' to 'misc/Ship.csv'
+    Export Table 'ShipVendor' to 'misc/ShipVendor.csv'
+    Export Table 'Station' to 'misc/Station.csv'
+    Ignore Table 'StationBuying'
+    Ignore Table 'StationItem'
+    Ignore Table 'StationSelling'
+    Export Table 'System' to 'misc/System.csv'
+    Export Table 'Upgrade' to 'misc/Upgrade.csv'
+    Export Table 'UpgradeVendor' to 'misc/UpgradeVendor.csv'
 
     > trade.py export -T System,Station
     Using database './data/TradeDangerous.db'
-    Export Table 'Station' to 'data\Station.csv'
-    Export Table 'System' to 'data\System.csv'
+    Export Table 'Station' to 'data/Station.csv'
+    Export Table 'System' to 'data/System.csv'
 
 ==============================================================================
 == ADDING OR CHANGING PRICE DATA

diff --git a/commands/export_cmd.py b/commands/export_cmd.py
@@ -60,11 +60,19 @@
             type=str,
             default=None
         ),
-    ParseArgument('--tables', "-T",
-            help='Specify comma separated tablenames to export.',
-            metavar='TABLE[,TABLE,...]',
-            type=str,
-            default=None
+    MutuallyExclusiveGroup(
+        ParseArgument('--tables', "-T",
+                help='Specify comma separated tablenames to export.',
+                metavar='TABLE[,TABLE,...]',
+                type=str,
+                default=None
+            ),
+        ParseArgument('--all-tables',
+                help='Include the price tables for export.',
+                dest='allTables',
+                action='store_true',
+                default=False
+            ),
         ),
     ParseArgument('--delete-empty',
             help='Delete CSV files without content.',
@@ -162,6 +170,10 @@ def run(results, cmdenv, tdb):
     else:
         bindValues = []
         tableStmt = ''
+        if not cmdenv.allTables:
+            ignoreList.append("StationItem")
+            ignoreList.append("StationBuying")
+            ignoreList.append("StationSelling")
 
     # prefix for unique/ignore columns
     uniquePfx = "unq:"