github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug fix

pull/5701/head
2dust 2024-09-08 10:45:05 +08:00
parent 8361b4e4a0
commit 07156cb55c
9 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
v2rayN/ServiceLib/Handler/WebDavHandler.cs
View File

@ -35,6 +35,14 @@ namespace ServiceLib.Handler
_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 @@ namespace ServiceLib.Handler
if (!response.IsSuccessful)
{
SaveLog(response.Description);
return false;
}
using var outputFileStream = new FileStream(fileName, FileMode.Create);
response.Stream.CopyTo(outputFileStream);

1
v2rayN/ServiceLib/Models/ConfigItems.cs
View File

@ -255,5 +255,6 @@
public string? url { get; set; }
public string? userName { get; set; }
public string? password { get; set; }
public string? dirName { get; set; }
}
}

9
v2rayN/ServiceLib/Resx/ResUI.Designer.cs generated
View File

@ -591,6 +591,15 @@ namespace ServiceLib.Resx {
}
}
/// <summary>
/// 查找类似 Remote folder name (optional) 的本地化字符串。
/// </summary>
public static string LvWebDavDirName {
get {
return ResourceManager.GetString("LvWebDavDirName", resourceCulture);
}
}
/// <summary>
/// 查找类似 WebDav Password 的本地化字符串。
/// </summary>

3
v2rayN/ServiceLib/Resx/ResUI.resx
View File

@ -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>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
View File

@ -1309,4 +1309,7 @@
<data name="LvWebDavUrl" xml:space="preserve">
<value>WebDav 服务器地址</value>
</data>
<data name="LvWebDavDirName" xml:space="preserve">
<value>远程文件夹名称(可选)</value>
</data>
</root>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
View File

@ -1189,4 +1189,7 @@
<data name="LvWebDavUrl" xml:space="preserve">
<value>WebDav 服務器地址</value>
</data>
<data name="LvWebDavDirName" xml:space="preserve">
<value>遠端資料夾名稱(可選)</value>
</data>
</root>

5
v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
View File

@ -117,6 +117,11 @@ namespace ServiceLib.ViewModels
{
return;
}
//exist
if (!File.Exists(fileName))
{
return;
}
//backup first
var fileBackup = Utils.GetBackupPath($"backup_{DateTime.Now:yyyyMMddHHmmss}.zip");

19
v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
View File

@ -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"

2
v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
View File

@ -25,6 +25,8 @@ namespace v2rayN.Views
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);