chore:封面异常时也支持创建壁纸

GiantappMan · Feb 6, 2024 · ad214ac · ad214ac
1 parent 7b3771c
commit ad214ac
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 33 deletions.
diff --git a/src/giantapp-wallpaper-client/Client.Test/Client.Test.csproj b/src/giantapp-wallpaper-client/Client.Test/Client.Test.csproj
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/giantapp-wallpaper-client/Client/Client.csproj b/src/giantapp-wallpaper-client/Client/Client.csproj
@@ -52,11 +52,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HandyControl" Version="3.4.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2277.86" />
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22621.2428" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageReference Include="MultiLanguageForXAML" Version="2.3.0.2" />
-    <PackageReference Include="NLog" Version="5.2.7" />
+    <PackageReference Include="NLog" Version="5.2.8" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/giantapp-wallpaper-client/Client/UI/ShellWindow.xaml.cs b/src/giantapp-wallpaper-client/Client/UI/ShellWindow.xaml.cs
@@ -13,7 +13,6 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows;
-using Windows.UI.Xaml.Controls;
 
 namespace GiantappWallpaper;
 
@@ -238,7 +237,7 @@ static bool CheckWebView2()
     {
         try
         {
-            var version = CoreWebView2Environment.GetAvailableBrowserVersionString();
+            string version = CoreWebView2Environment.GetAvailableBrowserVersionString(null, new CoreWebView2EnvironmentOptions());
             return true;
         }
         catch (WebView2RuntimeNotFoundException e)

diff --git a/src/giantapp-wallpaper-client/WallpaperCore.Test/WallpaperCore.Test.csproj b/src/giantapp-wallpaper-client/WallpaperCore.Test/WallpaperCore.Test.csproj
@@ -13,9 +13,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/giantapp-wallpaper-client/WallpaperCore/WallpaperApi.cs b/src/giantapp-wallpaper-client/WallpaperCore/WallpaperApi.cs
@@ -384,14 +384,18 @@ public static bool CreateWallpaper(Wallpaper wallpaper, string saveFolder)
             //保存到目录
             File.Copy(path, savePath);
         }
-        //移动cover位置
-        string coverExtension = Path.GetExtension(cover);
-        string coverSavePath = Path.Combine(saveFolder, $"{saveFileName}.cover{coverExtension}");
-        File.Copy(cover, coverSavePath);
+
+        if (!string.IsNullOrEmpty(cover))
+        {
+            //移动cover位置
+            string coverExtension = Path.GetExtension(cover);
+            string coverSavePath = Path.Combine(saveFolder, $"{saveFileName}.cover{coverExtension}");
+            File.Copy(cover, coverSavePath);
+            wallpaper.Meta.Cover = $"{saveFileName}.cover{coverExtension}";
+        }
 
         //保存meta
         wallpaper.Meta.CreateTime = DateTime.Now;
-        wallpaper.Meta.Cover = $"{saveFileName}.cover{coverExtension}";
         string metaJsonFile = Path.Combine(saveFolder, $"{saveFileName}.meta.json");
         File.WriteAllText(metaJsonFile, JsonConvert.SerializeObject(wallpaper.Meta, JsonSettings));
 

diff --git a/src/giantapp-wallpaper-client/WallpaperCore/WallpaperCore.csproj b/src/giantapp-wallpaper-client/WallpaperCore/WallpaperCore.csproj
@@ -13,7 +13,7 @@
       <!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NLog" Version="5.2.7" />
+    <PackageReference Include="NLog" Version="5.2.8" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/giantapp-wallpaper-ui/package.json b/src/giantapp-wallpaper-ui/package.json
@@ -40,7 +40,7 @@
     "next-themes": "^0.2.1",
     "react": "^18",
     "react-dom": "^18",
-    "react-hook-form": "^7.50.0",
+    "react-hook-form": "^7.50.1",
     "sonner": "^1.4.0",
     "tailwind-merge": "^2.2.1",
     "tailwindcss-animate": "^1.0.7",

diff --git a/src/giantapp-wallpaper-ui/pnpm-lock.yaml b/src/giantapp-wallpaper-ui/pnpm-lock.yaml
diff --git a/src/giantapp-wallpaper-ui/src/app/(local)/_components/wallpaper-dialog/index.tsx b/src/giantapp-wallpaper-ui/src/app/(local)/_components/wallpaper-dialog/index.tsx
@@ -193,6 +193,7 @@ export function WallpaperDialog(props: WallpaperDialogProps) {
     const [uploading, setUploading] = useState(false); //是否正在上传
     const fileInputRef = useRef<HTMLInputElement>(null);
     const inputRef = useRef<HTMLInputElement>(null);
+    const [loadVideoError, setLoadVideoError] = useState(false);
     const previewVideoRef = useRef<HTMLVideoElement>(null);
     const previewImgRef = useRef<HTMLImageElement>(null);
     const [openSelectWallpaperDialog, setOpenSelectWallpaperDialog] = useState(false);
@@ -237,6 +238,7 @@ export function WallpaperDialog(props: WallpaperDialogProps) {
     }, [form, props.open, props.wallpaper]);
 
     const uploadFile = useCallback(async (file: File) => {
+        setLoadVideoError(false);
         setProgress(0);
         setImporting(true);
         setImportedFile(undefined);
@@ -333,14 +335,22 @@ export function WallpaperDialog(props: WallpaperDialogProps) {
             eHeight = previewElement?.videoHeight || 0;
         }
 
-        const imgData = await generateCoverImage(previewElement, eWidth, eHeight);
-        //Blob转换成base64
-        const base64String = await getBase64FromBlob(imgData);
-        const fileName = importedFile.name.split(".")[0] + ".jpg";
-        var { data: coverUrl } = await api.uploadToTmp(fileName, base64String);
+        let coverUrl = null;
+        try {
+            const imgData = await generateCoverImage(previewElement, eWidth, eHeight);
+            //Blob转换成base64
+            const base64String = await getBase64FromBlob(imgData);
+            const fileName = importedFile.name.split(".")[0] + ".jpg";
+            var { data: tmpCoverUrl } = await api.uploadToTmp(fileName, base64String);
+            coverUrl = tmpCoverUrl;
+        } catch (e) {
+            console.error(e);
+            toast.error("生成封面失败");
+        }
         var wallpaper = new Wallpaper({
             ...props.wallpaper,
         });
+
         wallpaper.meta.title = data.title;
         wallpaper.meta.type = WallpaperType.Video;//todo 更细节的判断
         wallpaper.coverUrl = coverUrl || "";
@@ -510,22 +520,38 @@ export function WallpaperDialog(props: WallpaperDialogProps) {
                                             <div className="flex justify-between items-center text-[#9CA3AF]">
                                                 <div>
                                                     <div className="flex justify-between items-center">
-                                                        <p>{importedFile.name}</p>   <Button type="button" variant="ghost" onClick={() => {
+                                                        <p>{importedFile.name}</p>
+                                                        <Button type="button" variant="ghost" onClick={() => {
                                                             setImportedFile(undefined);
-                                                            // if (fileInputRef.current)
-                                                            //     fileInputRef.current.value = '';
+                                                            if (fileInputRef.current)
+                                                                fileInputRef.current.value = '';
                                                             form.setValue("file", undefined);
                                                         }}>
                                                             <DeleteIcon className="h-6 w-6" />
                                                         </Button>
                                                     </div>
                                                     {
                                                         importedFile.fileType === "video" && <video
-                                                            onError={(e) => console.error('Video loading error:', e)}
+                                                            onError={(e) => {
+                                                                console.error('Video loading error:', e);
+                                                                setLoadVideoError(true);
+                                                            }}
                                                             autoPlay={true} ref={previewVideoRef} className="object-contain">
                                                             <source src={importedFile.url} />
                                                         </video>
                                                     }
+                                                    {
+                                                        loadVideoError &&
+                                                        <button onClick={() => {
+                                                            // setLoadVideoError(false);
+                                                            // setImportedFile({
+                                                            //     ...importedFile,
+                                                            //     url: importedFile.url + "?t=" + Date.now()
+                                                            // })
+                                                        }}>
+                                                            加载视频失败，请重试
+                                                        </button>
+                                                    }
                                                     {
                                                         importedFile.fileType === "img" &&
                                                         <picture>