Merge branch 'master' into eddn_shipyards

cache.py

@@ -150,6 +150,8 @@
     \bE[O0]WAR[DO0] |
     III |
     STARON\b |
+    \bST.ION\b |
+    \bSTION\b |
     \BHANG[EA]R$ |
     ^\S+HUB$ |
     \bLEBEOEV |

data/Item.csv

@@ -41,15 +41,16 @@ unq:[email protected]_id,unq:name,ui_order
 'Metals','Copper',4
 'Metals','Gallium',5
 'Metals','Gold',6
-'Metals','Indium',7
-'Metals','Lithium',8
-'Metals','Osmium',9
-'Metals','Palladium',10
-'Metals','Platinum',11
-'Metals','Silver',12
-'Metals','Tantalum',13
-'Metals','Titanium',14
-'Metals','Uranium',15
+'Metals','Hafnium 178',7
+'Metals','Indium',8
+'Metals','Lithium',9
+'Metals','Osmium',10
+'Metals','Palladium',11
+'Metals','Platinum',12
+'Metals','Silver',13
+'Metals','Tantalum',14
+'Metals','Titanium',15
+'Metals','Uranium',16
 'Minerals','Bauxite',1
 'Minerals','Bertrandite',2
 'Minerals','Coltan',3
@@ -60,8 +61,16 @@ unq:[email protected]_id,unq:name,ui_order
 'Minerals','Rutile',8
 'Minerals','Uraninite',9
 'Salvage','AI Relics',1
-'Salvage','Antiquities',2
-'Salvage','SAP 8 Core Container',3
+'Salvage','Ancient Artefact',2
+'Salvage','Antiquities',3
+'Salvage','Experimental Chemicals',4
+'Salvage','Military Intelligence',5
+'Salvage','Military Plans',6
+'Salvage','Prototype Tech',7
+'Salvage','Rebel Transmissions',8
+'Salvage','SAP 8 Core Container',9
+'Salvage','Technical Blueprints',10
+'Salvage','Trade Data',11
 'Slavery','Imperial Slaves',1
 'Slavery','Slaves',2
 'Technology','Advanced Catalysers',1

data/Ship.csv

@@ -1,21 +1,24 @@
-unq:name,cost
-'Adder',87808
-'Anaconda',146969451
-'Asp',6661153
-'Clipper',22295860
-'Cobra',379718
-'Diamondback Explorer',1894760
-'Diamondback Scout',564329
-'Dropship',19814205
-'Eagle',44800
-'Fer-de-Lance',51567040
-'Hauler',52720
-'Imperial Courier',2542930
-'Orca',48539887
-'Python',56978179
-'Sidewinder',32000
-'Type 6',1045945
-'Type 7',17472252
-'Type 9',76555842
-'Viper',142931
-'Vulture',4925615
+unq:name,cost
+'Adder',87810
+'Anaconda',146969450
+'Asp',6661150
+'Clipper',22295860
+'Cobra',379720
+'Diamondback Explorer',1894760
+'Diamondback Scout',564330
+'Dropship',19814210
+'Eagle',44800
+'Federal Assault Ship',19814210
+'Federal Gunship',35814210
+'Fer-de-Lance',51567040
+'Hauler',52720
+'Imperial Courier',2542930
+'Imperial Eagle',110830
+'Orca',48539890
+'Python',56978180
+'Sidewinder',32000
+'Type 6',1045950
+'Type 7',17472250
+'Type 9',76555840
+'Viper',142930
+'Vulture',4925620

transfers.py

@@ -153,6 +153,9 @@ def download(
 
     fetched = 0
     lastTime = started = time.time()
+    spinner, spinners = 0, [ 
+        '     ', '.    ', '..   ', '...  ', ' ... ', '  ...', '   ..', '    .'
+    ]
     with tmpPath.open("wb") as fh:
         for data in req.iter_content(chunk_size=chunkSize):
             fh.write(data)
@@ -172,12 +175,15 @@ def download(
                 progBar.increment(
                     len(data),
                     postfix=lambda value, goal: \
-                        " {:>7s} [{:>7s}/s] {:>3.0f}%".format(
+                            " {:>7s} [{:>7s}/s] {:>3.0f}% {:1s}".format(
                             makeUnit(value),
                             makeUnit(sum(histogram) / len(histogram)),
                             (fetched * 100. / length),
+                            spinners[spinner]
                         )
                 )
+                if deltaT > 0.125:
+                    spinner = (spinner + 1) % len(spinners)
         tdenv.DEBUG0("End of data")
     if not tdenv.quiet:
         progBar.clear()