Added '-csvs' option to maddavo's plugin to import all the csvs at once

CHANGES.txt

@@ -5,6 +5,8 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 v6.12.5 Mar 03 2015
 . (kfsone) Added "--opt=shipvendors" to the maddavo plugin,
 . (kfsone) Added "--opt=csvonly" to maddavo plugin (stop after csv imports),
+. (kfsone) Added "--opt=csvs" to maddavo plugin (import all the .csvs),
+    equivalent to "--opt=systems --opt=stations --opt=shipvendor"
 . (kfsone) Changed "market" command, "-B" and "-S" are now optional. Default
     behavior is equivalent to --buy --sell
 

README.txt

@@ -551,6 +551,7 @@ IMPORT sub-command:
         systems:      Merge maddavo's System data into local db,
         stations:     Merge maddavo's Station data into local db,
         shipvendors:  Merge maddavo's ShipVendor data into local db,
+        csvs:         Merge all of the above
         exportcsv:    Regenerate System and Station .csv files after
                       merging System/Station data.
         csvonly:      Stop after importing CSV files, no prices,

plugins/maddavo_plug.py

@@ -44,9 +44,11 @@ class ImportPlugin(plugins.ImportPluginBase):
     dateRe = re.compile(r"(\d\d\d\d-\d\d-\d\d)[ T](\d\d:\d\d:\d\d)")
 
     pluginOptions = {
-        'systems':      "Merge maddavo's System data into local db.",
-        'stations':     "Merge maddavo's Station data into local db.",
-        'shipvendors':  "Merge maddavo's ShipVendor data into local db.",
+        'csvs':         "Merge System, Station and ShipVendor data into "
+                        "the local db.",
+        'systems':      "Merge System data into local db.",
+        'stations':     "Merge Station data into local db.",
+        'shipvendors':  "Merge ShipVendor data into local db.",
         'exportcsv':    "Regenerate System and Station .csv files after "
                         "merging System/Station data.",
         'csvonly':      "Stop after csv work, don't import prices",
@@ -446,6 +448,10 @@ def run(self):
 
         skipDownload = self.getOption("skipdl")
         forceParse = self.getOption("force") or skipDownload
+        if self.getOption("csvs"):
+            self.options["systems"] = True
+            self.options["stations"] = True
+            self.options["shipvendors"] = True
 
         # Ensure the cache is built and reloaded.
         tdb.reloadCache()

scripts/trade.bat

@@ -10,7 +10,7 @@ rem --== Set default values above to prevent being asked each run ==--
 set /P update=Update database from maddavo? (Y\N): 
 if /I not "%update%"=="Y" goto menu
 :update
-..\trade.py import --plug=maddavo --option=stations --option=systems --opt=usefull -v
+..\trade.py import --plug=maddavo --opt=stations --opt=usefull -v
 ..\trade.py import --plug=maddavo --opt=use2d -v
 ..\trade.py import --plug=maddavo --opt=use3h -v
 echo Update Complete

scripts/tradebrute.bat

@@ -23,7 +23,7 @@ If %update% ==y (goto :update) else (goto :Setup)
 
 
 :update
-%python%\python.exe trade.py import --plug=maddavo --opt=systems --opt=stations
+%python%\python.exe trade.py import --plug=maddavo --opt=csvs
 goto :Setup