Fix a TvDB Linking error

ShokoAnime · Oct 15, 2019 · e2a7209 · e2a7209
1 parent 46bebc8
commit e2a7209
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/Shoko.Server/Databases/SQLite.cs b/Shoko.Server/Databases/SQLite.cs
@@ -16,7 +16,6 @@ namespace Shoko.Server.Databases
 {
     public class SQLite : BaseDatabase<SQLiteConnection>, IDatabase
     {
-        public const string DefaultDBName = @"JMMServer.db3";
 
         public string Name { get; } = "SQLite";
 
@@ -36,7 +35,7 @@ public static string GetDatabasePath()
 
         public static string GetDatabaseFilePath()
         {
-            string dbName = Path.Combine(GetDatabasePath(), DefaultDBName);
+            string dbName = Path.Combine(GetDatabasePath(), ServerSettings.Instance.Database.SQLite_DatabaseFile);
             return dbName;
         }
 

diff --git a/Shoko.Server/Providers/TvDB/TvDBLinkingHelper.cs b/Shoko.Server/Providers/TvDB/TvDBLinkingHelper.cs
@@ -52,12 +52,10 @@ public static void GenerateTvDBEpisodeMatches(int animeID, bool skipMatchClearin
                     }
                 }
 
-                xref = new CrossRef_AniDB_TvDB_Episode
+                if (xref == null) xref = new CrossRef_AniDB_TvDB_Episode();
-                {
+                xref.AniDBEpisodeID = match.AniDB.EpisodeID;
-                    AniDBEpisodeID = match.AniDB.EpisodeID,
+                xref.TvDBEpisodeID = match.TvDB.Id;
-                    TvDBEpisodeID = match.TvDB.Id,
+                xref.MatchRating = match.Rating;
-                    MatchRating = match.Rating
-                };
 
                 tosave.Add(xref);
             }

diff --git a/Shoko.Server/Settings/Migration/ServerSettings_Legacy.cs b/Shoko.Server/Settings/Migration/ServerSettings_Legacy.cs
@@ -97,14 +97,6 @@ public static void LoadSettingsFromFile(string tmp_setting_file, bool delete_tmp
             {
                 try
                 {
-                    //Reconfigure log file to applicationpath
-                    var target = (FileTarget) LogManager.Configuration?.FindTargetByName("file");
-                    if (target != null)
-                    {
-                        target.FileName = ApplicationPath + "/logs/${shortdate}.log";
-                        LogManager.ReconfigExistingLoggers();
-                    }
-
                     disabledSave = true;
                     bool startedWithFreshConfig = false;