[rygel] media-export: Small refactor
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] media-export: Small refactor
- Date: Thu, 12 Aug 2010 15:20:09 +0000 (UTC)
commit a7391ec69c19fd7cf4e9d734bd815d5eab9749ee
Author: Jens Georg <mail jensge org>
Date: Fri Jul 30 00:48:23 2010 +0200
media-export: Small refactor
.../rygel-media-export-harvesting-task.vala | 22 +++++++++++++------
1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-harvesting-task.vala b/src/plugins/media-export/rygel-media-export-harvesting-task.vala
index 146a3f9..93f67bc 100644
--- a/src/plugins/media-export/rygel-media-export-harvesting-task.vala
+++ b/src/plugins/media-export/rygel-media-export-harvesting-task.vala
@@ -202,7 +202,7 @@ public class Rygel.MediaExport.HarvestingTask : Rygel.StateMachine, GLib.Object
return false;
}
- var parent_container = this.containers.peek_head () as DummyContainer;
+ var parent_container = this.container ();
foreach (var info in list) {
var dir = parent_container.file;
@@ -240,7 +240,7 @@ public class Rygel.MediaExport.HarvestingTask : Rygel.StateMachine, GLib.Object
private void cleanup_database () {
// delete all children which are not in filesystem anymore
- var container = this.containers.peek_head () as DummyContainer;
+ var container = this.container ();
try {
foreach (var child in container.children) {
this.cache.remove_by_id (child);
@@ -264,7 +264,7 @@ public class Rygel.MediaExport.HarvestingTask : Rygel.StateMachine, GLib.Object
var candidate = this.files.peek ();
this.extractor.extract (candidate);
} else if (this.containers.get_length () > 0) {
- var container = this.containers.peek_head () as DummyContainer;
+ var container = this.container ();
var directory = container.file;
this.enumerate_directory (directory);
} else {
@@ -300,13 +300,13 @@ public class Rygel.MediaExport.HarvestingTask : Rygel.StateMachine, GLib.Object
if (file == entry) {
MediaItem item;
if (dlna == null) {
- item = new Item.simple (this.containers.peek_head (),
+ item = new Item.simple (this.current_parent (),
file,
mime,
size,
mtime);
} else {
- item = Item.create_from_info (this.containers.peek_head (),
+ item = Item.create_from_info (this.current_parent (),
file,
dlna,
mime,
@@ -315,7 +315,7 @@ public class Rygel.MediaExport.HarvestingTask : Rygel.StateMachine, GLib.Object
}
if (item != null) {
- item.parent_ref = this.containers.peek_head ();
+ item.parent_ref = this.current_parent ();
try {
this.cache.save_item (item);
} catch (Error error) {
@@ -350,10 +350,18 @@ public class Rygel.MediaExport.HarvestingTask : Rygel.StateMachine, GLib.Object
private void do_update () {
if (this.files.size == 0 &&
this.containers.get_length () != 0) {
- this.containers.peek_head ().updated ();
+ this.current_parent ().updated ();
this.containers.pop_head ();
}
Idle.add (this.on_idle);
}
+
+ private DummyContainer container() {
+ return this.containers.peek_head () as DummyContainer;
+ }
+
+ private inline MediaContainer current_parent () {
+ return this.containers.peek_head ();
+ }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]