From 02062c8b9c589c8d10351f260e8c19b883d601f7 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Mon, 22 Oct 2018 22:43:23 +0200
Subject: [PATCH] v1.30 UWP

---
 AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj |  3 +
 AideDeJeu/AideDeJeu.UWP/NativeAPI.cs         | 63 ++++++++++++++++----
 AideDeJeu/AideDeJeu.UWP/Package.appxmanifest |  2 +-
 3 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
index 9f1d1da3..eb6d4a47 100644
--- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
+++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
@@ -112,6 +112,9 @@
     <EmbeddedResource Include="..\..\Data\library.db">
       <Link>library.db</Link>
     </EmbeddedResource>
+    <EmbeddedResource Include="..\..\Data\library.ver">
+      <Link>library.ver</Link>
+    </EmbeddedResource>
     <None Include="AideDeJeu.UWP_StoreKey.pfx" />
     <None Include="AideDeJeu.UWP_TemporaryKey.pfx" />
     <Content Include="Assets\Fonts\LinLibertine_R.ttf" />
diff --git a/AideDeJeu/AideDeJeu.UWP/NativeAPI.cs b/AideDeJeu/AideDeJeu.UWP/NativeAPI.cs
index da78d701..604c40e9 100644
--- a/AideDeJeu/AideDeJeu.UWP/NativeAPI.cs
+++ b/AideDeJeu/AideDeJeu.UWP/NativeAPI.cs
@@ -25,21 +25,62 @@ namespace AideDeJeu.UWP
 
         public async Task<string> GetDatabasePathAsync(string databaseName)
         {
-            var documentsDirectoryPath = Windows.Storage.ApplicationData.Current.LocalFolder.Path;
-            var path = Path.Combine(documentsDirectoryPath, $"{databaseName}.db");
-
-            if (!File.Exists(path))
+            if (await CheckDatabaseVersionAsync(databaseName))
             {
-                var assembly = typeof(Version_UWP).GetTypeInfo().Assembly;
-                using (var inStream = assembly.GetManifestResourceStream($"AideDeJeu.UWP.{databaseName}.db"))
+                await CopyOldToNewFileAsync(databaseName, "db");
+                await CopyOldToNewFileAsync(databaseName, "ver");
+            }
+            return GetNewFilePath(databaseName, "db");
+        }
+
+        public Stream GetOldFileStream(string fileName, string extension)
+        {
+            var assembly = typeof(Version_UWP).GetTypeInfo().Assembly;
+            return assembly.GetManifestResourceStream($"AideDeJeu.UWP.{fileName}.{extension}");
+        }
+        public string GetNewFilePath(string fileName, string extension)
+        {
+            var documentsDirectoryPath = Windows.Storage.ApplicationData.Current.LocalFolder.Path;
+            return Path.Combine(documentsDirectoryPath, $"{fileName}.{extension}");
+        }
+        public async Task CopyOldToNewFileAsync(string fileName, string extension)
+        {
+            using (var inStream = GetOldFileStream(fileName, extension))
+            {
+                using (var outStream = new FileStream(GetNewFilePath(fileName, extension), FileMode.Create))
                 {
-                    using (var outStream = new FileStream(path, FileMode.Create))
-                    {
-                        await inStream.CopyToAsync(outStream);
-                    }
+                    await inStream.CopyToAsync(outStream);
                 }
             }
-            return path;
         }
+
+        public async Task<bool> CheckDatabaseVersionAsync(string databaseName)
+        {
+            var path = GetNewFilePath(databaseName, "ver");
+            if (!File.Exists(path))
+            {
+                return true;
+            }
+            int newVersion = 0;
+            int oldVersion = -1;
+            using (var newStream = GetOldFileStream(databaseName, "ver"))
+            {
+                using (var sr = new StreamReader(newStream))
+                {
+                    var str = await sr.ReadToEndAsync();
+                    int.TryParse(str, out newVersion);
+                }
+            }
+            using (var oldStream = new FileStream(path, FileMode.Open))
+            {
+                using (var sr = new StreamReader(oldStream))
+                {
+                    var str = await sr.ReadToEndAsync();
+                    int.TryParse(str, out oldVersion);
+                }
+            }
+            return newVersion > oldVersion;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu.UWP/Package.appxmanifest b/AideDeJeu/AideDeJeu.UWP/Package.appxmanifest
index 6eb44114..25dcb5f2 100644
--- a/AideDeJeu/AideDeJeu.UWP/Package.appxmanifest
+++ b/AideDeJeu/AideDeJeu.UWP/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="7385YanManiez.AidedeJeu" Publisher="CN=2C78A91E-528B-4FF0-A4BE-FD7F7EBABB44" Version="1.29.0.0" />
+  <Identity Name="7385YanManiez.AidedeJeu" Publisher="CN=2C78A91E-528B-4FF0-A4BE-FD7F7EBABB44" Version="1.30.0.0" />
   <mp:PhoneIdentity PhoneProductId="7b75e00f-ae8d-472e-9d0f-cbfe5e44017c" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Haches &amp; Dés</DisplayName>