[rygel] core: Use Rygel.Database at remaining places
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rygel] core: Use Rygel.Database at remaining places
- Date: Sat, 24 Oct 2009 14:08:13 +0000 (UTC)
commit 877fe9d6e099eca1761b0903aecef69444a66e01
Author: Jens Georg <mail jensge org>
Date: Wed Sep 30 14:34:24 2009 +0200
core: Use Rygel.Database at remaining places
src/rygel/rygel-media-db.vala | 54 ++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 30 deletions(-)
---
diff --git a/src/rygel/rygel-media-db.vala b/src/rygel/rygel-media-db.vala
index 5f4e431..ab62e76 100644
--- a/src/rygel/rygel-media-db.vala
+++ b/src/rygel/rygel-media-db.vala
@@ -376,64 +376,58 @@ public class Rygel.MediaDB : Object {
}
public void save_container (MediaContainer container) throws Error {
- var rc = db.exec ("BEGIN");
try {
+ db.begin ();
create_object (container);
save_uris (container);
- rc = db.exec ("COMMIT");
- if (rc == Sqlite.OK) {
- object_added (container.id);
- container_added (container.id);
- }
- } catch (Error error) {
- rc = db.exec ("ROLLBACK");
- throw error;
+ db.commit ();
+ object_added (container.id);
+ container_added (container.id);
+ } catch (DatabaseError err) {
+ db.rollback ();
+ throw err;
}
}
public void save_item (MediaItem item) throws Error {
- var rc = db.exec ("BEGIN;");
try {
+ db.begin ();
save_metadata (item);
create_object (item);
save_uris (item);
- rc = db.exec ("COMMIT;");
- if (rc == Sqlite.OK) {
- object_added (item.id);
- item_added (item.id);
- }
- } catch (Error error) {
+ db.commit ();
+ object_added (item.id);
+ item_added (item.id);
+ } catch (DatabaseError error) {
warning ("Failed to add item with id %s: %s",
item.id,
error.message);
- rc = db.exec ("ROLLBACK;");
+ db.rollback ();
throw error;
}
}
public void update_object (MediaObject obj) throws Error {
- var rc = db.exec ("BEGIN");
try {
+ db.begin ();
remove_uris (obj);
if (obj is MediaItem) {
save_metadata ((MediaItem)obj, UPDATE_META_DATA_STRING);
}
update_object_internal (obj);
save_uris (obj);
- rc = db.exec ("COMMIT");
- if (rc == Sqlite.OK) {
- object_updated (obj.id);
- if (obj is MediaItem)
- item_updated (obj.id);
- else if (obj is MediaContainer)
- container_updated (obj.id);
- }
+ db.commit ();
+ object_updated (obj.id);
+ if (obj is MediaItem)
+ item_updated (obj.id);
+ else if (obj is MediaContainer)
+ container_updated (obj.id);
} catch (Error error) {
warning ("Failed to add item with id %s: %s",
obj.id,
error.message);
- rc = db.exec ("ROLLBACK");
+ db.rollback ();
throw error;
}
}
@@ -514,7 +508,7 @@ public class Rygel.MediaDB : Object {
}
- private void add_uris (MediaObject obj) throws MediaDBError {
+ private void add_uris (MediaObject obj) throws DatabaseError {
GLib.Value[] values = { obj.id };
this.db.exec (URI_GET_STRING,
values,
@@ -556,14 +550,14 @@ public class Rygel.MediaDB : Object {
obj.modified = statement.column_int64 (18);
add_uris (obj);
}
- } catch (MediaDBError err) {
+ } catch (DatabaseError err) {
warning ("Failed to load uris from database: %s", err.message);
obj = null;
}
return obj;
}
- public MediaObject? get_object (string object_id) throws MediaDBError {
+ public MediaObject? get_object (string object_id) throws DatabaseError {
MediaObject obj = null;
GLib.Value[] values = { object_id };
Rygel.Database.RowCallback cb = (stmt) => {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]