Merged kfsone/tradedangerous into master

eyeonus · Feb 21, 2015 · a7c5f67 · a7c5f67
2 parents 51f81a9 + 43f5279
commit a7c5f67
Show file tree

Hide file tree

Showing 10 changed files with 369 additions and 63 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -3,7 +3,15 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
 [wip]
+. (kfsone) Lots of improvements to edscupdate.py;
+   - added --random, checks 10 random new systems,
+   - added --conf N for changing the confidence rating,
+   - added --detail (-v) and --debug (-w),
+   - added --summary
+   - added --test (use the EDSC test database),
+   - added explanatory "splash" text (--no-splash or -NS to skip),
 . (kfsone) Allow a cache rebuild at the start of a mad import
++ (kfsone, maddavo) Lots of Systems and Stations
 
 v6.10.0 Feb 14 2015
 . (kfsone) Major changes to the 'maddavo' plugin:

diff --git a/cache.py b/cache.py
@@ -245,7 +245,8 @@
     I'L | R'I | (^|\s)'L | [^Ss]'(?=\s|$) |
     ^I \s (?! [Ss][Oo][Ll][Aa]) |
     \bA7\S |
-    \sH\sI?UB$
+    \sH\sI?UB$ |
+    \bALEDNDRIA\b
 )''', flags=re.X)
 
 

diff --git a/commands/__init__.py b/commands/__init__.py
@@ -194,7 +194,7 @@ def error(self, message):
                     action=HelpAction, nargs=0,
                 )
         stdArgs.add_argument('--debug', '-w',
-                    help='Enable diagnostic output.',
+                    help='Enable/raise level of diagnostic output.',
                     default=0, required=False, action='count',
                 )
         stdArgs.add_argument('--detail', '-v',

diff --git a/corrections.py b/corrections.py
@@ -13,50 +13,36 @@
     "PANTAA CEZISA": "GEORGE PANTAZIS",
     "TAVYTERE": "ALRAI SECTOR ON-T B3-2",
     "BODB DJEDI": "BODEDI",
+    "HIP 101110": "NEW YEMBO",
 
 #ADD_SYSTEMS_HERE
 }
 
 stations = {
     "ADLIVUN/ABL SURVEY":                   DELETED,
     "AKHENATEN/WANG PLATFORM":              DELETED,
-    "ALBICEVCI/DUBROVOLSKI SURVEY":         "Dobrovolski Survey",
     "ALPHA FORNACIS/BENNET PORT":           DELETED,
-    "AMAIT/LOPEZ DE VILLALOBOS":            "Lopez De Villalobos Prospect",
-    "AMARAK/WERNER VON SIEMENS VISON":      "Werner Von Siemens Vision",
-    "ANAPOS/HERSCHEL PLATFORM":             "Herschel Plant",
     "AO QIN/CHAPMAN HUB":                   DELETED,
-    "AULIN/ALUIN ENTERPIRSE":               "Aulin Enterprise",
     "BALDUR/DUTTON STATION":                DELETED,
     "BALTAH'SINE/BALTAH''SINE STATION":     DELETED,
     "BALTAH'SINE/BALTAH'SINE STATION":      DELETED,
     "BALTAH'SINE/BALTHAISINE STATION":      DELETED,
     "BD+65 1846/SHARGIN BEACON":            DELETED,
-    "BOLG/MOXONS MOJO":                     "Moxon's Mojo",
-    "CEMIESS/TITUS STATION":                "Titius Station",
     "COCIJO/HARRY MOORE 6 CO":              DELETED,
     "COSI/JU LIAN CITY":                    DELETED,
     "CPD-28 332/WI N N E GATEWAY":          DELETED,
     "DAJOAR/MACQUORN TERMINAL":             DELETED,
     "DITAE/DITAE":                          DELETED,
     "DORIS/ISHERWOOD DOCK":                 DELETED,
-    "DT VIRGINIS/CHUN STATION":             "Chun Vision",
-    "EGOVAE/ENOATE MARKET":                 "Endate Market",
-    "EKONIR/MOREYVISION":                   "Morey Vision",
     "ERAVATE/ERAVATE":                      DELETED,
     "GABIETYE/GABIETYE":                    DELETED,
-    "GCRV 4654/HERZEFELD LANDING":          "Herzfeld Landing",
     "HDS 1879/HEDIN ORBITAL":               DELETED,
     "HIP 4907/EDISON PLATFORM":             DELETED,
     "HIP 69913/KONORATYEV OUTPOST":         DELETED,
     "KANOS/LEE STATION":                    DELETED,
-    "KHOLEDO/LOPEZ DE DILLALOBOS COLONY":   "Lopez De Villalobos Colony",
     "LFT 1446/BOSCH SETTLEMENT":            DELETED,
     "LHS 1101/BONDAR CITY":                 DELETED,
     "LHS 1453/SAAVEORA PORT":               DELETED,
-    "LHS 250/KOVALESKY ENTERPRISE":         "Kovalevsky Enterprise",
-    "LHS 53/OCONNOR SETTLEMENT":            "O'Connor Settlement",
-    "LHS 64/WIBERG HANGAR":                 "Wiberg Hanger",    # "Hanger",
     "LOVEDU/OIVIS PLATFORM":                DELETED,
     "LP 322-836/BOLOTOV PORT":              DELETED,
     "LP 51-17/ARCHAMBAULT HORIZONS":        DELETED,
@@ -68,11 +54,9 @@
     "ROSMERTA/RHN ORBITAL":                 DELETED,
     "TANMARK/CASSI E-L-PEIA":               DELETED,
     "THUNDERBIRD/QUIMPY PORT":              DELETED,
-    "VEQUESS/AGNEWS FOLLY":                 "Agnews' Folly",
     "ZETA AQUILAE/JULIAN GATEWAY":          DELETED,
     "ZETA AQUILAE/MOHMAND HOLOINGS":        DELETED,
     "ZETA AQUILAE/MOHMANO HOLDINGS":        DELETED,
-    "ZETA TRIANGULI AUSTRALIS/GUEST CITY2": "Guest City",
 
 #ADD_STATIONS_HERE
     "FK5 2550/WU INDT GATEWAY":             DELETED,
@@ -101,12 +85,12 @@
     "PANDAMONIUM/RILDRICH PLTERS RING":     DELETED,
     "WOLF 1481/VE .LAZQU IEZ GATEWAY":      DELETED,
     "BALMUNG/RU IPPE .LT STATION":          DELETED,
-    "GELONG/ROERIIIG":                      "Roe Ring",
     "VOLOWAHKU/WATI' MINE":                 DELETED,
-    "10 KAPPA PEGASI/BONOAR HUB":           "Bondar Hub",
     "GLIESE 868/ALVARADO RING":             DELETED,
     "GLIESE 868/FEYNMAN TERMINAL":          DELETED,
     "TOXANDJI/TSU NENAGA ORBITAL":          DELETED,
+    "AMAHU/ALEDNDRIA GATEWAY":              DELETED,
+    "LTT 7548/ALEDNDRIA RING":              DELETED,
 }
 
 categories = {
@@ -115,17 +99,13 @@
 }
 
 items = {
-    'ALLOYS': DELETED,
-    'CENTAURI MEGA GIN': DELETED,
     'CONSUMER TECH': 'Consumer Technology',
-    'COTTON': DELETED,
     'DOM. APPLIANCES': 'Domestic Appliances',
     'FRUIT AND VEGETABLES': 'Fruit And Vegetables',
     'HEL-STATIC FURNACES': 'Microbial Furnaces',
     'HYDROGEN FUELS':   'Hydrogen Fuel',
     'MARINE SUPPLIES':  'Marine Equipment',
     'NON-LETHAL WPNS': 'Non-Lethal Weapons',
-    'PLASTICS': DELETED,
     'REACTIVE ARMOR': 'Reactive Armour',
     'TERRAIN ENRICH SYS': 'Land Enrichment Systems',
 

diff --git a/data/ShipVendor.csv b/data/ShipVendor.csv
@@ -304,6 +304,19 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id
 'KANOS','Geston Ring','Type 7'
 'KANOS','Geston Ring','Type 9'
 'KANOS','Geston Ring','Viper'
+'KHAN GUBII','Alpers City','Adder'
+'KHAN GUBII','Alpers City','Anaconda'
+'KHAN GUBII','Alpers City','Asp'
+'KHAN GUBII','Alpers City','Cobra'
+'KHAN GUBII','Alpers City','Dropship'
+'KHAN GUBII','Alpers City','Eagle'
+'KHAN GUBII','Alpers City','Hauler'
+'KHAN GUBII','Alpers City','Orca'
+'KHAN GUBII','Alpers City','Python'
+'KHAN GUBII','Alpers City','Sidewinder'
+'KHAN GUBII','Alpers City','Type 6'
+'KHAN GUBII','Alpers City','Type 7'
+'KHAN GUBII','Alpers City','Viper'
 'KRUGER 60','Kepler Gateway','Cobra'
 'KRUGER 60','Kepler Gateway','Dropship'
 'KRUGER 60','Kepler Gateway','Eagle'
@@ -556,6 +569,12 @@ unq:[email protected]_id,unq:[email protected]_id,unq:[email protected]_id
 'ONGKAMPAN','Rawat Hub','Sidewinder'
 'ONGKAMPAN','Rawat Hub','Type 6'
 'ONGKAMPAN','Rawat Hub','Viper'
+'PAESIA','Ramon City','Cobra'
+'PAESIA','Ramon City','Hauler'
+'PAESIA','Ramon City','Sidewinder'
+'PAESIA','Ramon City','Type 6'
+'PAESIA','Ramon City','Type 9'
+'PAESIA','Ramon City','Viper'
 'PERADJARIU','Vries Port','Adder'
 'PERADJARIU','Vries Port','Anaconda'
 'PERADJARIU','Vries Port','Cobra'