/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "secure_save.h"
#include "thumb_standard.h"
#include "ui_fileops.h"
+#include "rcfile.h"
/*
*-----------------------------------------------------------------------------
static GList *file_sidecar_list = NULL; /* files with allowed sidecar */
-gint ishidden(const gchar *name)
-{
- if (name[0] != '.') return FALSE;
- if (name[1] == '\0' || (name[1] == '.' && name[2] == '\0')) return FALSE;
- return TRUE;
-}
-
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;
return NULL;
}
-static gint filter_key_exists(const gchar *key)
+static gboolean filter_key_exists(const gchar *key)
{
- return (filter_get_by_key(key) == NULL ? FALSE : TRUE);
+ return (filter_get_by_key(key) != NULL);
}
-void filter_add(const gchar *key, const gchar *description, const gchar *extensions, FileFormatClass file_class, gboolean writable, gboolean allow_sidecar, gint enabled)
+void filter_add(const gchar *key, const gchar *description, const gchar *extensions, FileFormatClass file_class, gboolean writable, gboolean allow_sidecar, gboolean enabled)
{
filter_list = g_list_append(filter_list, filter_entry_new(key, description, extensions, file_class, writable, allow_sidecar, enabled));
}
-void filter_add_unique(const gchar *description, const gchar *extensions, FileFormatClass file_class, gboolean writable, gboolean allow_sidecar, gint enabled)
+void filter_add_unique(const gchar *description, const gchar *extensions, FileFormatClass file_class, gboolean writable, gboolean allow_sidecar, gboolean enabled)
{
gchar *key;
guint n;
g_free(key);
}
-static void filter_add_if_missing(const gchar *key, const gchar *description, const gchar *extensions, FileFormatClass file_class, gboolean writable, gboolean allow_sidecar, gint enabled)
+static void filter_add_if_missing(const gchar *key, const gchar *description, const gchar *extensions, FileFormatClass file_class, gboolean writable, gboolean allow_sidecar, gboolean enabled)
{
GList *work;
work = work->next;
name = gdk_pixbuf_format_get_name(format);
+
+ 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)
ext = g_strndup(b, l);
- if (strcasecmp(ext, "%image") == 0) file_class = FORMAT_CLASS_IMAGE;
- else if (strcasecmp(ext, "%raw") == 0) file_class = FORMAT_CLASS_RAWIMAGE;
- else if (strcasecmp(ext, "%meta") == 0) file_class = FORMAT_CLASS_META;
+ 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);
}
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;
}
}
- sidecar_ext_parse(options->sidecar.ext, FALSE); /* this must be updated after changed file extensions */
+ /* 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 (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(SecureSaveInfo *ssi)
+void filter_write_list(GString *outstr, gint indent)
{
GList *work;
+ WRITE_NL(); WRITE_STRING("<filter>");
+ indent++;
+
work = filter_list;
while (work)
{
FilterEntry *fe = work->data;
work = work->next;
- gchar *extensions = escquote_value(fe->extensions);
- gchar *description = escquote_value(fe->description);
-
- secure_fprintf(ssi, "file_filter.ext: \"%s%s\" %s %s %d %d %d\n",
- (fe->enabled) ? "" : "#",
- fe->key, extensions, description, fe->file_class, fe->writable, fe->allow_sidecar);
- g_free(extensions);
- g_free(description);
+ WRITE_NL(); WRITE_STRING("<file_type ");
+ WRITE_CHAR(*fe, key);
+ WRITE_BOOL(*fe, enabled);
+ WRITE_CHAR(*fe, extensions);
+ WRITE_CHAR(*fe, description);
+ WRITE_UINT(*fe, file_class);
+ WRITE_BOOL(*fe, writable);
+ WRITE_BOOL(*fe, allow_sidecar);
+ WRITE_STRING("/>");
}
+ indent--;
+ WRITE_NL(); WRITE_STRING("</filter>");
}
-void filter_parse(const gchar *text)
+void filter_load_file_type(const gchar **attribute_names, const gchar **attribute_values)
{
- const gchar *p;
- gchar *key;
- gchar *ext;
- gchar *desc;
- gint enabled = TRUE;
- guint file_class = FORMAT_CLASS_UNKNOWN;
- gboolean writable = TRUE;
- gboolean allow_sidecar = TRUE;
-
- if (!text || text[0] != '"') return;
-
- key = quoted_value(text, &p);
- if (!key) return;
-
- ext = quoted_value(p, &p);
- desc = quoted_value(p, &p);
-
- sscanf(p, "%u %d %d", &file_class, &writable, &allow_sidecar);
-
- if (file_class >= FILE_FORMAT_CLASSES) file_class = FORMAT_CLASS_UNKNOWN;
-
- if (key && key[0] == '#')
+ FilterEntry fe;
+ FilterEntry *old_fe;
+ memset(&fe, 0, sizeof(fe));
+ while (*attribute_names)
{
- gchar *tmp;
- tmp = g_strdup(key + 1);
- g_free(key);
- key = tmp;
-
- enabled = FALSE;
+ const gchar *option = *attribute_names++;
+ const gchar *value = *attribute_values++;
+
+ if (READ_CHAR(fe, key)) continue;
+ if (READ_BOOL(fe, enabled)) continue;
+ if (READ_CHAR(fe, extensions)) continue;
+ if (READ_CHAR(fe, description)) continue;
+ if (READ_UINT(fe, file_class)) continue;
+ if (READ_BOOL(fe, writable)) continue;
+ if (READ_BOOL(fe, allow_sidecar)) continue;
+
+ log_printf("unknown attribute %s = %s\n", option, value);
}
-
- if (key && strlen(key) > 0 && ext)
+ if (fe.file_class >= FILE_FORMAT_CLASSES) fe.file_class = FORMAT_CLASS_UNKNOWN;
+
+ if (fe.key && fe.key[0] != 0)
{
- FilterEntry *fe = filter_get_by_key(key);
+ old_fe = filter_get_by_key(fe.key);
- if (fe != NULL) filter_remove_entry(fe);
- filter_add(key, desc, ext, file_class, writable, allow_sidecar, enabled);
+ if (old_fe != NULL) filter_remove_entry(old_fe);
+ filter_add(fe.key, fe.description, fe.extensions, fe.file_class, fe.writable, fe.allow_sidecar, fe.enabled);
}
-
- g_free(key);
- g_free(ext);
- g_free(desc);
+ g_free(fe.key);
+ g_free(fe.extensions);
+ g_free(fe.description);
}
+
/*
*-----------------------------------------------------------------------------
* sidecar extension list
sidecar_ext_list = NULL;
}
-void sidecar_ext_parse(const gchar *text, gboolean quoted)
+void sidecar_ext_parse(const gchar *text)
{
- gchar *value;
-
sidecar_ext_free_list();
+ if (text == NULL) return;
- if (quoted)
- value = quoted_value(text, NULL);
- else
- value = (gchar *) text;
-
- if (value == NULL) return;
-
- sidecar_ext_list = filter_to_list(value);
-
- if (quoted) g_free(value);
+ sidecar_ext_list = filter_to_list(text);
}
projects / geeqie.git / blobdiff