nautilus

jdysya · Nov 3, 2023 · 5953b29 · 5953b29
1 parent 8295e97
commit 5953b29
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,6 @@
+v2.4.2
+- 修复：混合模式服务器hash信息缺失
+
 v2.4.1
 - 功能：启动时若存在已有的实例时，打开已有实例的窗口
 - 功能：新设置项：启动时是否隐藏窗口

diff --git a/src/SyncClipboard.Desktop/ClipboardAva/FileClipboardSetter.cs b/src/SyncClipboard.Desktop/ClipboardAva/FileClipboardSetter.cs
@@ -2,7 +2,7 @@
 using SyncClipboard.Core.Clipboard;
 using SyncClipboard.Core.Models;
 using System;
-using System.Linq;
+using System.Runtime.Versioning;
 using System.Text;
 
 namespace SyncClipboard.Desktop.ClipboardAva;
@@ -17,8 +17,23 @@ public override object CreateClipboardObjectContainer(ClipboardMetaInfomation me
         }
 
         var dataObject = new DataObject();
-        var urlList = string.Join("\n", metaInfomation.Files.Select(x => new Uri(x).ToString()));
-        dataObject.Set(Format.UriList, Encoding.UTF8.GetBytes(urlList));
+        if (OperatingSystem.IsLinux())
+        {
+            SetLinux(dataObject, metaInfomation.Files[0]);
+        }
+
         return dataObject;
     }
+
+    [SupportedOSPlatform("linux")]
+    private static void SetLinux(DataObject dataObject, string path)
+    {
+        var uriPath = new Uri(path).GetComponents(UriComponents.SerializationInfoString, UriFormat.UriEscaped);
+        dataObject.Set(Format.UriList, Encoding.UTF8.GetBytes(uriPath));
+
+        var nautilus = $"x-special/nautilus-clipboard\ncopy\n{uriPath}\n";
+        var nautilusBytes = Encoding.UTF8.GetBytes(nautilus);
+        dataObject.Set("COMPOUND_TEXT", nautilusBytes);
+        dataObject.Set("TEXT", nautilusBytes);
+    }
 }
diff --git a/src/SyncClipboard.Desktop/Views/SyncSettingPage.axaml b/src/SyncClipboard.Desktop/Views/SyncSettingPage.axaml
@@ -99,11 +99,11 @@
                         <ui:NumberBox Minimum="0" Maximum="100000" Value="{Binding TimeOut, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
-                <!--<ui:SettingsExpanderItem Content="{x:Static i18n:Strings.MaxFileSizeToUpload}">
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.MaxFileSizeToUpload}">
                     <ui:SettingsExpanderItem.Footer>
                         <ui:NumberBox Minimum="0" Maximum="100000" Value="{Binding MaxFileSize, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
-                </ui:SettingsExpanderItem>-->
+                </ui:SettingsExpanderItem>
                 <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.DeleteServerTemporaryFileAutoly}">
                     <ui:SettingsExpanderItem.Footer>
                         <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding AutoDeleleServerFile, Mode=TwoWay}" />

diff --git a/src/SyncClipboard.WinUI3/AppConfig.cs b/src/SyncClipboard.WinUI3/AppConfig.cs
@@ -6,7 +6,7 @@ internal class AppConfig : IAppConfig
 {
     public string AppId => Env.AppId;
     public string AppStringId => "SyncClipboard.WinUI";
-    public string AppVersion => "2.4.1";
+    public string AppVersion => "2.4.2";
     public string UpdateApiUrl => "https://api.github.com/repos/Jeric-X/SyncClipboard/releases/latest";
     public string UpdateUrl => "https://github.com/Jeric-X/SyncClipboard/releases/latest";
 }