update to net8.0

.github/workflows/publish.yml

@@ -13,6 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
+       dotnet-version: '8.0.x'
        fetch-depth: 0
 
     - name: Set up NuGet

dev/App.xaml.cs

@@ -10,7 +10,7 @@ public partial class App : Application
     public static Window currentWindow = Window.Current;
     public IServiceProvider Services { get; }
     public new static App Current => (App)Application.Current;
-    public string AppVersion { get; set; } = ApplicationHelper.GetAppVersion();
+    public string AppVersion { get; set; } = AssemblyInfoHelper.GetAssemblyVersion();
     public string AppName { get; set; } = "TvTime";
 
     public static T GetService<T>() where T : class

dev/Properties/PublishProfiles/win10-x64.pubxml → dev/Properties/PublishProfiles/win-x64.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <PublishDir>bin\win10-x64\Publish</PublishDir>
+    <PublishDir>bin\win-x64\Publish</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
     <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>

dev/Tools/Common/AppHelper.cs

@@ -236,7 +236,7 @@ public static string FixTitle(string title)
 
         title = Regex.Replace(title, @"\s*<.*?>\s*", "", RegexOptions.Singleline);
         title = title.Replace(".E..&gt;", "").Replace(">", "");
-        title = RemoveSpecialWords(ApplicationHelper.GetDecodedStringFromHtml(title));
+        title = RemoveSpecialWords(GeneralHelper.GetDecodedStringFromHtml(title));
         return title;
     }
 

dev/Tools/Common/Constants.cs

@@ -1,8 +1,8 @@
 namespace TvTime.Common;
 public static class Constants
 {
-    public static readonly string AppName = ApplicationHelper.GetAppNameAndVersion().NameAndVersion;
-    public static readonly string RootDirectoryPath = Path.Combine(ApplicationHelper.GetLocalFolderPath(), AppName);
+    public static readonly string AppName = AssemblyInfoHelper.GetAppInfo().NameAndVersion;
+    public static readonly string RootDirectoryPath = Path.Combine(PathHelper.GetLocalFolderPath(), AppName);
     public static readonly string LogDirectoryPath = Path.Combine(RootDirectoryPath, "Log");
     public static readonly string LogFilePath = Path.Combine(LogDirectoryPath, "Log.txt");
     public static readonly string AppConfigPath = Path.Combine(RootDirectoryPath, "AppConfig.json");

dev/TvTime.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
 		<RootNamespace>TvTime</RootNamespace>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<Platforms>x86;x64</Platforms>
-		<RuntimeIdentifiers>win10-x86;win10-x64</RuntimeIdentifiers>
-		<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+		<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+		<PublishProfile>win-$(Platform).pubxml</PublishProfile>
 		<UseWinUI>true</UseWinUI>
 		<EnableMsixTooling>true</EnableMsixTooling>
 		<Version>4.8.1</Version>
@@ -16,6 +16,7 @@
 		<AccelerateBuildsInVisualStudio>False</AccelerateBuildsInVisualStudio>
 		<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
 		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <UseRidGraph>true</UseRidGraph>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="Assets\**\*">
@@ -24,12 +25,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
-    <PackageReference Include="WinUICommunity.Components" Version="5.3.5" />
-    <PackageReference Include="WinUICommunity.Core" Version="5.3.1" />
-    <PackageReference Include="WinUICommunity.LandingPages" Version="5.3.1" />
+    <PackageReference Include="WinUICommunity.Components" Version="5.5.0" />
+    <PackageReference Include="WinUICommunity.Core" Version="5.5.1" />
+    <PackageReference Include="WinUICommunity.LandingPages" Version="5.5.1" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />

dev/ViewModels/IMDBDetailViewModel.cs

@@ -78,7 +78,7 @@ private async void GetIMDBDetails(string title)
     {
         try
         {
-            if (ApplicationHelper.IsNetworkAvailable())
+            if (NetworkHelper.IsNetworkAvailable())
             {
                 IsActive = false;
 

dev/ViewModels/Media/MediaDetailsViewModel.cs

@@ -145,7 +145,7 @@ public List<BaseMediaTable> GetAllServerDetails(string content, BaseMediaTable b
 
                     var finalServer = FixUriDuplication(baseMedia.Server, href);
 
-                    if (finalServer.Contains("dl5.dl1acemovies", StringComparison.OrdinalIgnoreCase))
+                    if (finalServer.Contains("acemovies", StringComparison.OrdinalIgnoreCase))
                     {
                         if (title.Equals("Home") || title.Equals("dl") ||
                             title.Equals("English") || title.Equals("Series") ||
@@ -156,7 +156,7 @@ public List<BaseMediaTable> GetAllServerDetails(string content, BaseMediaTable b
                         }
                     }
 
-                    list.Add(new BaseMediaTable(FixTitle(title), finalServer, date, ApplicationHelper.GetFileSize(fSize), baseMedia.ServerType));
+                    list.Add(new BaseMediaTable(FixTitle(title), finalServer, date, FileHelper.GetFileSize(fSize), baseMedia.ServerType));
                 }
             }
         }

dev/ViewModels/Media/MediaViewModel.cs

@@ -218,7 +218,7 @@ private async void DownloadMediaIntoDatabase()
                 int index = 0;
                 foreach (var item in urls)
                 {
-                    if (ApplicationHelper.IsNetworkAvailable())
+                    if (NetworkHelper.IsNetworkAvailable())
                     {
                         try
                         {
@@ -386,7 +386,7 @@ public async Task GetAllServerDetails(string content, string server)
 
                     var finalServer = FixUriDuplication(server, href);
                     if (finalServer.Contains("directadmin.com", StringComparison.OrdinalIgnoreCase) ||
-                        finalServer.Contains("dl5.dl1acemovies") && (title.Equals("Home") ||
+                        finalServer.Contains("acemovies") && (title.Equals("Home") ||
                         title.Equals("dl") || title.Equals("English") || title.Equals("Series") ||
                         title.Equals("Movie") || title.Contains("Parent Directory")))
                     {

dev/ViewModels/ServerViewModel.cs

@@ -108,7 +108,7 @@ private async void OnAddServerPrimaryButton(ContentDialog sender, ContentDialogB
 
                 if (SegmentedSelectedIndex == 0)
                 {
-                    var type = ApplicationHelper.GetEnum<ServerType>((dialog.CmbServerTypeSelectedItem as ComboBoxItem).Content?.ToString());
+                    var type = GeneralHelper.GetEnum<ServerType>((dialog.CmbServerTypeSelectedItem as ComboBoxItem).Content?.ToString());
                     baseServer.ServerType = type;
                     await db.MediaServers.AddAsync(new MediaServerTable(baseServer.Title, baseServer.Server, baseServer.IsActive, baseServer.ServerType));
                 }
@@ -178,7 +178,7 @@ private async Task OnUpdateServer(object dataContext)
                         var oldMediaServer = await db.MediaServers.Where(x => x.Title == server.Title && x.Server == server.Server && x.ServerType == server.ServerType).FirstOrDefaultAsync();
                         if (oldMediaServer != null)
                         {
-                            var type = ApplicationHelper.GetEnum<ServerType>((dialog.CmbServerTypeSelectedItem as ComboBoxItem).Content?.ToString());
+                            var type = GeneralHelper.GetEnum<ServerType>((dialog.CmbServerTypeSelectedItem as ComboBoxItem).Content?.ToString());
 
                             oldMediaServer.Title = dialog.ServerTitle;
                             oldMediaServer.Server = dialog.ServerUrl;
@@ -276,7 +276,7 @@ private async Task OnLoadPredefinedServer()
                     filePath = Constants.DEFAULT_SUBTITLE_SERVER_PATH;
                 }
 
-                using var streamReader = File.OpenText(await FileLoaderHelper.GetPath(filePath));
+                using var streamReader = File.OpenText(await PathHelper.GetFilePath(filePath));
                 var json = await streamReader.ReadToEndAsync();
                 using var db = new AppDbContext();
                 if (SegmentedSelectedIndex == 0)

dev/ViewModels/Settings/AppUpdateSettingViewModel.cs

@@ -40,7 +40,7 @@ private async Task CheckForUpdateAsync()
         IsUpdateAvailable = false;
         IsCheckButtonEnabled = false;
         LoadingStatus = "Checking for new version";
-        if (ApplicationHelper.IsNetworkAvailable())
+        if (NetworkHelper.IsNetworkAvailable())
         {
             LastUpdateCheck = DateTime.Now.ToShortDateString();
             Settings.LastUpdateCheck = DateTime.Now.ToShortDateString();

dev/ViewModels/Settings/BackupSettingViewModel.cs

@@ -33,7 +33,7 @@ private async Task OnBackupServer(object isMediaServer)
             {
                 { "Json", new List<string>() { ".json" } }
             };
-            var file = await ApplicationHelper.PickSaveFileAsync(App.currentWindow, fileTypeChoices, fileName);
+            var file = await FileAndFolderPickerHelper.PickSaveFileAsync(App.currentWindow, fileTypeChoices, fileName);
 
             if (file != null)
             {
@@ -70,7 +70,7 @@ private async Task OnRestoreServer(object isMediaServer)
         {
             this.isMediaServer = Convert.ToBoolean(isMediaServer);
 
-            var file = await ApplicationHelper.PickSingleFileAsync(App.currentWindow, new string[] { ".json" });
+            var file = await FileAndFolderPickerHelper.PickSingleFileAsync(App.currentWindow, new string[] { ".json" });
             if (file != null)
             {
                 using var streamReader = File.OpenText(file.Path);
@@ -119,7 +119,7 @@ private async Task OnBackupSettings()
             };
             var suggestedFileName = $"TvTime-Settings-{DateTime.Now:yyyy-MM-dd HH-mm-ss}";
 
-            var file = await ApplicationHelper.PickSaveFileAsync(App.currentWindow, fileTypeChoices, suggestedFileName);
+            var file = await FileAndFolderPickerHelper.PickSaveFileAsync(App.currentWindow, fileTypeChoices, suggestedFileName);
 
             if (file != null)
             {
@@ -145,7 +145,7 @@ private async Task OnRestoreSettings()
     {
         try
         {
-            var file = await ApplicationHelper.PickSingleFileAsync(App.currentWindow, new string[] { ".json" });
+            var file = await FileAndFolderPickerHelper.PickSingleFileAsync(App.currentWindow, new string[] { ".json" });
 
             if (file != null)
             {

dev/ViewModels/Subtitles/SubsceneDetailViewModel.cs

@@ -64,7 +64,7 @@ private async void OnNavigateToDetailsOrDownload(object sender)
         }
         else
         {
-            if (ApplicationHelper.IsNetworkAvailable())
+            if (NetworkHelper.IsNetworkAvailable())
             {
                 try
                 {

dev/ViewModels/Subtitles/SubsceneViewModel.cs

@@ -43,7 +43,7 @@ public SubsceneViewModel(IJsonNavigationViewService jsonNavigationViewService, I
                     using var db = new AppDbContext();
                     if (!db.SubtitleServers.Any())
                     {
-                        using var streamReader = File.OpenText(await FileLoaderHelper.GetPath(Constants.DEFAULT_SUBTITLE_SERVER_PATH));
+                        using var streamReader = File.OpenText(await PathHelper.GetFilePath(Constants.DEFAULT_SUBTITLE_SERVER_PATH));
                         var json = await streamReader.ReadToEndAsync();
                         var content = JsonConvert.DeserializeObject<List<SubtitleServerTable>>(json);
                         if (content is not null)
@@ -82,7 +82,7 @@ public SubsceneViewModel(IJsonNavigationViewService jsonNavigationViewService, I
 
     public async void OnQuerySubmitted()
     {
-        if (ApplicationHelper.IsNetworkAvailable())
+        if (NetworkHelper.IsNetworkAvailable())
         {
             try
             {
@@ -137,7 +137,7 @@ public async void OnQuerySubmitted()
                                         }
 
                                         var name = subNode?.InnerText?.Trim();
-                                        var server = ApplicationHelper.GetDecodedStringFromHtml(baseUrl.Server + subNode?.Attributes["href"]?.Value?.Trim());
+                                        var server = GeneralHelper.GetDecodedStringFromHtml(baseUrl.Server + subNode?.Attributes["href"]?.Value?.Trim());
                                         var subtitle = new SubtitleModel(name, server);
                                         subtitle.Description = count?.InnerText?.Trim();
                                         subtitle.GroupKey = GetSubtitleKey(i);

dev/Views/Media/MediaPage.xaml.cs

@@ -16,7 +16,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         base.OnNavigatedTo(e);
         var pageType = (e.Parameter as DataItem).Parameter?.ToString();
-        this.PageType = ApplicationHelper.GetEnum<ServerType>(pageType);
+        this.PageType = GeneralHelper.GetEnum<ServerType>(pageType);
     }
 
     private void ItemUserControl_Loading(FrameworkElement sender, object args)