[tracker] NMM: Made nmm:length deprecated, replaced all usage of it with nfo:duration

From: Philip Van Hoof <pvanhoof src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [tracker] NMM: Made nmm:length deprecated, replaced all usage of it with nfo:duration
Date: Thu, 11 Feb 2010 12:42:22 +0000 (UTC)
commit 28af42ccb3fa22f8062b9ad7b7b9649992d649c5
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu Feb 11 13:41:28 2010 +0100

    NMM: Made nmm:length deprecated, replaced all usage of it with nfo:duration

 data/ontologies/38-nmm.ontology                    |    1 +
 docs/manpages/tracker-sparql.1                     |    2 +-
 docs/ontologies/README.ontologiesdoc               |    2 +-
 src/libtracker-client/tracker.c                    |    2 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |    6 ---
 src/tracker-extract/tracker-extract-mp3.c          |    2 +-
 src/tracker-utils/tracker-search.c                 |    4 +-
 .../functional-tests/testdata/ttl/songlist_nmm.ttl |   42 ++++++++++----------
 utils/data-generators/generate-data-for-music.py   |    2 +-
 utils/data-generators/id32nmmTurtle.py             |    2 +-
 utils/services/file-class.cache.test               |    1 -
 11 files changed, 30 insertions(+), 36 deletions(-)
---
diff --git a/data/ontologies/38-nmm.ontology b/data/ontologies/38-nmm.ontology
index cf42877..c6599d1 100644
--- a/data/ontologies/38-nmm.ontology
+++ b/data/ontologies/38-nmm.ontology
@@ -90,6 +90,7 @@ nmm:length a rdf:Property ;
 	rdfs:comment "Length or duration (in seconds)" ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain nmm:MusicPiece ;
+	nao:deprecated true ;
 	rdfs:range xsd:integer .
 
 nmm:composer a rdf:Property ;
diff --git a/docs/manpages/tracker-sparql.1 b/docs/manpages/tracker-sparql.1
index cf491ca..855a94a 100644
--- a/docs/manpages/tracker-sparql.1
+++ b/docs/manpages/tracker-sparql.1
@@ -125,7 +125,7 @@ $ tracker-sparql -q "SELECT ?album ?title COUNT(?song)
       ?album a nmm:MusicAlbum ;
       nie:title ?title .
       ?song nmm:musicAlbum ?album ;
-      nmm:length ?length
+      nfo:duration ?length
  } GROUP BY ?album"
 .FI
 
diff --git a/docs/ontologies/README.ontologiesdoc b/docs/ontologies/README.ontologiesdoc
index bb380d9..b930dd5 100644
--- a/docs/ontologies/README.ontologiesdoc
+++ b/docs/ontologies/README.ontologiesdoc
@@ -34,7 +34,7 @@ following schema:
 
    [prefix-ontology]-[name-property-or-class]
 
- so the property "nmm:length" has the id "nmm-length" and
+ so the property "nfo:duration" has the id "nfo-duration" and
 the class "nmm:MusicPiece" has the id "nmm-MusicPiece".
 
  The ids are global and can be referenced anywhere else in the
diff --git a/src/libtracker-client/tracker.c b/src/libtracker-client/tracker.c
index 1feba38..5acffe6 100644
--- a/src/libtracker-client/tracker.c
+++ b/src/libtracker-client/tracker.c
@@ -723,7 +723,7 @@ tracker_resources_load (TrackerClient  *client,
  *          "  ?album a nmm:MusicAlbum ;"
  *          "  nie:title ?title ."
  *          "  ?song nmm:musicAlbum ?album ;"
- *          "  nmm:length ?length"
+ *          "  nfo:duration ?length"
  *          "} "
  *          "GROUP BY ?album");
  *
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 7e184b9..9cf57f3 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -396,9 +396,6 @@ extract_stream_metadata_tagreadbin (MetadataExtractor *extractor,
 		add_int_gst_tag (metadata, uri, "nfo:channels", extractor->tagcache, GST_TAG_CHANNEL);
 		add_int_gst_tag (metadata, uri, "nfo:sampleRate", extractor->tagcache, GST_TAG_RATE);
 		add_time_gst_tag (metadata, uri, "nfo:duration", extractor->tagcache, GST_TAG_DURATION);
-		if (extractor->mime == EXTRACT_MIME_AUDIO) {
-			add_time_gst_tag (metadata, uri, "nmm:length", extractor->tagcache, GST_TAG_DURATION);
-		}
 	} else {
 		add_int_gst_tag (metadata, uri, "nfo:aspectRatio", extractor->tagcache, GST_TAG_PIXEL_RATIO);
 	}
@@ -428,9 +425,6 @@ extract_stream_metadata_decodebin (MetadataExtractor *extractor,
 
 		if (extractor->duration >= 0) {
 			add_int64_info (metadata, uri, "nfo:duration", extractor->duration);
-			if (extractor->mime == EXTRACT_MIME_AUDIO) {
-				add_int64_info (metadata, uri, "nmm:length", extractor->duration);
-			}
 		}
 	} else {
 		if (extractor->aspect_ratio >= 0) {
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 237994a..7e6fed7 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -906,7 +906,7 @@ mp3_parse_header (const gchar          *data,
 			length = spfp8 * 8 * frames / (sample_rate ? sample_rate : 0xFFFFFFFF);
 		}
 
-		tracker_sparql_builder_predicate (metadata, "nmm:length");
+		tracker_sparql_builder_predicate (metadata, "nfo:duration");
 		tracker_sparql_builder_object_int64 (metadata, length);
 	}
 
diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c
index b0d9643..741928e 100644
--- a/src/tracker-utils/tracker-search.c
+++ b/src/tracker-utils/tracker-search.c
@@ -526,7 +526,7 @@ get_music_albums (TrackerClient *client,
 	if (fts) {
 		query = g_strdup_printf ("SELECT ?album nie:title (?album) COUNT(?song) "
 		                         "AS songs "
-		                         "SUM(nmm:length (?song)) AS totallength "
+		                         "SUM(nfo:duration (?song)) AS totallength "
 		                         "WHERE {"
 		                         "  ?album a nmm:MusicAlbum ."
 		                         "  ?song nmm:musicAlbum ?album ."
@@ -541,7 +541,7 @@ get_music_albums (TrackerClient *client,
 	} else {
 		query = g_strdup_printf ("SELECT ?album nie:title (?album) COUNT(?song) "
 		                         "AS songs "
-		                         "SUM(nmm:length (?song)) AS totallength "
+		                         "SUM(nfo:duration (?song)) AS totallength "
 		                         "WHERE {"
 		                         "  ?album a nmm:MusicAlbum ."
 		                         "  ?song nmm:musicAlbum ?album ." 
diff --git a/tests/functional-tests/testdata/ttl/songlist_nmm.ttl b/tests/functional-tests/testdata/ttl/songlist_nmm.ttl
index 71be3ee..1a0dcf2 100644
--- a/tests/functional-tests/testdata/ttl/songlist_nmm.ttl
+++ b/tests/functional-tests/testdata/ttl/songlist_nmm.ttl
@@ -23,7 +23,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "Other";
 	nmm:trackNumber 12;
-	nmm:length 4564624;
+	nfo:duration 4564624;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -39,7 +39,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "Rock";
 	nmm:trackNumber 17;
-	nmm:length 1965168;
+	nfo:duration 1965168;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -55,7 +55,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "R&B";
 	nmm:trackNumber 14;
-	nmm:length 3524601;
+	nfo:duration 3524601;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:uuid:747032952> a nco:Contact; 
@@ -73,7 +73,7 @@
 	nfo:fileSize 3977200;
 	nmm:musicAlbum <urn:album:Hot Vocal Hooks>;
 	nmm:genre "Alternative-Rock";
-	nmm:length 2239336;
+	nfo:duration 2239336;
 	nmm:performer <urn:uuid:747032952>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -89,7 +89,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "Oldies";
 	nmm:trackNumber 11;
-	nmm:length 4037450;
+	nfo:duration 4037450;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -105,7 +105,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "R&B";
 	nmm:trackNumber 14;
-	nmm:length 370296;
+	nfo:duration 370296;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -121,7 +121,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "Techno";
 	nmm:trackNumber 18;
-	nmm:length 4407507;
+	nfo:duration 4407507;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -137,7 +137,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "Techno";
 	nmm:trackNumber 18;
-	nmm:length 4285294;
+	nfo:duration 4285294;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -153,7 +153,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "Oldies";
 	nmm:trackNumber 11;
-	nmm:length 2589077;
+	nfo:duration 2589077;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -169,7 +169,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "Reggae";
 	nmm:trackNumber 16;
-	nmm:length 1483545;
+	nfo:duration 1483545;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -185,7 +185,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "Rap";
 	nmm:trackNumber 15;
-	nmm:length 681462;
+	nfo:duration 681462;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -201,7 +201,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "Pop";
 	nmm:trackNumber 13;
-	nmm:length 3426992;
+	nfo:duration 3426992;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -217,7 +217,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "Rock";
 	nmm:trackNumber 17;
-	nmm:length 3303396;
+	nfo:duration 3303396;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -233,7 +233,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "Reggae";
 	nmm:trackNumber 16;
-	nmm:length 4916495;
+	nfo:duration 4916495;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -249,7 +249,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "Pop";
 	nmm:trackNumber 13;
-	nmm:length 939440;
+	nfo:duration 939440;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -265,7 +265,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "New Age";
 	nmm:trackNumber 10;
-	nmm:length 2635588;
+	nfo:duration 2635588;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -281,7 +281,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "Industrial";
 	nmm:trackNumber 19;
-	nmm:length 4429763;
+	nfo:duration 4429763;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -297,7 +297,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "Industrial";
 	nmm:trackNumber 19;
-	nmm:length 1353801;
+	nfo:duration 1353801;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -313,7 +313,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "Rap";
 	nmm:trackNumber 15;
-	nmm:length 463567;
+	nfo:duration 463567;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [019]> a nmm:MusicAlbum; 
@@ -329,7 +329,7 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [019]>;
 	nmm:genre "Other";
 	nmm:trackNumber 12;
-	nmm:length 2918054;
+	nfo:duration 2918054;
 	nmm:performer <urn:uuid:1991081358>.
 
 <urn:album:TrkAlbum [016]> a nmm:MusicAlbum; 
@@ -345,6 +345,6 @@
 	nmm:musicAlbum <urn:album:TrkAlbum [016]>;
 	nmm:genre "New Age";
 	nmm:trackNumber 10;
-	nmm:length 1116317;
+	nfo:duration 1116317;
 	nmm:performer <urn:uuid:1991081358>.
 
diff --git a/utils/data-generators/generate-data-for-music.py b/utils/data-generators/generate-data-for-music.py
index d09e631..94591e4 100755
--- a/utils/data-generators/generate-data-for-music.py
+++ b/utils/data-generators/generate-data-for-music.py
@@ -92,7 +92,7 @@ def update_tag(artistid, artistname, albumid, trackid, genreid):
                 if len(trackArray) > 0:
                         f.write('\tnmm:trackNumber ' + trackArray[0] + ';\n')
 
-	f.write('\tnmm:length ' + str(length) + ';\n')
+	f.write('\tnfo:duration ' + str(length) + ';\n')
         f.write('\tnmm:performer <urn:uuid:' + UID + '>.\n\n')
 
 def create_track(artistid, albumid, genreid, settings):
diff --git a/utils/data-generators/id32nmmTurtle.py b/utils/data-generators/id32nmmTurtle.py
index 00d4ed0..be0c210 100644
--- a/utils/data-generators/id32nmmTurtle.py
+++ b/utils/data-generators/id32nmmTurtle.py
@@ -129,7 +129,7 @@ class FileProcessor:
                  if len(trackArray)>0: self.f.write('\tnmm:trackNumber '+trackArray[0]+';\n')
 
 
-            if length>0: self.f.write('\tnmm:length '+str(length)+';\n')
+            if length>0: self.f.write('\tnfo:duration '+str(length)+';\n')
             if len(UID)>0: self.f.write('\tnmm:performer <urn:uuid:'+UID+'>.\n\n')
 
 
diff --git a/utils/services/file-class.cache.test b/utils/services/file-class.cache.test
index 46a044e..1810c5c 100644
--- a/utils/services/file-class.cache.test
+++ b/utils/services/file-class.cache.test
@@ -280,7 +280,6 @@ nmm nmm:musicAlbum
 nmm nmm:albumArtist
 nmm nmm:beatsPerMinute
 nmm nmm:performer
-nmm nmm:length
 nmm nmm:composer
 nmm nmm:lyricist
 nmm nmm:lyrics
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]