callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: change file_utils_uti_get_ext() to file_utils_file_get_ext()

Browse Source
This commit is contained in:
Michael Natterer
2014-07-08 02:58:59 +02:00
parent 58f579cbe6
commit 5e13f81b99
3 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/file/file-procedure.c
View File

@ -326,40 +326,36 @@ file_proc_find_by_extension (GSList *procs,
gboolean skip_magic,
gboolean uri_procs_only)
{
gchar *uri = g_file_get_uri (file);
GSList *p;
const gchar *ext;
ext = file_utils_uri_get_ext (uri);
ext = file_utils_file_get_ext (file);
if (! (ext && *ext == '.'))
if (ext)
{
g_free (uri);
return NULL;
}
GSList *p;
ext++;
for (p = procs; p; p = g_slist_next (p))
{
GimpPlugInProcedure *proc = p->data;
if (uri_procs_only && ! proc->handles_uri)
continue;
if (skip_magic && proc->magics_list)
continue;
if (g_slist_find_custom (proc->extensions_list,
ext,
(GCompareFunc) g_ascii_strcasecmp))
for (p = procs; p; p = g_slist_next (p))
{
g_free (uri);
return proc;
}
}
GimpPlugInProcedure *proc = p->data;
g_free (uri);
if (uri_procs_only && ! proc->handles_uri)
continue;
if (skip_magic && proc->magics_list)
continue;
if (g_slist_find_custom (proc->extensions_list,
ext + 1,
(GCompareFunc) g_ascii_strcasecmp))
{
g_free (ext);
return proc;
}
}
g_free (ext);
}
return NULL;
}

65
app/file/file-utils.c
View File

@ -165,32 +165,38 @@ GFile *
file_utils_file_with_new_ext (GFile *file,
GFile *ext_file)
{
gchar *uri;
const gchar *uri_ext;
gchar *ext_uri = NULL;
const gchar *ext_uri_ext = NULL;
gchar *uri_without_ext;
gchar *new_uri;
GFile *ret;
gchar *uri;
gchar *file_ext;
gint file_ext_len = 0;
gchar *ext_file_ext = NULL;
gchar *uri_without_ext;
gchar *new_uri;
GFile *ret;
g_return_val_if_fail (G_IS_FILE (file), NULL);
g_return_val_if_fail (ext_file == NULL || G_IS_FILE (ext_file), NULL);
uri = g_file_get_uri (file);
uri_ext = file_utils_uri_get_ext (uri);
uri = g_file_get_uri (file);
file_ext = file_utils_file_get_ext (file);
if (ext_file)
if (file_ext)
{
ext_uri = g_file_get_uri (ext_file);
ext_uri_ext = file_utils_uri_get_ext (ext_uri);
file_ext_len = strlen (file_ext);
g_free (file_ext);
}
uri_without_ext = g_strndup (uri, uri_ext - uri);
if (ext_file)
ext_file_ext = file_utils_file_get_ext (ext_file);
new_uri = g_strconcat (uri_without_ext, ext_uri_ext, NULL);
uri_without_ext = g_strndup (uri, strlen (uri) - file_ext_len);
g_free (uri);
new_uri = g_strconcat (uri_without_ext, ext_file_ext, NULL);
ret = g_file_new_for_uri (new_uri);
g_free (ext_file_ext);
g_free (uri_without_ext);
g_free (new_uri);
@ -199,21 +205,26 @@ file_utils_file_with_new_ext (GFile *file,
/**
* file_utils_uri_get_ext:
* @uri:
* file_utils_file_get_ext:
* @file:
*
* Returns the position of the extension (including the .) for an URI. If
* there is no extension the returned position is right after the
* string, at the terminating NULL character.
* Returns the position of the extension (including the .), or NULL
* if there is no extension.
*
* Returns:
**/
const gchar *
file_utils_uri_get_ext (const gchar *uri)
gchar *
file_utils_file_get_ext (GFile *file)
{
const gchar *ext = NULL;
int uri_len = strlen (uri);
int search_len = 0;
gchar *uri;
gint uri_len;
gchar *ext = NULL;
gint search_len;
g_return_val_if_fail (G_IS_FILE (file), NULL);
uri = g_file_get_uri (file);
uri_len = strlen (uri);
if (g_strrstr (uri, ".gz"))
search_len = uri_len - 3;
@ -226,8 +237,10 @@ file_utils_uri_get_ext (const gchar *uri)
ext = g_strrstr_len (uri, search_len, ".");
if (! ext)
ext = uri + uri_len;
if (ext)
ext = g_strdup (ext);
g_free (uri);
return ext;
}

3
app/file/file-utils.h
View File

@ -26,9 +26,10 @@ gboolean file_utils_filename_is_uri (const gchar *filename,
gchar * file_utils_filename_to_uri (Gimp *gimp,
const gchar *filename,
GError **error);
GFile * file_utils_file_with_new_ext (GFile *file,
GFile *ext_file);
const gchar * file_utils_uri_get_ext (const gchar *uri);
gchar * file_utils_file_get_ext (GFile *file);
GdkPixbuf * file_utils_load_thumbnail (const gchar *filename);
gboolean file_utils_save_thumbnail (GimpImage *image,