Merge lp:~vikoadi/audience/fix-no-extensions into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

fix empty video title in playlist and welcome screen when opening video without .extension

fix empty video title in playlist and welcome screen when opening video without .extension

[Cody Garver (codygarver)]

When I play a video without an extension (or any .'s in the filename), for example "#video", I get a blank window title. But "#video.mp4" or "#video.non-extension-text" display as expected.

[lp:~vikoadi/audience/fix-no-extensions]

408. By Viko Adi Rahmawan on 2014-10-10

rewrite string utils

409. By Viko Adi Rahmawan on 2014-10-10

assume extension is three character

410. By Viko Adi Rahmawan on 2014-10-10

merge trunk

[Viko Adi Rahmawan (vikoadi)]

I end up assuming extension is three character anyway, in case we have a dot char in the middle of no extension name

[Robert Roth (evfool)]

Assuming only three characters might not be the best, e.g. .mpeg won't be happy.

[Viko Adi Rahmawan (vikoadi)]

> Assuming only three characters might not be the best, e.g. .mpeg won't be
> happy.

I can't find a way to detect that after the dot is an extenstions or not unless we list all video extensions which supported by GStreamer. Any Idea?

[Artem Anufrij (artem-anufrij)]

See all possible video file extensions here:

http://en.wikipedia.org/wiki/Digital_container_format

[Avi Romanoff (aroman)]

I can confirm this fixes the issue. I agree that the solution proposed isn't perfect (assuming file extension length), but it definitely fixes most common instances of the related bug. I tried an mp4 without the .mp4 extension against trunk, and it had a blank title. I tried it against this branch, and the title showed as expected.

I propose we merge.

review: Approve

[xapantu (xapantu)]

No, that will not work with .mpeg for instance, or .webm.

Can we have a different behavior? I would like audience to check if there is a dot in the filename. If so, it just removes what follows (so, yes, if you have The.Filename.mp4 without an extension, you will just get The, but that does not really matter as in most cases there is an extension). If it does not find a dot, then it just uses the whole filename.

review: Disapprove

Unmerged revisions

410. By Viko Adi Rahmawan on 2014-10-10

merge trunk

409. By Viko Adi Rahmawan on 2014-10-10

assume extension is three character

408. By Viko Adi Rahmawan on 2014-10-10

rewrite string utils

407. By Viko Adi Rahmawan on 2014-10-04

fix empty playlist when opening video without extension

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-10-05 05:04:18 +0000
+++ src/Audience.vala	2014-10-10 12:54:51 +0000
@@ -333,7 +333,7 @@
             //welcome.append ("internet-web-browser", _("Open a location"), _("Watch something from the infinity of the internet"));
             var filename = settings.current_video;
             var last_file = File.new_for_uri (filename);
-            welcome.append ("media-playback-start", _("Resume last video"), get_title (last_file.get_basename ()));
+            welcome.append ("media-playback-start", _("Resume last video"), get_title (last_file.get_uri ()));
             bool show_last_file = settings.current_video != "";
             if (last_file.query_exists () == false) {
                 show_last_file = false;

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2014-09-03 17:44:50 +0000
+++ src/Utils.vala	2014-10-10 12:54:51 +0000
@@ -16,6 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Tom Beckmann <[e-mail]>
+ *              Viko Adi Rahmawan <[e-mail]>
  */
 
 [DBus (name = "org.gnome.SettingsDaemon.MediaKeys")]
@@ -50,36 +51,39 @@
             func (file_to_process);
         }
     }
+
+    // return title without extensions from an uri or basename
     public static string get_title (string filename) {
-        var title = get_basename (filename);
-        title = Uri.unescape_string (title);
-        title = title.replace ("_", " ").replace (".", " ").replace ("  ", " ");
-
-        return title;
-    }
-
-    public static string get_extension (string filename) {
-        for (uint i=filename.length; i!=0; i--) {
-            if (filename[i] == '.')
-                return filename.substring (i+1);
-        }
-
-        return filename;
-    }
-
-    public static string get_basename (string filename) {
-        uint end = 0;
-        for (uint start=filename.length; start != 0; start--) {
-            if (filename[start] == '/') {
-                start ++;
-                return filename.substring (start, end - start);
-            }
-
-            if (filename[start] == '.' && end == 0)
-                end = start;
-        }
-
-        return filename.substring (0, end);
+        string basename = get_basename (filename);
+        string ext = get_extension (basename);
+
+        if (ext != "") {
+            basename = basename.slice (0, - (ext.length + 1));
+        }
+
+        return basename.replace ("_", " ").replace (".", " ").replace ("  ", " ");
+    }
+
+    // return extension of a filename, return empty string if nothing found
+    // extension keep original character case
+    public static string get_extension (string uri) {
+        if (uri.length > 4 && uri.get_char (uri.length - 4) == '.') {
+            string ext = uri.substring (-3);
+            if (!ext.contains ("/"))
+                return ext;
+        }
+
+        return "";
+    }
+
+    // return filename without full path of an uri
+    public static string get_basename (string uri) {
+        string path = Uri.unescape_string (uri);
+        int end = path.last_index_of_char ('/');
+        if (end > -1)
+            return path.substring (end + 1);
+        else
+            return path;
     }
 
     public static string seconds_to_time (int seconds) {
@@ -111,7 +115,7 @@
         var file = File.new_for_uri (uri);
         return file.query_exists ();
     }
-    
+
     /**
      * Notifications
      */
@@ -153,4 +157,4 @@
         }
 #endif
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Widgets/Playlist.vala'
--- src/Widgets/Playlist.vala	2014-10-03 23:49:32 +0000
+++ src/Widgets/Playlist.vala	2014-10-10 12:54:51 +0000
@@ -119,7 +119,7 @@
 
             playlist.append (out iter);
             playlist.set (iter, Columns.PLAYING, playing,
-                                Columns.TITLE, Audience.get_title (path.get_basename ()),
+                                Columns.TITLE, Audience.get_title (path.get_uri ()),
                                 Columns.FILENAME, path.get_uri ());
         }