From cebc360e85cf0dd491a2bf7757f9e8aca8399f00 Mon Sep 17 00:00:00 2001 From: mhogomchungu Date: Thu, 20 Feb 2025 16:55:32 +0300 Subject: [PATCH] inform user in batch and playlist tabs when a video is getting remuxed --- src/engines/yt-dlp.cpp | 15 ++++++++++++++- src/engines/yt-dlp.h | 1 + translations/ar.ts | 4 ++++ translations/de_DE.ts | 4 ++++ translations/en_US.ts | 4 ++++ translations/es.ts | 4 ++++ translations/fr_FR.ts | 4 ++++ translations/it_IT.ts | 4 ++++ translations/ja_JP.ts | 4 ++++ translations/ko_KR.ts | 4 ++++ translations/nl_NL.ts | 4 ++++ translations/pl_PL.ts | 4 ++++ translations/pt_BR.ts | 4 ++++ translations/ru_RU.ts | 4 ++++ translations/sv_SE.ts | 4 ++++ translations/tr_TR.ts | 4 ++++ translations/zh_CN.ts | 4 ++++ 17 files changed, 75 insertions(+), 1 deletion(-) diff --git a/src/engines/yt-dlp.cpp b/src/engines/yt-dlp.cpp index 91dcd89bb..040d4597b 100644 --- a/src/engines/yt-dlp.cpp +++ b/src/engines/yt-dlp.cpp @@ -67,6 +67,7 @@ const char * yt_dlp::testYtDlp() [download] downloaded_bytes:801810 ETA:0 total_bytes_estimate:NA total_bytes:801810 progress.speed:477969.5544142013 filename:16 years ago, LeBron James put up one of the greatest playoff performances ever 😤 ｜ NBA on ESPN-tn2USd5KeVM.f250.webm [download] downloaded_bytes:801810 ETA:NA total_bytes_estimate:NA total_bytes:801810 progress.speed:219337.62226918363 filename:16 years ago, LeBron James put up one of the greatest playoff performances ever 😤 ｜ NBA on ESPN-tn2USd5KeVM.f250.webm [Merger] Merging formats into "16 years ago, LeBron James put up one of the greatest playoff performances ever 😤 ｜ NBA on ESPN-tn2USd5KeVM.webm" +[VideoRemuxer] Remuxing video from webm to mkv; Destination: 16 years ago, LeBron James put up one of the greatest playoff performances ever 😤 ｜ NBA on ESPN-tn2USd5KeVM.mkv Deleting original file 16 years ago, LeBron James put up one of the greatest playoff performances ever 😤 ｜ NBA on ESPN-tn2USd5KeVM.f250.webm (pass -k to keep) Deleting original file 16 years ago, LeBron James put up one of the greatest playoff performances ever 😤 ｜ NBA on ESPN-tn2USd5KeVM.f242.webm (pass -k to keep))R" ; } @@ -1452,7 +1453,19 @@ const QByteArray& yt_dlp::yt_dlplFilter::parseOutput( const Logger::Data::QByteA this->setFileName( e.mid( e.indexOf( "] Destination: " ) + 15 ) ) ; } - if( e.contains( " Merging formats into \"" ) ){ + if( e.contains( "[VideoRemuxer] Remuxing video from" ) ){ + + this->setFileName( e.mid( e.indexOf( "Destination: " ) + 13 ) ) ; + + auto a = QObject::tr( "Remuxing video" ) ; + + m_tmp = a.toUtf8() + "\n" + m_fileNames.back() ; + + return m_tmp ; + } + if( !m_mergeSeen && e.contains( " Merging formats into \"" ) ){ + + m_mergeSeen = true ; auto m = e.mid( e.indexOf( '"' ) + 1 ) ; auto s = m.lastIndexOf( '"' ) ; diff --git a/src/engines/yt-dlp.h b/src/engines/yt-dlp.h index c2036a568..bcc514098 100644 --- a/src/engines/yt-dlp.h +++ b/src/engines/yt-dlp.h @@ -56,6 +56,7 @@ class yt_dlp : public engines::engine::baseEngine const engines::engine& m_engine ; QByteArray m_tmp ; + bool m_mergeSeen = false ; std::vector< QByteArray > m_fileNames ; yt_dlp& m_parent ; } ; diff --git a/translations/ar.ts b/translations/ar.ts index bd918753e..b15a0bcd3 100644 --- a/translations/ar.ts +++ b/translations/ar.ts @@ -990,6 +990,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/de_DE.ts b/translations/de_DE.ts index 1fb714f9d..659c9698c 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/en_US.ts b/translations/en_US.ts index 028f5882c..d429bf156 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/es.ts b/translations/es.ts index 82c4bcb35..5807ab531 100644 --- a/translations/es.ts +++ b/translations/es.ts @@ -990,6 +990,10 @@ Ejemplo 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts index 2b54c7c2c..69491f47e 100644 --- a/translations/fr_FR.ts +++ b/translations/fr_FR.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/it_IT.ts b/translations/it_IT.ts index 799587298..8fe29270d 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -993,6 +993,10 @@ Per maggiori dettagli vedi la GNU General Public License . Merging Audio and Video Together Unione audio e video + + Remuxing video + + basicdownloader diff --git a/translations/ja_JP.ts b/translations/ja_JP.ts index 964525b1f..41a398806 100644 --- a/translations/ja_JP.ts +++ b/translations/ja_JP.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/ko_KR.ts b/translations/ko_KR.ts index 40dcac55c..121367197 100644 --- a/translations/ko_KR.ts +++ b/translations/ko_KR.ts @@ -990,6 +990,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index 6bc086c6d..561d262cc 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index 5850bb06a..8875c99ef 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -990,6 +990,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/pt_BR.ts b/translations/pt_BR.ts index fac1df6a6..79b4fb584 100644 --- a/translations/pt_BR.ts +++ b/translations/pt_BR.ts @@ -990,6 +990,10 @@ Exemplo 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 1c6382aab..c438a4a33 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/sv_SE.ts b/translations/sv_SE.ts index 2dbd4d032..fb7143a0d 100644 --- a/translations/sv_SE.ts +++ b/translations/sv_SE.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/tr_TR.ts b/translations/tr_TR.ts index b5ec722ed..ebed68850 100644 --- a/translations/tr_TR.ts +++ b/translations/tr_TR.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 18fe52581..7eaa377e2 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080 Merging Audio and Video Together + + Remuxing video + + basicdownloader