v1.3.1

nilaoda · Oct 11, 2020 · fbdd51c · fbdd51c
1 parent 2537e3d
commit fbdd51c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/BBDown/BBDown.csproj b/BBDown/BBDown.csproj
@@ -3,8 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.3.0</Version>
+    <Version>1.3.1</Version>
     <Description>BBDown是一个免费且便捷高效的哔哩哔哩下载/解析软件.</Description>
+    <PackageProjectUrl>https://github.com/nilaoda/BBDown</PackageProjectUrl>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/BBDown/Program.cs b/BBDown/Program.cs
@@ -417,7 +417,7 @@ private static async Task DoWorkAsync(MyOption myOption)
                     List<Audio> audioInfo = new List<Audio>();
                     string videoPath = $"{p.aid}/{p.aid}.P{p.index}.{p.cid}.mp4";
                     string audioPath = $"{p.aid}/{p.aid}.P{p.index}.{p.cid}.m4a";
-                    string outPath = title + (pagesInfo.Count > 1 ? $"/[P{p.index}]{p.title}.mp4" : $"[P{p.index}]{p.title}.mp4");
+                    string outPath = title + (pagesInfo.Count > 1 ? $"/[P{p.index}]{p.title}" : (vInfo.PagesInfo.Count > 1 ? $"[P{p.index}]{p.title}" : "")) + ".mp4";
                     //调用解析
                     string webJson = GetPlayJson(aidOri, p.aid, p.cid, p.epid, tvApi);
                     //File.WriteAllText($"debug.json", JObject.Parse(webJson).ToString());
@@ -587,7 +587,7 @@ private static async Task DoWorkAsync(MyOption myOption)
                         int code = MuxAV(videoPath, audioPath, outPath,
                             desc.Replace("\"", ""),
                             title.Replace("\"", ""),
-                            pagesInfo.Count > 1 ? ($"P{p.index}.{p.title}") : "",
+                            vInfo.PagesInfo.Count > 1 ? ($"P{p.index}.{p.title}") : "",
                             File.Exists($"{p.aid}/{p.aid}.jpg") ? $"{p.aid}/{p.aid}.jpg" : "",
                             subtitleInfo);
                         if (code != 0 || !File.Exists(outPath) || new FileInfo(outPath).Length == 0)
@@ -732,7 +732,7 @@ private static async Task DoWorkAsync(MyOption myOption)
                         int code = MuxAV(videoPath, "", outPath,
                             desc.Replace("\"", ""),
                             title.Replace("\"", ""),
-                            pagesInfo.Count > 1 ? ($"P{p.index}.{p.title}") : "",
+                            vInfo.PagesInfo.Count > 1 ? ($"P{p.index}.{p.title}") : "",
                             File.Exists($"{p.aid}/{p.aid}.jpg") ? $"{p.aid}/{p.aid}.jpg" : "",
                             subtitleInfo);
                         if (code != 0 || !File.Exists(outPath) || new FileInfo(outPath).Length == 0)

diff --git a/README.md b/README.md
@@ -55,6 +55,9 @@ Commands:
 <details>
 <summary>点击查看详情</summary>
 
+* 2020年10月12日 0:31  
+  优化封装信息及文件命名的逻辑  
+
 * 2020年10月3日 0:18  
   修正字幕获取逻辑(同一avid不同cid)  
   增强的字幕获取接口