media-export: Remove WriteableContainer

Functionality has been moved to DBContainer

diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 34e1c8a..49fa248 100644 (file)
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -35,7 +35,6 @@ librygel_media_export_la_SOURCES = rygel-media-export-plugin.vala \
                                   rygel-media-export-harvester.vala \
                                   rygel-media-export-item.vala \
                                   rygel-media-export-jpeg-writer.vala \
-                                  rygel-media-export-writable-container.vala \
                                   rygel-media-export-object-factory.vala
 
 librygel_media_export_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \

diff --git a/src/plugins/media-export/rygel-media-export-db-container.vala b/src/plugins/media-export/rygel-media-export-db-container.vala
index 142cd0d..d4809f3 100644 (file)
--- a/src/plugins/media-export/rygel-media-export-db-container.vala
+++ b/src/plugins/media-export/rygel-media-export-db-container.vala
@@ -104,4 +104,15 @@ public class Rygel.MediaExport.DBContainer : MediaContainer {
                                                     throws Error {
         return this.media_db.get_object (id);
     }
+
+    public override async void add_item (Rygel.MediaItem    item,
+                                         Cancellable?       cancellable)
+                                         throws Error {
+        yield base.add_item (item, cancellable);
+
+        item.parent = this;
+        item.id = Item.get_id (File.new_for_uri (item.uris[0]));
+        this.media_db.save_item (item);
+    }
+
 }

diff --git a/src/plugins/media-export/rygel-media-export-object-factory.vala b/src/plugins/media-export/rygel-media-export-object-factory.vala
index 8b9eb40..ea90b28 100644 (file)
--- a/src/plugins/media-export/rygel-media-export-object-factory.vala
+++ b/src/plugins/media-export/rygel-media-export-object-factory.vala
@@ -36,7 +36,7 @@ internal class Rygel.MediaExport.ObjectFactory : Object {
         if (id.has_prefix (QueryContainer.PREFIX)) {
             return new QueryContainer (media_db, id, title);
         } else {
-            return new WritableContainer (media_db, id, title);
+            return new DBContainer (media_db, id, title);
         }
     }
 

diff --git a/src/plugins/media-export/rygel-media-export-writable-container.vala b/src/plugins/media-export/rygel-media-export-writable-container.vala
deleted file mode 100644 (file)
index 8544b71..0000000
--- a/src/plugins/media-export/rygel-media-export-writable-container.vala
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 Jens Georg <mail@jensge.org>.
- * Copyright (C) 2010 Nokia Corporation.
- *
- * Author: Jens Georg <mail@jensge.org>
- *         Zeeshan Ali (Khattak) <zeeshan.ali@nokia.com>
- *                               <zeeshanak@gnome.org>
- *
- * This file is part of Rygel.
- *
- * Rygel is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Rygel is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-internal class Rygel.MediaExport.WritableContainer : DBContainer {
-    public WritableContainer (MediaCache media_db,
-                              string     id,
-                              string     title) {
-        base (media_db, id, title);
-    }
-
-    public override async void add_item (Rygel.MediaItem    item,
-                                         Cancellable?       cancellable)
-                                         throws Error {
-        yield base.add_item (item, cancellable);
-
-        item.parent = this;
-        item.id = Checksum.compute_for_string (ChecksumType.MD5, item.uris[0]);
-        this.media_db.save_item (item);
-    }
-}