aytac/linkdingsync
1
0
Fork 0
mirror of https://github.com/spaytac/linkdingsync.git synced 2026-01-23 01:34:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

**fixed** debug setting was a part of the last commit. appsettings.json was expected. Fixed with preprocessor directives.

Browse Source
This commit is contained in:
Aytac Kirmizi 2023-02-07 19:12:09 +01:00
parent bfa2c37210
commit 9b3c2733a0
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ riderModule.iml
**/.env **/.env
.env .env
compose/ compose/
compose-test/

1
.idea/.idea.Linkding.Sync/.idea/.name
View File

@ -1 +0,0 @@
Linkding.Sync

6
src/Linkding/Program.cs
View File

@ -10,10 +10,12 @@ IHost host = Host.CreateDefaultBuilder(args)
{ {
builder builder
.AddEnvironmentVariables() .AddEnvironmentVariables()
.AddCommandLine(args) #if DEBUG
.AddJsonFile("appsettings.json") .AddJsonFile("appsettings.json")
.AddJsonFile("appsettings.Development.json") .AddJsonFile("appsettings.Development.json")
.AddUserSecrets<Program>(true); #endif
.AddUserSecrets<Program>(true)
.AddCommandLine(args);
}) })
.Build(); .Build();

1
src/Services/Wallabag.Client/WallabagServiceEntries.cs
View File

@ -26,6 +26,7 @@ public partial class WallabagService
while (allQuery.QueryLinks.Next != null && !string.IsNullOrEmpty(allQuery.QueryLinks.Next.Href)) while (allQuery.QueryLinks.Next != null && !string.IsNullOrEmpty(allQuery.QueryLinks.Next.Href))
{ {
// url = allQuery.QueryLinks.Next.Href.Replace(_settings.Url, ""); // url = allQuery.QueryLinks.Next.Href.Replace(_settings.Url, "");
url = allQuery.QueryLinks.Next.Href;
if (_client.BaseAddress.Scheme == "https") if (_client.BaseAddress.Scheme == "https")
{ {
url = allQuery.QueryLinks.Next.Href.Replace("http://", "https://"); url = allQuery.QueryLinks.Next.Href.Replace("http://", "https://");

6
src/Wallabag/Program.cs
View File

@ -11,10 +11,12 @@ IHost host = Host.CreateDefaultBuilder(args)
{ {
builder builder
.AddEnvironmentVariables() .AddEnvironmentVariables()
.AddCommandLine(args) #if DEBUG
.AddJsonFile("appsettings.json") .AddJsonFile("appsettings.json")
.AddJsonFile("appsettings.Development.json") .AddJsonFile("appsettings.Development.json")
.AddUserSecrets<Program>(true); #endif
.AddUserSecrets<Program>(true)
.AddCommandLine(args);
}) })
.Build(); .Build();

9
src/Wallabag/Wallabag.csproj
View File

@ -18,4 +18,13 @@
<ProjectReference Include="..\Services\Linkding.Client\Linkding.Client.csproj" /> <ProjectReference Include="..\Services\Linkding.Client\Linkding.Client.csproj" />
<ProjectReference Include="..\Services\Wallabag.Client\Wallabag.Client.csproj" /> <ProjectReference Include="..\Services\Wallabag.Client\Wallabag.Client.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Update="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="appsettings.Development.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project> </Project>