Trim trailing white spaces.

[geeqie.git] / src / filefilter.c

diff --git a/src/filefilter.c b/src/filefilter.c
index 25c6d96..c62ac59 100644 (file)
--- a/src/filefilter.c
+++ b/src/filefilter.c
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -38,7 +38,7 @@ static GList *file_sidecar_list = NULL; /* files with allowed sidecar */
 
 
 static FilterEntry *filter_entry_new(const gchar *key, const gchar *description,
-                                    const gchar *extensions, FileFormatClass file_class, 
+                                    const gchar *extensions, FileFormatClass file_class,
                                     gboolean writable, gboolean allow_sidecar, gboolean enabled)
 {
        FilterEntry *fe;
@@ -189,7 +189,7 @@ void filter_add_defaults(void)
 
                name = gdk_pixbuf_format_get_name(format);
                
-               if (strcmp(name, "Digital camera RAW") == 0) 
+               if (strcmp(name, "Digital camera RAW") == 0)
                        {
                        DEBUG_1("Skipped '%s' from loader", name);
                        g_free(name);
@@ -238,11 +238,16 @@ void filter_add_defaults(void)
        filter_add_if_missing("ico", "Icon file", ".ico;.cur", FORMAT_CLASS_IMAGE, TRUE, FALSE, FALSE);
        filter_add_if_missing("ras", "Raster", ".ras", FORMAT_CLASS_IMAGE, TRUE, FALSE, FALSE);
        filter_add_if_missing("svg", "Scalable Vector Graphics", ".svg", FORMAT_CLASS_IMAGE, TRUE, FALSE, FALSE);
-
+       
+       /* special formats for stereo */
+       filter_add_if_missing("jps", "Stereo side-by-side jpeg", ".jps", FORMAT_CLASS_IMAGE, TRUE, FALSE, TRUE);
+       filter_add_if_missing("mpo", "Stereo multi-image jpeg", ".mpo", FORMAT_CLASS_IMAGE, FALSE, TRUE, TRUE);
+       
        /* non-image files that might be desirable to show */
        filter_add_if_missing("xmp", "XMP sidecar", ".xmp", FORMAT_CLASS_META, TRUE, FALSE, TRUE);
        filter_add_if_missing("gqv", GQ_APPNAME " image collection", GQ_COLLECTION_EXT, FORMAT_CLASS_META, FALSE, FALSE, TRUE);
        filter_add_if_missing("ufraw", "UFRaw ID file", ".ufraw", FORMAT_CLASS_META, FALSE, FALSE, TRUE);
+       filter_add_if_missing("pto", "Panorama script file", ".pto", FORMAT_CLASS_META, FALSE, FALSE, TRUE);
 
        /* These are the raw camera formats with embedded jpeg/exif.
         * (see format_raw.c and/or exiv2.cc)
@@ -262,6 +267,8 @@ void filter_add_defaults(void)
        filter_add_if_missing("r3d", "Red raw format", ".r3d", FORMAT_CLASS_RAWIMAGE, FALSE, TRUE, TRUE);
        filter_add_if_missing("3fr", "Hasselblad raw format", ".3fr", FORMAT_CLASS_RAWIMAGE, FALSE, TRUE, TRUE);
        filter_add_if_missing("erf", "Epson raw format", ".erf", FORMAT_CLASS_RAWIMAGE, FALSE, TRUE, TRUE);
+       filter_add_if_missing("srw", "Samsung raw format", ".srw", FORMAT_CLASS_RAWIMAGE, FALSE, TRUE, TRUE);
+       filter_add_if_missing("rw2", "Panasonic raw format", ".rw2", FORMAT_CLASS_RAWIMAGE, FALSE, TRUE, TRUE);
 }
 
 GList *filter_to_list(const gchar *extensions)
@@ -293,7 +300,7 @@ GList *filter_to_list(const gchar *extensions)
                else if (g_ascii_strcasecmp(ext, "%meta") == 0) file_class = FORMAT_CLASS_META;
                else if (g_ascii_strcasecmp(ext, "%unknown") == 0) file_class = FORMAT_CLASS_UNKNOWN;
                
-               if (file_class == -1) 
+               if (file_class == -1)
                        {
                        list = g_list_append(list, ext);
                        }
@@ -309,6 +316,20 @@ GList *filter_to_list(const gchar *extensions)
        return list;
 }
 
+static gint filter_sort_ext_len_cb(gconstpointer a, gconstpointer b)
+{
+       gchar *sa = (gchar *)a;
+       gchar *sb = (gchar *)b;
+       
+       gint len_a = strlen(sa);
+       gint len_b = strlen(sb);
+       
+       if (len_a > len_b) return -1;
+       if (len_a < len_b) return 1;
+       return 0;
+}
+ 
+
 void filter_rebuild(void)
 {
        GList *work;
@@ -369,10 +390,13 @@ void filter_rebuild(void)
                        }
                }
 
+       /* make sure registered_extension_from_path finds the longer match first */
+       extension_list = g_list_sort(extension_list, filter_sort_ext_len_cb);
        sidecar_ext_parse(options->sidecar.ext); /* this must be updated after changed file extensions */
 }
 
-static gboolean filter_name_find(GList *filter, const gchar *name)
+/* return the extension part of the name or NULL */
+static const gchar *filter_name_find(GList *filter, const gchar *name)
 {
        GList *work;
        guint ln;
@@ -387,20 +411,23 @@ static gboolean filter_name_find(GList *filter, const gchar *name)
                if (ln >= lf)
                        {
                        /* FIXME: utf8 */
-                       if (g_ascii_strncasecmp(name + ln - lf, filter, lf) == 0) return TRUE;
+                       if (g_ascii_strncasecmp(name + ln - lf, filter, lf) == 0) return name + ln - lf;
                        }
                work = work->next;
                }
 
-       return FALSE;
+       return NULL;
+}
+const gchar *registered_extension_from_path(const gchar *name)
+{
+       return filter_name_find(extension_list, name);
 }
-
 
 gboolean filter_name_exists(const gchar *name)
 {
        if (!extension_list || options->file_filter.disable) return TRUE;
 
-       return filter_name_find(extension_list, name);
+       return !!filter_name_find(extension_list, name);
 }
 
 gboolean filter_file_class(const gchar *name, FileFormatClass file_class)
@@ -411,17 +438,17 @@ gboolean filter_file_class(const gchar *name, FileFormatClass file_class)
                return FALSE;
                }
 
-       return filter_name_find(file_class_extension_list[file_class], name);
+       return !!filter_name_find(file_class_extension_list[file_class], name);
 }
 
 gboolean filter_name_is_writable(const gchar *name)
 {
-       return filter_name_find(file_writable_list, name);
+       return !!filter_name_find(file_writable_list, name);
 }
 
 gboolean filter_name_allow_sidecar(const gchar *name)
 {
-       return filter_name_find(file_sidecar_list, name);
+       return !!filter_name_find(file_sidecar_list, name);
 }
 
 void filter_write_list(GString *outstr, gint indent)