fix: ytarchive dockerfile path changed

jim60105 · jim60105 · commit fd0ee7815735 · 2024-05-07T23:11:14.000+08:00
- Added a new key-value entry in the `LivestreamRecorderService.sln.DotSettings` file
- Updated commands in `FC2LiveDLService.cs`, `YtarchiveService.cs` and `YtdlpService.cs` files located in both the `SingletonServices/ACI/Downloader/` and `SingletonServices/Kubernetes/Downloader/` directories. It appears that the commands have been restructured to be more compact.
- Fixed a comment in `YtdlpService.cs` files from "Workground for twitcasting" to "Workaround for twitcasting". The same change has been implemented in both the `SingletonServices/ACI/Downloader/` and `SingletonServices/Kubernetes/Downloader/` directories. This likely improves the understanding of the underlying issue.

Signed-off-by: 陳鈞 &lt;jim60105@gmail.com&gt;
diff --git a/LivestreamRecorderService.sln.DotSettings b/LivestreamRecorderService.sln.DotSettings
@@ -1,4 +1,5 @@
 ﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=sharedvolume/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=telop/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=twitcasting/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ytarchive/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/SingletonServices/ACI/Downloader/FC2LiveDLService.cs b/SingletonServices/ACI/Downloader/FC2LiveDLService.cs
@@ -55,18 +55,14 @@ Task<ArmOperation<ArmDeploymentResource>> doWithImage(string imageName)
             string[] command = useCookiesFile
                 ?
                 [
-                    "dumb-init",
-                    "--",
-                    "sh",
-                    "-c",
+                    "dumb-init", "--",
+                    "sh", "-c",
                     $"fc2-live-dl --latency high --threads 1 -o '{Path.ChangeExtension(filename, ".%(ext)s")}' --log-level trace --cookies /sharedvolume/cookies/{video.ChannelId}.txt 'https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}' && mv '/recordings/{filename}' /sharedvolume/"
                 ]
                 :
                 [
-                    "dumb-init",
-                    "--",
-                    "sh",
-                    "-c",
+                    "dumb-init", "--",
+                    "sh", "-c",
                     $"fc2-live-dl --latency high --threads 1 -o '{Path.ChangeExtension(filename, ".%(ext)s")}' --log-level trace 'https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}' && mv '/recordings/{filename}' /sharedvolume/"
                 ];
 
diff --git a/SingletonServices/ACI/Downloader/YtarchiveService.cs b/SingletonServices/ACI/Downloader/YtarchiveService.cs
@@ -45,15 +45,15 @@ Task<ArmOperation<ArmDeploymentResource>> doWithImage(string imageName)
             string[] command = useCookiesFile
                 ?
                 [
-                    "sh",
-                    "-c",
-                    $"/bin/ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' -c /sharedvolume/cookies/{video.ChannelId}.txt '{url}' best && mv *.mp4 /sharedvolume/"
+                    "dumb-init", "--",
+                    "sh", "-c",
+                    $"ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' -c /sharedvolume/cookies/{video.ChannelId}.txt '{url}' best && mv *.mp4 /sharedvolume/"
                 ]
                 :
                 [
-                    "sh",
-                    "-c",
-                    $"/bin/ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' '{url}' best && mv *.mp4 /sharedvolume/"
+                    "dumb-init", "--",
+                    "sh", "-c",
+                    $"ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' '{url}' best && mv *.mp4 /sharedvolume/"
                 ];
 
             return CreateResourceAsync(
diff --git a/SingletonServices/ACI/Downloader/YtdlpService.cs b/SingletonServices/ACI/Downloader/YtdlpService.cs
@@ -45,22 +45,18 @@ Task<ArmOperation<ArmDeploymentResource>> doWithImage(string imageName)
             string[] command = useCookiesFile
                 ?
                 [
-                    "dumb-init",
-                    "--",
-                    "sh",
-                    "-c",
+                    "dumb-init", "--",
+                    "sh", "-c",
                     $"yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part --cookies /sharedvolume/cookies/{video.ChannelId}.txt -o '{filename}' '{url}' && mv *.mp4 /sharedvolume/"
                 ]
                 :
                 [
-                    "dumb-init",
-                    "--",
-                    "sh",
-                    "-c",
+                    "dumb-init", "--",
+                    "sh", "-c",
                     $"yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part -o '{filename}' '{url}' && mv *.mp4 /sharedvolume/"
                 ];
 
-            // Workground for twitcasting ERROR: Initialization fragment found after media fragments, unable to download
+            // Workaround for twitcasting ERROR: Initialization fragment found after media fragments, unable to download
             // https://github.com/yt-dlp/yt-dlp/issues/5497
             if (url.Contains("twitcasting.tv"))
             {
diff --git a/SingletonServices/Kubernetes/Downloader/FC2LiveDLService.cs b/SingletonServices/Kubernetes/Downloader/FC2LiveDLService.cs
@@ -40,18 +40,14 @@ Task<V1Job> doWithImage(string imageName)
             string[] command = useCookiesFile
                 ?
                 [
-                    "dumb-init",
-                    "--",
-                    "sh",
-                    "-c",
+                    "dumb-init", "--",
+                    "sh", "-c",
                     $"fc2-live-dl --latency high --threads 1 -o '{Path.ChangeExtension(filename, ".%(ext)s")}' --log-level trace --cookies /sharedvolume/cookies/{video.ChannelId}.txt 'https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}' && mv '/recordings/{filename}' /sharedvolume/"
                 ]
                 :
                 [
-                    "dumb-init",
-                    "--",
-                    "sh",
-                    "-c",
+                    "dumb-init", "--",
+                    "sh", "-c",
                     $"fc2-live-dl --latency high --threads 1 -o '{Path.ChangeExtension(filename, ".%(ext)s")}' --log-level trace 'https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}' && mv '/recordings/{filename}' /sharedvolume/"
                 ];
 
diff --git a/SingletonServices/Kubernetes/Downloader/YtarchiveService.cs b/SingletonServices/Kubernetes/Downloader/YtarchiveService.cs
@@ -42,15 +42,15 @@ Task<V1Job> doWithImage(string imageName)
             string[] command = useCookiesFile
                 ?
                 [
-                    "sh",
-                    "-c",
-                    $"/bin/ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' -c /sharedvolume/cookies/{video.ChannelId}.txt '{url}' best && mv *.mp4 /sharedvolume/"
+                    "dumb-init", "--",
+                    "sh", "-c",
+                    $"ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' -c /sharedvolume/cookies/{video.ChannelId}.txt '{url}' best && mv *.mp4 /sharedvolume/"
                 ]
                 :
                 [
-                    "sh",
-                    "-c",
-                    $"/bin/ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' '{url}' best && mv *.mp4 /sharedvolume/"
+                    "dumb-init", "--",
+                    "sh", "-c",
+                    $"ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' '{url}' best && mv *.mp4 /sharedvolume/"
                 ];
 
             return CreateInstanceAsync(
diff --git a/SingletonServices/Kubernetes/Downloader/YtdlpService.cs b/SingletonServices/Kubernetes/Downloader/YtdlpService.cs
@@ -42,22 +42,18 @@ Task<V1Job> doWithImage(string imageName)
             string[] command = useCookiesFile
                 ?
                 [
-                    "dumb-init",
-                    "--",
-                    "sh",
-                    "-c",
+                    "dumb-init", "--",
+                    "sh", "-c",
                     $"yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part --cookies /sharedvolume/cookies/{video.ChannelId}.txt -o '{filename}' '{url}' && mv *.mp4 /sharedvolume/"
                 ]
                 :
                 [
-                    "dumb-init",
-                    "--",
-                    "sh",
-                    "-c",
+                    "dumb-init", "--",
+                    "sh", "-c",
                     $"yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part -o '{filename}' '{url}' && mv *.mp4 /sharedvolume/"
                 ];
 
-            // Workground for twitcasting ERROR: Initialization fragment found after media fragments, unable to download
+            // Workaround for twitcasting ERROR: Initialization fragment found after media fragments, unable to download
             // https://github.com/yt-dlp/yt-dlp/issues/5497
             if (url.Contains("twitcasting.tv"))
             {

Original file line number	Diff line number	Diff line change
`@@ -55,18 +55,14 @@ Task<ArmOperation<ArmDeploymentResource>> doWithImage(string imageName)`
`55`	`55`	`string[] command = useCookiesFile`
`56`	`56`	`?`
`57`	`57`	`[`
`58`		`- "dumb-init",`
`59`		`- "--",`
`60`		`- "sh",`
`61`		`- "-c",`
	`58`	`+ "dumb-init", "--",`
	`59`	`+ "sh", "-c",`
`62`	`60`	`$"fc2-live-dl --latency high --threads 1 -o '{Path.ChangeExtension(filename, ".%(ext)s")}' --log-level trace --cookies /sharedvolume/cookies/{video.ChannelId}.txt 'https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}' && mv '/recordings/{filename}' /sharedvolume/"`
`63`	`61`	`]`
`64`	`62`	`:`
`65`	`63`	`[`
`66`		`- "dumb-init",`
`67`		`- "--",`
`68`		`- "sh",`
`69`		`- "-c",`
	`64`	`+ "dumb-init", "--",`
	`65`	`+ "sh", "-c",`
`70`	`66`	`$"fc2-live-dl --latency high --threads 1 -o '{Path.ChangeExtension(filename, ".%(ext)s")}' --log-level trace 'https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}' && mv '/recordings/{filename}' /sharedvolume/"`
`71`	`67`	`];`
`72`	`68`
Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,15 @@ Task<ArmOperation<ArmDeploymentResource>> doWithImage(string imageName)`
`45`	`45`	`string[] command = useCookiesFile`
`46`	`46`	`?`
`47`	`47`	`[`
`48`		`- "sh",`
`49`		`- "-c",`
`50`		`- $"/bin/ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' -c /sharedvolume/cookies/{video.ChannelId}.txt '{url}' best && mv *.mp4 /sharedvolume/"`
	`48`	`+ "dumb-init", "--",`
	`49`	`+ "sh", "-c",`
	`50`	`+ $"ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' -c /sharedvolume/cookies/{video.ChannelId}.txt '{url}' best && mv *.mp4 /sharedvolume/"`
`51`	`51`	`]`
`52`	`52`	`:`
`53`	`53`	`[`
`54`		`- "sh",`
`55`		`- "-c",`
`56`		`- $"/bin/ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' '{url}' best && mv *.mp4 /sharedvolume/"`
	`54`	`+ "dumb-init", "--",`
	`55`	`+ "sh", "-c",`
	`56`	`+ $"ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' '{url}' best && mv *.mp4 /sharedvolume/"`
`57`	`57`	`];`
`58`	`58`
`59`	`59`	`return CreateResourceAsync(`
Original file line number	Diff line number	Diff line change
`@@ -45,22 +45,18 @@ Task<ArmOperation<ArmDeploymentResource>> doWithImage(string imageName)`
`45`	`45`	`string[] command = useCookiesFile`
`46`	`46`	`?`
`47`	`47`	`[`
`48`		`- "dumb-init",`
`49`		`- "--",`
`50`		`- "sh",`
`51`		`- "-c",`
	`48`	`+ "dumb-init", "--",`
	`49`	`+ "sh", "-c",`
`52`	`50`	`$"yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part --cookies /sharedvolume/cookies/{video.ChannelId}.txt -o '{filename}' '{url}' && mv *.mp4 /sharedvolume/"`
`53`	`51`	`]`
`54`	`52`	`:`
`55`	`53`	`[`
`56`		`- "dumb-init",`
`57`		`- "--",`
`58`		`- "sh",`
`59`		`- "-c",`
	`54`	`+ "dumb-init", "--",`
	`55`	`+ "sh", "-c",`
`60`	`56`	`$"yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part -o '{filename}' '{url}' && mv *.mp4 /sharedvolume/"`
`61`	`57`	`];`
`62`	`58`
`63`		`- // Workground for twitcasting ERROR: Initialization fragment found after media fragments, unable to download`
	`59`	`+ // Workaround for twitcasting ERROR: Initialization fragment found after media fragments, unable to download`
`64`	`60`	`// https://github.com/yt-dlp/yt-dlp/issues/5497`
`65`	`61`	`if (url.Contains("twitcasting.tv"))`
`66`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,18 +40,14 @@ Task<V1Job> doWithImage(string imageName)`
`40`	`40`	`string[] command = useCookiesFile`
`41`	`41`	`?`
`42`	`42`	`[`
`43`		`- "dumb-init",`
`44`		`- "--",`
`45`		`- "sh",`
`46`		`- "-c",`
	`43`	`+ "dumb-init", "--",`
	`44`	`+ "sh", "-c",`
`47`	`45`	`$"fc2-live-dl --latency high --threads 1 -o '{Path.ChangeExtension(filename, ".%(ext)s")}' --log-level trace --cookies /sharedvolume/cookies/{video.ChannelId}.txt 'https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}' && mv '/recordings/{filename}' /sharedvolume/"`
`48`	`46`	`]`
`49`	`47`	`:`
`50`	`48`	`[`
`51`		`- "dumb-init",`
`52`		`- "--",`
`53`		`- "sh",`
`54`		`- "-c",`
	`49`	`+ "dumb-init", "--",`
	`50`	`+ "sh", "-c",`
`55`	`51`	`$"fc2-live-dl --latency high --threads 1 -o '{Path.ChangeExtension(filename, ".%(ext)s")}' --log-level trace 'https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}' && mv '/recordings/{filename}' /sharedvolume/"`
`56`	`52`	`];`
`57`	`53`
Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,15 @@ Task<V1Job> doWithImage(string imageName)`
`42`	`42`	`string[] command = useCookiesFile`
`43`	`43`	`?`
`44`	`44`	`[`
`45`		`- "sh",`
`46`		`- "-c",`
`47`		`- $"/bin/ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' -c /sharedvolume/cookies/{video.ChannelId}.txt '{url}' best && mv *.mp4 /sharedvolume/"`
	`45`	`+ "dumb-init", "--",`
	`46`	`+ "sh", "-c",`
	`47`	`+ $"ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' -c /sharedvolume/cookies/{video.ChannelId}.txt '{url}' best && mv *.mp4 /sharedvolume/"`
`48`	`48`	`]`
`49`	`49`	`:`
`50`	`50`	`[`
`51`		`- "sh",`
`52`		`- "-c",`
`53`		`- $"/bin/ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' '{url}' best && mv *.mp4 /sharedvolume/"`
	`51`	`+ "dumb-init", "--",`
	`52`	`+ "sh", "-c",`
	`53`	`+ $"ytarchive --add-metadata --merge --retry-frags 30 --thumbnail -o '{filename.Replace(".mp4", "")}' '{url}' best && mv *.mp4 /sharedvolume/"`
`54`	`54`	`];`
`55`	`55`
`56`	`56`	`return CreateInstanceAsync(`
Original file line number	Diff line number	Diff line change
`@@ -42,22 +42,18 @@ Task<V1Job> doWithImage(string imageName)`
`42`	`42`	`string[] command = useCookiesFile`
`43`	`43`	`?`
`44`	`44`	`[`
`45`		`- "dumb-init",`
`46`		`- "--",`
`47`		`- "sh",`
`48`		`- "-c",`
	`45`	`+ "dumb-init", "--",`
	`46`	`+ "sh", "-c",`
`49`	`47`	`$"yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part --cookies /sharedvolume/cookies/{video.ChannelId}.txt -o '{filename}' '{url}' && mv *.mp4 /sharedvolume/"`
`50`	`48`	`]`
`51`	`49`	`:`
`52`	`50`	`[`
`53`		`- "dumb-init",`
`54`		`- "--",`
`55`		`- "sh",`
`56`		`- "-c",`
	`51`	`+ "dumb-init", "--",`
	`52`	`+ "sh", "-c",`
`57`	`53`	`$"yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part -o '{filename}' '{url}' && mv *.mp4 /sharedvolume/"`
`58`	`54`	`];`
`59`	`55`
`60`		`- // Workground for twitcasting ERROR: Initialization fragment found after media fragments, unable to download`
	`56`	`+ // Workaround for twitcasting ERROR: Initialization fragment found after media fragments, unable to download`
`61`	`57`	`// https://github.com/yt-dlp/yt-dlp/issues/5497`
`62`	`58`	`if (url.Contains("twitcasting.tv"))`
`63`	`59`	`{`