[gnome-music/wip/jfelder/tracker3-rebased: 3/39] grltrackerplaylists: Update to Grilo/Tracker3 expectatives
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/jfelder/tracker3-rebased: 3/39] grltrackerplaylists: Update to Grilo/Tracker3 expectatives
- Date: Wed, 29 Jul 2020 15:06:56 +0000 (UTC)
commit 76709959426d94574f6f78a5bdba4ddddb7d10ae
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Jun 14 15:47:56 2020 +0200
grltrackerplaylists: Update to Grilo/Tracker3 expectatives
The playlists are themselves local data, pointing to resources in
the tracker-miner-fs service.
The tracker: namespace is no longer used in the base ontology.
gnomemusic/grilowrappers/grltrackerplaylists.py | 376 +++++++++++++++---------
1 file changed, 232 insertions(+), 144 deletions(-)
---
diff --git a/gnomemusic/grilowrappers/grltrackerplaylists.py b/gnomemusic/grilowrappers/grltrackerplaylists.py
index 2dffa7c1..5fdff652 100644
--- a/gnomemusic/grilowrappers/grltrackerplaylists.py
+++ b/gnomemusic/grilowrappers/grltrackerplaylists.py
@@ -108,24 +108,18 @@ class GrlTrackerPlaylists(GObject.GObject):
self._window.notifications_popup.push_loading()
query = """
SELECT DISTINCT
- rdf:type(?playlist)
- tracker:id(?playlist) AS ?id
+ %(media_type)s AS ?type
+ ?playlist AS ?id
nie:title(?playlist) AS ?title
- tracker:added(?playlist) AS ?creation_date
- nfo:entryCounter(?playlist) AS ?childcount
+ nrl:added(?playlist) AS ?creationDate
+ nfo:entryCounter(?playlist) AS ?childCount
WHERE
{
?playlist a nmm:Playlist .
- OPTIONAL { ?playlist nie:url ?url;
- tracker:available ?available . }
- FILTER ( !STRENDS(LCASE(?url), '.m3u')
- && !STRENDS(LCASE(?url), '.m3u8')
- && !STRENDS(LCASE(?url), '.pls')
- || !BOUND(nfo:belongsToContainer(?playlist)) )
- FILTER ( !BOUND(?tag) )
- OPTIONAL { ?playlist nao:hasTag ?tag }
}
- """.replace('\n', ' ').strip()
+ """.replace("\n", " ").strip() % {
+ "media_type": int(Grl.MediaType.CONTAINER),
+ }
options = self._fast_options.copy()
@@ -222,17 +216,19 @@ class GrlTrackerPlaylists(GObject.GObject):
playlist_urn = result[0][0]['playlist']
query = """
SELECT
- rdf:type(?playlist)
- tracker:id(?playlist) AS ?id
+ %(media_type)s AS ?type
+ ?playlist AS ?id
nie:title(?playlist) AS ?title
- tracker:added(?playlist) AS ?creation_date
- nfo:entryCounter(?playlist) AS ?childcount
+ nrl:added(?playlist) AS ?creationDate
+ nfo:entryCounter(?playlist) AS ?childCount
WHERE
{
- ?playlist a nmm:Playlist .
- FILTER ( <%(playlist_urn)s> = ?playlist )
+ BIND ( <%(playlist_urn)s> AS ?playlist )
}
- """.replace("\n", " ").strip() % {"playlist_urn": playlist_urn}
+ """.replace("\n", " ").strip() % {
+ "media_type": int(Grl.MediaType.AUDIO),
+ "playlist_urn": playlist_urn
+ }
options = self._fast_options.copy()
self._source.query(
@@ -357,26 +353,37 @@ class Playlist(GObject.GObject):
query = """
SELECT
- rdf:type(?song)
- ?song AS ?tracker_urn
- tracker:id(?song) AS ?id
- nie:url(?song) AS ?url
- nie:title(?song) AS ?title
- nmm:artistName(nmm:performer(?song)) AS ?artist
- nie:title(nmm:musicAlbum(?song)) AS ?album
- nfo:duration(?song) AS ?duration
- ?tag AS ?favourite
- nie:contentAccessed(?song) AS ?last_played_time
- nie:usageCounter(?song) AS ?play_count
+ %(media_type)s AS ?type
+ ?song AS ?id
+ ?url
+ ?title
+ ?artist
+ ?album
+ ?duration
+ ?tag AS ?favorite
+ nie:contentAccessed(?song) AS ?lastPlayed
+ nie:usageCounter(?song) AS ?playCount
WHERE {
?playlist a nmm:Playlist ;
a nfo:MediaList ;
nfo:hasMediaFileListEntry ?entry .
?entry a nfo:MediaFileListEntry ;
nfo:entryUrl ?url .
- ?song a nmm:MusicPiece ;
- a nfo:FileDataObject ;
- nie:url ?url .
+ SERVICE <dbus:org.freedesktop.Tracker3.Miner.Files> {
+ GRAPH tracker:Audio {
+ SELECT
+ ?song
+ nie:title(?song) AS ?title
+ nmm:artistName(nmm:performer(?song)) AS ?artist
+ nie:title(nmm:musicAlbum(?song)) AS ?album
+ nfo:duration(?song) AS ?duration
+ WHERE {
+ ?song a nmm:MusicPiece ;
+ nie:isStoredAs ?url .
+ %(location_filter)s
+ }
+ }
+ }
OPTIONAL {
?song nao:hasTag ?tag .
FILTER( ?tag = nao:predefined-tag-favorite )
@@ -384,14 +391,10 @@ class Playlist(GObject.GObject):
FILTER (
%(filter_clause)s
)
- FILTER (
- NOT EXISTS { ?song a nmm:Video }
- && NOT EXISTS { ?song a nmm:Playlist }
- )
- %(location_filter)s
}
ORDER BY nfo:listPosition(?entry)
""".replace('\n', ' ').strip() % {
+ "media_type": int(Grl.MediaType.AUDIO),
"filter_clause": 'tracker:id(?playlist) = ' + self.props.pl_id,
"location_filter": self._tracker_wrapper.location_filter()
}
@@ -549,7 +552,7 @@ class Playlist(GObject.GObject):
}
}
}
- }
+ };
INSERT OR REPLACE {
?playlist nfo:entryCounter ?new_counter .
}
@@ -564,7 +567,7 @@ class Playlist(GObject.GObject):
tracker:id(?playlist) = %(playlist_id)s
)
}
- }
+ };
DELETE {
?playlist nfo:hasMediaFileListEntry ?entry .
?entry a rdfs:Resource .
@@ -609,26 +612,37 @@ class Playlist(GObject.GObject):
media_id = coresong.props.media.get_id()
query = """
SELECT
- rdf:type(?song)
- ?song AS ?tracker_urn
- tracker:id(?song) AS ?id
- nie:url(?song) AS ?url
- nie:title(?song) AS ?title
- nmm:artistName(nmm:performer(?song)) AS ?artist
- nie:title(nmm:musicAlbum(?song)) AS ?album
- nfo:duration(?song) AS ?duration
- ?tag AS ?favourite
- nie:contentAccessed(?song) AS ?last_played_time
- nie:usageCounter(?song) AS ?play_count
+ %(media_type)s AS ?type
+ ?song AS ?id
+ ?url
+ ?title
+ ?artist
+ ?album
+ ?duration
+ ?tag AS ?favorite
+ nie:contentAccessed(?song) AS ?lastPlayed
+ nie:usageCounter(?song) AS ?playCount
WHERE {
?playlist a nmm:Playlist ;
a nfo:MediaList ;
nfo:hasMediaFileListEntry ?entry .
?entry a nfo:MediaFileListEntry ;
nfo:entryUrl ?url .
- ?song a nmm:MusicPiece ;
- a nfo:FileDataObject ;
- nie:url ?url .
+ SERVICE <dbus:org.freedesktop.Tracker3.Miner.Files> {
+ GRAPH tracker:Audio {
+ SELECT
+ ?song
+ nie:title(?song) AS ?title
+ nmm:artistName(nmm:performer(?song)) AS ?artist
+ nie:title(nmm:musicAlbum(?song)) AS ?album
+ nfo:duration(?song) AS ?duration
+ WHERE {
+ ?song a nmm:MusicPiece ;
+ nie:isStoredAs ?url .
+ %(location_filter)s
+ }
+ }
+ }
OPTIONAL {
?song nao:hasTag ?tag .
FILTER( ?tag = nao:predefined-tag-favorite )
@@ -636,13 +650,9 @@ class Playlist(GObject.GObject):
FILTER (
%(filter_clause)s
)
- FILTER (
- NOT EXISTS { ?song a nmm:Video }
- && NOT EXISTS { ?song a nmm:Playlist }
- )
- %(location_filter)s
}
""".replace("\n", " ").strip() % {
+ "media_type": int(Grl.MediaType.AUDIO),
"filter_clause": "tracker:id(?song) = " + media_id,
"location_filter": self._tracker_wrapper.location_filter()
}
@@ -822,27 +832,43 @@ class MostPlayed(SmartPlaylist):
self._title = _("Most Played")
self.props.query = """
SELECT
- rdf:type(?song)
- tracker:id(?song) AS ?id
- ?song AS ?tracker_urn
- nie:title(?song) AS ?title
- nie:url(?song) AS ?url
- nmm:artistName(nmm:performer(?song)) AS ?artist
- nie:title(nmm:musicAlbum(?song)) AS ?album
- nfo:duration(?song) AS ?duration
- nie:usageCounter(?song) AS ?play_count
- nmm:trackNumber(?song) AS ?track_number
- nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
- ?tag AS ?favourite
+ %(media_type)s AS ?type
+ ?song AS ?id
+ ?title
+ ?url
+ ?artist
+ ?album
+ ?duration
+ ?trackNumber
+ ?albumDiscNumber
+ ?playCount
+ ?tag AS ?favorite
WHERE {
- ?song a nmm:MusicPiece ;
- nie:usageCounter ?count .
+ SERVICE <dbus:org.freedesktop.Tracker3.Miner.Files> {
+ GRAPH tracker:Audio {
+ SELECT
+ ?song
+ nie:title(?song) AS ?title
+ nie:isStoredAs(?song) AS ?url
+ nmm:artistName(nmm:performer(?song)) AS ?artist
+ nie:title(nmm:musicAlbum(?song)) AS ?album
+ nfo:duration(?song) AS ?duration
+ nmm:trackNumber(?song) AS ?trackNumber
+ nmm:setNumber(nmm:musicAlbumDisc(?song))
+ AS ?albumDiscNumber
+ WHERE {
+ ?song a nmm:MusicPiece .
+ %(location_filter)s
+ }
+ }
+ }
+ ?song nie:usageCounter ?playCount
OPTIONAL { ?song nao:hasTag ?tag .
FILTER (?tag = nao:predefined-tag-favorite) }
- %(location_filter)s
}
- ORDER BY DESC(?count) LIMIT 50
+ ORDER BY DESC(?playCount) LIMIT 50
""".replace('\n', ' ').strip() % {
+ "media_type": int(Grl.MediaType.AUDIO),
"location_filter": self._tracker_wrapper.location_filter()
}
@@ -858,26 +884,42 @@ class NeverPlayed(SmartPlaylist):
self._title = _("Never Played")
self.props.query = """
SELECT
- rdf:type(?song)
- tracker:id(?song) AS ?id
- ?song AS ?tracker_urn
- nie:title(?song) AS ?title
- nie:url(?song) AS ?url
- nmm:artistName(nmm:performer(?song)) AS ?artist
- nie:title(nmm:musicAlbum(?song)) AS ?album
- nfo:duration(?song) AS ?duration
- nie:usageCounter(?song) AS ?play_count
- nmm:trackNumber(?song) AS ?track_number
- nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
- ?tag AS ?favourite
+ %(media_type)s AS ?type
+ ?song AS ?id
+ ?title
+ ?url
+ ?artist
+ ?album
+ ?duration
+ ?trackNumber
+ ?albumDiscNumber
+ nie:usageCounter(?song) AS ?playCount
+ ?tag AS ?favorite
WHERE {
- ?song a nmm:MusicPiece ;
+ SERVICE <dbus:org.freedesktop.Tracker3.Miner.Files> {
+ GRAPH tracker:Audio {
+ SELECT
+ ?song
+ nie:title(?song) AS ?title
+ nie:isStoredAs(?song) AS ?url
+ nmm:artistName(nmm:performer(?song)) AS ?artist
+ nie:title(nmm:musicAlbum(?song)) AS ?album
+ nfo:duration(?song) AS ?duration
+ nmm:trackNumber(?song) AS ?trackNumber
+ nmm:setNumber(nmm:musicAlbumDisc(?song))
+ AS ?albumDiscNumber
+ WHERE {
+ ?song a nmm:MusicPiece .
+ %(location_filter)s
+ }
+ }
+ }
FILTER ( NOT EXISTS { ?song nie:usageCounter ?count .} )
OPTIONAL { ?song nao:hasTag ?tag .
FILTER (?tag = nao:predefined-tag-favorite) }
- %(location_filter)s
} ORDER BY nfo:fileLastAccessed(?song) LIMIT 50
""".replace('\n', ' ').strip() % {
+ "media_type": int(Grl.MediaType.AUDIO),
"location_filter": self._tracker_wrapper.location_filter()
}
@@ -900,28 +942,44 @@ class RecentlyPlayed(SmartPlaylist):
time.gmtime(time.time() - seconds_difference))
self.props.query = """
SELECT
- rdf:type(?song)
- tracker:id(?song) AS ?id
- ?song AS ?tracker_urn
- nie:title(?song) AS ?title
- nie:url(?song) AS ?url
- nmm:artistName(nmm:performer(?song)) AS ?artist
- nie:title(nmm:musicAlbum(?song)) AS ?album
- nfo:duration(?song) AS ?duration
- nie:usageCounter(?song) AS ?play_count
- nmm:trackNumber(?song) AS ?track_number
- nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
- ?tag AS ?favourite
+ %(media_type)s AS ?type
+ ?song AS ?id
+ ?title
+ ?url
+ ?artist
+ ?album
+ ?duration
+ ?trackNumber
+ ?albumDiscNumber
+ nie:usageCounter(?song) AS ?playCount
+ ?tag AS ?favorite
WHERE {
- ?song a nmm:MusicPiece ;
- nie:contentAccessed ?last_played .
- FILTER ( ?last_played > '%(compare_date)s'^^xsd:dateTime
+ SERVICE <dbus:org.freedesktop.Tracker3.Miner.Files> {
+ GRAPH tracker:Audio {
+ SELECT
+ ?song
+ nie:title(?song) AS ?title
+ nie:isStoredAs(?song) AS ?url
+ nmm:artistName(nmm:performer(?song)) AS ?artist
+ nie:title(nmm:musicAlbum(?song)) AS ?album
+ nfo:duration(?song) AS ?duration
+ nmm:trackNumber(?song) AS ?trackNumber
+ nmm:setNumber(nmm:musicAlbumDisc(?song))
+ AS ?albumDiscNumber
+ WHERE {
+ ?song a nmm:MusicPiece .
+ %(location_filter)s
+ }
+ }
+ }
+ ?song nie:contentAccessed ?lastPlayed .
+ FILTER ( ?lastPlayed > '%(compare_date)s'^^xsd:dateTime
&& EXISTS { ?song nie:usageCounter ?count .} )
OPTIONAL { ?song nao:hasTag ?tag .
FILTER (?tag = nao:predefined-tag-favorite) }
- %(location_filter)s
- } ORDER BY DESC(?last_played) LIMIT 50
+ } ORDER BY DESC(?lastPlayed) LIMIT 50
""".replace('\n', ' ').strip() % {
+ "media_type": int(Grl.MediaType.AUDIO),
'compare_date': compare_date,
"location_filter": self._tracker_wrapper.location_filter()
}
@@ -945,27 +1003,44 @@ class RecentlyAdded(SmartPlaylist):
time.gmtime(time.time() - seconds_difference))
self.props.query = """
SELECT
- rdf:type(?song)
- tracker:id(?song) AS ?id
- ?song AS ?tracker_urn
- nie:title(?song) AS ?title
- nie:url(?song) AS ?url
- nmm:artistName(nmm:performer(?song)) AS ?artist
- nie:title(nmm:musicAlbum(?song)) AS ?album
- nfo:duration(?song) AS ?duration
- nie:usageCounter(?song) AS ?play_count
- nmm:trackNumber(?song) AS ?track_number
- nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
- ?tag AS ?favourite
+ %(media_type)s AS ?type
+ ?song AS ?id
+ ?title
+ ?url
+ ?artist
+ ?album
+ ?duration
+ ?trackNumber
+ ?albumDiscNumber
+ nie:usageCounter(?song) AS ?playCount
+ ?tag AS ?favorite
WHERE {
- ?song a nmm:MusicPiece ;
- tracker:added ?added .
- FILTER ( tracker:added(?song) > '%(compare_date)s'^^xsd:dateTime )
+ SERVICE <dbus:org.freedesktop.Tracker3.Miner.Files> {
+ GRAPH tracker:Audio {
+ SELECT
+ ?song
+ nie:title(?song) AS ?title
+ nie:isStoredAs(?song) AS ?url
+ nmm:artistName(nmm:performer(?song)) AS ?artist
+ nie:title(nmm:musicAlbum(?song)) AS ?album
+ nfo:duration(?song) AS ?duration
+ nmm:trackNumber(?song) AS ?trackNumber
+ nmm:setNumber(nmm:musicAlbumDisc(?song))
+ AS ?albumDiscNumber
+ ?added
+ WHERE {
+ ?song a nmm:MusicPiece ;
+ nrl:added ?added .
+ %(location_filter)s
+ FILTER ( ?added > '%(compare_date)s'^^xsd:dateTime )
+ }
+ }
+ }
OPTIONAL { ?song nao:hasTag ?tag .
FILTER (?tag = nao:predefined-tag-favorite) }
- %(location_filter)s
- } ORDER BY DESC(tracker:added(?song)) LIMIT 50
+ } ORDER BY DESC(nrl:added(?song)) LIMIT 50
""".replace('\n', ' ').strip() % {
+ "media_type": int(Grl.MediaType.AUDIO),
'compare_date': compare_date,
"location_filter": self._tracker_wrapper.location_filter()
}
@@ -982,27 +1057,40 @@ class Favorites(SmartPlaylist):
self._title = _("Favorite Songs")
self.props.query = """
SELECT
- rdf:type(?song)
- tracker:id(?song) AS ?id
- ?song AS ?tracker_urn
- nie:title(?song) AS ?title
- nie:url(?song) AS ?url
- nmm:artistName(nmm:performer(?song)) AS ?artist
- nie:title(nmm:musicAlbum(?song)) AS ?album
- nfo:duration(?song) AS ?duration
- nie:usageCounter(?song) AS ?play_count
- nmm:trackNumber(?song) AS ?track_number
- nmm:setNumber(nmm:musicAlbumDisc(?song)) AS ?album_disc_number
- nao:predefined-tag-favorite AS ?favourite
+ %(media_type)s AS ?type
+ ?song AS ?id
+ ?title
+ ?url
+ ?artist
+ ?album
+ ?duration
+ ?trackNumber
+ ?albumDiscNumber
+ nie:usageCounter(?song) AS ?playCount
+ nao:predefined-tag-favorite AS ?favorite
WHERE {
- ?song a nmm:MusicPiece ;
- nie:isStoredAs ?as ;
- nao:hasTag nao:predefined-tag-favorite .
- ?as nie:url ?url .
- OPTIONAL { ?song nao:hasTag ?tag .
- FILTER (?tag = nao:predefined-tag-favorite) }
- %(location_filter)s
- } ORDER BY DESC(tracker:added(?song))
+ SERVICE <dbus:org.freedesktop.Tracker3.Miner.Files> {
+ GRAPH tracker:Audio {
+ SELECT
+ ?song
+ nie:title(?song) AS ?title
+ nie:isStoredAs(?song) AS ?url
+ nmm:artistName(nmm:performer(?song)) AS ?artist
+ nie:title(nmm:musicAlbum(?song)) AS ?album
+ nfo:duration(?song) AS ?duration
+ nmm:trackNumber(?song) AS ?trackNumber
+ nmm:setNumber(nmm:musicAlbumDisc(?song))
+ AS ?albumDiscNumber
+ nrl:added(?song) AS ?added
+ WHERE {
+ ?song a nmm:MusicPiece .
+ %(location_filter)s
+ }
+ }
+ }
+ ?song nao:hasTag nao:predefined-tag-favorite .
+ } ORDER BY DESC(?added)
""".replace('\n', ' ').strip() % {
+ "media_type": int(Grl.MediaType.AUDIO),
"location_filter": self._tracker_wrapper.location_filter()
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
