Separating out filename formatting options into separate widget.
First step towards unifying filename formatting over different dialogs.
This commit is contained in:
parent
922afe506f
commit
a6fef97cac
|
@ -385,6 +385,7 @@ set(SOURCES
|
||||||
widgets/errordialog.cpp
|
widgets/errordialog.cpp
|
||||||
widgets/fancytabwidget.cpp
|
widgets/fancytabwidget.cpp
|
||||||
widgets/favoritewidget.cpp
|
widgets/favoritewidget.cpp
|
||||||
|
widgets/filenameformatwidget.cpp
|
||||||
widgets/fileview.cpp
|
widgets/fileview.cpp
|
||||||
widgets/fileviewlist.cpp
|
widgets/fileviewlist.cpp
|
||||||
widgets/forcescrollperpixel.cpp
|
widgets/forcescrollperpixel.cpp
|
||||||
|
@ -683,6 +684,7 @@ set(HEADERS
|
||||||
widgets/errordialog.h
|
widgets/errordialog.h
|
||||||
widgets/fancytabwidget.h
|
widgets/fancytabwidget.h
|
||||||
widgets/favoritewidget.h
|
widgets/favoritewidget.h
|
||||||
|
widgets/filenameformatwidget.h
|
||||||
widgets/fileview.h
|
widgets/fileview.h
|
||||||
widgets/fileviewlist.h
|
widgets/fileviewlist.h
|
||||||
widgets/freespacebar.h
|
widgets/freespacebar.h
|
||||||
|
@ -807,6 +809,7 @@ set(UI
|
||||||
|
|
||||||
widgets/equalizerslider.ui
|
widgets/equalizerslider.ui
|
||||||
widgets/errordialog.ui
|
widgets/errordialog.ui
|
||||||
|
widgets/filenameformatwidget.ui
|
||||||
widgets/fileview.ui
|
widgets/fileview.ui
|
||||||
widgets/loginstatewidget.ui
|
widgets/loginstatewidget.ui
|
||||||
widgets/osdpretty.ui
|
widgets/osdpretty.ui
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
#include <QHash>
|
||||||
#include <QPalette>
|
#include <QPalette>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
|
|
||||||
|
@ -143,6 +144,27 @@ QString OrganiseFormat::GetFilenameForSong(const Song& song) const {
|
||||||
return parts.join("/");
|
return parts.join("/");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QStringList OrganiseFormat::GetFilenamesForSongs(const SongList& songs) const {
|
||||||
|
// Check if we will have multiple files with the same name.
|
||||||
|
// If so, they will erase each other if the overwrite flag is set.
|
||||||
|
// Better to rename them: e.g. foo.bar -> foo(2).bar
|
||||||
|
QHash<QString, int> filenames;
|
||||||
|
QStringList new_filenames;
|
||||||
|
|
||||||
|
for (const Song& song : songs) {
|
||||||
|
QString new_filename = GetFilenameForSong(song);
|
||||||
|
if (filenames.contains(new_filename)) {
|
||||||
|
QString song_number = QString::number(++filenames[new_filename]);
|
||||||
|
new_filename = Utilities::PathWithoutFilenameExtension(new_filename) +
|
||||||
|
"(" + song_number + ")." +
|
||||||
|
QFileInfo(new_filename).suffix();
|
||||||
|
}
|
||||||
|
filenames.insert(new_filename, 1);
|
||||||
|
new_filenames << new_filename;
|
||||||
|
}
|
||||||
|
return new_filenames;
|
||||||
|
}
|
||||||
|
|
||||||
QString OrganiseFormat::ParseBlock(QString block, const Song& song,
|
QString OrganiseFormat::ParseBlock(QString block, const Song& song,
|
||||||
bool* any_empty) const {
|
bool* any_empty) const {
|
||||||
QRegExp tag_regexp(kTagPattern);
|
QRegExp tag_regexp(kTagPattern);
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#ifndef CORE_ORGANISEFORMAT_H_
|
#ifndef CORE_ORGANISEFORMAT_H_
|
||||||
#define CORE_ORGANISEFORMAT_H_
|
#define CORE_ORGANISEFORMAT_H_
|
||||||
|
|
||||||
|
#include <QStringList>
|
||||||
#include <QSyntaxHighlighter>
|
#include <QSyntaxHighlighter>
|
||||||
#include <QTextEdit>
|
#include <QTextEdit>
|
||||||
#include <QValidator>
|
#include <QValidator>
|
||||||
|
@ -55,6 +56,7 @@ class OrganiseFormat {
|
||||||
|
|
||||||
bool IsValid() const;
|
bool IsValid() const;
|
||||||
QString GetFilenameForSong(const Song& song) const;
|
QString GetFilenameForSong(const Song& song) const;
|
||||||
|
QStringList GetFilenamesForSongs(const SongList& songs) const;
|
||||||
|
|
||||||
class Validator : public QValidator {
|
class Validator : public QValidator {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -57,52 +57,11 @@ OrganiseDialog::OrganiseDialog(TaskManager* task_manager,
|
||||||
ui_->aftercopying->setItemIcon(
|
ui_->aftercopying->setItemIcon(
|
||||||
1, IconLoader::Load("edit-delete", IconLoader::Base));
|
1, IconLoader::Load("edit-delete", IconLoader::Base));
|
||||||
|
|
||||||
// Valid tags
|
|
||||||
QMap<QString, QString> tags;
|
|
||||||
tags[tr("Title")] = "title";
|
|
||||||
tags[tr("Album")] = "album";
|
|
||||||
tags[tr("Artist")] = "artist";
|
|
||||||
tags[tr("Artist's initial")] = "artistinitial";
|
|
||||||
tags[tr("Album artist")] = "albumartist";
|
|
||||||
tags[tr("Composer")] = "composer";
|
|
||||||
tags[tr("Performer")] = "performer";
|
|
||||||
tags[tr("Grouping")] = "grouping";
|
|
||||||
tags[tr("Lyrics")] = "lyrics";
|
|
||||||
tags[tr("Track")] = "track";
|
|
||||||
tags[tr("Disc")] = "disc";
|
|
||||||
tags[tr("BPM")] = "bpm";
|
|
||||||
tags[tr("Year")] = "year";
|
|
||||||
tags[tr("Original year")] = "originalyear";
|
|
||||||
tags[tr("Genre")] = "genre";
|
|
||||||
tags[tr("Comment")] = "comment";
|
|
||||||
tags[tr("Length")] = "length";
|
|
||||||
tags[tr("Bitrate", "Refers to bitrate in file organise dialog.")] = "bitrate";
|
|
||||||
tags[tr("Samplerate")] = "samplerate";
|
|
||||||
tags[tr("File extension")] = "extension";
|
|
||||||
|
|
||||||
// Naming scheme input field
|
|
||||||
new OrganiseFormat::SyntaxHighlighter(ui_->naming);
|
|
||||||
|
|
||||||
connect(ui_->destination, SIGNAL(currentIndexChanged(int)),
|
connect(ui_->destination, SIGNAL(currentIndexChanged(int)),
|
||||||
SLOT(UpdatePreviews()));
|
SLOT(UpdatePreviews()));
|
||||||
connect(ui_->naming, SIGNAL(textChanged()), SLOT(UpdatePreviews()));
|
connect(ui_->naming_group, SIGNAL(OptionChanged()), SLOT(UpdatePreviews()));
|
||||||
connect(ui_->replace_ascii, SIGNAL(toggled(bool)), SLOT(UpdatePreviews()));
|
connect(ui_->naming_group, SIGNAL(FormatStringChanged()),
|
||||||
connect(ui_->replace_the, SIGNAL(toggled(bool)), SLOT(UpdatePreviews()));
|
SLOT(UpdatePreviews()));
|
||||||
connect(ui_->replace_spaces, SIGNAL(toggled(bool)), SLOT(UpdatePreviews()));
|
|
||||||
|
|
||||||
// Get the titles of the tags to put in the insert menu
|
|
||||||
QStringList tag_titles = tags.keys();
|
|
||||||
std::stable_sort(tag_titles.begin(), tag_titles.end());
|
|
||||||
|
|
||||||
// Build the insert menu
|
|
||||||
QMenu* tag_menu = new QMenu(this);
|
|
||||||
for (const QString& title : tag_titles) {
|
|
||||||
QAction* action = tag_menu->addAction(title);
|
|
||||||
QString tag = tags[title];
|
|
||||||
connect(action, &QAction::triggered, [this, tag]() { InsertTag(tag); });
|
|
||||||
}
|
|
||||||
|
|
||||||
ui_->insert->setMenu(tag_menu);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
OrganiseDialog::~OrganiseDialog() { delete ui_; }
|
OrganiseDialog::~OrganiseDialog() { delete ui_; }
|
||||||
|
@ -209,28 +168,14 @@ void OrganiseDialog::SetCopy(bool copy) {
|
||||||
ui_->aftercopying->setCurrentIndex(copy ? 0 : 1);
|
ui_->aftercopying->setCurrentIndex(copy ? 0 : 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OrganiseDialog::InsertTag(const QString& tag) {
|
|
||||||
ui_->naming->insertPlainText("%" + tag);
|
|
||||||
}
|
|
||||||
|
|
||||||
Organise::NewSongInfoList OrganiseDialog::ComputeNewSongsFilenames(
|
Organise::NewSongInfoList OrganiseDialog::ComputeNewSongsFilenames(
|
||||||
const SongList& songs, const OrganiseFormat& format) {
|
const SongList& songs, const OrganiseFormat& format) {
|
||||||
// Check if we will have multiple files with the same name.
|
QStringList new_filenames = format.GetFilenamesForSongs(songs);
|
||||||
// If so, they will erase each other if the overwrite flag is set.
|
Q_ASSERT(new_filenames.length() == songs.length());
|
||||||
// Better to rename them: e.g. foo.bar -> foo(2).bar
|
|
||||||
QHash<QString, int> filenames;
|
|
||||||
Organise::NewSongInfoList new_songs_info;
|
|
||||||
|
|
||||||
for (const Song& song : songs) {
|
Organise::NewSongInfoList new_songs_info;
|
||||||
QString new_filename = format.GetFilenameForSong(song);
|
for (int i = 0; i < new_filenames.length(); ++i) {
|
||||||
if (filenames.contains(new_filename)) {
|
new_songs_info << Organise::NewSongInfo(songs[i], new_filenames[i]);
|
||||||
QString song_number = QString::number(++filenames[new_filename]);
|
|
||||||
new_filename = Utilities::PathWithoutFilenameExtension(new_filename) +
|
|
||||||
"(" + song_number + ")." +
|
|
||||||
QFileInfo(new_filename).suffix();
|
|
||||||
}
|
|
||||||
filenames.insert(new_filename, 1);
|
|
||||||
new_songs_info << Organise::NewSongInfo(song, new_filename);
|
|
||||||
}
|
}
|
||||||
return new_songs_info;
|
return new_songs_info;
|
||||||
}
|
}
|
||||||
|
@ -265,11 +210,8 @@ void OrganiseDialog::UpdatePreviews() {
|
||||||
ui_->free_space->set_total_bytes(capacity);
|
ui_->free_space->set_total_bytes(capacity);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update the format object
|
// Get updated format object
|
||||||
format_.set_format(ui_->naming->toPlainText());
|
OrganiseFormat format = ui_->naming_group->format();
|
||||||
format_.set_replace_non_ascii(ui_->replace_ascii->isChecked());
|
|
||||||
format_.set_replace_spaces(ui_->replace_spaces->isChecked());
|
|
||||||
format_.set_replace_the(ui_->replace_the->isChecked());
|
|
||||||
|
|
||||||
// If this is set to Transcode_Always, then the user has selected transcode,
|
// If this is set to Transcode_Always, then the user has selected transcode,
|
||||||
// so we can be fairly certain that the device supports the selected format.
|
// so we can be fairly certain that the device supports the selected format.
|
||||||
|
@ -278,14 +220,14 @@ void OrganiseDialog::UpdatePreviews() {
|
||||||
// the preview will be incorrect.
|
// the preview will be incorrect.
|
||||||
if (storage &&
|
if (storage &&
|
||||||
storage->GetTranscodeMode() == MusicStorage::Transcode_Always) {
|
storage->GetTranscodeMode() == MusicStorage::Transcode_Always) {
|
||||||
const Song::FileType format = storage->GetTranscodeFormat();
|
const Song::FileType file_format = storage->GetTranscodeFormat();
|
||||||
TranscoderPreset preset = Transcoder::PresetForFileType(format);
|
TranscoderPreset preset = Transcoder::PresetForFileType(file_format);
|
||||||
format_.add_tag_override("extension", preset.extension_);
|
format.add_tag_override("extension", preset.extension_);
|
||||||
} else {
|
} else {
|
||||||
format_.reset_tag_overrides();
|
format.reset_tag_overrides();
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool format_valid = !has_local_destination || format_.IsValid();
|
const bool format_valid = !has_local_destination || format.IsValid();
|
||||||
|
|
||||||
// Are we gonna enable the ok button?
|
// Are we gonna enable the ok button?
|
||||||
bool ok = format_valid && !songs_.isEmpty();
|
bool ok = format_valid && !songs_.isEmpty();
|
||||||
|
@ -294,7 +236,7 @@ void OrganiseDialog::UpdatePreviews() {
|
||||||
ui_->button_box->button(QDialogButtonBox::Ok)->setEnabled(ok);
|
ui_->button_box->button(QDialogButtonBox::Ok)->setEnabled(ok);
|
||||||
if (!format_valid) return;
|
if (!format_valid) return;
|
||||||
|
|
||||||
new_songs_info_ = ComputeNewSongsFilenames(songs_, format_);
|
new_songs_info_ = ComputeNewSongsFilenames(songs_, format);
|
||||||
|
|
||||||
// Update the previews
|
// Update the previews
|
||||||
ui_->preview->clear();
|
ui_->preview->clear();
|
||||||
|
@ -325,12 +267,7 @@ void OrganiseDialog::DestDataChanged(const QModelIndex& begin,
|
||||||
QSize OrganiseDialog::sizeHint() const { return QSize(650, 0); }
|
QSize OrganiseDialog::sizeHint() const { return QSize(650, 0); }
|
||||||
|
|
||||||
void OrganiseDialog::Reset() {
|
void OrganiseDialog::Reset() {
|
||||||
ui_->naming->setPlainText(kDefaultFormat);
|
ui_->naming_group->Reset();
|
||||||
ui_->replace_ascii->setChecked(false);
|
|
||||||
ui_->replace_spaces->setChecked(false);
|
|
||||||
ui_->replace_the->setChecked(false);
|
|
||||||
ui_->overwrite->setChecked(false);
|
|
||||||
ui_->mark_as_listened->setChecked(false);
|
|
||||||
ui_->eject_after->setChecked(false);
|
ui_->eject_after->setChecked(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -339,13 +276,6 @@ void OrganiseDialog::showEvent(QShowEvent*) {
|
||||||
|
|
||||||
QSettings s;
|
QSettings s;
|
||||||
s.beginGroup(kSettingsGroup);
|
s.beginGroup(kSettingsGroup);
|
||||||
ui_->naming->setPlainText(s.value("format", kDefaultFormat).toString());
|
|
||||||
ui_->replace_ascii->setChecked(s.value("replace_ascii", false).toBool());
|
|
||||||
ui_->replace_spaces->setChecked(s.value("replace_spaces", false).toBool());
|
|
||||||
ui_->replace_the->setChecked(s.value("replace_the", false).toBool());
|
|
||||||
ui_->overwrite->setChecked(s.value("overwrite", false).toBool());
|
|
||||||
ui_->mark_as_listened->setChecked(
|
|
||||||
s.value("mark_as_listened", false).toBool());
|
|
||||||
ui_->eject_after->setChecked(s.value("eject_after", false).toBool());
|
ui_->eject_after->setChecked(s.value("eject_after", false).toBool());
|
||||||
|
|
||||||
QString destination = s.value("destination").toString();
|
QString destination = s.value("destination").toString();
|
||||||
|
@ -358,14 +288,9 @@ void OrganiseDialog::showEvent(QShowEvent*) {
|
||||||
void OrganiseDialog::accept() {
|
void OrganiseDialog::accept() {
|
||||||
QSettings s;
|
QSettings s;
|
||||||
s.beginGroup(kSettingsGroup);
|
s.beginGroup(kSettingsGroup);
|
||||||
s.setValue("format", ui_->naming->toPlainText());
|
|
||||||
s.setValue("replace_ascii", ui_->replace_ascii->isChecked());
|
|
||||||
s.setValue("replace_spaces", ui_->replace_spaces->isChecked());
|
|
||||||
s.setValue("replace_the", ui_->replace_the->isChecked());
|
|
||||||
s.setValue("overwrite", ui_->overwrite->isChecked());
|
|
||||||
s.setValue("mark_as_listened", ui_->overwrite->isChecked());
|
|
||||||
s.setValue("destination", ui_->destination->currentText());
|
s.setValue("destination", ui_->destination->currentText());
|
||||||
s.setValue("eject_after", ui_->eject_after->isChecked());
|
s.setValue("eject_after", ui_->eject_after->isChecked());
|
||||||
|
ui_->naming_group->StoreSettings();
|
||||||
|
|
||||||
const QModelIndex destination =
|
const QModelIndex destination =
|
||||||
ui_->destination->model()->index(ui_->destination->currentIndex(), 0);
|
ui_->destination->model()->index(ui_->destination->currentIndex(), 0);
|
||||||
|
@ -377,14 +302,16 @@ void OrganiseDialog::accept() {
|
||||||
|
|
||||||
// Reset the extension override if we set it. Organise should correctly set
|
// Reset the extension override if we set it. Organise should correctly set
|
||||||
// the Song object.
|
// the Song object.
|
||||||
format_.reset_tag_overrides();
|
OrganiseFormat format = ui_->naming_group->format();
|
||||||
|
format.reset_tag_overrides();
|
||||||
|
|
||||||
// It deletes itself when it's finished.
|
// It deletes itself when it's finished.
|
||||||
const bool copy = ui_->aftercopying->currentIndex() == 0;
|
const bool copy = ui_->aftercopying->currentIndex() == 0;
|
||||||
Organise* organise = new Organise(
|
Organise* organise =
|
||||||
task_manager_, storage, format_, copy, ui_->overwrite->isChecked(),
|
new Organise(task_manager_, storage, format, copy,
|
||||||
ui_->mark_as_listened->isChecked(), new_songs_info_,
|
ui_->naming_group->overwrite_existing(),
|
||||||
ui_->eject_after->isChecked());
|
ui_->naming_group->mark_as_listened(), new_songs_info_,
|
||||||
|
ui_->eject_after->isChecked());
|
||||||
connect(organise, SIGNAL(Finished(QStringList)),
|
connect(organise, SIGNAL(Finished(QStringList)),
|
||||||
SLOT(OrganiseFinished(QStringList)));
|
SLOT(OrganiseFinished(QStringList)));
|
||||||
connect(organise, SIGNAL(FileCopied(int)), this, SIGNAL(FileCopied(int)));
|
connect(organise, SIGNAL(FileCopied(int)), this, SIGNAL(FileCopied(int)));
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "core/organise.h"
|
#include "core/organise.h"
|
||||||
#include "core/organiseformat.h"
|
|
||||||
#include "core/song.h"
|
#include "core/song.h"
|
||||||
#include "gtest/gtest_prod.h"
|
#include "gtest/gtest_prod.h"
|
||||||
#include "library/librarybackend.h"
|
#include "library/librarybackend.h"
|
||||||
|
@ -75,7 +74,6 @@ class OrganiseDialog : public QDialog {
|
||||||
private slots:
|
private slots:
|
||||||
void Reset();
|
void Reset();
|
||||||
|
|
||||||
void InsertTag(const QString& tag);
|
|
||||||
void UpdatePreviews();
|
void UpdatePreviews();
|
||||||
|
|
||||||
void DestDataChanged(const QModelIndex& begin, const QModelIndex& end);
|
void DestDataChanged(const QModelIndex& begin, const QModelIndex& end);
|
||||||
|
@ -95,8 +93,6 @@ class OrganiseDialog : public QDialog {
|
||||||
|
|
||||||
QMetaObject::Connection model_connection_;
|
QMetaObject::Connection model_connection_;
|
||||||
|
|
||||||
OrganiseFormat format_;
|
|
||||||
|
|
||||||
QFuture<SongList> songs_future_;
|
QFuture<SongList> songs_future_;
|
||||||
SongList songs_;
|
SongList songs_;
|
||||||
Organise::NewSongInfoList new_songs_info_;
|
Organise::NewSongInfoList new_songs_info_;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>588</width>
|
<width>588</width>
|
||||||
<height>525</height>
|
<height>596</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -64,77 +64,7 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="naming_group">
|
<widget class="FileNameFormatWidget" name="naming_group" native="true"/>
|
||||||
<property name="title">
|
|
||||||
<string>Naming options</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="LineTextEdit" name="naming">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><p>Tokens start with %, for example: %artist %album %title </p>
|
|
||||||
|
|
||||||
<p>If you surround sections of text that contain a token with curly-braces, that section will be hidden if the token is empty.</p></string>
|
|
||||||
</property>
|
|
||||||
<property name="lineWrapMode">
|
|
||||||
<enum>QTextEdit::NoWrap</enum>
|
|
||||||
</property>
|
|
||||||
<property name="acceptRichText">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QToolButton" name="insert">
|
|
||||||
<property name="text">
|
|
||||||
<string>Insert...</string>
|
|
||||||
</property>
|
|
||||||
<property name="popupMode">
|
|
||||||
<enum>QToolButton::InstantPopup</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="replace_the">
|
|
||||||
<property name="text">
|
|
||||||
<string>Ignore "The" in artist names</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="replace_spaces">
|
|
||||||
<property name="text">
|
|
||||||
<string>Replaces spaces with underscores</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="replace_ascii">
|
|
||||||
<property name="text">
|
|
||||||
<string>Restrict to ASCII characters</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="overwrite">
|
|
||||||
<property name="text">
|
|
||||||
<string>Overwrite existing files</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="mark_as_listened">
|
|
||||||
<property name="text">
|
|
||||||
<string>Mark as listened</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="preview_group">
|
<widget class="QGroupBox" name="preview_group">
|
||||||
|
@ -152,7 +82,16 @@
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="margin">
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
|
@ -165,7 +104,16 @@
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="margin">
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
|
@ -227,28 +175,23 @@
|
||||||
<header>widgets/freespacebar.h</header>
|
<header>widgets/freespacebar.h</header>
|
||||||
<container>1</container>
|
<container>1</container>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
<customwidget>
|
|
||||||
<class>LineTextEdit</class>
|
|
||||||
<extends>QTextEdit</extends>
|
|
||||||
<header>widgets/linetextedit.h</header>
|
|
||||||
</customwidget>
|
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>BusyIndicator</class>
|
<class>BusyIndicator</class>
|
||||||
<extends>QWidget</extends>
|
<extends>QWidget</extends>
|
||||||
<header>widgets/busyindicator.h</header>
|
<header>widgets/busyindicator.h</header>
|
||||||
<container>1</container>
|
<container>1</container>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
|
<customwidget>
|
||||||
|
<class>FileNameFormatWidget</class>
|
||||||
|
<extends>QWidget</extends>
|
||||||
|
<header>widgets/filenameformatwidget.h</header>
|
||||||
|
<container>1</container>
|
||||||
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>destination</tabstop>
|
<tabstop>destination</tabstop>
|
||||||
<tabstop>aftercopying</tabstop>
|
<tabstop>aftercopying</tabstop>
|
||||||
<tabstop>eject_after</tabstop>
|
<tabstop>eject_after</tabstop>
|
||||||
<tabstop>naming</tabstop>
|
|
||||||
<tabstop>insert</tabstop>
|
|
||||||
<tabstop>replace_the</tabstop>
|
|
||||||
<tabstop>replace_spaces</tabstop>
|
|
||||||
<tabstop>replace_ascii</tabstop>
|
|
||||||
<tabstop>overwrite</tabstop>
|
|
||||||
<tabstop>button_box</tabstop>
|
<tabstop>button_box</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
|
@ -0,0 +1,166 @@
|
||||||
|
/* This file is part of Clementine.
|
||||||
|
Copyright 2010, David Sansome <me@davidsansome.com>
|
||||||
|
Copyright 2021, Lukas Prediger <lumip@lumip.de>
|
||||||
|
|
||||||
|
Clementine is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
Clementine is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "filenameformatwidget.h"
|
||||||
|
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QMap>
|
||||||
|
#include <QMenu>
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QString>
|
||||||
|
#include <QStringList>
|
||||||
|
|
||||||
|
#include "core/organise.h"
|
||||||
|
#include "ui/organisedialog.h"
|
||||||
|
#include "ui_filenameformatwidget.h"
|
||||||
|
|
||||||
|
const char* FileNameFormatWidget::kDefaultFormat =
|
||||||
|
"%artist/%album{ (Disc %disc)}/{%track - }%title.%extension";
|
||||||
|
const char* FileNameFormatWidget::kSettingsGroup = "FileNameFormatWidget";
|
||||||
|
|
||||||
|
FileNameFormatWidget::FileNameFormatWidget(QWidget* parent)
|
||||||
|
: QWidget(parent), ui_(new Ui_FileNameFormatWidget) {
|
||||||
|
setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
||||||
|
ui_->setupUi(this);
|
||||||
|
|
||||||
|
// Syntax highlighting for naming scheme input field.
|
||||||
|
// attaches as child to ui_->naming, which transfers ownership
|
||||||
|
new OrganiseFormat::SyntaxHighlighter(ui_->naming);
|
||||||
|
|
||||||
|
// Valid tags
|
||||||
|
QMap<QString, QString> tags;
|
||||||
|
tags[tr("Title")] = "title";
|
||||||
|
tags[tr("Album")] = "album";
|
||||||
|
tags[tr("Artist")] = "artist";
|
||||||
|
tags[tr("Artist's initial")] = "artistinitial";
|
||||||
|
tags[tr("Album artist")] = "albumartist";
|
||||||
|
tags[tr("Composer")] = "composer";
|
||||||
|
tags[tr("Performer")] = "performer";
|
||||||
|
tags[tr("Grouping")] = "grouping";
|
||||||
|
tags[tr("Lyrics")] = "lyrics";
|
||||||
|
tags[tr("Track")] = "track";
|
||||||
|
tags[tr("Disc")] = "disc";
|
||||||
|
tags[tr("BPM")] = "bpm";
|
||||||
|
tags[tr("Year")] = "year";
|
||||||
|
tags[tr("Original year")] = "originalyear";
|
||||||
|
tags[tr("Genre")] = "genre";
|
||||||
|
tags[tr("Comment")] = "comment";
|
||||||
|
tags[tr("Length")] = "length";
|
||||||
|
tags[tr("Bitrate", "Refers to bitrate in file organise dialog.")] = "bitrate";
|
||||||
|
tags[tr("Samplerate")] = "samplerate";
|
||||||
|
tags[tr("File extension")] = "extension";
|
||||||
|
|
||||||
|
// Get the titles of the tags to put in the insert menu
|
||||||
|
QStringList tag_titles = tags.keys();
|
||||||
|
std::stable_sort(tag_titles.begin(), tag_titles.end());
|
||||||
|
|
||||||
|
// Build the insert menu
|
||||||
|
QMenu* tag_menu = new QMenu(this);
|
||||||
|
for (const QString& title : tag_titles) {
|
||||||
|
QAction* action = tag_menu->addAction(title);
|
||||||
|
QString tag = tags[title];
|
||||||
|
connect(action, &QAction::triggered, [this, tag]() { InsertTag(tag); });
|
||||||
|
}
|
||||||
|
|
||||||
|
ui_->insert->setMenu(tag_menu);
|
||||||
|
|
||||||
|
connect(ui_->naming, SIGNAL(textChanged()), SIGNAL(FormatStringChanged()));
|
||||||
|
connect(ui_->replace_ascii, SIGNAL(toggled(bool)), SIGNAL(OptionChanged()));
|
||||||
|
connect(ui_->replace_spaces, SIGNAL(toggled(bool)), SIGNAL(OptionChanged()));
|
||||||
|
connect(ui_->replace_the, SIGNAL(toggled(bool)), SIGNAL(OptionChanged()));
|
||||||
|
connect(ui_->overwrite, SIGNAL(toggled(bool)), SIGNAL(OptionChanged()));
|
||||||
|
connect(ui_->mark_as_listened, SIGNAL(toggled(bool)),
|
||||||
|
SIGNAL(OptionChanged()));
|
||||||
|
|
||||||
|
LoadSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileNameFormatWidget::Reset() {
|
||||||
|
ui_->naming->setPlainText(kDefaultFormat);
|
||||||
|
ui_->replace_ascii->setChecked(false);
|
||||||
|
ui_->replace_spaces->setChecked(false);
|
||||||
|
ui_->replace_the->setChecked(false);
|
||||||
|
ui_->overwrite->setChecked(false);
|
||||||
|
ui_->mark_as_listened->setChecked(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool FileNameFormatWidget::ignore_the() const {
|
||||||
|
return ui_->replace_the->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool FileNameFormatWidget::replace_spaces() const {
|
||||||
|
return ui_->replace_spaces->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool FileNameFormatWidget::restrict_to_ascii() const {
|
||||||
|
return ui_->replace_ascii->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool FileNameFormatWidget::overwrite_existing() const {
|
||||||
|
return ui_->overwrite->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool FileNameFormatWidget::mark_as_listened() const {
|
||||||
|
return ui_->mark_as_listened->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
OrganiseFormat FileNameFormatWidget::format() const {
|
||||||
|
OrganiseFormat format;
|
||||||
|
format.set_format(ui_->naming->toPlainText());
|
||||||
|
format.set_replace_non_ascii(ui_->replace_ascii->isChecked());
|
||||||
|
format.set_replace_spaces(ui_->replace_spaces->isChecked());
|
||||||
|
format.set_replace_the(ui_->replace_the->isChecked());
|
||||||
|
return format;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileNameFormatWidget::InsertTag(const QString& tag) {
|
||||||
|
ui_->naming->insertPlainText("%" + tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileNameFormatWidget::LoadSettings() {
|
||||||
|
QSettings s;
|
||||||
|
|
||||||
|
// transitional fallback: if the new kSettingsGroup for FileNameFormatWidget
|
||||||
|
// is not present, try loading from OrganiseDialog::kSettingsGroup, where
|
||||||
|
// these settings where previously held.
|
||||||
|
if (!s.childGroups().contains(kSettingsGroup) &&
|
||||||
|
s.childGroups().contains(OrganiseDialog::kSettingsGroup)) {
|
||||||
|
s.beginGroup(OrganiseDialog::kSettingsGroup);
|
||||||
|
} else {
|
||||||
|
s.beginGroup(kSettingsGroup);
|
||||||
|
}
|
||||||
|
|
||||||
|
ui_->naming->setPlainText(s.value("format", kDefaultFormat).toString());
|
||||||
|
ui_->replace_ascii->setChecked(s.value("replace_ascii", false).toBool());
|
||||||
|
ui_->replace_spaces->setChecked(s.value("replace_spaces", false).toBool());
|
||||||
|
ui_->replace_the->setChecked(s.value("replace_the", false).toBool());
|
||||||
|
ui_->overwrite->setChecked(s.value("overwrite", false).toBool());
|
||||||
|
ui_->mark_as_listened->setChecked(
|
||||||
|
s.value("mark_as_listened", false).toBool());
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileNameFormatWidget::StoreSettings() {
|
||||||
|
QSettings s;
|
||||||
|
s.beginGroup(kSettingsGroup);
|
||||||
|
s.setValue("format", ui_->naming->toPlainText());
|
||||||
|
s.setValue("replace_ascii", ui_->replace_ascii->isChecked());
|
||||||
|
s.setValue("replace_spaces", ui_->replace_spaces->isChecked());
|
||||||
|
s.setValue("replace_the", ui_->replace_the->isChecked());
|
||||||
|
s.setValue("overwrite", ui_->overwrite->isChecked());
|
||||||
|
s.setValue("mark_as_listened", ui_->overwrite->isChecked());
|
||||||
|
}
|
|
@ -0,0 +1,59 @@
|
||||||
|
/* This file is part of Clementine.
|
||||||
|
Copyright 2010, David Sansome <me@davidsansome.com>
|
||||||
|
Copyright 2021, Lukas Prediger <lumip@lumip.de>
|
||||||
|
|
||||||
|
Clementine is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
Clementine is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef FILENAMEFORMATWIDGET_H
|
||||||
|
#define FILENAMEFORMATWIDGET_H
|
||||||
|
|
||||||
|
#include <QWidget>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
#include "core/organiseformat.h"
|
||||||
|
#include "ui_filenameformatwidget.h"
|
||||||
|
|
||||||
|
class FileNameFormatWidget : public QWidget {
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
static const char* kDefaultFormat;
|
||||||
|
static const char* kSettingsGroup;
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void OptionChanged();
|
||||||
|
void FormatStringChanged();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void InsertTag(const QString& tag);
|
||||||
|
|
||||||
|
public:
|
||||||
|
FileNameFormatWidget(QWidget* parent);
|
||||||
|
void Reset();
|
||||||
|
void StoreSettings();
|
||||||
|
|
||||||
|
bool ignore_the() const;
|
||||||
|
bool replace_spaces() const;
|
||||||
|
bool restrict_to_ascii() const;
|
||||||
|
bool overwrite_existing() const;
|
||||||
|
bool mark_as_listened() const;
|
||||||
|
OrganiseFormat format() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
void LoadSettings();
|
||||||
|
|
||||||
|
std::unique_ptr<Ui_FileNameFormatWidget> ui_;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // FILENAMEFORMATWIDGET_H
|
|
@ -0,0 +1,107 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>FileNameFormatWidget</class>
|
||||||
|
<widget class="QWidget" name="FileNameFormatWidget">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>361</width>
|
||||||
|
<height>283</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="naming_group">
|
||||||
|
<property name="title">
|
||||||
|
<string>Naming options</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="innerVerticalLayout">
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="innerHorizontalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="LineTextEdit" name="naming">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string><p>Tokens start with %, for example: %artist %album %title </p>
|
||||||
|
|
||||||
|
<p>If you surround sections of text that contain a token with curly-braces, that section will be hidden if the token is empty.</p></string>
|
||||||
|
</property>
|
||||||
|
<property name="lineWrapMode">
|
||||||
|
<enum>QTextEdit::NoWrap</enum>
|
||||||
|
</property>
|
||||||
|
<property name="acceptRichText">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="insert">
|
||||||
|
<property name="text">
|
||||||
|
<string>Insert...</string>
|
||||||
|
</property>
|
||||||
|
<property name="popupMode">
|
||||||
|
<enum>QToolButton::InstantPopup</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="replace_the">
|
||||||
|
<property name="text">
|
||||||
|
<string>Ignore "The" in artist names</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="replace_spaces">
|
||||||
|
<property name="text">
|
||||||
|
<string>Replaces spaces with underscores</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="replace_ascii">
|
||||||
|
<property name="text">
|
||||||
|
<string>Restrict to ASCII characters</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="overwrite">
|
||||||
|
<property name="text">
|
||||||
|
<string>Overwrite existing files</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="mark_as_listened">
|
||||||
|
<property name="text">
|
||||||
|
<string>Mark as listened</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<customwidgets>
|
||||||
|
<customwidget>
|
||||||
|
<class>LineTextEdit</class>
|
||||||
|
<extends>QTextEdit</extends>
|
||||||
|
<header>widgets/linetextedit.h</header>
|
||||||
|
</customwidget>
|
||||||
|
</customwidgets>
|
||||||
|
<tabstops>
|
||||||
|
<tabstop>naming</tabstop>
|
||||||
|
<tabstop>insert</tabstop>
|
||||||
|
<tabstop>replace_the</tabstop>
|
||||||
|
<tabstop>replace_spaces</tabstop>
|
||||||
|
<tabstop>replace_ascii</tabstop>
|
||||||
|
<tabstop>overwrite</tabstop>
|
||||||
|
<tabstop>mark_as_listened</tabstop>
|
||||||
|
</tabstops>
|
||||||
|
<resources/>
|
||||||
|
<connections/>
|
||||||
|
</ui>
|
Loading…
Reference in New Issue