Skip to content

Commit

Permalink
inform user in batch and playlist tabs when a video is getting remuxed
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhogomchungu
mhogomchungu committed Feb 20, 2025
1 parent e0ef618 commit cebc360
Show file tree
Hide file tree
Showing 17 changed files with 75 additions and 1 deletion.
15 changes: 14 additions & 1 deletion src/engines/yt-dlp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" ;
}
Expand Down Expand Up @@ -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( '"' ) ;
Expand Down
1 change: 1 addition & 0 deletions src/engines/yt-dlp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;
} ;
Expand Down
4 changes: 4 additions & 0 deletions translations/ar.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/de_DE.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/en_US.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/es.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,10 @@ Ejemplo 2: ${gateway}:8080</translation>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/fr_FR.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/it_IT.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -993,6 +993,10 @@ Per maggiori dettagli vedi la GNU General Public License .</translation>
<source>Merging Audio and Video Together</source>
<translation>Unione audio e video</translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/ja_JP.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/ko_KR.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/nl_NL.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/pl_PL.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/pt_BR.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,10 @@ Exemplo 2: ${gateway}:8080</translation>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/ru_RU.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/sv_SE.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/tr_TR.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down
4 changes: 4 additions & 0 deletions translations/zh_CN.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,10 @@ Exampe 2: ${gateway}:8080</source>
<source>Merging Audio and Video Together</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remuxing video</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>basicdownloader</name>
Expand Down

0 comments on commit cebc360

Please sign in to comment.