Fix converter logic and version mismatch T_T

MonkAlex · Jul 12, 2020 · a2eef4f · a2eef4f
1 parent 1a06889
commit a2eef4f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/MangaReader.Avalonia/ProcessModel.cs b/MangaReader.Avalonia/ProcessModel.cs
@@ -72,7 +72,7 @@ public ProcessModel()
       this.Percent = 0;
       this.ProgressState = ProgressState.Indeterminate;
       this.Status = string.Empty;
-      this.Version = new Version(AppConfig.Version.Major, AppConfig.Version.Minor, AppConfig.Version.Build);
+      this.Version = AppConfig.Version;
       this.State = ConvertState.None;
     }
 

diff --git a/MangaReader.Core/Convertation/Primitives/BaseConverter.cs b/MangaReader.Core/Convertation/Primitives/BaseConverter.cs
@@ -40,8 +40,9 @@ protected virtual bool ProtectedCanConvert(IProcess process)
 
     protected bool CanConvertVersion(IProcess process)
     {
-      return this.Version.CompareTo(Repository.GetStateless<DatabaseConfig>().Single().Version) > 0 &&
-             process.Version.CompareTo(this.Version) >= 0;
+      var versionGreaterThanDatabase = this.Version.CompareTo(Repository.GetStateless<DatabaseConfig>().Single().Version) > 0;
+      var versionLessOrEqualThanApp = process.Version.CompareTo(this.Version) >= 0;
+      return versionGreaterThanDatabase && versionLessOrEqualThanApp;
     }
 
     protected async Task<object> RunSql(string command)

diff --git a/MangaReader.Core/MangaReader.Core.csproj b/MangaReader.Core/MangaReader.Core.csproj
@@ -14,14 +14,14 @@
     <EmbeddedResource Include="..\CHANGELOG.md" Link="Update\CHANGELOG.md" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Collection" Version="6.0.0" />
+    <PackageReference Include="AutoMapper.Collection" Version="7.0.0" />
     <PackageReference Include="FluentNHibernate" Version="2.1.2" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.23" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="NLog" Version="4.7.0" />
-    <PackageReference Include="Octokit" Version="0.46.0" />
+    <PackageReference Include="NLog" Version="4.7.2" />
+    <PackageReference Include="Octokit" Version="0.48.0" />
     <PackageReference Include="System.ComponentModel.Composition" Version="4.7.0" />
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112.1" />
+    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.1" />
     <PackageReference Include="System.Interactive.Async" Version="3.2.0" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

diff --git a/Sites/Grouple.ru/Convertation/From49_8To49_9.cs b/Sites/Grouple.ru/Convertation/From49_8To49_9.cs
@@ -26,7 +26,7 @@ protected override async Task ProtectedConvert(IProcess process)
 
     public From49_8To49_9()
     {
-      this.Version = new Version(1, 49, 8);
+      this.Version = new Version(1, 49, 9, 62);
       this.CanReportProcess = false;
       this.Name = "Обновляем ссылки на readmanga.live...";
     }

diff --git a/VersionInfo.cs b/VersionInfo.cs
@@ -11,4 +11,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.49.9.61")]
+[assembly: AssemblyVersion("1.49.9.62")]