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

Merge branch 'develop' of https://github.com/Kareadita/Kavita into develop

Browse Source
This commit is contained in:
majora2007 2021-08-28 00:42:57 +00:00
commit abc54436b9
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
API/API.csproj
View File

@ -73,7 +73,6 @@
<ItemGroup>
<ProjectReference Include="..\Kavita.Common\Kavita.Common.csproj" />
<Content Condition=" '$(Configuration)' == 'Release' " Include="appsettings.json" />
</ItemGroup>
@ -118,6 +117,9 @@
<Content Remove="temp\**" />
<Content Remove="stats\**" />
<Content Condition=" '$(Configuration)' == 'Release' " Remove="appsettings.Development.json" />
<Content Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>

8
API/Services/MetadataService.cs
View File

@ -20,7 +20,7 @@ namespace API.Services
private readonly IArchiveService _archiveService;
private readonly IBookService _bookService;
private readonly IImageService _imageService;
private readonly ChapterSortComparer _chapterSortComparer = new ChapterSortComparer();
private readonly ChapterSortComparerZeroFirst _chapterSortComparerForInChapterSorting = new ChapterSortComparerZeroFirst();
/// <summary>
/// Width of the Thumbnail generation
/// </summary>
@ -102,7 +102,7 @@ namespace API.Services
, false)) return;
volume.Chapters ??= new List<Chapter>();
var firstChapter = volume.Chapters.OrderBy(x => double.Parse(x.Number), _chapterSortComparer).FirstOrDefault();
var firstChapter = volume.Chapters.OrderBy(x => double.Parse(x.Number), _chapterSortComparerForInChapterSorting).FirstOrDefault();
if (firstChapter == null) return;
@ -127,13 +127,13 @@ namespace API.Services
// If firstCover is null and one volume, the whole series is Chapters under Vol 0.
if (series.Volumes.Count == 1)
{
coverImage = series.Volumes[0].Chapters.OrderBy(c => double.Parse(c.Number), _chapterSortComparer)
coverImage = series.Volumes[0].Chapters.OrderBy(c => double.Parse(c.Number), _chapterSortComparerForInChapterSorting)
.FirstOrDefault(c => !c.IsSpecial)?.CoverImage;
}
if (!HasCoverImage(coverImage))
{
coverImage = series.Volumes[0].Chapters.OrderBy(c => double.Parse(c.Number), _chapterSortComparer)
coverImage = series.Volumes[0].Chapters.OrderBy(c => double.Parse(c.Number), _chapterSortComparerForInChapterSorting)
.FirstOrDefault()?.CoverImage;
}
}

3
Dockerfile
View File

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

2
Kavita.Common/Kavita.Common.csproj
View File

@ -4,7 +4,7 @@
<TargetFramework>net5.0</TargetFramework>
<Company>kavitareader.com</Company>
<Product>Kavita</Product>
<AssemblyVersion>0.4.4.4</AssemblyVersion>
<AssemblyVersion>0.4.4.7</AssemblyVersion>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>

10
build.sh
View File

@ -97,7 +97,15 @@ 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 "Copying appsettings.json"
cp appsettings.Development.json $lOutputFolder/appsettings.json
echo "Creating tar"
cd ../$outputFolder/"$runtime"/

3
monorepo-build.sh
View File

@ -57,6 +57,9 @@ Package()
echo "Show API structure"
find
echo "Copying appsettings.json"
cp appsettings.Development.json $lOutputFolder/appsettings.json
echo "Creating tar"
cd ../$outputFolder/"$runtime"/
tar -czvf ../kavita-$runtime.tar.gz Kavita