haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update progress during InstallFromFile.

This commit is contained in:
Jeff Young 2021-11-11 10:17:23 +00:00
parent 686b32dbd3
commit 78bedbed93
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kicad/pcm/pcm_task_manager.cpp
View File

@ -97,7 +97,7 @@ void PCM_TASK_MANAGER::DownloadAndInstall( const PCM_PACKAGE& aPackage, const wx
m_reporter->Report( wxString::Format( _( "Extracting package '%s'." ), m_reporter->Report( wxString::Format( _( "Extracting package '%s'." ),
aPackage.identifier ) ); aPackage.identifier ) );
if( extract( file_path.GetFullPath(), aPackage.identifier ) ) if( extract( file_path.GetFullPath(), aPackage.identifier, true ) )
{ {
m_pcm->MarkInstalled( aPackage, get_pkgver->version, aRepositoryId ); m_pcm->MarkInstalled( aPackage, get_pkgver->version, aRepositoryId );
// TODO register libraries. // TODO register libraries.
@ -169,7 +169,8 @@ int PCM_TASK_MANAGER::downloadFile( const wxString& aFilePath, const wxString& u
} }
bool PCM_TASK_MANAGER::extract( const wxString& aFilePath, const wxString& aPackageId ) bool PCM_TASK_MANAGER::extract( const wxString& aFilePath, const wxString& aPackageId,
bool isMultiThreaded )
{ {
wxFFileInputStream stream( aFilePath ); wxFFileInputStream stream( aFilePath );
wxZipInputStream zip( stream ); wxZipInputStream zip( stream );
@ -235,6 +236,9 @@ bool PCM_TASK_MANAGER::extract( const wxString& aFilePath, const wxString& aPack
extracted++; extracted++;
m_reporter->SetOverallProgress( extracted, entries ); m_reporter->SetOverallProgress( extracted, entries );
if( !isMultiThreaded )
m_reporter->KeepRefreshing( false );
if( m_reporter->IsCancelled() ) if( m_reporter->IsCancelled() )
break; break;
} }
@ -247,7 +251,7 @@ bool PCM_TASK_MANAGER::extract( const wxString& aFilePath, const wxString& aPack
return false; return false;
} }
m_reporter->Report( wxT( "Extracted package\n" ), RPT_SEVERITY_INFO ); m_reporter->Report( _( "Extracted package\n" ), RPT_SEVERITY_INFO );
m_reporter->SetOverallProgress( entries, entries ); m_reporter->SetOverallProgress( entries, entries );
return true; return true;
@ -329,7 +333,7 @@ void PCM_TASK_MANAGER::InstallFromFile( wxWindow* aParent, const wxString& aFile
m_reporter = std::make_unique<DIALOG_PCM_PROGRESS>( aParent, false ); m_reporter = std::make_unique<DIALOG_PCM_PROGRESS>( aParent, false );
m_reporter->Show(); m_reporter->Show();
if( extract( aFilePath, package.identifier ) ) if( extract( aFilePath, package.identifier, false ) )
m_pcm->MarkInstalled( package, package.versions[0].version, "" ); m_pcm->MarkInstalled( package, package.versions[0].version, "" );
m_reporter->SetFinished(); m_reporter->SetFinished();
@ -374,8 +378,8 @@ void PCM_TASK_MANAGER::Uninstall( const PCM_PACKAGE& aPackage )
m_pcm->MarkUninstalled( aPackage ); m_pcm->MarkUninstalled( aPackage );
m_reporter->Report( m_reporter->Report( wxString::Format( _( "Package %s uninstalled" ),
wxString::Format( _( "Package %s uninstalled" ), aPackage.identifier ) ); aPackage.identifier ) );
}; };
m_install_queue.push( task ); m_install_queue.push( task );

3
kicad/pcm/pcm_task_manager.h
View File

@ -118,9 +118,10 @@ private:
* *
* @param aFilePath path to the archive * @param aFilePath path to the archive
* @param aPackageId id of the package * @param aPackageId id of the package
* @param isMultiThreaded MUST be set to true if the caller is not running in the main thread
* @return true if archive was extracted successfuly * @return true if archive was extracted successfuly
*/ */
bool extract( const wxString& aFilePath, const wxString& aPackageId ); bool extract( const wxString& aFilePath, const wxString& aPackageId, bool isMultiThreaded );
/** /**
* @brief Delete all package files * @brief Delete all package files