From 9f447473a2fb32b65c63a7afb3eb312f0fdfdccd Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Sun, 1 Aug 2021 15:26:33 +0200
Subject: [PATCH] don't download automatically, only when a new button is
 pressed

---
 EDDB/API.cs        | 33 ++++++++++++++++++++++++---------
 MainWindow.xaml    |  7 ++++---
 MainWindow.xaml.cs | 20 ++++++++++----------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/EDDB/API.cs b/EDDB/API.cs
index ea350bb..0209546 100644
--- a/EDDB/API.cs
+++ b/EDDB/API.cs
@@ -43,15 +43,27 @@ namespace NonaBGS.EDDB {
 
         private void DownloadFile(string url, string file, DatabaseAvailableDelegate notifier) {
             WebClient client = new WebClient();
-            client.DownloadDataCompleted += Client_DownloadDataCompleted;
+            client.DownloadFileCompleted += Client_DownloadFileCompleted;
             client.DownloadFileAsync(new Uri(url), file, notifier);
         }
 
+        private void Client_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e) {
+            DatabaseAvailableDelegate notifier = e.UserState as DatabaseAvailableDelegate;
+            notifier?.Invoke();
+        }
+
         private void TranslateStations() {
             if (!HaveStationsFile) {
                 return;
             }
 
+            var short_time = File.GetLastWriteTimeUtc(StationsFileShort);
+            var long_time = File.GetLastWriteTimeUtc(StationsFile);
+
+            if (HaveStationsFileShort && long_time <= short_time) {
+                return;
+            }
+
             Dictionary<int, List<string>> systems = new Dictionary<int, List<string>>();
 
             using (var str = new StreamReader(StationsFile)) {
@@ -89,6 +101,16 @@ namespace NonaBGS.EDDB {
             }
         }
 
+        public void CheckDatabases() {
+            if (HaveSystemsFile) {
+                SystemsAvailable?.Invoke();
+            }
+
+            if (HaveStationsFile) {
+                StationsAvailable?.Invoke();
+            }
+        }
+
         public void Download(bool force) {
             if (!HaveSystemsFile || force) {
                 DownloadFile(EDDB_SYSTEMS_ARCHIVE, systems_file, SystemsAvailable);
@@ -132,16 +154,9 @@ namespace NonaBGS.EDDB {
                 throw new InvalidOperationException("no local systems file downloaded");
             }
 
-            if (!HaveStationsFileShort) {
-                TranslateStations();
-            }
+            TranslateStations();
 
             return Stations.FromFile(StationsFileShort);
         }
-
-        private void Client_DownloadDataCompleted(object sender, DownloadDataCompletedEventArgs e) {
-            DatabaseAvailableDelegate notifier = e.UserState as DatabaseAvailableDelegate;
-            notifier?.Invoke();
-        }
     }
 }
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 1010bd5..b44a078 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -99,10 +99,11 @@
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="26*"/>
-                                <ColumnDefinition Width="285*"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <CheckBox x:Name="useeddb" Content="Use eddb station and system data for autocompletion" HorizontalAlignment="Left" Margin="0,10,0,10" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Click="useeddb_Click"/>
+                            <CheckBox x:Name="useeddb" Content="Use eddb station and system data for autocompletion" HorizontalAlignment="Left" Margin="0,10,0,10" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="1" Click="useeddb_Click"/>
+                            <Button x:Name="DownloadData" Content="Download Data" HorizontalAlignment="Center" Grid.Column="1" VerticalAlignment="Center" Width="Auto" Click="DownloadData_Click"/>
                         </Grid>
                     </GroupBox>
                 </Grid>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 07a459a..2f3c666 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -59,7 +59,7 @@ namespace NonaBGS {
             api.StationsAvailable += Api_StationsAvailable;
 
             try {
-                SyncDatabases();
+                api.CheckDatabases();
             } catch (Exception e) {
                 Log(e.Message);
             }
@@ -97,14 +97,6 @@ namespace NonaBGS {
             Report_OnLog(message);
         }
 
-        private void SyncDatabases() {
-            if (!config.Global.UseEDDB) {
-                return;
-            }
-
-            api.Download();
-        }
-
         private void RefreshObjectives() {
             entries.Items.Clear();
 
@@ -213,7 +205,6 @@ namespace NonaBGS {
 
         private void useeddb_Click(object sender, RoutedEventArgs e) {
             Config.Global.UseEDDB = (bool)useeddb.IsChecked;
-            SyncDatabases();
         }
 
         private void Filter_KeyDown(object sender, KeyEventArgs e) {
@@ -239,5 +230,14 @@ namespace NonaBGS {
                 Log(exc.Message);
             }
         }
+
+        private void DownloadData_Click(object sender, RoutedEventArgs e) {
+            if (!Config.Global.UseEDDB) {
+                return;
+            }
+
+            // Force download
+            api.Download(true);
+        }
     }
 }