diff --git a/API.Tests/Services/MetadataServiceTests.cs b/API.Tests/Services/MetadataServiceTests.cs index 3f550f80a..796201538 100644 --- a/API.Tests/Services/MetadataServiceTests.cs +++ b/API.Tests/Services/MetadataServiceTests.cs @@ -36,6 +36,13 @@ namespace API.Tests.Services }, false, false)); } + [Fact] + public void ShouldUpdateCoverImage_OnFirstRunSeries() + { + // Represents first run + Assert.True(MetadataService.ShouldUpdateCoverImage(null,null, false, false)); + } + [Fact] public void ShouldUpdateCoverImage_OnSecondRun_FileModified() { diff --git a/API/API.csproj b/API/API.csproj index 7d2707e28..c49d3eb28 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -73,7 +73,6 @@ - diff --git a/API/Services/MetadataService.cs b/API/Services/MetadataService.cs index 2db52fe3f..fe2a27172 100644 --- a/API/Services/MetadataService.cs +++ b/API/Services/MetadataService.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Linq; using System.Threading.Tasks; using API.Comparators; @@ -37,11 +36,6 @@ namespace API.Services _imageService = imageService; } - private static bool IsCoverImageSet(byte[] coverImage, bool forceUpdate = false) - { - return forceUpdate || HasCoverImage(coverImage); - } - /// /// Determines whether an entity should regenerate cover image /// @@ -104,7 +98,8 @@ namespace API.Services /// Force updating cover image even if underlying file has not been modified or chapter already has a cover image public void UpdateMetadata(Volume volume, bool forceUpdate) { - if (volume == null || !IsCoverImageSet(volume.CoverImage, forceUpdate)) return; + if (volume == null || !ShouldUpdateCoverImage(volume.CoverImage, null, forceUpdate + , false)) return; volume.Chapters ??= new List(); var firstChapter = volume.Chapters.OrderBy(x => double.Parse(x.Number), _chapterSortComparer).FirstOrDefault(); diff --git a/Dockerfile b/Dockerfile index 496db0002..a1d36ee56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,7 @@ RUN apt-get update \ #Creates the data directory RUN mkdir /kavita/data -RUN cp /kavita/appsettings.Development.json /kavita/appsettings.json \ - && sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json +RUN sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json COPY entrypoint.sh /entrypoint.sh diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj index c1b0f91a7..5b68eb51a 100644 --- a/Kavita.Common/Kavita.Common.csproj +++ b/Kavita.Common/Kavita.Common.csproj @@ -4,7 +4,7 @@ net5.0 kavitareader.com Kavita - 0.4.4.3 + 0.4.4.4 en diff --git a/build.sh b/build.sh index 9aa3b0239..ccecbd597 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,20 @@ -#! /bin/bash +#! /bin/bash set -e outputFolder='_output' +CheckRequirements() +{ + if ! command -v npm &> /dev/null + then + echo "Warning!!! npm not found, it is required for building Kavita!" + fi + if ! command -v dotnet &> /dev/null + then + echo "Warning!!! dotnet not found, it is required for building Kavita!" + fi +} + ProgressStart() { echo "Start '$1'" @@ -55,7 +67,8 @@ BuildUI() echo 'Building UI' npm run prod echo 'Copying back to Kavita wwwroot' - cp -r dist/* ../../API/wwwroot + mkdir -p ../../API/wwwroot + cp -R dist/* ../../API/wwwroot cd ../../ || exit ProgressEnd 'Building UI' } @@ -75,7 +88,7 @@ Package() dotnet publish -c Release --self-contained --runtime $runtime -o "$lOutputFolder" --framework $framework echo "Recopying wwwroot due to bug" - cp -r ./wwwroot/* $lOutputFolder/wwwroot + cp -R ./wwwroot/* $lOutputFolder/wwwroot echo "Copying Install information" cp ../INSTALL.txt "$lOutputFolder"/README.txt @@ -84,7 +97,13 @@ Package() cp ../LICENSE "$lOutputFolder"/LICENSE.txt echo "Renaming API -> Kavita" - mv "$lOutputFolder"/API "$lOutputFolder"/Kavita + + if [ $runtime == "win-x64" ] || [ $runtime == "win-x86" ] + then + mv "$lOutputFolder"/API.exe "$lOutputFolder"/Kavita.exe + else + mv "$lOutputFolder"/API "$lOutputFolder"/Kavita + fi echo "Creating tar" cd ../$outputFolder/"$runtime"/ @@ -101,6 +120,7 @@ Package() RID="$1" +CheckRequirements BuildUI Build