提交: 65f6e40d206f286362c779283578a8ef746753ca - CleanAuLait.Prism.WPF (git)

Commit MetaInfo

• 修訂: 65f6e40d206f286362c779283578a8ef746753ca (tree)
• 時間: 2022-08-16 00:39:30
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[MOD] ResourceHelper の実装を CleanAuLait.Prism.WinUI3 からフィードバック

Change Summary

• modified: Core/Resource/ResourceHelper.cs

差異

--- a/Core/Resource/ResourceHelper.cs
+++ b/Core/Resource/ResourceHelper.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using Windows.Storage;
 
 namespace CleanAuLait.Core.Resource
 {
@@ -12,9 +13,15 @@ namespace CleanAuLait.Core.Resource
 
         public static string LoadTextFromResource(string resourcePathPrefix, string resourceRelativePath, Assembly assembly = null)
         {
+            Uri resourceUri = CreateResourceUri(assembly, resourcePathPrefix, resourceRelativePath);
+
+            return LoadTextFromUri(resourceUri);
+        }
+
+        private static string LoadTextFromUri(Uri resourceUri)
+        {
             try
             {
-                Uri resourceUri = CreateResourceUri(assembly, resourcePathPrefix, resourceRelativePath);
                 var sri = Application.GetResourceStream(resourceUri);
 
                 using var sr = new StreamReader(sri.Stream);
@@ -25,23 +32,27 @@ namespace CleanAuLait.Core.Resource
             catch (SystemException e)
             {
                 logger.Error(e);
-                throw new ApplicationException($"リソーステキスト {resourcePathPrefix}{resourceRelativePath} の読み込みに失敗しました", e);
+                throw new ApplicationException($"リソーステキスト {resourceUri} の読み込みに失敗しました", e);
             }
         }
-
-        /// <see cref="https://stackoverflow.com/questions/347614/storing-wpf-image-resources"/>
         public static BitmapImage LoadBitmapFromResource(string resourcePathPrefix, string resourceRelativePath, Assembly assembly = null)
         {
+            Uri resourceUri = CreateResourceUri(assembly, resourcePathPrefix, resourceRelativePath);
+
+            return LoadBitmapFromUri(resourceUri);
+        }
+
+        private static BitmapImage LoadBitmapFromUri(Uri resourceUri)
+        {
             try
             {
-                Uri resourceUri = CreateResourceUri(assembly, resourcePathPrefix, resourceRelativePath);
-
+                /// <see cref="https://stackoverflow.com/questions/347614/storing-wpf-image-resources"/>
                 return new BitmapImage(resourceUri);
             }
             catch (SystemException e)
             {
                 logger.Error(e);
-                throw new ApplicationException($"リソース画像 {resourcePathPrefix}{resourceRelativePath} の読み込みに失敗しました", e);
+                throw new ApplicationException($"リソース画像 {resourceUri} の読み込みに失敗しました", e);
             }
         }
 
@@ -52,17 +63,24 @@ namespace CleanAuLait.Core.Resource
                 assembly = Assembly.GetCallingAssembly();
             }
 
+            string assemblyName = assembly.GetName().Name;
+
+            string resourcePath = CreateResourcePath(resourcePathPrefix, resourceRelativePath);
+
+            Uri resourceUri = CreateResourceUri(assemblyName, resourcePath);
+
+            return resourceUri;
+        }
+
+        private static string CreateResourcePath(string resourcePathPrefix, string resourceRelativePath)
+        {
             if (resourcePathPrefix[0] == '/')
             {
                 resourcePathPrefix = resourcePathPrefix[1..];
             }
 
-            string assemblyName = assembly.GetName().Name;
             string resourcePath = resourcePathPrefix + resourceRelativePath;
-
-            Uri resourceUri = CreateResourceUri(assemblyName, resourcePath);
-
-            return resourceUri;
+            return resourcePath;
         }
 
         private static Uri CreateResourceUri(string assemblyName, string resourcePath)