Fresh Nightly Installs Work (#1659)

* Bump loader-utils from 2.0.3 to 2.0.4 in /UI/Web

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.3...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Removed a very old cgecj from Nov 2021 when data/appsettings was moved to config/

* Added some notes about migration

* Removed a file that shouldn't have been there.

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Joe Milazzo 2022-11-17 15:52:10 -06:00 committed by GitHub
parent c6d24808ef
commit e520861e33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 32 deletions

4
.gitignore vendored
View File

@ -526,8 +526,10 @@ API/config/stats/*
API/config/stats/app_stats.json
API/config/pre-metadata/
API/config/post-metadata/
API/config/relations-imported.csv
API/config/relations.csv
API.Tests/TestResults/
UI/Web/.vscode/settings.json
/API.Tests/Services/Test Data/ArchiveService/CoverImages/output/*
UI/Web/.angular/
BenchmarkDotNet.Artifacts
BenchmarkDotNet.Artifacts

View File

@ -82,7 +82,14 @@ public class Program
}
// This must run before the migration
await MigrateSeriesRelationsExport.Migrate(context, logger);
try
{
await MigrateSeriesRelationsExport.Migrate(context, logger);
}
catch (Exception ex)
{
// If fresh install, could fail and we should just carry on as it's not applicable
}
await context.Database.MigrateAsync();
@ -90,14 +97,6 @@ public class Program
await Seed.SeedSettings(context, directoryService);
await Seed.SeedThemes(context);
await Seed.SeedUserApiKeys(context);
// NOTE: This check is from v0.4.8 (Nov 04, 2021). We can likely remove this
var isDocker = new OsInfo(Array.Empty<IOsVersionAdapter>()).IsDocker;
if (isDocker && new FileInfo("data/appsettings.json").Exists)
{
logger.LogCritical("WARNING! Mount point is incorrect, nothing here will persist. Please change your container mount from /kavita/data to /kavita/config");
return;
}
}
catch (Exception ex)
{

View File

@ -1,10 +0,0 @@
SeriesName,SeriesId,TargetSeriesName,TargetId,Relationship
Kaguya-sama - Love Is War,308,Kaguya-sama - Love Is War - Digital Colored Comics,307,AlternativeVersion
Kaguya-sama - Love Is War,308,Kaguya Wants To Be Confessed To Official Doujin,306,SpinOff
Konosuba,341,Konosuba - An Explosion on This Wonderful World!,342,SideStory
Konosuba,341,Kono Subarashii Sekai ni Nichijou wo!,337,SideStory
Accel World,1739,Accel World,887,Edition
24 Hours in Ancient Athens,1748,Kono Subarashii Sekai ni Nichijou wo!,337,Adaptation
24 Hours in Ancient Athens,1748,Accel World,887,Adaptation
Subete no Jidai o Tsuujite no Satsujinjutsu,1877,Accel World,887,Adaptation
KonoSuba,2032,Konosuba,341,Adaptation
1 SeriesName SeriesId TargetSeriesName TargetId Relationship
2 Kaguya-sama - Love Is War 308 Kaguya-sama - Love Is War - Digital Colored Comics 307 AlternativeVersion
3 Kaguya-sama - Love Is War 308 Kaguya Wants To Be Confessed To Official Doujin 306 SpinOff
4 Konosuba 341 Konosuba - An Explosion on This Wonderful World! 342 SideStory
5 Konosuba 341 Kono Subarashii Sekai ni Nichijou wo! 337 SideStory
6 Accel World 1739 Accel World 887 Edition
7 24 Hours in Ancient Athens 1748 Kono Subarashii Sekai ni Nichijou wo! 337 Adaptation
8 24 Hours in Ancient Athens 1748 Accel World 887 Adaptation
9 Subete no Jidai o Tsuujite no Satsujinjutsu 1877 Accel World 887 Adaptation
10 KonoSuba 2032 Konosuba 341 Adaptation

View File

@ -5089,9 +5089,9 @@
},
"dependencies": {
"loader-utils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
"integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@ -6746,9 +6746,9 @@
},
"dependencies": {
"loader-utils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
"integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@ -7115,9 +7115,9 @@
},
"dependencies": {
"loader-utils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
"integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@ -14660,9 +14660,9 @@
},
"dependencies": {
"loader-utils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
"integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",