diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2014-03-10 20:05:12 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2015-04-19 15:24:08 +0200 |
| commit | 278f83066f25f44f7f3744d4c29c7e7564c7aabd (patch) | |
| tree | 4223aaa35f748c4aa2bbadb82c3e598086e3d64f | |
| parent | 64852ed3e38a59858e68b2331abd7b5a2119e139 (diff) | |
| download | rygel-278f83066f25f44f7f3744d4c29c7e7564c7aabd.tar.gz | |
lms plugin: do not skip files with absent mimetypes
| -rw-r--r-- | src/plugins/lms/rygel-lms-album.vala | 3 | ||||
| -rw-r--r-- | src/plugins/lms/rygel-lms-all-images.vala | 3 | ||||
| -rw-r--r-- | src/plugins/lms/rygel-lms-all-music.vala | 3 | ||||
| -rw-r--r-- | src/plugins/lms/rygel-lms-all-videos.vala | 6 | ||||
| -rw-r--r-- | src/plugins/lms/rygel-lms-image-year.vala | 3 |
5 files changed, 7 insertions, 11 deletions
diff --git a/src/plugins/lms/rygel-lms-album.vala b/src/plugins/lms/rygel-lms-album.vala index 25bfc0f2..8bba210f 100644 --- a/src/plugins/lms/rygel-lms-album.vala +++ b/src/plugins/lms/rygel-lms-album.vala @@ -72,10 +72,9 @@ public class Rygel.LMS.Album : Rygel.LMS.CategoryContainer { if (mime_type == null || mime_type.length == 0) { /* TODO is this correct? */ - debug ("Skipping music item %d (%s) with no MIME type", + debug ("Music item %d (%s) has no MIME type", id, path); - return null; } var title = statement.column_text(3); diff --git a/src/plugins/lms/rygel-lms-all-images.vala b/src/plugins/lms/rygel-lms-all-images.vala index 875889bd..d6f2624c 100644 --- a/src/plugins/lms/rygel-lms-all-images.vala +++ b/src/plugins/lms/rygel-lms-all-images.vala @@ -47,10 +47,9 @@ public class Rygel.LMS.AllImages : Rygel.LMS.CategoryContainer { if (mime_type == null || mime_type.length == 0){ /* TODO is this correct? */ - debug ("Skipping music item %d (%s) with no MIME type", + debug ("Image item %d (%s) has no MIME type", id, path); - return null; } var title = statement.column_text(1); diff --git a/src/plugins/lms/rygel-lms-all-music.vala b/src/plugins/lms/rygel-lms-all-music.vala index c6027550..a8de4493 100644 --- a/src/plugins/lms/rygel-lms-all-music.vala +++ b/src/plugins/lms/rygel-lms-all-music.vala @@ -85,10 +85,9 @@ public class Rygel.LMS.AllMusic : Rygel.LMS.CategoryContainer { if (mime_type == null || mime_type.length == 0) { /* TODO is this correct? */ - debug ("Skipping music item %d (%s) with no MIME type", + debug ("Music item %d (%s) has no MIME type", id, path); - return null; } var title = statement.column_text(3); diff --git a/src/plugins/lms/rygel-lms-all-videos.vala b/src/plugins/lms/rygel-lms-all-videos.vala index e1c021cc..33cb6496 100644 --- a/src/plugins/lms/rygel-lms-all-videos.vala +++ b/src/plugins/lms/rygel-lms-all-videos.vala @@ -49,20 +49,20 @@ public class Rygel.LMS.AllVideos : Rygel.LMS.CategoryContainer { /* TODO: Temporary code to extract the MIME TYPE. LMS does not seem to compute the mime type of videos. Don't know why. */ - if (mime_type == null || mime_type.length == 0) { +/* if (mime_type == null || mime_type.length == 0) { try { FileInfo info = file.query_info(FileAttribute.STANDARD_CONTENT_TYPE, FileQueryInfoFlags.NONE, null); mime_type = info.get_content_type(); } catch {} } +*/ if (mime_type == null || mime_type.length == 0) { /* TODO is this correct? */ - debug ("Skipping music item %d (%s) with no MIME type", + debug ("Video item %d (%s) has no MIME type", id, path); - return null; } var title = statement.column_text(1); diff --git a/src/plugins/lms/rygel-lms-image-year.vala b/src/plugins/lms/rygel-lms-image-year.vala index 1c32b71e..baa0f76c 100644 --- a/src/plugins/lms/rygel-lms-image-year.vala +++ b/src/plugins/lms/rygel-lms-image-year.vala @@ -47,10 +47,9 @@ public class Rygel.LMS.ImageYear : Rygel.LMS.CategoryContainer { if (mime_type == null || mime_type.length == 0){ /* TODO is this correct? */ - debug ("Skipping music item %d (%s) with no MIME type", + debug ("Image item %d (%s) has no MIME type", id, path); - return null; } var title = statement.column_text(1); |