Skip to content

Commit

Permalink
Merge pull request #16 from NetNerd/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
NetNerd committed Dec 15, 2018
2 parents 2fefe41 + ba3a501 commit 574c9a4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
4 changes: 2 additions & 2 deletions My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("0.9.2")>
<Assembly: AssemblyFileVersion("0.9.2")>
<Assembly: AssemblyVersion("0.9.3")>
<Assembly: AssemblyFileVersion("0.9.3")>
4 changes: 2 additions & 2 deletions Plugin.vb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Public Class Plugin
about.Name = "VocaDB Lyrics Plugin"
about.VersionMajor = 0
about.VersionMinor = 9
about.Revision = 2
about.Revision = 3
about.PluginInfoVersion = about.VersionMinor
about.Description = "A lyrics provider for VocaDB, UtaiteDB, and TouhouDB. (v" & about.VersionMajor & "." & about.VersionMinor & ")"
about.Author = "NetNerd"
Expand Down Expand Up @@ -199,7 +199,7 @@ Public Class Plugin

If MySettings.UpdateChecking Then
If Updates.LastUpdate < DateTime.Now.AddDays(-1) Then
Updates.UpdateCheck(WebProxy, about.VersionMajor, about.VersionMinor, mbApiInterface.Setting_GetPersistentStoragePath().TrimEnd("\/".ToCharArray) & "\" & SettingsFolder & "\", MySettings.UILanguage)
Updates.UpdateCheck(WebProxy, about.VersionMajor, about.VersionMinor, about.Revision, mbApiInterface.Setting_GetPersistentStoragePath().TrimEnd("\/".ToCharArray) & "\" & SettingsFolder & "\", MySettings.UILanguage)
End If
End If

Expand Down
17 changes: 15 additions & 2 deletions Updates.vb
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
Private Shared WebProx As Net.WebProxy
Private Shared VerMajor As Integer
Private Shared VerMinor As Integer
Private Shared VerRevision As Integer
Private Shared UILang As LanguageClass.Language
Private Shared Path As String
Public Shared LastUpdate As New DateTime(0)

Public Shared Sub UpdateCheck(Proxy As Net.WebProxy, VersionMajor As Integer, VersionMinor As Integer, StoragePath As String, UILanguage As LanguageClass.Language)
Public Shared Sub UpdateCheck(Proxy As Net.WebProxy, VersionMajor As Integer, VersionMinor As Integer, VersionRevision As Integer, StoragePath As String, UILanguage As LanguageClass.Language)
If UpdateThread.IsAlive = False Then
WebProx = Proxy
VerMajor = VersionMajor
VerMinor = VersionMinor
VerRevision = VersionRevision
UILang = UILanguage
Path = StoragePath

Expand All @@ -30,7 +32,18 @@
SettingsClass.SaveFile("LastUpdateCheck", Path, LastUpdate.ToUniversalTime.ToString("u"), UILang, True)

Dim LatestVer() As Integer = GetLatestVersion()
If (LatestVer(0) > VerMajor) OrElse (LatestVer(0) = VerMajor And LatestVer(1) > VerMinor) Then
Dim IsNewVer As Boolean = False

If LatestVer(0) > VerMajor Then
IsNewVer = True
ElseIf LatestVer(0) = VerMajor And LatestVer(1) = (VerMinor * 10 + VerRevision) Then
IsNewVer = False
ElseIf LatestVer(0) = VerMajor And LatestVer(1) > VerMinor Then
IsNewVer = True
End If


If IsNewVer Then
If MsgBox(
LanguageClass.FallbackHelper(UILang.UpdateMsg, LanguageClass.LangEnUS.UpdateMsg) & vbNewLine & vbNewLine &
LanguageClass.FallbackHelper(UILang.CurVer, LanguageClass.LangEnUS.CurVer) & VerMajor & "." & VerMinor & vbNewLine &
Expand Down

0 comments on commit 574c9a4

Please sign in to comment.