dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TranscodeDialog: Minor adjustments

Browse Source
This commit is contained in:
Jonas Kvinge
2025-01-10 01:57:44 +01:00
parent 018448159c
commit bc206f43b4
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/transcoder/transcodedialog.cpp
View File

@@ -216,10 +216,12 @@ void TranscodeDialog::SetWorking(bool working) {
ui_->output_group->setEnabled(!working); ui_->output_group->setEnabled(!working);
ui_->progress_group->setVisible(true); ui_->progress_group->setVisible(true);
if (working) if (working) {
progress_timer_.start(kProgressInterval, this); progress_timer_.start(kProgressInterval, this);
else }
else {
progress_timer_.stop(); progress_timer_.stop();
}
} }
@@ -233,9 +235,7 @@ void TranscodeDialog::Start() {
// Add jobs to the transcoder // Add jobs to the transcoder
for (int i = 0; i < file_model->rowCount(); ++i) { for (int i = 0; i < file_model->rowCount(); ++i) {
const QString input_filepath = file_model->index(i, 0).data(Qt::UserRole).toString(); const QString input_filepath = file_model->index(i, 0).data(Qt::UserRole).toString();
const QString input_import_dir = ui_->preserve_dir_structure->isChecked() ? file_model->index(i, 2).data(Qt::UserRole).toString() : QString();
const QString input_import_dir = ui_->preserve_dir_structure->isChecked() ? file_model->index(i, 2).data(Qt::UserRole).toString() : ""_L1;
if (input_filepath.isEmpty()) continue; if (input_filepath.isEmpty()) continue;
const QString output_filepath = GetOutputFileName(input_filepath, input_import_dir, preset); const QString output_filepath = GetOutputFileName(input_filepath, input_import_dir, preset);
if (output_filepath.isEmpty()) continue; if (output_filepath.isEmpty()) continue;
@@ -453,31 +453,25 @@ QString TranscodeDialog::TrimPath(const QString &path) {
return path.section(u'/', -1, -1, QString::SectionSkipEmpty); return path.section(u'/', -1, -1, QString::SectionSkipEmpty);
} }
void TranscodeDialog::CreatePathIfNotExists(const QString &path) {
const QDir dir(path);
if (!dir.exists()) {
dir.mkpath("."_L1);
}
}
QString TranscodeDialog::GetOutputFileName(const QString &input_filepath, const QString &input_import_dir, const TranscoderPreset &preset) const { QString TranscodeDialog::GetOutputFileName(const QString &input_filepath, const QString &input_import_dir, const TranscoderPreset &preset) const {
QString destination_path = ui_->destination->itemData(ui_->destination->currentIndex()).toString(); QString destination_path = ui_->destination->itemData(ui_->destination->currentIndex()).toString();
QString output_filepath; QString output_filepath;
if (destination_path.isEmpty()) { if (destination_path.isEmpty()) {
// Keep the original path. // Keep the original path.
output_filepath = input_filepath.section(QLatin1Char('.'), 0, -2) + QLatin1Char('.') + preset.extension_; output_filepath = input_filepath.section(u'.', 0, -2) + u'.' + preset.extension_;
} }
else { else {
QString filename = TrimPath(input_filepath); QString filename = TrimPath(input_filepath);
filename = filename.section(u'.', 0, -2); filename = filename.section(u'.', 0, -2);
// If checkbox for preserving import directory structure is checked validate the path exists // If checkbox for preserving import directory structure is checked validate the path exists
if (ui_->preserve_dir_structure->isChecked()) { if (ui_->preserve_dir_structure->isChecked()) {
QString path_to_validate = destination_path + u'/' + input_import_dir + u'/'; const QString path = destination_path + u'/' + input_import_dir;
output_filepath = path_to_validate + filename + u'.' + preset.extension_; const QDir dir(path);
CreatePathIfNotExists(path_to_validate); if (!dir.exists()) {
dir.mkpath(u"."_s);
}
output_filepath = path + u'/' + filename + u'.' + preset.extension_;
} }
// Otherwise no modifications to the output path // Otherwise no modifications to the output path
else { else {

1
src/transcoder/transcodedialog.h
View File

@@ -63,7 +63,6 @@ class TranscodeDialog : public QDialog {
void UpdateStatusText(); void UpdateStatusText();
void UpdateProgress(); void UpdateProgress();
static QString TrimPath(const QString &path); static QString TrimPath(const QString &path);
static void CreatePathIfNotExists(const QString &path);
QString GetOutputFileName(const QString &input, const QString &input_import_dir, const TranscoderPreset &preset) const; QString GetOutputFileName(const QString &input, const QString &input_import_dir, const TranscoderPreset &preset) const;
private Q_SLOTS: private Q_SLOTS: