fixed windows 7 build and added new release link icon

jwallet · Oct 13, 2018 · 3387fcc · 3387fcc
1 parent f6fa69b
commit 3387fcc
Show file tree

Hide file tree

Showing 15 changed files with 330 additions and 243 deletions.
diff --git a/EspionSpotify/EspionSpotify.csproj b/EspionSpotify/EspionSpotify.csproj
@@ -133,10 +133,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Http.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -293,6 +290,7 @@
     <Content Include="libmp3lame.64.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Resources\release.gif" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/EspionSpotify/Extensions/StringExtensions.cs b/EspionSpotify/Extensions/StringExtensions.cs
@@ -1,14 +1,14 @@
 using EspionSpotify.Enums;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text.RegularExpressions;
 
 namespace EspionSpotify.Extensions
 {
     public static class StringExtensions
     {
+        private static Regex _regexVersion = new Regex(@"(\d+\.)(\d+\.)?(\d+\.)?(\*|\d+)");
+        private static Regex _regexTag = new Regex(@"[^0-9.]");
+
         public static AlbumCoverSize? ConvertToAlbumCoverSize(this string value)
         {
             var types = typeof(AlbumCoverSize);
@@ -20,5 +20,20 @@ public static class StringExtensions
 
             return (AlbumCoverSize) Enum.Parse(types, value, ignoreCase: true);
         }
+
+        public static Version ToVersion(this string value)
+        {
+            var versionString = value.ToStringVersion();
+
+            if (string.IsNullOrEmpty(versionString) || !_regexVersion.IsMatch(versionString)) return null;
+
+            return new Version(value);
+        }
+
+        public static string ToStringVersion(this string tag)
+        {
+            return string.IsNullOrEmpty(tag) ? string.Empty : _regexTag.Replace(tag, string.Empty);
+        }
+
     }
 }
diff --git a/EspionSpotify/GitHub.cs b/EspionSpotify/GitHub.cs
@@ -1,4 +1,5 @@
-using EspionSpotify.Models.GitHub;
+using EspionSpotify.Extensions;
+using EspionSpotify.Models.GitHub;
 using EspionSpotify.Properties;
 using Newtonsoft.Json;
 using System;
@@ -15,11 +16,9 @@ namespace EspionSpotify
 {
     internal static class GitHub
     {
-        private static Regex _regexVersion = new Regex(@"(\d+\.)(\d+\.)?(\d+\.)?(\*|\d+)");
-        private static Regex _regexTag = new Regex(@"[^0-9.]");
         private const string _repoReleaseLink = "https://api.github.com/repos/jwallet/spy-spotify/releases/latest";
 
-        public static async void NewestVersion()
+        public static async void GetVersion()
         {
             if (!Uri.TryCreate(_repoReleaseLink, UriKind.Absolute, out var uri)) return;
 
@@ -43,15 +42,14 @@ public static async void NewestVersion()
 
                     var body = Encoding.UTF8.GetString(content.ToArray());
                     var release = JsonConvert.DeserializeObject<Release>(body);
-                    var versionTag = ParseTagToVersionString(release.tag_name);
+                    var githubTagVersion = release.tag_name.ToVersion();
 
-                    if (!_regexVersion.IsMatch(versionTag)) return;
+                    if (githubTagVersion == null) return;
 
-                    var githubTagVersion = new Version(versionTag);
                     var assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version;
 
                     if (githubTagVersion <= assemblyVersion) return;
-                    if (LastVersionPrompted() == assemblyVersion) return;
+                    if (Settings.Default.LastVersionPrompted.ToVersion() == githubTagVersion) return;
 
                     var dialogTitle = string.Format(FrmEspionSpotify.Rm.GetString($"msgNewVersionTitle"), githubTagVersion);
                     var dialogMessage = FrmEspionSpotify.Rm.GetString($"msgNewVersionContent");
@@ -66,18 +64,16 @@ public static async void NewestVersion()
                         FrmEspionSpotify.Instance,
                         dialogMessage,
                         dialogTitle,
-                        MessageBoxButtons.YesNoCancel,
+                        MessageBoxButtons.OKCancel,
                         MessageBoxIcon.Question);
 
-                    if (dialogResult == DialogResult.Yes)
+                    if (dialogResult == DialogResult.OK)
                     {
                         Process.Start(new ProcessStartInfo(release.html_url));
                     }
-                    else if (dialogResult == DialogResult.No)
-                    {
-                        Settings.Default.LastVersionPrompted = assemblyVersion.ToString();
-                        Settings.Default.Save();
-                    }
+
+                    Settings.Default.LastVersionPrompted = githubTagVersion.ToString();
+                    Settings.Default.Save();
                 }
             }
             catch (Exception ex)
@@ -86,18 +82,5 @@ public static async void NewestVersion()
                 Console.WriteLine(ex.Message);
             }
         }
-
-        private static Version LastVersionPrompted()
-        {
-            var lastVersionPromptedSaved = Settings.Default.LastVersionPrompted;
-            if (!_regexVersion.IsMatch(lastVersionPromptedSaved)) return null;
-
-            return new Version(lastVersionPromptedSaved);
-        }
-
-        private static string ParseTagToVersionString(string tag)
-        {
-            return string.IsNullOrEmpty(tag) ? string.Empty : _regexTag.Replace(tag, string.Empty);
-        }
     }
 }
diff --git a/EspionSpotify/Properties/AssemblyInfo.cs b/EspionSpotify/Properties/AssemblyInfo.cs
@@ -4,13 +4,13 @@
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("EspionSpotify")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("Spytify")]
+[assembly: AssemblyDescription("github.com/jwallet")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCompany("jwallet")]
+[assembly: AssemblyProduct("Spytify")]
+[assembly: AssemblyCopyright("jwallet")]
+[assembly: AssemblyTrademark("Spytify")]
 [assembly: AssemblyCulture("")]
 
 // Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
@@ -31,5 +31,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.2.1")]
+[assembly: AssemblyFileVersion("1.1.2.1")]
diff --git a/EspionSpotify/Properties/Resources.Designer.cs b/EspionSpotify/Properties/Resources.Designer.cs
diff --git a/EspionSpotify/Properties/Resources.resx b/EspionSpotify/Properties/Resources.resx
@@ -277,4 +277,7 @@
   <data name="record" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\record.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="release" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\release.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/EspionSpotify/Resources/release.gif b/EspionSpotify/Resources/release.gif
diff --git a/EspionSpotify/english.Designer.cs b/EspionSpotify/english.Designer.cs
diff --git a/EspionSpotify/english.resx b/EspionSpotify/english.resx
@@ -416,4 +416,8 @@
   <data name="logUnsupportedNumberChannels" xml:space="preserve">
     <value>// Error while recording: Recording multi-channel files is not supported, reduce the number of channels to 2 (stereo) or 1 (mono).</value>
   </data>
+  <data name="tipRelease" xml:space="preserve">
+    <value>New version available</value>
+    <comment>interface</comment>
+  </data>
 </root>
diff --git a/EspionSpotify/french.resx b/EspionSpotify/french.resx
@@ -415,4 +415,8 @@
   <data name="logUnsupportedNumberChannels" xml:space="preserve">
     <value>// Erreur lors de l'enregistrement: L'enregistrement multi-canaux de fichiers n'est pas supporté, veuillez réduire le nombre de canaux à 2 (stéréo) ou 1 (mono).</value>
   </data>
+  <data name="tipRelease" xml:space="preserve">
+    <value>Nouvelle version disponible</value>
+    <comment>interface</comment>
+  </data>
 </root>
diff --git a/EspionSpotify/french1.Designer.cs b/EspionSpotify/french1.Designer.cs