Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-09 03:04:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a migration issue on docker happening too many times or throwing exception when source wasn't there. (#719)

Browse Source
This commit is contained in:
Joseph Milazzo 2021-11-03 19:23:46 -05:00 committed by GitHub
parent 53bb1af21b
commit 18c2cdf6ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -500,8 +500,8 @@ _output/
API/stats/ API/stats/
UI/Web/dist/ UI/Web/dist/
/API.Tests/Extensions/Test Data/modified on run.txt /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/covers/
/API/config/logs/ /API/config/logs/
/API/config/backups/ /API/config/backups/
@ -515,6 +515,6 @@ UI/Web/dist/
/API/config/Hangfire-log.db /API/config/Hangfire-log.db
API/config/covers/ API/config/covers/
API/config/*.db API/config/*.db
API/config/stats/*
UI/Web/.vscode/settings.json UI/Web/.vscode/settings.json

18
API/Data/MigrateConfigFiles.cs
View File

@ -39,6 +39,12 @@ namespace API.Data
if (isDocker) if (isDocker)
{ {
if (Configuration.LogPath.Contains("config"))
{
Console.WriteLine("Migration to config/ not needed");
return;
}
Console.WriteLine( Console.WriteLine(
"Migrating files from pre-v0.4.8. All Kavita config files are now located in config/"); "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; if (new DirectoryInfo(Path.Join(ConfigDirectory, folderToMove)).Exists) continue;
DirectoryService.CopyDirectoryToDirectory(Path.Join(Directory.GetCurrentDirectory(), folderToMove), try
Path.Join(ConfigDirectory, folderToMove)); {
DirectoryService.CopyDirectoryToDirectory(
Path.Join(Directory.GetCurrentDirectory(), folderToMove),
Path.Join(ConfigDirectory, folderToMove));
}
catch (Exception)
{
/* Swallow Exception */
}
} }

1
API/config/stats/app_stats - Copy.json
View File

@ -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}]}

1
API/config/stats/app_stats.json
View File

@ -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}]}