mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-29 19:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

A couple small bug fixes to recent refactors so the metadata server runs

Browse Source 
queries properly again.
This commit is contained in:
casey langen 2018-01-03 22:43:06 -08:00
parent 6c354f513b
commit 14ba4ea1bb
6 changed files with 293 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
enc_temp_folder/204de5dad4917c052518b368f0d92c/CategoryQueryUtil.h Normal file
View File

@ -0,0 +1,224 @@
//////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2007-2017 musikcube team
//
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// * Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// * Neither the name of the author nor the names of other contributors may
// be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
//////////////////////////////////////////////////////////////////////////////
#pragma once
#include <core/library/LocalLibraryConstants.h>
#include <core/db/Statement.h>
#include <core/db/Connection.h>
#include <memory>
namespace musik { namespace core { namespace db { namespace local {
namespace category {
namespace constants = musik::core::library::constants;
/* there are two types of track resources in our app: Regular, and Extended. "Regular"
properties are well-defined and optimized, and include album, artist, album artist,
and genre. they are fast to retrieve and easy to query. however, we also allow for
plugins to index arbitrary track metadata in a completely denormalized key/value
store. these resource types are called "Extended" properties. */
enum class PropertyType: int { Regular, Extended };
/* property name to foreign key id */
static std::map<std::string, std::string> PREDICATE_TO_COLUMN_MAP = {
{ constants::Track::ALBUM, "album_id" },
{ constants::Track::ARTIST, "visual_artist_id" },
{ constants::Track::ALBUM_ARTIST, "album_artist_id" },
{ constants::Track::GENRE, "visual_genre_id" }
};
/* resource type to a pair { <table_name>, <track_table_fk_name> } */
static std::map<std::string, std::pair<std::string, std::string>> REGULAR_PROPERTY_MAP = {
{ "album",{ "albums", "album_id" } },
{ "artist",{ "artists", "visual_artist_id" } },
{ "album_artist",{ "artists", "album_artist_id" } },
{ "genre",{ "genres", "visual_genre_id" } }
};
static const std::string REGULAR_PREDICATE = " tracks.{{fk_id}}=? ";
static const std::string REGULAR_FILTER = " AND LOWER({{table}}.name) LIKE ? ";
static const std::string EXTENDED_PREDICATE = " (key=? AND meta_value_id=?) ";
static const std::string EXTENDED_FILTER = " AND LOWER(extended_metadata.value) LIKE ?";
static const std::string EXTENDED_INNER_JOIN =
"INNER JOIN ( "
" SELECT id AS track_id "
" FROM extended_metadata "
" WHERE {{extended_predicates}} "
" GROUP BY track_id "
" HAVING COUNT(track_id)={{extended_predicate_count}} "
") AS md ON tracks.id=md.track_id ";
/* REGULAR_PROPERTY_QUERY is used to return a list of property values and their
respective IDs for regular properties, that is, albums, artists, album artists,
and genres. these resource types are the most common, and are optimized for display.
the query may also be predicated to select all resources that are related to other
resources, including extended resources. the full requerly propety looks something
like the following example where we query all albums made in "1995" by "J. Cantrell": */
// SELECT DISTINCT albums.id, albums.name
// FROM albums, tracks
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "year" AND value = "1995") OR
// (key = "composer" AND value = "J. Cantrell")
// GROUP BY track_id
// HAVING COUNT(track_id) = 2
// ) AS md ON tracks.id = md.track_id
// WHERE
// albums.id = tracks.album_id AND
// tracks.visible = 1;
static const std::string REGULAR_PROPERTY_QUERY =
"SELECT DISTINCT {{table}}.id, {{table}}.name "
"FROM {{table}}, tracks "
"{{extended_predicates}} "
"WHERE {{table}}.id=tracks.{{fk_id}} AND tracks.visible=1 "
"{{regular_predicates}} "
"{{regular_filter}} "
"ORDER BY {{table}}.sort_order";
/* REGULAR_PROPERTY_QUERY is similar to REGULAR_PROPERTY_QUERY, but is used to
retrieve non-standard metadata fields. it's slower, has (potentially) more joins,
and is generally more difficult to use. here's an example where we select all
"years" for a particular artist "595" where the composer is "J. Cantrell": */
// SELECT DISTINCT meta_value_id, value
// FROM extended_metadata
// INNER JOIN(
// SELECT id AS track_id
// FROM tracks
// WHERE visual_artist_id = 595
// ) AS reg ON extended_metadata.id = reg.track_id
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "composer" AND value = "J. Cantrell") OR
// ...
// GROUP BY track_id
// HAVING COUNT(track_id) = 1
// ) AS md ON extended_metadata.id = md.track_id
// WHERE
// extended_metadata.key = "year";
static const std::string EXTENDED_PROPERTY_QUERY =
"SELECT DISTINCT meta_value_id, value "
"FROM extended_metadata "
"INNER JOIN ( "
" SELECT id AS track_id "
" FROM tracks "
" WHERE tracks.visible=1 {{regular_predicates}} "
") AS reg on extended_metadata.id=reg.track_id "
"{{extended_predicates}} "
"WHERE extended_metadata.key=? "
"{{extended_filter}} "
"ORDER BY extended_metadata.value ASC";
/* used to select all tracks that match a specified set of predicates. both
regular and extended predicates are supported. in essense: */
// SELECT DISTINCT tracks.*
// FROM tracks
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "year" AND value = "1995") OR
// (key = "composer" AND value = "J. Cantrell")
// GROUP BY track_id
// HAVING COUNT(track_id) = 2
// ) AS md ON tracks.id = md.track_id;
static const std::string CATEGORY_TRACKLIST_FILTER =
" AND (tracks.title LIKE ? OR al.name LIKE ? OR ar.name LIKE ? OR gn.name LIKE ?) ";
static const std::string CATEGORY_TRACKLIST_QUERY =
"SELECT DISTINCT tracks.id, al.name "
"FROM tracks, albums al, artists ar, genres gn "
"{{extended_predicates}} "
"WHERE "
" tracks.visible=1 AND "
" tracks.album_id=al.id AND "
" tracks.visual_genre_id=gn.id AND "
" tracks.visual_artist_id=ar.id "
" {{regular_predicates}} "
" {{tracklist_filter}} "
"ORDER BY al.name, disc, track, ar.name "
"{{limit_and_offset}} ";
using Predicate = std::pair<std::string, int64_t>;
using PredicateList = std::vector<Predicate>;
struct Argument { virtual void Bind(Statement& stmt, int pos) const = 0; };
using ArgumentList = std::vector<std::shared_ptr<Argument>>;
extern PropertyType GetPropertyType(const std::string& key);
extern std::shared_ptr<Argument> IdArgument(int64_t);
extern std::shared_ptr<Argument> StringArgument(const std::string);
extern size_t Hash(const PredicateList& input);
extern void ReplaceAll(
std::string& input,
const std::string& find,
const std::string& replace);
extern void SplitPredicates(
const PredicateList& input,
PredicateList& regular,
PredicateList& extended);
extern std::string JoinRegular(
const PredicateList& pred,
ArgumentList& args,
const std::string& prefix = "");
extern std::string InnerJoinExtended(
const PredicateList& pred, ArgumentList& args);
extern std::string JoinExtended(
const PredicateList& pred, ArgumentList& args);
extern void Apply(
musik::core::db::Statement& stmt,
const ArgumentList& args);
}
} } } }

9
src/core/library/LocalSimpleDataProvider.cpp
View File

@ -341,8 +341,13 @@ ITrackList* LocalSimpleDataProvider::QueryTracksByCategory(
search.reset(new GetPlaylistQuery(this->library, selectedId));
}
else {
search.reset(new CategoryTrackListQuery(
this->library, categoryType, selectedId, filter));
if (categoryType && strlen(categoryType) && selectedId > 0) {
search.reset(new CategoryTrackListQuery(
this->library, categoryType, selectedId, filter));
}
else {
search.reset(new CategoryTrackListQuery(this->library, filter));
}
}
if (limit >= 0) {

7
src/core/library/query/local/CategoryTrackListQuery.cpp
View File

@ -54,6 +54,13 @@ using namespace musik::core::db::local;
using namespace musik::core::library::constants;
using namespace boost::algorithm;
CategoryTrackListQuery::CategoryTrackListQuery(
musik::core::ILibraryPtr library,
const std::string& filter)
: CategoryTrackListQuery(library, category::PredicateList(), filter)
{
}
CategoryTrackListQuery::CategoryTrackListQuery(
musik::core::ILibraryPtr library,
const std::string& column,

4
src/core/library/query/local/CategoryTrackListQuery.h
View File

@ -46,6 +46,10 @@ namespace musik { namespace core { namespace db { namespace local {
class CategoryTrackListQuery : public TrackListQueryBase {
public:
CategoryTrackListQuery(
musik::core::ILibraryPtr library,
const std::string& filter = "");
CategoryTrackListQuery(
musik::core::ILibraryPtr library,
const std::string& column,

12
src/core/library/query/local/util/CategoryQueryUtil.cpp
View File

@ -104,11 +104,13 @@ namespace musik { namespace core { namespace db { namespace local { namespace ca
auto end = REGULAR_PROPERTY_MAP.end();
for (auto p : input) {
if (REGULAR_PROPERTY_MAP.find(p.first) != end) {
regular.push_back(p);
}
else {
extended.push_back(p);
if (p.first.size() && p.second > 0) {
if (REGULAR_PROPERTY_MAP.find(p.first) != end) {
regular.push_back(p);
}
else {
extended.push_back(p);
}
}
}
}

88
src/core/library/query/local/util/CategoryQueryUtil.h
View File

@ -90,20 +90,20 @@ namespace musik { namespace core { namespace db { namespace local {
resources, including extended resources. the full requerly propety looks something
like the following example where we query all albums made in "1995" by "J. Cantrell": */
// SELECT DISTINCT albums.id, albums.name
// FROM albums, tracks
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "year" AND value = "1995") OR
// (key = "composer" AND value = "J. Cantrell")
// GROUP BY track_id
// HAVING COUNT(track_id) = 2
// ) AS md ON tracks.id = md.track_id
// WHERE
// albums.id = tracks.album_id AND
// tracks.visible = 1;
// SELECT DISTINCT albums.id, albums.name
// FROM albums, tracks
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "year" AND value = "1995") OR
// (key = "composer" AND value = "J. Cantrell")
// GROUP BY track_id
// HAVING COUNT(track_id) = 2
// ) AS md ON tracks.id = md.track_id
// WHERE
// albums.id = tracks.album_id AND
// tracks.visible = 1;
static const std::string REGULAR_PROPERTY_QUERY =
"SELECT DISTINCT {{table}}.id, {{table}}.name "
@ -114,29 +114,29 @@ namespace musik { namespace core { namespace db { namespace local {
"{{regular_filter}} "
"ORDER BY {{table}}.sort_order";
/* REGULAR_PROPERTY_QUERY is similar to REGULAR_PROPERTY_QUERY, but is used to
/* EXTENDED_PROPERTY_QUERY is similar to REGULAR_PROPERTY_QUERY, but is used to
retrieve non-standard metadata fields. it's slower, has (potentially) more joins,
and is generally more difficult to use. here's an example where we select all
"years" for a particular artist "595" where the composer is "J. Cantrell": */
// SELECT DISTINCT meta_value_id, value
// FROM extended_metadata
// INNER JOIN(
// SELECT id AS track_id
// FROM tracks
// WHERE visual_artist_id = 595
// ) AS reg ON extended_metadata.id = reg.track_id
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "composer" AND value = "J. Cantrell") OR
// ...
// GROUP BY track_id
// HAVING COUNT(track_id) = 1
// ) AS md ON extended_metadata.id = md.track_id
// WHERE
// extended_metadata.key = "year";
// SELECT DISTINCT meta_value_id, value
// FROM extended_metadata
// INNER JOIN(
// SELECT id AS track_id
// FROM tracks
// WHERE visual_artist_id = 595
// ) AS reg ON extended_metadata.id = reg.track_id
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "composer" AND value = "J. Cantrell") OR
// ...
// GROUP BY track_id
// HAVING COUNT(track_id) = 1
// ) AS md ON extended_metadata.id = md.track_id
// WHERE
// extended_metadata.key = "year";
static const std::string EXTENDED_PROPERTY_QUERY =
"SELECT DISTINCT meta_value_id, value "
@ -154,17 +154,17 @@ namespace musik { namespace core { namespace db { namespace local {
/* used to select all tracks that match a specified set of predicates. both
regular and extended predicates are supported. in essense: */
// SELECT DISTINCT tracks.*
// FROM tracks
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "year" AND value = "1995") OR
// (key = "composer" AND value = "J. Cantrell")
// GROUP BY track_id
// HAVING COUNT(track_id) = 2
// ) AS md ON tracks.id = md.track_id;
// SELECT DISTINCT tracks.*
// FROM tracks
// INNER JOIN(
// SELECT id AS track_id
// FROM extended_metadata
// WHERE
// (key = "year" AND value = "1995") OR
// (key = "composer" AND value = "J. Cantrell")
// GROUP BY track_id
// HAVING COUNT(track_id) = 2
// ) AS md ON tracks.id = md.track_id;
static const std::string CATEGORY_TRACKLIST_FILTER =
" AND (tracks.title LIKE ? OR al.name LIKE ? OR ar.name LIKE ? OR gn.name LIKE ?) ";