Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move trackset-features into library subfolder #2715

Merged
merged 21 commits into from
Jun 11, 2020
Merged

Move trackset-features into library subfolder #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
085af01
Use QStringLiteral and value binding for library queries
xeruf Apr 26, 2020
29b3b20
Move childModel to BaseTrackSetFeature
xeruf Apr 25, 2020
e566fae
Move all trackset-features into library subdirectory
xeruf Apr 25, 2020
d31825b
Clean up CapabilitiesFlags and apply clang format
xeruf Apr 26, 2020
e5861ed
Clean up HiddenTableModel::setTableModel
xeruf May 19, 2020
5477354
Fix formatting in CreateFeature classes
xeruf May 19, 2020
f6e1eea
Inline anonymous method in CrateFeature
xeruf May 20, 2020
bd4a67d
Reformat long lines & clean up tablemodels
xeruf May 21, 2020
132a958
Merge branch 'master' into refactor-basetrackset
xeruf May 21, 2020
102ec4f
Move TrackSetTableModel into trackset folder
xeruf May 21, 2020
d2762e8
Use QStringLiteral for BansheePlaylistModel queries
xeruf May 21, 2020
d982438
Replace empty destructors with default
xeruf May 21, 2020
bc862ed
Replace weirdly formatted QStringLiteral by joined QStringList
xeruf May 21, 2020
5815cb9
Reformat PlaylistDAO
xeruf May 22, 2020
76f5fae
Embrace QStringLiteral in TrackSet features
xeruf May 22, 2020
d40ade3
Replace tr "[noun]" with "//:"
xeruf May 22, 2020
9eb5ec6
Fix comment spaces in src/library
xeruf May 22, 2020
4f032f7
clang-format
daschuer May 23, 2020
f8d44a4
Adjust reformattings
xeruf May 30, 2020
eb756ee
Merge branch 'master' into refactor-basetrackset
xeruf Jun 5, 2020
8757571
Merge branch 'master' into refactor-basetrackset
xeruf Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,10 +508,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/baseexternallibraryfeature.cpp
src/library/baseexternalplaylistmodel.cpp
src/library/baseexternaltrackmodel.cpp
src/library/baseplaylistfeature.cpp
src/library/basesqltablemodel.cpp
src/library/basetrackcache.cpp
src/library/basetracksetfeature.cpp
src/library/basetracktablemodel.cpp
src/library/bpmdelegate.cpp
src/library/browse/browsefeature.cpp
Expand All @@ -524,10 +522,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/coverartcache.cpp
src/library/coverartdelegate.cpp
src/library/coverartutils.cpp
src/library/crate/cratefeature.cpp
src/library/crate/cratefeaturehelper.cpp
src/library/crate/cratestorage.cpp
src/library/crate/cratetablemodel.cpp
src/library/dao/analysisdao.cpp
src/library/dao/autodjcratesdao.cpp
src/library/dao/cuedao.cpp
Expand Down Expand Up @@ -567,7 +561,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/parsercsv.cpp
src/library/parserm3u.cpp
src/library/parserpls.cpp
src/library/playlistfeature.cpp
src/library/playlisttablemodel.cpp
src/library/previewbuttondelegate.cpp
src/library/proxytrackmodel.cpp
Expand All @@ -587,7 +580,16 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/searchqueryparser.cpp
src/library/serato/seratofeature.cpp
src/library/serato/seratoplaylistmodel.cpp
src/library/setlogfeature.cpp
src/library/trackset/baseplaylistfeature.cpp
src/library/trackset/basetracksetfeature.cpp
src/library/trackset/crate/cratefeature.cpp
src/library/trackset/crate/cratefeaturehelper.cpp
src/library/trackset/crate/cratestorage.cpp
src/library/trackset/crate/cratetablemodel.cpp
src/library/trackset/playlistfeature.cpp
src/library/trackset/setlogfeature.cpp
src/library/trackset/tracksettablemodel.cpp
src/library/traktor/traktorfeature.cpp
src/library/sidebarmodel.cpp
src/library/songdownloader.cpp
src/library/stardelegate.cpp
Expand All @@ -597,8 +599,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/trackcollection.cpp
src/library/trackcollectionmanager.cpp
src/library/trackloader.cpp
src/library/tracksettablemodel.cpp
src/library/traktor/traktorfeature.cpp
src/library/treeitem.cpp
src/library/treeitemmodel.cpp
src/mixer/auxiliary.cpp
Expand Down
18 changes: 9 additions & 9 deletions build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,23 +1047,23 @@ def sources(self, build):
"src/library/coverartcache.cpp",
"src/library/coverartutils.cpp",

"src/library/crate/cratestorage.cpp",
"src/library/crate/cratefeature.cpp",
"src/library/crate/cratefeaturehelper.cpp",
"src/library/crate/cratetablemodel.cpp",
"src/library/trackset/basetracksetfeature.cpp",
"src/library/trackset/baseplaylistfeature.cpp",
"src/library/trackset/playlistfeature.cpp",
"src/library/trackset/setlogfeature.cpp",
"src/library/trackset/tracksettablemodel.cpp",
"src/library/trackset/crate/cratestorage.cpp",
"src/library/trackset/crate/cratefeature.cpp",
"src/library/trackset/crate/cratefeaturehelper.cpp",
"src/library/trackset/crate/cratetablemodel.cpp",

"src/library/playlisttablemodel.cpp",
"src/library/tracksettablemodel.cpp",
"src/library/libraryfeature.cpp",
"src/library/analysisfeature.cpp",
"src/library/autodj/autodjfeature.cpp",
"src/library/autodj/autodjprocessor.cpp",
"src/library/dao/directorydao.cpp",
"src/library/mixxxlibraryfeature.cpp",
"src/library/basetracksetfeature.cpp",
"src/library/baseplaylistfeature.cpp",
"src/library/playlistfeature.cpp",
"src/library/setlogfeature.cpp",
"src/library/autodj/dlgautodj.cpp",
"src/library/dlganalysis.cpp",
"src/library/dlgcoverartfullsize.cpp",
Expand Down
10 changes: 5 additions & 5 deletions src/library/autodj/autodjfeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
// FORK FORK FORK on 11/1/2009 by Albert Santoni (alberts@mixxx.org)
// Created 8/23/2009 by RJ Ryan (rryan@mit.edu)

#include <QtDebug>
#include <QMetaObject>
#include <QMenu>

#include "library/autodj/autodjfeature.h"

#include <QMenu>
#include <QMetaObject>
#include <QtDebug>

#include "controllers/keyboard/keyboardeventfilter.h"
#include "library/autodj/autodjprocessor.h"
#include "library/autodj/dlgautodj.h"
#include "library/crate/cratestorage.h"
#include "library/library.h"
#include "library/parser.h"
#include "library/trackcollection.h"
#include "library/trackcollectionmanager.h"
#include "library/trackset/crate/cratestorage.h"
#include "library/treeitem.h"
#include "mixer/playermanager.h"
#include "sources/soundsourceproxy.h"
Expand Down
16 changes: 8 additions & 8 deletions src/library/autodj/autodjfeature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
#ifndef AUTODJFEATURE_H
#define AUTODJFEATURE_H

#include <QObject>
#include <QStringListModel>
#include <QVariant>
#include <QAction>
#include <QIcon>
#include <QUrl>
#include <QList>
#include <QModelIndex>
#include <QObject>
#include <QPoint>
#include <QAction>
#include <QPointer>
#include <QStringListModel>
#include <QUrl>
#include <QVariant>

#include "library/dao/autodjcratesdao.h"
#include "library/libraryfeature.h"
#include "preferences/usersettings.h"
#include "library/trackset/crate/crate.h"
#include "library/treeitemmodel.h"
#include "library/crate/crate.h"
#include "library/dao/autodjcratesdao.h"
#include "preferences/usersettings.h"

class DlgAutoDJ;
class Library;
Expand Down
182 changes: 83 additions & 99 deletions src/library/banshee/bansheeplaylistmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#include "library/banshee/bansheeplaylistmodel.h"

#include <QtDebug>

#include "library/banshee/bansheeplaylistmodel.h"
#include "library/banshee/bansheedbconnection.h"
#include "library/queryutil.h"
#include "library/starrating.h"
#include "library/previewbuttondelegate.h"
#include "library/trackcollectionmanager.h"
#include "mixer/playermanager.h"
#include "track/beatfactory.h"
#include "track/beats.h"
#include "mixer/playermanager.h"

#define BANSHEE_TABLE "banshee"
#define CLM_TRACK_ID "track_id"
Expand Down Expand Up @@ -75,73 +75,56 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
m_playlistId = playlistId;

QSqlQuery query(m_database);
QString strQuery("CREATE TEMP TABLE IF NOT EXISTS %1"
" (" CLM_TRACK_ID " INTEGER, "
CLM_VIEW_ORDER " INTEGER, "
CLM_ARTIST " TEXT, "
CLM_TITLE " TEXT, "
CLM_DURATION " INTEGER, "
CLM_URI " TEXT, "
CLM_ALBUM " TEXT, "
CLM_ALBUM_ARTIST " TEXT, "
CLM_YEAR " INTEGER, "
CLM_RATING " INTEGER, "
CLM_GENRE " TEXT, "
CLM_GROUPING " TEXT, "
CLM_TRACKNUMBER " INTEGER, "
CLM_DATEADDED " INTEGER, "
CLM_BPM " INTEGER, "
CLM_BITRATE " INTEGER, "
CLM_COMMENT " TEXT, "
CLM_PLAYCOUNT" INTEGER, "
CLM_COMPOSER " TEXT, "
CLM_PREVIEW " TEXT)");
if (!query.exec(strQuery.arg(m_tempTableName))) {
if (!query.exec(QStringLiteral(
"CREATE TEMP TABLE IF NOT EXISTS %1 (" //
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove these empty end-of-line comments that don't belong to the code and don't add any value.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know how else to get to a satisfactory result in this code, this is what the auto-formatter does otherwise:
image
This is the only alternative I found, but it is semantically very wrong because the type of one column is in the same line with the name of the next:
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got to a satisfactory solution for the part below (bc862ed), but this doesn't work here because there's a different type for each column.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you using pre-commit? If you do you shouldn't get a single long line thanks to the line-length hook.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am using pre-commit now. Still ending up with that long line ^^

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daschuer

CLM_TRACK_ID " INTEGER, " //
CLM_VIEW_ORDER " INTEGER, " //
CLM_ARTIST " TEXT, " //
CLM_TITLE " TEXT, " //
CLM_DURATION " INTEGER, " //
CLM_URI " TEXT, " //
CLM_ALBUM " TEXT, " //
CLM_ALBUM_ARTIST " TEXT, " //
CLM_YEAR " INTEGER, " //
CLM_RATING " INTEGER, " //
CLM_GENRE " TEXT, " //
CLM_GROUPING " TEXT, " //
CLM_TRACKNUMBER " INTEGER, " //
CLM_DATEADDED " INTEGER, " //
CLM_BPM " INTEGER, " //
CLM_BITRATE " INTEGER, " //
CLM_COMMENT " TEXT, " //
CLM_PLAYCOUNT " INTEGER, " //
CLM_COMPOSER " TEXT, " //
CLM_PREVIEW " TEXT)")
.arg(m_tempTableName))) {
LOG_FAILED_QUERY(query);
}

QString strQuery2("INSERT INTO %1"
" (" CLM_TRACK_ID ", "
CLM_VIEW_ORDER ", "
CLM_ARTIST ", "
CLM_TITLE ", "
CLM_DURATION ", "
CLM_URI ", "
CLM_ALBUM ", "
CLM_ALBUM_ARTIST ", "
CLM_YEAR ", "
CLM_RATING ", "
CLM_GENRE ", "
CLM_GROUPING ", "
CLM_TRACKNUMBER ", "
CLM_DATEADDED ", "
CLM_BPM ", "
CLM_BITRATE ", "
CLM_COMMENT ", "
CLM_PLAYCOUNT ", "
CLM_COMPOSER ") "
"VALUES (:"
CLM_TRACK_ID ", :"
CLM_VIEW_ORDER ", :"
CLM_ARTIST ", :"
CLM_TITLE ", :"
CLM_DURATION ", :"
CLM_URI ", :"
CLM_ALBUM ", :"
CLM_ALBUM_ARTIST ", :"
CLM_YEAR ", :"
CLM_RATING ", :"
CLM_GENRE ", :"
CLM_GROUPING ", :"
CLM_TRACKNUMBER ", :"
CLM_DATEADDED ", :"
CLM_BPM ", :"
CLM_BITRATE ", :"
CLM_COMMENT ", :"
CLM_PLAYCOUNT ", :"
CLM_COMPOSER ") ");

query.prepare(strQuery2.arg(m_tempTableName));
QStringList insertColumns;
insertColumns
<< CLM_TRACK_ID
<< CLM_VIEW_ORDER
<< CLM_ARTIST
<< CLM_TITLE
<< CLM_DURATION
<< CLM_URI
<< CLM_ALBUM
<< CLM_ALBUM_ARTIST
<< CLM_YEAR
<< CLM_RATING
<< CLM_GENRE
<< CLM_GROUPING
<< CLM_TRACKNUMBER
<< CLM_DATEADDED
<< CLM_BPM
<< CLM_BITRATE
<< CLM_COMMENT
<< CLM_PLAYCOUNT
<< CLM_COMPOSER;
query.prepare(
QStringLiteral("INSERT INTO %1 (%2) VALUES (:%3)")
.arg(m_tempTableName, insertColumns.join(", "), insertColumns.join(", :")));

QList<struct BansheeDbConnection::PlaylistEntry> list =
m_pConnection->getPlaylistEntries(playlistId);
Expand Down Expand Up @@ -186,34 +169,37 @@ void BansheePlaylistModel::setTableModel(int playlistId) {

QStringList tableColumns;
tableColumns
<< CLM_TRACK_ID // 0
<< CLM_VIEW_ORDER
<< CLM_PREVIEW; // 3
<< CLM_TRACK_ID // 0
<< CLM_VIEW_ORDER
<< CLM_PREVIEW; // 3

QStringList trackSourceColumns;
trackSourceColumns
<< CLM_TRACK_ID // 0
<< CLM_ARTIST
<< CLM_TITLE
<< CLM_DURATION
<< CLM_URI
<< CLM_ALBUM
<< CLM_ALBUM_ARTIST
<< CLM_YEAR
<< CLM_RATING
<< CLM_GENRE
<< CLM_GROUPING
<< CLM_TRACKNUMBER
<< CLM_DATEADDED
<< CLM_BPM
<< CLM_BITRATE
<< CLM_COMMENT
<< CLM_PLAYCOUNT
<< CLM_COMPOSER;
<< CLM_TRACK_ID // 0
<< CLM_ARTIST
<< CLM_TITLE
<< CLM_DURATION
<< CLM_URI
<< CLM_ALBUM
<< CLM_ALBUM_ARTIST
<< CLM_YEAR
<< CLM_RATING
<< CLM_GENRE
<< CLM_GROUPING
<< CLM_TRACKNUMBER
<< CLM_DATEADDED
<< CLM_BPM
<< CLM_BITRATE
<< CLM_COMMENT
<< CLM_PLAYCOUNT
<< CLM_COMPOSER;

QSharedPointer<BaseTrackCache> trackSource(
new BaseTrackCache(m_pTrackCollectionManager->internalCollection(), m_tempTableName, CLM_TRACK_ID,
trackSourceColumns, false));
new BaseTrackCache(m_pTrackCollectionManager->internalCollection(),
m_tempTableName,
CLM_TRACK_ID,
trackSourceColumns,
false));

setTable(m_tempTableName, CLM_TRACK_ID, tableColumns, trackSource);
setSearch("");
Expand All @@ -222,15 +208,14 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
}

TrackModel::CapabilitiesFlags BansheePlaylistModel::getCapabilities() const {
return TRACKMODELCAPS_NONE
| TRACKMODELCAPS_ADDTOPLAYLIST
| TRACKMODELCAPS_ADDTOCRATE
| TRACKMODELCAPS_ADDTOAUTODJ
| TRACKMODELCAPS_LOADTODECK
| TRACKMODELCAPS_LOADTOSAMPLER;
return TRACKMODELCAPS_ADDTOPLAYLIST |
TRACKMODELCAPS_ADDTOCRATE |
TRACKMODELCAPS_ADDTOAUTODJ |
TRACKMODELCAPS_LOADTODECK |
TRACKMODELCAPS_LOADTOSAMPLER;
}

Qt::ItemFlags BansheePlaylistModel::flags(const QModelIndex &index) const {
Qt::ItemFlags BansheePlaylistModel::flags(const QModelIndex& index) const {
return readOnlyFlags(index);
}

Expand Down Expand Up @@ -297,7 +282,6 @@ TrackPointer BansheePlaylistModel::getTrack(const QModelIndex& index) const {
mixxx::BeatsPointer pBeats = BeatFactory::makeBeatGrid(*pTrack, bpm, 0.0);
pTrack->setBeats(pBeats);
}

}
return pTrack;
}
Expand Down Expand Up @@ -348,5 +332,5 @@ QString BansheePlaylistModel::getTrackLocation(const QModelIndex& index) const {
bool BansheePlaylistModel::isColumnInternal(int column) {
return (column == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_TRACKID) ||
(PlayerManager::numPreviewDecks() == 0 &&
column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_PREVIEW)));
column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_PREVIEW)));
}
2 changes: 1 addition & 1 deletion src/library/baseexternallibraryfeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ void BaseExternalLibraryFeature::slotImportAsMixxxPlaylist() {
playlistDao.appendTracksToPlaylist(trackIds, playlistId);
} else {
// Do not change strings here without also changing strings in
// src/library/baseplaylistfeature.cpp
// src/library/trackset/baseplaylistfeature.cpp
QMessageBox::warning(NULL,
tr("Playlist Creation Failed"),
tr("An unknown error occurred while creating playlist: ")
Expand Down
Loading