mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-07-09 03:04:19 -04:00
Merge branch 'develop' of https://github.com/Kareadita/Kavita into develop
This commit is contained in:
commit
abc54436b9
@ -73,7 +73,6 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Kavita.Common\Kavita.Common.csproj" />
|
<ProjectReference Include="..\Kavita.Common\Kavita.Common.csproj" />
|
||||||
<Content Condition=" '$(Configuration)' == 'Release' " Include="appsettings.json" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
||||||
@ -118,6 +117,9 @@
|
|||||||
<Content Remove="temp\**" />
|
<Content Remove="temp\**" />
|
||||||
<Content Remove="stats\**" />
|
<Content Remove="stats\**" />
|
||||||
<Content Condition=" '$(Configuration)' == 'Release' " Remove="appsettings.Development.json" />
|
<Content Condition=" '$(Configuration)' == 'Release' " Remove="appsettings.Development.json" />
|
||||||
|
<Content Update="appsettings.json">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -20,7 +20,7 @@ namespace API.Services
|
|||||||
private readonly IArchiveService _archiveService;
|
private readonly IArchiveService _archiveService;
|
||||||
private readonly IBookService _bookService;
|
private readonly IBookService _bookService;
|
||||||
private readonly IImageService _imageService;
|
private readonly IImageService _imageService;
|
||||||
private readonly ChapterSortComparer _chapterSortComparer = new ChapterSortComparer();
|
private readonly ChapterSortComparerZeroFirst _chapterSortComparerForInChapterSorting = new ChapterSortComparerZeroFirst();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Width of the Thumbnail generation
|
/// Width of the Thumbnail generation
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -102,7 +102,7 @@ namespace API.Services
|
|||||||
, false)) return;
|
, false)) return;
|
||||||
|
|
||||||
volume.Chapters ??= new List<Chapter>();
|
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;
|
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 firstCover is null and one volume, the whole series is Chapters under Vol 0.
|
||||||
if (series.Volumes.Count == 1)
|
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;
|
.FirstOrDefault(c => !c.IsSpecial)?.CoverImage;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!HasCoverImage(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;
|
.FirstOrDefault()?.CoverImage;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,8 +26,7 @@ RUN apt-get update \
|
|||||||
#Creates the data directory
|
#Creates the data directory
|
||||||
RUN mkdir /kavita/data
|
RUN mkdir /kavita/data
|
||||||
|
|
||||||
RUN cp /kavita/appsettings.Development.json /kavita/appsettings.json \
|
RUN sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json
|
||||||
&& sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json
|
|
||||||
|
|
||||||
COPY entrypoint.sh /entrypoint.sh
|
COPY entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<TargetFramework>net5.0</TargetFramework>
|
<TargetFramework>net5.0</TargetFramework>
|
||||||
<Company>kavitareader.com</Company>
|
<Company>kavitareader.com</Company>
|
||||||
<Product>Kavita</Product>
|
<Product>Kavita</Product>
|
||||||
<AssemblyVersion>0.4.4.4</AssemblyVersion>
|
<AssemblyVersion>0.4.4.7</AssemblyVersion>
|
||||||
<NeutralLanguage>en</NeutralLanguage>
|
<NeutralLanguage>en</NeutralLanguage>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
10
build.sh
10
build.sh
@ -97,7 +97,15 @@ Package()
|
|||||||
cp ../LICENSE "$lOutputFolder"/LICENSE.txt
|
cp ../LICENSE "$lOutputFolder"/LICENSE.txt
|
||||||
|
|
||||||
echo "Renaming API -> Kavita"
|
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"
|
echo "Creating tar"
|
||||||
cd ../$outputFolder/"$runtime"/
|
cd ../$outputFolder/"$runtime"/
|
||||||
|
@ -56,6 +56,9 @@ Package()
|
|||||||
|
|
||||||
echo "Show API structure"
|
echo "Show API structure"
|
||||||
find
|
find
|
||||||
|
|
||||||
|
echo "Copying appsettings.json"
|
||||||
|
cp appsettings.Development.json $lOutputFolder/appsettings.json
|
||||||
|
|
||||||
echo "Creating tar"
|
echo "Creating tar"
|
||||||
cd ../$outputFolder/"$runtime"/
|
cd ../$outputFolder/"$runtime"/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user