Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 12:27:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Beginnings of a job queue management.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-03-14 19:43:15 +00:00
parent 51e76048c8
commit 39eb689395
3 changed files with 217 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/mmg/jobs.h Normal file
View File

@ -0,0 +1,41 @@
/*
mkvmerge GUI -- utility for splicing together matroska files
from component media subtypes
jobs.h
Written by Moritz Bunkus <moritz@bunkus.org>
Parts of this code were written by Florian Wager <flo.wagner@gmx.de>
Distributed under the GPL
see the file COPYING for details
or visit http://www.gnu.org/copyleft/gpl.html
*/
/*!
\file
\version $Id$
\brief declaration for the job queue
\author Moritz Bunkus <moritz@bunkus.org>
*/
#ifndef __JOBS_H
#define __JOBS_H
enum job_status_t {
jobs_pending,
jobs_done,
jobs_aborted,
jobs_failed
};
typedef struct {
int32_t id;
job_status_t status;
int32_t added_at, started_at, finished_at;
wxString *description;
} job_t;
extern vector<job_t> jobs;
#endif // __JOBS_H

166
src/mmg/mmg.cpp
View File

@ -35,6 +35,7 @@
#include "chapters.h"
#include "common.h"
#include "jobs.h"
#if defined(SYS_UNIX) || defined(SYS_APPLE)
#include "matroskalogo_big.xpm"
#endif
@ -56,6 +57,7 @@ vector<wxString> last_settings;
vector<wxString> last_chapters;
vector<mmg_file_t> files;
map<wxString, wxString, lt_wxString> capabilities;
vector<job_t> jobs;
wxString &
break_line(wxString &line,
@ -367,6 +369,14 @@ mmg_dialog::mmg_dialog(): wxFrame(NULL, -1, "mkvmerge GUI v" VERSION,
wxS("Create &option file"),
wxS("Save the command line to an option file "
"that can be read by mkvmerge"));
muxing_menu->AppendSeparator();
muxing_menu->Append(ID_M_MUXING_ADD_TO_JOBQUEUE,
wxS("&Add to job queue"),
wxS("Adds the current settings as a new job entry to "
"the job queue"));
muxing_menu->Append(ID_M_MUXING_MANAGE_JOBS,
wxS("&Manage jobs"),
wxS("Brings up the job queue editor"));
chapter_menu = new wxMenu();
chapter_menu->Append(ID_M_CHAPTERS_NEW, wxS("&New chapters"),
@ -482,6 +492,11 @@ mmg_dialog::mmg_dialog(): wxFrame(NULL, -1, "mkvmerge GUI v" VERSION,
bs_buttons->Add(b_copy_to_clipboard, 0, wxALIGN_CENTER_HORIZONTAL | wxALL,
8);
b_add_to_jobqueue =
new wxButton(panel, ID_B_ADD_TO_JOBQUEUE, wxS("&Add to job queue"),
wxDefaultPosition, wxSize(130, -1));
bs_buttons->Add(b_add_to_jobqueue, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 8);
bs_main->Add(bs_buttons, 0, wxALIGN_CENTER_HORIZONTAL);
last_open_dir = "";
@ -490,6 +505,8 @@ mmg_dialog::mmg_dialog(): wxFrame(NULL, -1, "mkvmerge GUI v" VERSION,
cmdline_timer.SetOwner(this, ID_T_UPDATECMDLINE);
cmdline_timer.Start(1000);
load_job_queue();
SetIcon(wxICON(matroskalogo_big));
set_status_bar("mkvmerge GUI ready");
@ -623,10 +640,12 @@ mmg_dialog::on_file_save(wxCommandEvent &evt) {
}
void
mmg_dialog::save(wxString file_name) {
mmg_dialog::save(wxString file_name,
bool used_for_jobs) {
wxFileConfig *cfg;
set_last_settings_in_menu(file_name);
if (!used_for_jobs)
set_last_settings_in_menu(file_name);
cfg = new wxFileConfig("mkvmerge GUI", "Moritz Bunkus", file_name);
cfg->SetPath("/mkvmergeGUI");
cfg->Write("file_version", 1);
@ -640,7 +659,8 @@ mmg_dialog::save(wxString file_name) {
delete cfg;
set_status_bar("Configuration saved.");
if (!used_for_jobs)
set_status_bar("Configuration saved.");
}
void
@ -1253,11 +1273,149 @@ mmg_dialog::set_output_maybe(const wxString &new_output) {
}
}
void
mmg_dialog::on_add_to_jobqueue(wxCommandEvent &evt) {
wxString description;
job_t job;
if (tc_output->GetValue().Length() == 0) {
wxMessageBox(wxS("You have not yet selected an output file."),
wxS("mkvmerge GUI: error"), wxOK | wxCENTER | wxICON_ERROR);
return;
}
if (!input_page->validate_settings() ||
!attachments_page->validate_settings() ||
!global_page->validate_settings() ||
!settings_page->validate_settings())
return;
if ((verified_output_file != tc_output->GetValue()) &&
wxFile::Exists(tc_output->GetValue()) &&
(wxMessageBox(wxS("The output file '") + tc_output->GetValue() +
wxS("' exists already. Do you want to overwrite it?"),
wxS("Overwrite existing file?"), wxYES_NO) != wxYES))
return;
verified_output_file = tc_output->GetValue();
description = wxGetTextFromUser(wxS("Please enter a description for the "
"new job:"), wxS("Job description"),
wxS(""));
if (description.length() == 0)
return;
if (!wxDirExists(wxS("jobs")))
wxMkdir(wxS("jobs"));
last_job_id++;
if (last_job_id > 2000000000)
last_job_id = 0;
job.id = last_job_id;
job.status = jobs_pending;
job.added_at = wxGetLocalTime();
job.started_at = -1;
job.finished_at = -1;
job.description = new wxString(description);
jobs.push_back(job);
description.Printf(wxS("/jobs/%d.mmg"), job.id);
save(wxGetCwd() + description);
save_job_queue();
set_status_bar(wxS("Job added to job queue"));
}
void
mmg_dialog::on_manage_jobs(wxCommandEvent &evt) {
}
void
mmg_dialog::load_job_queue() {
int num, i, value;
wxString s;
wxConfigBase *cfg;
job_t job;
last_job_id = 0;
cfg = wxConfigBase::Get();
cfg->SetPath(wxS("/jobs"));
cfg->Read(wxS("last_job_id"), &last_job_id);
if (!cfg->Read(wxS("number_of_jobs"), &num))
return;
for (i = 0; i < jobs.size(); i++)
delete jobs[i].description;
jobs.clear();
for (i = 0; i < num; i++) {
s.Printf(wxS("/jobs/%u"), i);
if (!cfg->HasGroup(s))
continue;
cfg->SetPath(s);
cfg->Read(wxS("id"), &value);
job.id = value;
cfg->Read(wxS("status"), &s);
job.status =
s == wxS("pending") ? jobs_pending :
s == wxS("done") ? jobs_done :
s == wxS("aborted") ? jobs_aborted :
jobs_failed;
cfg->Read(wxS("added_at"), &value);
job.added_at = value;
cfg->Read(wxS("started_at"), &value);
job.started_at = value;
cfg->Read(wxS("finished_at"), &value);
job.finished_at = value;
cfg->Read(wxS("description"), &s);
job.description = new wxString(s);
jobs.push_back(job);
}
}
void
mmg_dialog::save_job_queue() {
wxString s;
wxConfigBase *cfg;
uint32_t i;
vector<wxString> job_groups;
long cookie;
cfg = wxConfigBase::Get();
cfg->SetPath(wxS("/jobs"));
if (cfg->GetFirstGroup(s, cookie)) {
do {
job_groups.push_back(s);
} while (cfg->GetNextGroup(s, cookie));
for (i = 0; i < job_groups.size(); i++)
cfg->DeleteGroup(job_groups[i]);
}
cfg->Write(wxS("last_job_id"), last_job_id);
cfg->Write(wxS("number_of_jobs"), (int)jobs.size());
for (i = 0; i < jobs.size(); i++) {
s.Printf(wxS("/jobs/%u"), i);
cfg->SetPath(s);
cfg->Write(wxS("id"), jobs[i].id);
cfg->Write(wxS("status"),
jobs[i].status == jobs_pending ? wxS("pending") :
jobs[i].status == jobs_done ? wxS("done") :
jobs[i].status == jobs_aborted ? wxS("aborted") :
wxS("failed"));
cfg->Write(wxS("added_at"), jobs[i].added_at);
cfg->Write(wxS("started_at"), jobs[i].started_at);
cfg->Write(wxS("finished_at"), jobs[i].finished_at);
cfg->Write(wxS("description"), *jobs[i].description);
}
cfg->Flush();
}
IMPLEMENT_CLASS(mmg_dialog, wxFrame);
BEGIN_EVENT_TABLE(mmg_dialog, wxFrame)
EVT_BUTTON(ID_B_BROWSEOUTPUT, mmg_dialog::on_browse_output)
EVT_BUTTON(ID_B_STARTMUXING, mmg_dialog::on_run)
EVT_BUTTON(ID_B_COPYTOCLIPBOARD, mmg_dialog::on_copy_to_clipboard)
EVT_BUTTON(ID_B_ADD_TO_JOBQUEUE, mmg_dialog::on_add_to_jobqueue)
EVT_TIMER(ID_T_UPDATECMDLINE, mmg_dialog::on_update_command_line)
EVT_TIMER(ID_T_STATUSBAR, mmg_dialog::on_clear_status_bar)
EVT_MENU(ID_M_FILE_EXIT, mmg_dialog::on_quit)
@ -1269,6 +1427,8 @@ BEGIN_EVENT_TABLE(mmg_dialog, wxFrame)
EVT_MENU(ID_M_MUXING_COPY_CMDLINE, mmg_dialog::on_copy_to_clipboard)
EVT_MENU(ID_M_MUXING_SAVE_CMDLINE, mmg_dialog::on_save_cmdline)
EVT_MENU(ID_M_MUXING_CREATE_OPTIONFILE, mmg_dialog::on_create_optionfile)
EVT_MENU(ID_M_MUXING_ADD_TO_JOBQUEUE, mmg_dialog::on_add_to_jobqueue)
EVT_MENU(ID_M_MUXING_MANAGE_JOBS, mmg_dialog::on_manage_jobs)
EVT_MENU(ID_M_HELP_ABOUT, mmg_dialog::on_about)
EVT_MENU(ID_M_FILE_LOADLAST1, mmg_dialog::on_file_load_last)
EVT_MENU(ID_M_FILE_LOADLAST2, mmg_dialog::on_file_load_last)

15
src/mmg/mmg_dialog.h
View File

@ -30,6 +30,7 @@
#define ID_T_STATUSBAR 10005
#define ID_B_STARTMUXING 10006
#define ID_B_COPYTOCLIPBOARD 10007
#define ID_B_ADD_TO_JOBQUEUE 10008
#define ID_M_FILE_NEW 60000
#define ID_M_FILE_LOAD 60001
@ -46,6 +47,8 @@
#define ID_M_MUXING_COPY_CMDLINE 60101
#define ID_M_MUXING_SAVE_CMDLINE 60102
#define ID_M_MUXING_CREATE_OPTIONFILE 60103
#define ID_M_MUXING_ADD_TO_JOBQUEUE 60104
#define ID_M_MUXING_MANAGE_JOBS 60105
#define ID_M_CHAPTERS_NEW 60200
#define ID_M_CHAPTERS_LOAD 60201
@ -103,7 +106,9 @@ protected:
tab_settings *settings_page;
tab_chapters *chapter_editor_page;
wxButton *b_start_muxing, *b_copy_to_clipboard;
wxButton *b_start_muxing, *b_copy_to_clipboard, *b_add_to_jobqueue;
int32_t last_job_id;
public:
mmg_dialog();
@ -126,7 +131,7 @@ public:
wxArrayString &get_command_line_args();
void load(wxString file_name);
void save(wxString file_name);
void save(wxString file_name, bool used_for_jobs = false);
void on_clear_status_bar(wxTimerEvent &evt);
void set_status_bar(wxString text);
@ -151,6 +156,12 @@ public:
void set_title_maybe(const wxString &new_title);
void set_output_maybe(const wxString &new_output);
void on_add_to_jobqueue(wxCommandEvent &evt);
void on_manage_jobs(wxCommandEvent &evt);
void load_job_queue();
void save_job_queue();
};
extern mmg_dialog *mdlg;