On Tue, May 4, 2010 at 12:29, Martyn Russell <mar...@lanedo.com> wrote:
>> 38 - some clean-ups and consistency fixes (metadata tile)
>
> You use '%s' for URIs, please don't we use \"%s\" everywhere else in the
> code base and also it breaks for URIs which use ' in their name.
>
> We usually escape strings too before using them there, but I presume the
> URI came from Tracker so it should already be escaped.
>
> If you can fix those ' vs " issues, I will commit it.
find attached, patch 0005
>> 39 - fix a segfault
>
> Looks good, but doesn't commit due to 0038.
find attached, patch 0006
--
my place on the web:
floss-and-misc.blogspot.com
From 81114850a2b2fa9faa533b22f6a0939ba93d7ad3 Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshep...@gmail.com>
Date: Wed, 5 May 2010 02:44:29 +0200
Subject: [PATCH 5/6] TST: consistency fixes for metadata tile
---
src/tracker-search-tool/tracker-metadata-tile.gs | 47 ++++++----------------
1 files changed, 12 insertions(+), 35 deletions(-)
diff --git a/src/tracker-search-tool/tracker-metadata-tile.gs b/src/tracker-search-tool/tracker-metadata-tile.gs
index b079f6e..620b532 100644
--- a/src/tracker-search-tool/tracker-metadata-tile.gs
+++ b/src/tracker-search-tool/tracker-metadata-tile.gs
@@ -34,8 +34,6 @@ class TrackerMetadataTile : EventBox
name_link : LinkButton
path_link : LinkButton
table : Table
- sparql : string
-
/* metadata fields */
name_label : Label
@@ -59,15 +57,8 @@ class TrackerMetadataTile : EventBox
info_label6 : Label
info_value6 : Label
- info_label7 : Label
- info_value7 : Label
-
- info_label8 : Label
- info_value8 : Label
-
_result_grid : TrackerResultGrid
-
prop Query : TrackerQuery
prop ResultGrid : TrackerResultGrid
@@ -93,8 +84,6 @@ class TrackerMetadataTile : EventBox
table.set_col_spacings (3)
table.set_row_spacings (3)
-
-
add (table)
image = new Image.from_icon_name ("text-x-generic", IconSize.DIALOG)
@@ -115,42 +104,34 @@ class TrackerMetadataTile : EventBox
info_label1 = CreateLabel (N_("Type:"), false)
AttachToTable (info_label1, 1, 2, 1, 2, false)
-
info_value1 = CreateLabel ("-", true)
AttachToTable (info_value1, 2, 3, 1, 2, true)
info_label2 = CreateLabel (N_("Size:"), false)
AttachToTable (info_label2, 3, 4, 1, 2, false)
-
info_value2 = CreateLabel ("-", true)
AttachToTable (info_value2, 4, 5, 1, 2, true)
info_label3 = CreateLabel (N_("Modified:"), false)
AttachToTable (info_label3, 5, 6, 1, 2, false)
-
info_value3 = CreateLabel ("-", true)
AttachToTable (info_value3, 6, 7, 1, 2, true)
info_label4 = CreateLabel ("", false)
AttachToTable (info_label4, 1, 2, 2, 3, false)
-
info_value4 = CreateLabel ("-", true)
AttachToTable (info_value4, 2, 3, 2, 3, true)
info_label5 = CreateLabel ("", false)
AttachToTable (info_label5, 3, 4, 2, 3, false)
-
info_value5 = CreateLabel ("-", true)
AttachToTable (info_value5, 4, 5, 2, 3, true)
info_label6 = CreateLabel ("", false)
AttachToTable (info_label6, 5, 6, 2, 3, false)
-
info_value6 = CreateLabel ("-", true)
AttachToTable (info_value6, 6, 7, 2, 3, true)
- sparql = "SELECT ?mimetype WHERE {<%s> nie:mimeType ?mimetype.}"
-
ClearLabels ()
@@ -206,6 +187,7 @@ class TrackerMetadataTile : EventBox
else
table.attach (lab, l, r, t, b, AttachOptions.FILL, AttachOptions.FILL, 0, 0)
+
def private CreateLabel (s : string, e : bool) : Label
var l = new Label (s)
l.xalign = 0
@@ -236,11 +218,13 @@ class TrackerMetadataTile : EventBox
name_link.set_sensitive (false)
path_link.set_sensitive (false);
+
def SetLabelValue (label : Label, val : string)
var val1 = "<b>%s</b>".printf (val)
label.set_markup (val1)
label.xalign = 0
+
def SetLabelSizeValue (label : Label, size: int64)
var val1 = "<b>%s</b>".printf (FormatFileSize (size))
label.set_markup (val1)
@@ -263,12 +247,10 @@ class TrackerMetadataTile : EventBox
var val1 = "<b>%s</b>".printf (value)
label.set_markup (val1)
label.xalign = 0
-
-
def private GetCategory (uri : string) : Categories
- var query = "select rdf:type(?s) where { ?s nie:url \"%s\" }".printf(uri)
+ var query = "SELECT rdf:type(?s) where { ?s nie:url \"%s\" }".printf(uri)
var results = Query.Query (query)
var res = ""
for s in results
@@ -321,7 +303,7 @@ class TrackerMetadataTile : EventBox
def private DisplayImageDetails (uri : string)
- var query = "select nfo:height(?s) nfo:width(?s) Where { ?s nie:url \"%s\" }".printf(uri)
+ var query = "SELECT nfo:height(?s) nfo:width(?s) WHERE { ?s nie:url \"%s\" }".printf(uri)
var result = Query.Query (query)
info_label4.set_text (N_("Height:"))
@@ -330,11 +312,10 @@ class TrackerMetadataTile : EventBox
if result is not null
SetLabelValue (info_value4, result[0])
SetLabelValue (info_value5, result[1])
-
-
+
def private DisplayAudioDetails (uri : string)
- var query = "select nie:title(?s) nmm:performer(?s) nmm:musicAlbum(?s) Where { ?s nie:url \"%s\" }".printf(uri)
+ var query = "SELECT nie:title(?s) nmm:performer(?s) nmm:musicAlbum(?s) WHERE { ?s nie:url \"%s\" }".printf(uri)
var result = Query.Query (query)
info_label4.set_text (N_("Title:"))
@@ -346,8 +327,9 @@ class TrackerMetadataTile : EventBox
SetLabelUrnValue (info_value5, result[1])
SetLabelUrnValue (info_value6, result[2])
+
def private DisplayVideoDetails (uri : string)
- var query = "select nfo:height(?s) nfo:width(?s) nfo:duration (?s) Where { ?s nie:url \"%s\" }".printf(uri)
+ var query = "SELECT nfo:height(?s) nfo:width(?s) nfo:duration (?s) WHERE { ?s nie:url \"%s\" }".printf(uri)
var result = Query.Query (query)
info_label4.set_text (N_("Height:"))
@@ -359,8 +341,9 @@ class TrackerMetadataTile : EventBox
SetLabelValue (info_value5, result[1])
SetLabelValue (info_value6, result[2])
+
def private DisplayDocumentDetails (uri : string)
- var query = "select nie:title(?s) nco:creator(?s) nfo:pageCount (?s) Where { ?s nie:url \"%s\" }".printf(uri)
+ var query = "SELECT nie:title(?s) nco:creator(?s) nfo:pageCount (?s) WHERE { ?s nie:url \"%s\" }".printf(uri)
var result = Query.Query (query)
info_label4.set_text (N_("Title:"))
@@ -372,9 +355,7 @@ class TrackerMetadataTile : EventBox
SetLabelValue (info_value5, result[1])
SetLabelValue (info_value6, result[2])
- def private DisplayApplicationDetails (uri : string)
- return
-
+
def LoadUri (path : TreePath?)
ClearLabels ()
@@ -392,7 +373,6 @@ class TrackerMetadataTile : EventBox
_result_grid.store.get_iter (out iter, path)
_result_grid.store.get (iter, ResultColumns.Id, out id, ResultColumns.Uri, out uri, ResultColumns.Mime, out mime, ResultColumns.Icon, out icon)
-
/* determine category type */
var cat = GetCategory (uri)
@@ -401,12 +381,9 @@ class TrackerMetadataTile : EventBox
image.set_from_pixbuf (icon)
case cat
- when Categories.Application do DisplayApplicationDetails (uri)
when Categories.Audio do DisplayAudioDetails (uri)
when Categories.Video do DisplayVideoDetails (uri)
when Categories.Image do DisplayImageDetails (uri)
when Categories.Document do DisplayDocumentDetails (uri)
default do return
-
-
--
1.7.0
From 7a7d5c49c9bb432767c0692494f9f50a15abbe6a Mon Sep 17 00:00:00 2001
From: Tshepang Lekhonkhobe <tshep...@gmail.com>
Date: Wed, 5 May 2010 02:46:57 +0200
Subject: [PATCH 6/6] TST: segfault fix
---
src/tracker-search-tool/tracker-metadata-tile.gs | 8 ++++++--
src/tracker-search-tool/tracker-query.gs | 1 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/tracker-search-tool/tracker-metadata-tile.gs b/src/tracker-search-tool/tracker-metadata-tile.gs
index 620b532..fdae19f 100644
--- a/src/tracker-search-tool/tracker-metadata-tile.gs
+++ b/src/tracker-search-tool/tracker-metadata-tile.gs
@@ -253,8 +253,12 @@ class TrackerMetadataTile : EventBox
var query = "SELECT rdf:type(?s) where { ?s nie:url \"%s\" }".printf(uri)
var results = Query.Query (query)
var res = ""
- for s in results
- res += s
+
+ if results is null
+ print "Query result is null!"
+
+ else
+ res = results[0]
if res.contains ("nfo#Video") do return Categories.Video
if res.contains ("nfo#Image") do return Categories.Image
diff --git a/src/tracker-search-tool/tracker-query.gs b/src/tracker-search-tool/tracker-query.gs
index 50363bf..1c60d0c 100644
--- a/src/tracker-search-tool/tracker-query.gs
+++ b/src/tracker-search-tool/tracker-query.gs
@@ -92,7 +92,6 @@ class TrackerQuery : Object
return null
-
def Query (sparql : string) : array of string[,]?
try
return tracker.SparqlQuery (sparql)
--
1.7.0
_______________________________________________
tracker-list mailing list
tracker-list@gnome.org
http://mail.gnome.org/mailman/listinfo/tracker-list
