/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
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;
{
if (fe->file_class == FORMAT_CLASS_UNKNOWN)
fe->file_class = file_class; /* for compatibility */
-
+
if (fe->writable && fe->allow_sidecar)
{
fe->writable = writable;
work = work->next;
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);
continue;
}
-
+
desc = gdk_pixbuf_format_get_description(format);
extensions = gdk_pixbuf_format_get_extensions(format);
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)
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)
p++;
l++;
}
-
+
ext = g_strndup(b, l);
-
+
if (g_ascii_strcasecmp(ext, "%image") == 0) file_class = FORMAT_CLASS_IMAGE;
else if (g_ascii_strcasecmp(ext, "%raw") == 0) file_class = FORMAT_CLASS_RAWIMAGE;
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);
}
list = g_list_concat(list, string_list_copy(file_class_extension_list[file_class]));
g_free(ext);
}
-
+
if (*p == ';') p++;
}
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;
{
log_printf("WARNING: invalid file class %d\n", fe->file_class);
}
-
+
if (fe->writable)
{
ext = filter_to_list(fe->extensions);
ext = filter_to_list(fe->extensions);
if (ext) file_sidecar_list = g_list_concat(file_sidecar_list, ext);
}
-
+
}
}
+ /* 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;
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)
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)
log_printf("unknown attribute %s = %s\n", option, value);
}
if (fe.file_class >= FILE_FORMAT_CLASSES) fe.file_class = FORMAT_CLASS_UNKNOWN;
-
+
if (fe.key && fe.key[0] != 0)
{
old_fe = filter_get_by_key(fe.key);