Skip to content

Fix playlists and grouping options not being shown properly #17

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

Merged
daschuer merged 2 commits into from
Feb 11, 2017
Merged

Fix playlists and grouping options not being shown properly #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86eb10c
Fix Artists not appearing in grouping view
jmigual Feb 11, 2017
325d5bb
Fix playlists names and time not being shown properly
jmigual Feb 11, 2017
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
3 changes: 2 additions & 1 deletion src/library/features/libraryfolder/libraryfoldermodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,12 @@ void LibraryFolderModel::createTracksTree() {
"FROM track_locations INNER JOIN library ON %3=%4 "
"WHERE %2=0 AND %1 LIKE :dir "
"GROUP BY %1 "
"ORDER BY %1 COLLATE localeAwareCompare";
"ORDER BY ";
queryStr = queryStr.arg(TRACKLOCATIONSTABLE_DIRECTORY,
"library." + LIBRARYTABLE_MIXXXDELETED,
"library." + LIBRARYTABLE_ID,
"track_locations." + TRACKLOCATIONSTABLE_ID);
queryStr += DbConnection::collateLexicographically(TRACKLOCATIONSTABLE_DIRECTORY);

QSqlQuery query(m_pTrackCollection->database());
query.prepare(queryStr);
Expand Down
3 changes: 2 additions & 1 deletion src/library/features/mixxxlibrary/mixxxlibrarytreemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "widget/wpixmapstore.h"

#include "library/features/mixxxlibrary/mixxxlibrarytreemodel.h"
#include "util/db/dbconnection.h"

namespace {
// This is used since MixxxLibraryTreeModel inherits QAbstractItemModel
Expand Down Expand Up @@ -211,7 +212,7 @@ void MixxxLibraryTreeModel::createTracksTree() {
QStringList sortColumns;
#ifdef __SQLITE3__
for (const QString& col : m_sortOrder) {
sortColumns << col + " COLLATE localeAwareCompare";
sortColumns << DbConnection::collateLexicographically(col);
}
#else
sortColumns = m_sortOrder;
Expand Down
9 changes: 1 addition & 8 deletions src/library/features/playlist/playlistfeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,7 @@ void PlaylistFeature::buildPlaylistList() {
LOG_FAILED_QUERY(query);
}

// Setup the sidebar playlist model
QSqlTableModel playlistTableModel(this, m_pTrackCollection->database());
playlistTableModel.setTable("PlaylistsCountsDurations");
playlistTableModel.select();
while (playlistTableModel.canFetchMore()) {
playlistTableModel.fetchMore();
}
QSqlRecord record = playlistTableModel.record();
QSqlRecord record = query.record();
int nameColumn = record.indexOf("name");
int idColumn = record.indexOf("id");
int countColumn = record.indexOf("count");
Expand Down