do not add empty json entries when saving playlist downloader tab ent…

…ries
mhogomchungu · Aug 3, 2024 · a704140 · a704140
1 parent 6312c0b
commit a704140
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/src/networkAccess.cpp b/src/networkAccess.cpp
@@ -235,9 +235,9 @@ void networkAccess::uMediaDownloaderM( networkAccess::updateMDOptions& md,
 	}else{
 		md.file.write( p.data() ) ;
 
-		auto perc = double( p.received() )  * 100 / md.size ;
-		auto totalSize = md.locale.formattedDataSize( qint64( md.size ) ) ;
-		auto current   = md.locale.formattedDataSize( p.received() ) ;
+		auto perc       = double( p.received() )  * 100 / md.size ;
+		auto totalSize  = md.locale.formattedDataSize( qint64( md.size ) ) ;
+		auto current    = md.locale.formattedDataSize( p.received() ) ;
 		auto percentage = QString::number( perc,'f',2 ) ;
 
 		auto m = QString( "%1 / %2 (%3%)" ).arg( current,totalSize,percentage ) ;

diff --git a/src/tabmanager.cpp b/src/tabmanager.cpp
@@ -42,7 +42,7 @@ tabManager::tabManager( settings& s,
 	m_playlistdownloader( m_ctx ),
 	m_library( m_ctx )
 {
-	t.setContext( &m_ctx ) ;
+	t.setContext( m_ctx ) ;
 
 	qRegisterMetaType< QClipboard::Mode >() ;
 

diff --git a/src/translator.cpp b/src/translator.cpp
@@ -46,9 +46,9 @@ translator::translator( settings& s,QApplication& app ) : m_qapp( app ),m_settin
 	this->setDefaultLanguage() ;
 }
 
-void translator::setContext( Context * ctx )
+void translator::setContext( Context& ctx )
 {
-	m_ctx = ctx ;
+	m_ctx = &ctx ;
 
 	this->setDefaultLanguage() ;
 }

diff --git a/src/translator.h b/src/translator.h
@@ -36,7 +36,7 @@ class translator
 {
 public:
 	translator( settings&,QApplication& ) ;
-	void setContext( Context * ) ;
+	void setContext( Context& ) ;
 	void setLanguage( const QString& e ) ;
 	void setDefaultLanguage() ;
 	~translator() ;
@@ -61,7 +61,7 @@ class translator
 	void addString( const QString& translatedString,
 			const char * untranslatedString,
 			const QString& internalName ) ;
-	void clear( void ) ;
+	void clear() ;
 	QApplication& m_qapp ;
 	QTranslator * m_translator = nullptr ;
 	Context * m_ctx = nullptr ;

diff --git a/src/utility.cpp b/src/utility.cpp
@@ -1050,17 +1050,24 @@ static QJsonArray _saveDownloadList( tableWidget& tableWidget,bool noFinishedSuc
 
 			if( title == url ){
 
-				obj.insert( "title","" ) ;
+				obj.remove( "title" ) ;
 			}
 		}
 
-		obj.insert( "runningState",e.runningState ) ;
+		if( !e.downloadingOptions.isEmpty() ){
 
-		obj.insert( "downloadOptions",e.downloadingOptions ) ;
+			obj.insert( "downloadOptions",e.downloadingOptions ) ;
+		}
+
+		if( !e.engineName.isEmpty() ){
 
-		obj.insert( "engineName",e.engineName ) ;
+			obj.insert( "engineName",e.engineName ) ;
+		}
 
-		obj.insert( "downloadExtraOptions",e.extraDownloadingOptions ) ;
+		if( !e.extraDownloadingOptions.isEmpty() ){
+
+			obj.insert( "downloadExtraOptions",e.extraDownloadingOptions ) ;
+		}
 
 		arr.append( obj ) ;
 	} ;