Skip to content

Commit c63c533

Browse files
committed
修复一些小问题。 🚬
1 parent c156fbd commit c63c533

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

upgrading/.shared/Deployer.Argument.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static Argument Create(string[] args)
132132
else if(arg[0] == '-' || arg[0] == '/')
133133
arg = arg[1..];
134134

135-
var index = arg.IndexOfAny(['=', ':']);
135+
var index = arg.IndexOf('=');
136136

137137
if(index > 0)
138138
parameters.Add(arg[..index].Trim().ToString(), arg[(index + 1)..].Trim().ToString());

upgrading/client/Extractor.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public sealed class Extractor
4949
/// <param name="manifest">指定的升级清单对象。</param>
5050
/// <param name="filePath">指定的升级清单文件路径。</param>
5151
/// <param name="cancellation">异步操作的取消标记。</param>
52-
/// <returns>如果部署成功则返回版本文件的完整路径,否则返回空(<c>null</c>)。</returns>
52+
/// <returns>如果部署成功则返回提取(解压)后的目录路径,否则返回空(<c>null</c>)。</returns>
5353
public static async ValueTask<string> ExtractAsync(Manifest manifest, string filePath, CancellationToken cancellation = default)
5454
{
5555
if(manifest == null || string.IsNullOrEmpty(filePath))
@@ -100,13 +100,13 @@ public static async ValueTask<string> ExtractAsync(Manifest manifest, string fil
100100
}
101101

102102
//在目标目录下创建一个版本文件并将版本号写入到该文件中
103-
var version = new FileInfo(Path.Combine(destination.FullName, ".version"));
104-
using var writer = new StreamWriter(version.OpenWrite());
103+
using var stream = File.OpenWrite(Path.Combine(destination.FullName, ".version"));
104+
using var writer = new StreamWriter(stream);
105105
writer.WriteLine($"{manifest.Name}@{manifest.Version}");
106-
await writer.DisposeAsync();
106+
await writer.FlushAsync(cancellation);
107107

108108
//返回部署成功
109-
return version.FullName;
109+
return destination.FullName;
110110

111111
static DirectoryInfo CreateDirectory(string path)
112112
{

upgrading/client/Upgrader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public static async ValueTask<bool> UpgradeAsync(string channel, CancellationTok
5353
return false;
5454

5555
//从升级信息中提取解压升级包文件
56-
var version = await Extractor.ExtractAsync(info.Manifest, info.FilePath, cancellation);
57-
if(string.IsNullOrEmpty(version))
56+
var directory = await Extractor.ExtractAsync(info.Manifest, info.FilePath, cancellation);
57+
if(string.IsNullOrEmpty(directory))
5858
return false;
5959

6060
//创建本次升级的部署文件文件
61-
return Deployer.Deployment.Save(info.FilePath, Path.GetDirectoryName(version)) != null;
61+
return Deployer.Deployment.Save(info.FilePath, directory) != null;
6262
}
6363

6464
public static void Deploy()

0 commit comments

Comments
 (0)