From 9b3c2733a0f6015a9c593bf4b0b15d6f6844f3a3 Mon Sep 17 00:00:00 2001
From: Aytac Kirmizi <aytac.kirmizi@gmail.com>
Date: Tue, 7 Feb 2023 19:12:09 +0100
Subject: [PATCH] **fixed** debug setting was a part of the last commit.
 appsettings.json was expected. Fixed with preprocessor directives.

---
 .gitignore                                             | 3 ++-
 .idea/.idea.Linkding.Sync/.idea/.name                  | 1 -
 src/Linkding/Program.cs                                | 6 ++++--
 src/Services/Wallabag.Client/WallabagServiceEntries.cs | 1 +
 src/Wallabag/Program.cs                                | 6 ++++--
 src/Wallabag/Wallabag.csproj                           | 9 +++++++++
 6 files changed, 20 insertions(+), 6 deletions(-)
 delete mode 100644 .idea/.idea.Linkding.Sync/.idea/.name

diff --git a/.gitignore b/.gitignore
index 07a6899..19a59e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ riderModule.iml
 /_ReSharper.Caches/
 **/.env
 .env
-compose/
\ No newline at end of file
+compose/
+compose-test/
\ No newline at end of file
diff --git a/.idea/.idea.Linkding.Sync/.idea/.name b/.idea/.idea.Linkding.Sync/.idea/.name
deleted file mode 100644
index bbf3e88..0000000
--- a/.idea/.idea.Linkding.Sync/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Linkding.Sync
\ No newline at end of file
diff --git a/src/Linkding/Program.cs b/src/Linkding/Program.cs
index 47fdf76..29ea977 100644
--- a/src/Linkding/Program.cs
+++ b/src/Linkding/Program.cs
@@ -10,10 +10,12 @@ IHost host = Host.CreateDefaultBuilder(args)
     {
         builder
             .AddEnvironmentVariables()
-            .AddCommandLine(args)
+#if DEBUG
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.Development.json")
-            .AddUserSecrets<Program>(true);
+#endif
+            .AddUserSecrets<Program>(true)
+            .AddCommandLine(args);
     })
     .Build();
 
diff --git a/src/Services/Wallabag.Client/WallabagServiceEntries.cs b/src/Services/Wallabag.Client/WallabagServiceEntries.cs
index 31968fd..d529092 100644
--- a/src/Services/Wallabag.Client/WallabagServiceEntries.cs
+++ b/src/Services/Wallabag.Client/WallabagServiceEntries.cs
@@ -26,6 +26,7 @@ public partial class WallabagService
                 while (allQuery.QueryLinks.Next != null && !string.IsNullOrEmpty(allQuery.QueryLinks.Next.Href))
                 {
                     // url = allQuery.QueryLinks.Next.Href.Replace(_settings.Url, "");
+                    url = allQuery.QueryLinks.Next.Href;
                     if (_client.BaseAddress.Scheme == "https")
                     {
                         url = allQuery.QueryLinks.Next.Href.Replace("http://", "https://");
diff --git a/src/Wallabag/Program.cs b/src/Wallabag/Program.cs
index ad9e440..d92a584 100644
--- a/src/Wallabag/Program.cs
+++ b/src/Wallabag/Program.cs
@@ -11,10 +11,12 @@ IHost host = Host.CreateDefaultBuilder(args)
     {
         builder
             .AddEnvironmentVariables()
-            .AddCommandLine(args)
+#if DEBUG
             .AddJsonFile("appsettings.json")
             .AddJsonFile("appsettings.Development.json")
-            .AddUserSecrets<Program>(true);
+#endif
+            .AddUserSecrets<Program>(true)
+            .AddCommandLine(args);
     })
     .Build();
 
diff --git a/src/Wallabag/Wallabag.csproj b/src/Wallabag/Wallabag.csproj
index 86e10dc..83888e0 100644
--- a/src/Wallabag/Wallabag.csproj
+++ b/src/Wallabag/Wallabag.csproj
@@ -18,4 +18,13 @@
       <ProjectReference Include="..\Services\Linkding.Client\Linkding.Client.csproj" />
       <ProjectReference Include="..\Services\Wallabag.Client\Wallabag.Client.csproj" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Content Update="appsettings.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+      <Content Update="appsettings.Development.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
 </Project>