From 56e48f35f694f2b15ff2e26e34c9e42e541ea414 Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Fri, 11 Sep 2009 20:44:50 +0200 Subject: [PATCH] core,media-export: Rename MediaObject.timestamp MediaObject.timestamp is now called "modified" --- .../media-export/rygel-media-export-item.vala | 2 +- .../rygel-media-export-root-container.vala | 46 ++++++++++++++-------- src/rygel/rygel-media-db.vala | 6 +-- src/rygel/rygel-media-object.vala | 2 +- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/plugins/media-export/rygel-media-export-item.vala b/src/plugins/media-export/rygel-media-export-item.vala index 4a5c51e..ededecc 100644 --- a/src/plugins/media-export/rygel-media-export-item.vala +++ b/src/plugins/media-export/rygel-media-export-item.vala @@ -196,7 +196,7 @@ public class Rygel.MediaExportItem : Rygel.MediaItem { tag_list.get_uint64 (MetadataExtractor.TAG_RYGEL_MTIME, out mtime); - this.timestamp = (int64) mtime; + this.modified = (int64) mtime; this.add_uri (file.get_uri (), null); } diff --git a/src/plugins/media-export/rygel-media-export-root-container.vala b/src/plugins/media-export/rygel-media-export-root-container.vala index deb056e..dd41f4b 100644 --- a/src/plugins/media-export/rygel-media-export-root-container.vala +++ b/src/plugins/media-export/rygel-media-export-root-container.vala @@ -64,7 +64,7 @@ public class Rygel.MediaExportRootContainer : Rygel.MediaDBContainer { public static MediaContainer get_instance() { if (MediaExportRootContainer.instance == null) { try { - var db = MediaDB.create("media-export"); + var db = MediaDB.create ("media-export"); MediaExportRootContainer.instance = new MediaExportRootContainer (db); } catch (MediaDBError err) { @@ -85,7 +85,14 @@ public class Rygel.MediaExportRootContainer : Rygel.MediaDBContainer { var file = File.new_for_commandline_arg (uri); var id = Checksum.compute_for_string (ChecksumType.MD5, file.get_uri ()); - this.media_db.delete_by_id (id); + + try { + this.media_db.delete_by_id (id); + } catch (MediaDBError e) { + warning ("Failed to remove item %s: %s", + file.get_uri(), + e.message); + } } @@ -110,23 +117,28 @@ public class Rygel.MediaExportRootContainer : Rygel.MediaDBContainer { } catch (Error error) { } - var ids = media_db.get_child_ids ("0"); - var uris = get_uris (); - foreach (var uri in uris) { - var file = File.new_for_commandline_arg (uri); - if (file.query_exists (null)) { - var id = Checksum.compute_for_string (ChecksumType.MD5, - file.get_uri ()); - ids.remove (id); - this.harvest (file); + try { + var ids = media_db.get_child_ids ("0"); + var uris = get_uris (); + foreach (var uri in uris) { + var file = File.new_for_commandline_arg (uri); + if (file.query_exists (null)) { + var id = Checksum.compute_for_string (ChecksumType.MD5, + file.get_uri ()); + ids.remove (id); + this.harvest (file); + } } + foreach (var id in ids) { + debug ("Id %s no longer in config, deleting...", + id); + this.media_db.delete_by_id (id); + } + this.updated (); + } catch (MediaDBError e) { + warning ("Failed to get children for root container: %s", + e.message); } - foreach (var id in ids) { - debug ("Id %s no longer in config, deleting...", - id); - this.media_db.delete_by_id (id); - } - this.updated (); } private void on_file_harvested (File file) { diff --git a/src/rygel/rygel-media-db.vala b/src/rygel/rygel-media-db.vala index fc4e32b..91cf630 100644 --- a/src/rygel/rygel-media-db.vala +++ b/src/rygel/rygel-media-db.vala @@ -444,7 +444,7 @@ public class Rygel.MediaDB : Object { null); if (rc == Sqlite.OK) { if (statement.bind_text (1, obj.title) != Sqlite.OK || - statement.bind_int64 (2, (int64) obj.timestamp) != Sqlite.OK || + statement.bind_int64 (2, (int64) obj.modified) != Sqlite.OK || statement.bind_text (3, obj.id) != Sqlite.OK) { throw new MediaDBError.SQLITE_ERROR (db.errmsg ()); } @@ -522,7 +522,7 @@ public class Rygel.MediaDB : Object { null); if (rc == Sqlite.OK) { if (statement.bind_text (1, item.id) != Sqlite.OK || - statement.bind_int64 (5, (int64) item.timestamp) != Sqlite.OK || + statement.bind_int64 (5, (int64) item.modified) != Sqlite.OK || statement.bind_text (2, item.title) != Sqlite.OK) { throw new MediaDBError.SQLITE_ERROR (db.errmsg ()); } @@ -681,7 +681,7 @@ public class Rygel.MediaDB : Object { try { if (obj != null) { - obj.timestamp = statement.column_int64 (18); + obj.modified = statement.column_int64 (18); add_uris (obj); } } catch (MediaDBError err) { diff --git a/src/rygel/rygel-media-object.vala b/src/rygel/rygel-media-object.vala index ace77e9..6d552b9 100644 --- a/src/rygel/rygel-media-object.vala +++ b/src/rygel/rygel-media-object.vala @@ -29,7 +29,7 @@ using Gee; public abstract class Rygel.MediaObject : GLib.Object { public string id; public string title; - public uint64 timestamp; + public uint64 modified; public Gee.ArrayList uris; // You can keep both a unowned and owned ref to parent of this MediaObject. -- 2.7.4