From c5aafbae90462285bbe23e37d8982067ca388f0a Mon Sep 17 00:00:00 2001 From: mhogomchungu Date: Tue, 6 Aug 2024 22:36:31 +0300 Subject: [PATCH] more work on making a package for flathub --- src/engines.cpp | 26 +++++++++---------- ...mhogomchungu.media-downloader.metainfo.xml | 8 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/engines.cpp b/src/engines.cpp index ede8b193..9dbe7810 100644 --- a/src/engines.cpp +++ b/src/engines.cpp @@ -222,13 +222,6 @@ void engines::openUrls( tableWidget& table,int row,const engines::engine& engine } } -void engines::openUrls( const QString& path ) const -{ - auto m = QUrl::fromLocalFile( path ) ; - - QDesktopServices::openUrl( m ) ; -} - const QString& engines::defaultEngineName() const { return m_defaultEngine.name() ; @@ -1492,6 +1485,17 @@ util::Json engines::engine::baseEngine::parsePlayListData( const QByteArray& e ) return e ; } +static void _openUrl( const QString& path ) +{ + auto m = QUrl::fromLocalFile( path ) ; + QDesktopServices::openUrl( m ) ; +} + +void engines::openUrls( const QString& s ) const +{ + _openUrl( s ) ; +} + void engines::engine::baseEngine::openLocalFile( const engines::engine::baseEngine::localFile& l ) { auto e = [ & ](){ @@ -1516,13 +1520,9 @@ void engines::engine::baseEngine::openLocalFile( const engines::engine::baseEngi if( s.startsWith( ss ) ){ - auto m = QUrl::fromLocalFile( s ) ; - - QDesktopServices::openUrl( m ) ; + _openUrl( s ) ; }else{ - auto m = QUrl::fromLocalFile( l.downloadFolder + "/" + e ) ; - - QDesktopServices::openUrl( m ) ; + _openUrl( l.downloadFolder + "/" + e ) ; } } diff --git a/src/flatpak/io.github.mhogomchungu.media-downloader.metainfo.xml b/src/flatpak/io.github.mhogomchungu.media-downloader.metainfo.xml index c63162a4..dab5fd2a 100644 --- a/src/flatpak/io.github.mhogomchungu.media-downloader.metainfo.xml +++ b/src/flatpak/io.github.mhogomchungu.media-downloader.metainfo.xml @@ -5,7 +5,7 @@ Media Downloader - A Qt based GUI frontend to yt-dlp, gallery-dl, lux, svtplay-dl and others + A GUI to yt-dlp, gallery-dl, lux FSFAP @@ -26,13 +26,13 @@ - https://github.com/mhogomchungu/media-downloader/tree/58ba88ec57fd8d9cd263957e9352e6970654b8aa/images/images/media-downloader-1.png + https://raw.githubusercontent.com/mhogomchungu/media-downloader/a186152191cc5bf6259ae5e6d2fc12a9e3c0a0bc/images/media-downloader-1.png - https://github.com/mhogomchungu/media-downloader/tree/58ba88ec57fd8d9cd263957e9352e6970654b8aa/images/images/media-downloader-2.png + https://raw.githubusercontent.com/mhogomchungu/media-downloader/a186152191cc5bf6259ae5e6d2fc12a9e3c0a0bc/images/media-downloader-2.png - https://github.com/mhogomchungu/media-downloader/tree/58ba88ec57fd8d9cd263957e9352e6970654b8aa/images/images/media-downloader-3.png + https://raw.githubusercontent.com/mhogomchungu/media-downloader/a186152191cc5bf6259ae5e6d2fc12a9e3c0a0bc/images/media-downloader-3.png