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

Compare commits

base: aytac:991885a9d1325f301ae860da7627e6095647ed41
Branches Tags
aytac:main
aytac:feature/dotnet-8-update
aytac:3-unhandled-exception-systemiofilenotfoundexception-the-configuration-file-appsettingsjson-was-not-found-and-is-not-optional-the-expected-physical-path-was-appappsettingsjson
aytac:bugfix/BUG1-Client-Http-Connection-Issue
..
compare: aytac:d12f6cb8a448f5898765c2aefe52e9930f88fbc7
Branches Tags
aytac:main
aytac:feature/dotnet-8-update
aytac:3-unhandled-exception-systemiofilenotfoundexception-the-configuration-file-appsettingsjson-was-not-found-and-is-not-optional-the-expected-physical-path-was-appappsettingsjson
aytac:bugfix/BUG1-Client-Http-Connection-Issue

No commits in common. "991885a9d1325f301ae860da7627e6095647ed41" and "d12f6cb8a448f5898765c2aefe52e9930f88fbc7" have entirely different histories.
991885a9d1 ... d12f6cb8a4

11 changed files with 33 additions and 37 deletions
Show Stats Expand all files Collapse all files

2
.github/workflows/publish.yml vendored
View File

@ -1,7 +1,7 @@
name: Deploy Images to GHCR
env:
DOTNET_VERSION: '8.0.x'
DOTNET_VERSION: '6.0.x'
on:
push:

2
.gitignore vendored
View File

@ -7,5 +7,3 @@ riderModule.iml
.env
compose/
compose-test/
.vscode/
.idea/

2
README.md
View File

@ -4,7 +4,7 @@ LinkdingSync is a collection of tools that make life with [Linkding](https://git
One of the workers is for syncing to [Wallabag](https://wallabag.org/en).
## Getting Started
It is recommended to use the Docker images. Otherwise, a .NET 8 environment is required to customize and build the code.
It is recommended to use the Docker images. Otherwise, a .NET 6 environment is required to customize and build the code.
## Environment Variables
For the containers to work, the environment variables must be passed. This can be done either directly via the Docker run **-e** switch, via the **environment** settings in a Docker compose definition, or via an environment variable file.

2
global.json
View File

@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.0",
"version": "6.0.0",
"rollForward": "latestMinor",
"allowPrerelease": false
}

6
src/Domain/Core/Core.csproj
View File

@ -6,9 +6,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
</ItemGroup>
</Project>

6
src/Linkding/Linkding.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-LinkdingService-80165DE2-FA70-4803-B366-DF8F24CF86BE</UserSecretsId>
@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="YamlDotNet" Version="15.1.2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="YamlDotNet" Version="12.3.1" />
</ItemGroup>
<ItemGroup>

5
src/Services/Linkding.Client/Extensions/ServiceRegistrationExtensions.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
using System.Net.Http.Headers;
using Linkding.Client;
using Linkding.Client.Options;
using Microsoft.Extensions.Configuration;
@ -19,8 +19,7 @@ public static class ServiceRegistrationExtensions
.SetHandlerLifetime(TimeSpan.FromMinutes(5)) //Set lifetime to five minutes
.AddPolicyHandler(GetRetryPolicy());
var assemblies = AppDomain.CurrentDomain.GetAssemblies();
services.AddAutoMapper(assemblies);
services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
return services;
}

15
src/Services/Linkding.Client/Linkding.Client.csproj
View File

@ -1,19 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.13" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
</ItemGroup>
<ItemGroup>

6
src/Services/Wallabag.Client/Extensions/ServiceRegistrationExtensions.cs
View File

@ -17,10 +17,8 @@ public static class ServiceRegistrationExtensions
{
var configSection = configuration.GetSection(WallabagSettings.Position);
services.Configure<WallabagSettings>(configSection);
// services.AddScoped<IAccessTokenProvider, OAuthTokenProvider>();
// services.AddScoped<AuthenticationClient>();
services.AddSingleton<IAccessTokenProvider, OAuthTokenProvider>();
services.AddSingleton<AuthenticationClient>();
services.AddScoped<IAccessTokenProvider, OAuthTokenProvider>();
services.AddScoped<AuthenticationClient>();
services.AddHttpClient<WallabagService>()
.SetHandlerLifetime(TimeSpan.FromMinutes(5)) //Set lifetime to five minutes
.AddPolicyHandler(GetRetryPolicy());

12
src/Services/Wallabag.Client/Wallabag.Client.csproj
View File

@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.13" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
</ItemGroup>
<ItemGroup>

8
src/Wallabag/Wallabag.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-WallabagWorker-D5E52F5F-C642-4BF8-9FD7-8C6C417B0D3A</UserSecretsId>
@ -9,9 +9,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="YamlDotNet" Version="15.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="YamlDotNet" Version="12.3.1" />
</ItemGroup>
<ItemGroup>