Browse Source

Ensure output path is not empty before trying archive and folder runs

pcb_db
Marek Roszko 1 year ago
parent
commit
1b05e77fb2
  1. 12
      common/jobs/jobs_output_archive.cpp
  2. 1
      common/jobs/jobs_output_archive.h
  3. 11
      common/jobs/jobs_output_folder.cpp
  4. 2
      common/jobs/jobs_output_folder.h

12
common/jobs/jobs_output_archive.cpp

@ -29,6 +29,18 @@ JOBS_OUTPUT_ARCHIVE::JOBS_OUTPUT_ARCHIVE() : JOBS_OUTPUT_HANDLER(),
{
}
bool JOBS_OUTPUT_ARCHIVE::OutputPrecheck()
{
if( m_outputPath.IsEmpty() )
{
return false;
}
return true;
}
bool JOBS_OUTPUT_ARCHIVE::HandleOutputs( const wxString& baseTempPath,
const std::vector<JOB_OUTPUT>& aOutputsToHandle )
{

1
common/jobs/jobs_output_archive.h

@ -33,6 +33,7 @@ public:
};
bool HandleOutputs( const wxString& baseTempPath, const std::vector<JOB_OUTPUT>& aOutputsToHandle ) override;
bool OutputPrecheck() override;
void FromJson( const nlohmann::json& j ) override;
void ToJson( nlohmann::json& j ) const override;

11
common/jobs/jobs_output_folder.cpp

@ -53,6 +53,17 @@ bool JOBS_OUTPUT_FOLDER::HandleOutputs( const wxString& baseTempP
}
bool JOBS_OUTPUT_FOLDER::OutputPrecheck()
{
if( m_outputPath.IsEmpty() )
{
return false;
}
return true;
}
void JOBS_OUTPUT_FOLDER::FromJson( const nlohmann::json& j )
{
m_outputPath = j.value( "output_path", "" );

2
common/jobs/jobs_output_folder.h

@ -30,6 +30,8 @@ public:
bool HandleOutputs( const wxString& baseTempPath,
const std::vector<JOB_OUTPUT>& aOutputsToHandle ) override;
bool OutputPrecheck() override;
void FromJson( const nlohmann::json& j ) override;
void ToJson( nlohmann::json& j ) const override;
};
Loading…
Cancel
Save