Bug fix

2dust · Sep 8, 2024 · 07156cb · 07156cb
1 parent 8361b4e
commit 07156cb
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 1 deletion.
diff --git a/v2rayN/ServiceLib/Handler/WebDavHandler.cs b/v2rayN/ServiceLib/Handler/WebDavHandler.cs
@@ -35,6 +35,14 @@ private async Task<bool> GetClient()
                     _client?.Dispose();
                     _client = null;
                 }
+                if (_config.webDavItem.dirName.IsNullOrEmpty())
+                {
+                    _webDir = Global.AppName + "_backup";
+                }
+                else
+                {
+                    _webDir = _config.webDavItem.dirName.TrimEx();
+                }
 
                 var clientParams = new WebDavClientParams
                 {
@@ -145,6 +153,7 @@ public async Task<bool> GetRawFile(string fileName)
                 if (!response.IsSuccessful)
                 {
                     SaveLog(response.Description);
+                    return false;
                 }
                 using var outputFileStream = new FileStream(fileName, FileMode.Create);
                 response.Stream.CopyTo(outputFileStream);

diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -255,5 +255,6 @@ public class WebDavItem
         public string? url { get; set; }
         public string? userName { get; set; }
         public string? password { get; set; }
+        public string? dirName { get; set; }
     }
 }
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1312,4 +1312,7 @@
   <data name="LvWebDavCheck" xml:space="preserve">
     <value>WebDav Check</value>
   </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>Remote folder name (optional)</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1309,4 +1309,7 @@
   <data name="LvWebDavUrl" xml:space="preserve">
     <value>WebDav 服务器地址</value>
   </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>远程文件夹名称(可选)</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1189,4 +1189,7 @@
   <data name="LvWebDavUrl" xml:space="preserve">
     <value>WebDav 服務器地址</value>
   </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>遠端資料夾名稱(可選)</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs b/v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
@@ -117,6 +117,11 @@ public async Task LocalRestore(string fileName)
             {
                 return;
             }
+            //exist
+            if (!File.Exists(fileName))
+            {
+                return;
+            }
 
             //backup first
             var fileBackup = Utils.GetBackupPath($"backup_{DateTime.Now:yyyyMMddHHmmss}.zip");

diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
@@ -130,6 +130,7 @@
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
                                     </Grid.RowDefinitions>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -184,9 +185,25 @@
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}" />
 
+                                    <TextBlock
+                                        Grid.Row="3"
+                                        Grid.Column="0"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource ToolbarTextBlock}"
+                                        Text="{x:Static resx:ResUI.LvWebDavDirName}" />
+
+                                    <TextBox
+                                        x:Name="txtWebDavDirName"
+                                        Grid.Row="3"
+                                        Grid.Column="1"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource DefTextBox}" />
+
                                     <Button
                                         x:Name="menuWebDavCheck"
-                                        Grid.Row="3"
+                                        Grid.Row="4"
                                         Grid.Column="1"
                                         Margin="8"
                                         VerticalAlignment="Center"

diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
@@ -25,6 +25,8 @@ public BackupAndRestoreView()
                 this.Bind(ViewModel, vm => vm.SelectedSource.url, v => v.txtWebDavUrl.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.userName, v => v.txtWebDavUserName.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.password, v => v.txtWebDavPassword.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.dirName, v => v.txtWebDavDirName.Text).DisposeWith(disposables);
+                
                 this.BindCommand(ViewModel, vm => vm.WebDavCheckCmd, v => v.menuWebDavCheck).DisposeWith(disposables);
 
                 this.BindCommand(ViewModel, vm => vm.RemoteBackupCmd, v => v.menuRemoteBackup).DisposeWith(disposables);