starred/Samsung-Jellyfin-Installer
1
0
Fork 0
mirror of https://github.com/Jellyfin2Samsung/Samsung-Jellyfin-Installer.git synced 2026-03-01 11:21:12 +03:00
Code Issues 1 Packages Projects Releases 23 Wiki Activity

code clean up and testin github action

Browse Source
This commit is contained in:
PatrickSt1991
2026-01-18 12:53:22 +01:00
parent 196fe4e89b
commit 750f571cf4
23 changed files with 46 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Jellyfin2Samsung-CrossOS/Helpers/API/JellyfinApiClient.cs
View File

@@ -3,7 +3,6 @@ using Jellyfin2Samsung.Models;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Text.Json;

5
Jellyfin2Samsung-CrossOS/Helpers/Core/FileHelper.cs
View File

@@ -1,6 +1,5 @@
using Avalonia.Platform.Storage;
using Jellyfin2Samsung.Models;
using SkiaSharp;
using System;
using System.Collections.Generic;
using System.IO;
@@ -24,7 +23,7 @@ namespace Jellyfin2Samsung.Helpers.Core
{
new("WGT Files")
{
Patterns = wgtItem
Patterns = wgtItem
},
new("TPK Files")
{
@@ -32,7 +31,7 @@ namespace Jellyfin2Samsung.Helpers.Core
},
new("All Supported Files")
{
Patterns = allItem
Patterns = allItem
}
};

7
Jellyfin2Samsung-CrossOS/Helpers/Core/PackageHelper.cs
View File

@@ -5,7 +5,6 @@ using Jellyfin2Samsung.Models;
using Jellyfin2Samsung.ViewModels;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;
@@ -47,8 +46,8 @@ namespace Jellyfin2Samsung.Helpers.Core
bool ipMismatch = !localIps.Contains(selectedDevice.DeveloperIP) && !string.IsNullOrEmpty(selectedDevice.DeveloperIP);
if (!string.IsNullOrEmpty(AppSettings.Default.LocalIp)
&& !string.IsNullOrEmpty(selectedDevice.DeveloperIP)
if (!string.IsNullOrEmpty(AppSettings.Default.LocalIp)
&& !string.IsNullOrEmpty(selectedDevice.DeveloperIP)
&& _networkService.IsDifferentSubnet(AppSettings.Default.LocalIp, selectedDevice.DeveloperIP))
{
bool continueExecution =
@@ -95,7 +94,7 @@ namespace Jellyfin2Samsung.Helpers.Core
if (ipMismatch)
{
bool continueExecution = await _dialogService.ShowConfirmationAsync("IP Mismatch","DeveloperIPMismatch".Localized(), "keyContinue".Localized(), "keyStop".Localized());
bool continueExecution = await _dialogService.ShowConfirmationAsync("IP Mismatch", "DeveloperIPMismatch".Localized(), "keyContinue".Localized(), "keyStop".Localized());
if (!continueExecution)
return false;
}

1
Jellyfin2Samsung-CrossOS/Helpers/Core/ProcessHelper.cs
View File

@@ -1,6 +1,5 @@
using Jellyfin2Samsung.Models;
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;

2
Jellyfin2Samsung-CrossOS/Helpers/Jellyfin/Patches/JellyfinIndex.cs
View File

@@ -1,7 +1,6 @@
using Jellyfin2Samsung.Helpers.API;
using Jellyfin2Samsung.Helpers.Core;
using Jellyfin2Samsung.Helpers.Jellyfin.Plugins;
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -9,7 +8,6 @@ using System.Net.Http;
using System.Text;
using System.Text.Json.Nodes;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace Jellyfin2Samsung.Helpers.Jellyfin.Patches
{

4
Jellyfin2Samsung-CrossOS/Helpers/Jellyfin/Plugins/EditorsChoice/PatchEditorsChoice.cs
View File

@@ -1,6 +1,4 @@
using System;
namespace Jellyfin2Samsung.Helpers.Jellyfin.Plugins.EditorsChoice
namespace Jellyfin2Samsung.Helpers.Jellyfin.Plugins.EditorsChoice
{
public class PatchEditorsChoice
{

1
Jellyfin2Samsung-CrossOS/Helpers/Jellyfin/Plugins/KefinTweaks/KefinTweaksPatch.cs
View File

@@ -1,5 +1,4 @@
using Jellyfin2Samsung.Helpers.Core;
using Jellyfin2Samsung.Helpers.Jellyfin.Plugins;
using Jellyfin2Samsung.Interfaces;
using System;
using System.Collections.Generic;

2
Jellyfin2Samsung-CrossOS/Helpers/Jellyfin/Plugins/PluginManager.cs
View File

@@ -130,7 +130,7 @@ namespace Jellyfin2Samsung.Helpers.Jellyfin.Plugins
return null;
}
}
public async Task<byte[]?> DownloadBytesAsync(string url)
{
try

2
Jellyfin2Samsung-CrossOS/Helpers/Jellyfin/Plugins/PluginMatrix.cs
View File

@@ -85,7 +85,7 @@ namespace Jellyfin2Samsung.Helpers.Jellyfin.Plugins
UseBabel = true
}
];
public static readonly List<ServerAssetRule> ServerAssetRules =
public static readonly List<ServerAssetRule> ServerAssetRules =
[
new ServerAssetRule(
pluginName: "GenericPluginAsset",

1
Jellyfin2Samsung-CrossOS/Helpers/Jellyfin/Plugins/PluginPatches.cs
View File

@@ -5,7 +5,6 @@ using Jellyfin2Samsung.Models;
using System;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace Jellyfin2Samsung.Helpers.Jellyfin.Plugins

32
Jellyfin2Samsung-CrossOS/Helpers/Tizen/Certificate/CertificateHelper.cs
View File

@@ -31,25 +31,25 @@ namespace Jellyfin2Samsung.Helpers.Tizen.Certificate
if (!Directory.Exists(certificateFolders))
return certificates;
var p12Files = Directory.GetFiles(
certificateFolders,
"author.p12",
SearchOption.AllDirectories);
foreach(var p12Path in p12Files)
{
var directory = Path.GetDirectoryName(p12Path);
if (directory == null)
continue;
var p12Files = Directory.GetFiles(
certificateFolders,
"author.p12",
SearchOption.AllDirectories);
var passwordPath = Path.Combine(directory, "password.txt");
if (!File.Exists(passwordPath))
continue;
foreach (var p12Path in p12Files)
{
var directory = Path.GetDirectoryName(p12Path);
if (directory == null)
continue;
var password = File.ReadAllText(passwordPath).Trim();
if (string.IsNullOrWhiteSpace(password))
continue;
var passwordPath = Path.Combine(directory, "password.txt");
if (!File.Exists(passwordPath))
continue;
var password = File.ReadAllText(passwordPath).Trim();
if (string.IsNullOrWhiteSpace(password))
continue;
try
{
var cert = new X509Certificate2(

2
Jellyfin2Samsung-CrossOS/Helpers/Tizen/Devices/DeviceHelper.cs
View File

@@ -21,7 +21,7 @@ namespace Jellyfin2Samsung.Helpers.Tizen.Devices
_tizenApiClient = tizenApiClient;
}
public async Task<List<NetworkDevice>> ScanForDevicesAsync(CancellationToken cancellationToken = default, bool virtualScan = false)
{

9
Jellyfin2Samsung-CrossOS/Services/DialogService.cs
View File

@@ -1,14 +1,13 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Markup.Xaml.Styling;
using Avalonia.Media;
using Avalonia.Styling;
using Avalonia.Markup.Xaml.Styling;
using System.Threading.Tasks;
using System;
using Jellyfin2Samsung.Interfaces;
using Jellyfin2Samsung;
using Jellyfin2Samsung.Helpers;
using Jellyfin2Samsung.Interfaces;
using System;
using System.Threading.Tasks;
namespace Jellyfin2Samsung.Services
{

1
Jellyfin2Samsung-CrossOS/Services/NetworkService.cs
View File

@@ -10,7 +10,6 @@ using System.Net;
using System.Net.Http;
using System.Net.NetworkInformation;
using System.Net.Sockets;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

6
Jellyfin2Samsung-CrossOS/Services/TizenCertificateService.cs
View File

@@ -27,7 +27,7 @@ namespace Jellyfin2Samsung.Services
private readonly IDialogService _dialogService;
public TizenCertificateService(
HttpClient httpClient,
HttpClient httpClient,
IDialogService dialogService)
{
_httpClient = httpClient;
@@ -146,7 +146,7 @@ namespace Jellyfin2Samsung.Services
// Simplified Http Post for Author CSR
private async Task<byte[]> PostAuthorCsrAsync(byte[] csrData, string accessToken, string userId)
{
{
var request = new HttpRequestMessage(HttpMethod.Post, AppSettings.Default.AuthorEndpoint_V3);
var content = new MultipartFormDataContent
{
@@ -198,7 +198,7 @@ namespace Jellyfin2Samsung.Services
};
var v3Request = new HttpRequestMessage(HttpMethod.Post, AppSettings.Default.DistributorsEndpoint_V3);
v3Request.Content = v3Content;
v3Request.Content = v3Content;
var v3Response = await _httpClient.SendAsync(v3Request);
if (!v3Response.IsSuccessStatusCode)

2
Jellyfin2Samsung-CrossOS/ViewLocator.cs
View File

@@ -1,7 +1,7 @@
using System;
using Avalonia.Controls;
using Avalonia.Controls.Templates;
using Jellyfin2Samsung.ViewModels;
using System;
namespace Jellyfin2Samsung
{

11
Jellyfin2Samsung-CrossOS/ViewModels/BuildInfoViewModel.cs
View File

@@ -1,14 +1,13 @@
using System;
using CommunityToolkit.Mvvm.Input;
using Jellyfin2Samsung.Helpers;
using Jellyfin2Samsung.Helpers.Core;
using Jellyfin2Samsung.Models;
using System;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Jellyfin2Samsung.Helpers;
using Jellyfin2Samsung.Helpers.Core;
using Jellyfin2Samsung.Models;
namespace Jellyfin2Samsung.ViewModels
{

4
Jellyfin2Samsung-CrossOS/ViewModels/InstallationCompleteViewModel.cs
View File

@@ -1,6 +1,4 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Jellyfin2Samsung.Interfaces;
using System;

2
Jellyfin2Samsung-CrossOS/ViewModels/IpInputDialogViewModel.cs
View File

@@ -31,6 +31,6 @@ namespace Jellyfin2Samsung.ViewModels
private void OnOk() => _close(true);
private void OnCancel() => _close(false);
private void OnCancel() => _close(false);
}
}

2
Jellyfin2Samsung-CrossOS/ViewModels/JellyfinConfigViewModel.cs
View File

@@ -43,7 +43,7 @@ namespace Jellyfin2Samsung.ViewModels
[ObservableProperty]
private JellyTheme? selectedJellyTheme;
[ObservableProperty]
private Bitmap? selectedJellyThemePreview;

10
Jellyfin2Samsung-CrossOS/ViewModels/MainWindowViewModel.cs
View File

@@ -78,7 +78,7 @@ namespace Jellyfin2Samsung.ViewModels
private string L(string key) => _localizationService.GetString(key);
public bool EnableDevicesInput => !IsLoadingDevices;
public string LblRelease => _localizationService.GetString("lblRelease");
public string LblRelease => _localizationService.GetString("lblRelease");
public string LblVersion => _localizationService.GetString("lblVersion");
public string LblSelectTv => _localizationService.GetString("lblSelectTv");
public string DownloadAndInstall => _localizationService.GetString("DownloadAndInstall");
@@ -225,7 +225,7 @@ namespace Jellyfin2Samsung.ViewModels
SetStatus("FailedTizenSdb");
return;
}
ProcessHelper.KillSdbServers();
await LoadReleasesAsync();
@@ -328,7 +328,7 @@ namespace Jellyfin2Samsung.ViewModels
_samsungLoginCts = null;
}
if(!AppSettings.Default.KeepWGTFile)
if (!AppSettings.Default.KeepWGTFile)
_packageHelper.CleanupDownloadedPackage(downloadPath);
}
}
@@ -552,8 +552,8 @@ namespace Jellyfin2Samsung.ViewModels
return;
var dialog = new IpInputDialog();
string? ip = await dialog.ShowDialogAsync(desktop.MainWindow);
if (string.IsNullOrWhiteSpace(ip))

1
Jellyfin2Samsung-CrossOS/Views/IpInputDialog.axaml.cs
View File

@@ -1,5 +1,4 @@
using Avalonia.Controls;
using Jellyfin2Samsung;
using Jellyfin2Samsung.Interfaces;
using Jellyfin2Samsung.ViewModels;
using Microsoft.Extensions.DependencyInjection;

1
Jellyfin2Samsung-CrossOS/Views/TvLogsWindow.axaml.cs
View File

@@ -1,4 +1,3 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Threading;
using Jellyfin2Samsung.ViewModels;