Merge lp:~vikoadi/audience/check-mimetype into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

check file mimetype before added to playlist.
mimetipe list is taken from Totem code

[kay van der Zander (kay20)]

-fix if code style one lined if with brackets. (When code has already new code style and old style, stick with the new.)

Also the 2 comment then it is all good

review: Needs Fixing (code)

[Danielle Foré (danrabbit)]

Rejecting since it seems to be abandoned

Unmerged revisions

553. By Viko Adi Rahmawan on 2015-11-03

rearrange if else

552. By Viko Adi Rahmawan on 2015-11-03

use video mimetype list for open file dialog

551. By Viko Adi Rahmawan on 2015-11-03

check if file is in video mimetest video before adding to playlist

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2015-10-31 19:40:48 +0000
+++ src/Audience.vala	2015-11-03 17:36:48 +0000
@@ -254,7 +254,9 @@
 
             var video_filter = new Gtk.FileFilter ();
             video_filter.set_filter_name (_("Video files"));
-            video_filter.add_mime_type ("video/*");
+            foreach (var mime_type in video_mime_types) {
+                video_filter.add_mime_type (mime_type);
+            }
 
             file.add_filter (video_filter);
             file.add_filter (all_files_filter);
@@ -336,19 +338,17 @@
             var player_page = (mainwindow.get_child () as PlayerPage);
             string[] videos = {};
             foreach (var file in files) {
-
-                if (file.query_file_type (0) == FileType.DIRECTORY) {
+                if (is_video (file)) {
+                    player_page.append_to_playlist (file);
+                    videos += file.get_uri ();
+                } else if (file.query_file_type (0) == FileType.DIRECTORY) {
                     Audience.recurse_over_dir (file, (file_ret) => {
-                        player_page.append_to_playlist (file);
-                        videos += file_ret.get_uri ();
+                            player_page.append_to_playlist (file_ret);
+                            videos += file_ret.get_uri ();
                     });
                 } else if (player_page.video_player.playing &&
                         PlayerPage.is_subtitle (file.get_uri ())) {
-                    message ("is subtitle");
                     player_page.video_player.set_subtitle_uri (file.get_uri ());
-                } else {
-                    player_page.append_to_playlist (file);
-                    videos += file.get_uri ();
                 }
             }
 
@@ -364,11 +364,8 @@
                     show_notification (_("%i videos added to playlist").printf (videos.length), "");
             }
 
-            play_file (videos [0]);
-
-
+            player_page.play_first_in_playlist ();
         }
-
     }
 }
 

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2015-06-06 14:08:15 +0000
+++ src/Utils.vala	2015-11-03 17:36:48 +0000
@@ -33,6 +33,86 @@
 }
 
 namespace Audience {
+    // taken from totem-mime-types.h
+    static const string video_mime_types[] = {
+        "application/mxf",
+        "application/ogg",
+        "application/ram",
+        "application/sdp",
+        "application/vnd.apple.mpegurl",
+        "application/vnd.ms-wpl",
+        "application/vnd.rn-realmedia",
+        "application/x-extension-m4a",
+        "application/x-extension-mp4",
+        "application/x-flash-video",
+        "application/x-matroska",
+        "application/x-netshow-channel",
+        "application/x-ogg",
+        "application/x-quicktimeplayer",
+        "application/x-shorten",
+        "image/vnd.rn-realpix",
+        "image/x-pict",
+        "misc/ultravox",
+        "text/x-google-video-pointer",
+        "video/3gp",
+        "video/3gpp",
+        "video/dv",
+        "video/divx",
+        "video/fli",
+        "video/flv",
+        "video/mp2t",
+        "video/mp4",
+        "video/mp4v-es",
+        "video/mpeg",
+        "video/msvideo",
+        "video/ogg",
+        "video/quicktime",
+        "video/vivo",
+        "video/vnd.divx",
+        "video/vnd.mpegurl",
+        "video/vnd.rn-realvideo",
+        "video/vnd.vivo",
+        "video/webm",
+        "video/x-anim",
+        "video/x-avi",
+        "video/x-flc",
+        "video/x-fli",
+        "video/x-flic",
+        "video/x-flv",
+        "video/x-m4v",
+        "video/x-matroska",
+        "video/x-mpeg",
+        "video/x-mpeg2",
+        "video/x-ms-asf",
+        "video/x-ms-asx",
+        "video/x-msvideo",
+        "video/x-ms-wm",
+        "video/x-ms-wmv",
+        "video/x-ms-wmx",
+        "video/x-ms-wvx",
+        "video/x-nsv",
+        "video/x-ogm+ogg",
+        "video/x-theora+ogg",
+        "video/x-totem-stream",
+        "audio/x-pn-realaudio",
+    };
+
+    public static bool is_video (File filename) {
+        try {
+            string content_type = filename.query_info (
+                    FileAttribute.STANDARD_CONTENT_TYPE,
+                    FileQueryInfoFlags.NONE,
+                    null).get_content_type ();
+            foreach (var video_mime_type in video_mime_types)
+                if (video_mime_type == content_type)
+                    return true;
+            return false;
+        } catch (Error e) {
+            debug ("cant get ContentType " + e.message);
+            return false;
+        }
+    }
+
     public delegate void FuncOverDir (File file_under_dir);
     public static void recurse_over_dir (File file_to_process, FuncOverDir func) {
         if (file_to_process.query_file_type (0) == FileType.DIRECTORY) {

=== modified file 'src/Widgets/Playlist.vala'
--- src/Widgets/Playlist.vala	2015-06-08 05:53:03 +0000
+++ src/Widgets/Playlist.vala	2015-11-03 17:36:48 +0000
@@ -99,8 +99,9 @@
         }
 
         public void add_item (File path) {
-            if (!path.query_exists ())
+            if (!path.query_exists () || !is_video (path))
                 return;
+
             var file_name = path.get_uri ();
             bool exist = false;
             Gtk.TreeIter iter;