diff --git a/.gitignore b/.gitignore index b4cc993ab..8c0eeb5d2 100644 --- a/.gitignore +++ b/.gitignore @@ -500,8 +500,8 @@ _output/ API/stats/ UI/Web/dist/ /API.Tests/Extensions/Test Data/modified on run.txt -/API/covers/ -# All config files in config except appsettings.json + +# All config files/folders in config except appsettings.json /API/config/covers/ /API/config/logs/ /API/config/backups/ @@ -515,6 +515,6 @@ UI/Web/dist/ /API/config/Hangfire-log.db API/config/covers/ API/config/*.db -API/config/stats/* + UI/Web/.vscode/settings.json diff --git a/API/Data/MigrateConfigFiles.cs b/API/Data/MigrateConfigFiles.cs index c17b2d695..2436e3820 100644 --- a/API/Data/MigrateConfigFiles.cs +++ b/API/Data/MigrateConfigFiles.cs @@ -39,6 +39,12 @@ namespace API.Data if (isDocker) { + if (Configuration.LogPath.Contains("config")) + { + Console.WriteLine("Migration to config/ not needed"); + return; + } + Console.WriteLine( "Migrating files from pre-v0.4.8. All Kavita config files are now located in config/"); @@ -112,8 +118,16 @@ namespace API.Data { if (new DirectoryInfo(Path.Join(ConfigDirectory, folderToMove)).Exists) continue; - DirectoryService.CopyDirectoryToDirectory(Path.Join(Directory.GetCurrentDirectory(), folderToMove), - Path.Join(ConfigDirectory, folderToMove)); + try + { + DirectoryService.CopyDirectoryToDirectory( + Path.Join(Directory.GetCurrentDirectory(), folderToMove), + Path.Join(ConfigDirectory, folderToMove)); + } + catch (Exception) + { + /* Swallow Exception */ + } } diff --git a/API/config/stats/app_stats - Copy.json b/API/config/stats/app_stats - Copy.json deleted file mode 100644 index 2ea2d8321..000000000 --- a/API/config/stats/app_stats - Copy.json +++ /dev/null @@ -1 +0,0 @@ -{"InstallId":"2c158339","LastUpdate":"2021-07-26T00:32:01.7509137Z","UsageInfo":null,"ServerInfo":null,"ClientsInfo":[{"KavitaUiVersion":"0.4.2","ScreenResolution":"1920 x 1080","PlatformType":"desktop","Browser":{"Name":"Chrome","Version":"91.0.4472.124"},"Os":{"Name":"Windows","Version":"NT 10.0"},"CollectedAt":"2021-07-26T00:32:01.7289388Z","UsingDarkTheme":true}]} \ No newline at end of file diff --git a/API/config/stats/app_stats.json b/API/config/stats/app_stats.json deleted file mode 100644 index b02f7729f..000000000 --- a/API/config/stats/app_stats.json +++ /dev/null @@ -1 +0,0 @@ -{"InstallId":"2c158339","LastUpdate":"2021-10-20T12:44:40.269713Z","UsageInfo":{"UsersCount":6,"FileTypes":[".epub",".pdf",".cbr",".cbz",".zip",".rar",".jpg",".7z",".png"],"LibraryTypesCreated":[{"Type":0,"Count":2},{"Type":1,"Count":2},{"Type":2,"Count":1}]},"ServerInfo":{"Os":"Microsoft Windows 10.0.19042","DotNetVersion":"5.0.9","RunTimeVersion":".NET 5.0.9","KavitaVersion":"0.4.7.16","BuildBranch":"Debug","Culture":"en-US","IsDocker":false,"NumOfCores":12},"ClientsInfo":[{"KavitaUiVersion":"0.4.2","ScreenResolution":"1920 x 1080","PlatformType":"desktop","Browser":{"Name":"Chrome","Version":"94.0.4606.81"},"Os":{"Name":"Windows","Version":"NT 10.0"},"CollectedAt":"2021-10-20T12:36:27.2838212Z","UsingDarkTheme":true}]} \ No newline at end of file