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

Add tests (#193)

Browse Source
This commit is contained in:
Jonas Kvinge
2019-06-28 01:33:22 +02:00
committed by GitHub
parent b9f4407815
commit 60bd90848b
42 changed files with 3156 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/collection/collectionmodel.cpp
View File

@@ -106,7 +106,8 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
cover_loader_options_.pad_output_image_ = true;
cover_loader_options_.scale_output_image_ = true;
connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64, QImage)), SLOT(AlbumArtLoaded(quint64, QImage)));
if (app_)
connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64, QImage)), SLOT(AlbumArtLoaded(quint64, QImage)));
//icon_cache_->setCacheDirectory(Utilities::GetConfigPath(Utilities::Path_CacheRoot) + "/pixmapcache");
//icon_cache_->setMaximumCacheSize(CollectionModel::kIconCacheSize);
@@ -172,7 +173,8 @@ void CollectionModel::Init(bool async) {
endResetModel();
// Show a loading indicator in the status bar too.
init_task_id_ = app_->task_manager()->StartTask(tr("Loading songs"));
if (app_)
init_task_id_ = app_->task_manager()->StartTask(tr("Loading songs"));
ResetAsync();
}
@@ -794,7 +796,8 @@ void CollectionModel::ResetAsyncQueryFinished(QFuture<CollectionModel::QueryResu
PostQuery(root_, result, false);
if (init_task_id_ != -1) {
app_->task_manager()->SetTaskFinished(init_task_id_);
if (app_)
app_->task_manager()->SetTaskFinished(init_task_id_);
init_task_id_ = -1;
}

3
src/organise/organisedialog.cpp
View File

@@ -69,7 +69,8 @@
using std::shared_ptr;
using std::stable_sort;
const char *OrganiseDialog::kDefaultFormat = "%albumartist/%album{ (Disc %disc)}/{%track - }%albumartist - %album - %title.%extension";
const char *OrganiseDialog::kDefaultFormat = "%albumartist/%album{ (Disc %disc)}/{%track - }{%albumartist - }%album{ (Disc %disc)} - %title.%extension";
const char *OrganiseDialog::kSettingsGroup = "OrganiseDialog";
OrganiseDialog::OrganiseDialog(TaskManager *task_manager, CollectionBackend *backend, QWidget *parent)

7
src/organise/organisedialog.h
View File

@@ -59,6 +59,8 @@ class OrganiseDialog : public QDialog {
OrganiseDialog(TaskManager *task_manager, CollectionBackend *backend = nullptr, QWidget *parent = nullptr);
~OrganiseDialog();
static const char *kDefaultFormat;
QSize sizeHint() const;
void SetDestinationModel(QAbstractItemModel *model, bool devices = false);
@@ -71,6 +73,8 @@ class OrganiseDialog : public QDialog {
void SetCopy(bool copy);
static Organise::NewSongInfoList ComputeNewSongsFilenames(const SongList &songs, const OrganiseFormat &format);
signals:
void FileCopied(int);
@@ -97,10 +101,7 @@ class OrganiseDialog : public QDialog {
SongList LoadSongsBlocking(const QStringList &filenames);
void SetLoadingSongs(bool loading);
static Organise::NewSongInfoList ComputeNewSongsFilenames(const SongList &songs, const OrganiseFormat &format);
private:
static const char *kDefaultFormat;
static const char *kSettingsGroup;
Ui_OrganiseDialog *ui_;