Move unique_filename_from_url functions to common

Makefile.am

@@ -93,8 +93,6 @@ unittest_sources = \
 	src/tools/clipboard.c src/tools/clipboard.h \
 	src/tools/bookmark_ignore.c \
 	src/tools/bookmark_ignore.h \
-	src/tools/http_download.c \
-	src/tools/http_download.h \
 	src/config/accounts.h \
 	src/config/account.c src/config/account.h \
 	src/config/files.c src/config/files.h \
@@ -153,7 +151,6 @@ unittest_sources = \
 	tests/unittests/test_cmd_disconnect.c tests/unittests/test_cmd_disconnect.h \
 	tests/unittests/test_callbacks.c tests/unittests/test_callbacks.h \
 	tests/unittests/test_plugins_disco.c tests/unittests/test_plugins_disco.h \
-	tests/unittests/test_http_common.c tests/unittests/test_http_common.h \
 	tests/unittests/unittests.c
 
 functionaltest_sources = \

src/command/cmd_funcs.c

@@ -9110,67 +9110,6 @@ _url_external_method(const char* cmd_template, const char* url, const char* file
     g_strfreev(argv);
 }
 
-char*
-_unique_filename(const char* filename)
-{
-    char* unique = strdup(filename);
-
-    unsigned int i = 0;
-    while (g_file_test(unique, G_FILE_TEST_EXISTS)) {
-        free(unique);
-
-        if (i > 1000) { // Give up after 1000 attempts.
-            return NULL;
-        }
-
-        if (asprintf(&unique, "%s.%u", filename, i) < 0) {
-            return NULL;
-        }
-
-        i++;
-    }
-
-    return unique;
-}
-
-char*
-_unique_filename_from_url(char* url, char* path)
-{
-    gchar* directory = NULL;
-    gchar* basename = NULL;
-    if (path != NULL) {
-        directory = g_path_get_dirname(path);
-        basename = g_path_get_basename(path);
-    }
-
-    if (directory == NULL) {
-        // Explicitly use "./" as directory if no directory has been passed.
-        directory = "./";
-    }
-
-    if (!g_file_test(directory, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-        cons_show_error("Directory '%s' does not exist or is not a directory.", directory);
-        return NULL;
-    }
-
-    if (!basename) {
-        basename = http_basename_from_url(url);
-    }
-
-    char* filename = NULL;
-    filename = g_build_filename(directory, basename, NULL);
-
-    char* unique_filename = _unique_filename(filename);
-    if (!unique_filename) {
-        cons_show_error("Failed to generate an unique filename from '%s'.", filename);
-        free(filename);
-        return NULL;
-    }
-
-    free(filename);
-    return unique_filename;
-}
-
 gboolean
 cmd_url_open(ProfWin* window, const char* const command, gchar** args)
 {
@@ -9200,7 +9139,7 @@ cmd_url_open(ProfWin* window, const char* const command, gchar** args)
 #ifdef HAVE_OMEMO
     // OMEMO URLs (aesgcm://) must be saved and decrypted before being opened.
     if (0 == g_strcmp0(scheme, "aesgcm")) {
-        char* filename = _unique_filename_from_url(url, files_get_data_path(DIR_DOWNLOADS));
+        char* filename = unique_filename_from_url(url, files_get_data_path(DIR_DOWNLOADS));
         _url_aesgcm_method(window, cmd_template, url, filename);
 
         free(filename);
@@ -9241,7 +9180,7 @@ cmd_url_save(ProfWin* window, const char* const command, gchar** args)
         return TRUE;
     }
 
-    char* filename = _unique_filename_from_url(url, path);
+    char* filename = unique_filename_from_url(url, path);
 
     char* cmd_template = prefs_get_string_with_option(PREF_URL_SAVE_CMD, scheme);
     if (cmd_template == NULL) {

src/common.c

@@ -33,6 +33,9 @@
  * source files in the program, then also delete it here.
  *
  */
+
+#define _GNU_SOURCE 1
+
 #include "config.h"
 
 #include <errno.h>
@@ -575,3 +578,80 @@ format_call_external_argv(const char* template, const char* url, const char* fil
 
     return argv;
 }
+
+gchar*
+_unique_filename(const char* filename)
+{
+    gchar* unique = g_strdup(filename);
+
+    unsigned int i = 0;
+    while (g_file_test(unique, G_FILE_TEST_EXISTS)) {
+        free(unique);
+
+        if (i > 1000) { // Give up after 1000 attempts.
+            return NULL;
+        }
+
+        if (asprintf(&unique, "%s.%u", filename, i) < 0) {
+            return NULL;
+        }
+
+        i++;
+    }
+
+    return unique;
+}
+
+gchar*
+_basename_from_url(const char* url)
+{
+    const char* default_name = "index.html";
+
+    GFile* file = g_file_new_for_uri(url);
+    gchar* filename = g_file_get_basename(file);
+    g_object_unref(file);
+
+    if (g_strcmp0(filename, ".") == 0
+        || g_strcmp0(filename, "..") == 0
+        || g_strcmp0(filename, G_DIR_SEPARATOR_S) == 0) {
+        g_free(filename);
+        return strdup(default_name);
+    }
+
+    return filename;
+}
+
+gchar*
+unique_filename_from_url(const char* url, const char* path)
+{
+    gchar* directory = NULL;
+    gchar* basename = NULL;
+    if (path != NULL) {
+        directory = g_path_get_dirname(path);
+        basename = g_path_get_basename(path);
+    }
+
+    if (!directory) {
+        // Explicitly use "./" as directory if no directory has been passed.
+        directory = "./";
+    }
+
+    if (!g_file_test(directory, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+        return NULL;
+    }
+
+    if (g_file_test(path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+        basename = _basename_from_url(url);
+    }
+
+    gchar* filename = g_build_filename(directory, basename, NULL);
+
+    gchar* unique_filename = _unique_filename(filename);
+    if (!unique_filename) {
+        g_free(filename);
+        return NULL;
+    }
+
+    g_free(filename);
+    return unique_filename;
+}

src/common.h

@@ -107,4 +107,6 @@ char* get_random_string(int length);
 gboolean call_external(gchar** argv, gchar*** const output_ptr, gchar*** const error_ptr);
 gchar** format_call_external_argv(const char* template, const char* url, const char* filename);
 
+gchar* unique_filename_from_url(const char* url, const char* path);
+
 #endif

src/config/preferences.c

@@ -1865,7 +1865,6 @@ _get_group(preference_t pref)
         return PREF_GROUP_LOGGING;
     case PREF_AVATAR_CMD:
     case PREF_URL_OPEN_CMD:
-        return PREF_GROUP_EXECUTABLES;
     case PREF_URL_SAVE_CMD:
         return PREF_GROUP_EXECUTABLES;
     case PREF_AUTOAWAY_CHECK:

src/tools/http_common.c

@@ -44,25 +44,6 @@
 
 #define FALLBACK_MSG ""
 
-char*
-http_basename_from_url(const char* url)
-{
-    const char* default_name = "index.html";
-
-    GFile* file = g_file_new_for_uri(url);
-    char* filename = g_file_get_basename(file);
-    g_object_unref(file);
-
-    if (g_strcmp0(filename, ".") == 0
-        || g_strcmp0(filename, "..") == 0
-        || g_strcmp0(filename, G_DIR_SEPARATOR_S) == 0) {
-        g_free(filename);
-        return strdup(default_name);
-    }
-
-    return filename;
-}
-
 void
 http_print_transfer_update(ProfWin* window, char* url, const char* fmt, ...)
 {

src/tools/http_common.h

@@ -38,9 +38,7 @@
 
 #include "ui/window.h"
 
-char* http_basename_from_url(const char* url);
 void http_print_transfer(ProfWin* window, char* url, const char* fmt, ...);
 void http_print_transfer_update(ProfWin* window, char* url, const char* fmt, ...);
-gchar** http_format_external_argv(const char* cmd, const char* url, const char* filename);
 
 #endif

tests/unittests/test_common.c

@@ -330,6 +330,83 @@ strip_quotes_strips_both(void** state)
     free(result);
 }
 
+typedef struct
+{
+    char* url;
+    char* path;
+    char* filename;
+} unique_filename_from_url_t;
+
+void
+unique_filename_from_url_td(void** state)
+{
+    enum table { num_tests = 11 };
+
+    unique_filename_from_url_t tests[num_tests] = {
+        (unique_filename_from_url_t){
+            .url = "https://host.test/image.jpeg",
+            .path = "./",
+            .filename = "./image.jpeg",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test/image.jpeg#somefragment",
+            .path = "./",
+            .filename = "./image.jpeg",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test/image.jpeg?query=param",
+            .path = "./",
+            .filename = "./image.jpeg",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test/image.jpeg?query=param&another=one",
+            .path = "./",
+            .filename = "./image.jpeg",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test/images/",
+            .path = "./",
+            .filename = "./images",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test/images/../../file",
+            .path = "./",
+            .filename = "./file",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test/images/../../file/..",
+            .path = "./",
+            .filename = "./index.html",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test/images/..//",
+            .path = "./",
+            .filename = "./index.html",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test/",
+            .path = "./",
+            .filename = "./index.html",
+        },
+        (unique_filename_from_url_t){
+            .url = "https://host.test",
+            .path = "./",
+            .filename = "./index.html",
+        },
+        (unique_filename_from_url_t){
+            .url = "aesgcm://host.test",
+            .path = "./",
+            .filename = "./index.html",
+        },
+    };
+
+    char* filename;
+    for (int i = 0; i < num_tests; i++) {
+        filename = unique_filename_from_url(tests[i].url, tests[i].path);
+        assert_string_equal(filename, tests[i].filename);
+    }
+}
+
 gboolean
 _lists_equal(GSList* a, GSList* b)
 {

tests/unittests/test_common.h

@@ -31,3 +31,4 @@ void strip_quotes_strips_last(void** state);
 void strip_quotes_strips_both(void** state);
 void prof_partial_occurrences_tests(void** state);
 void prof_whole_occurrences_tests(void** state);
+void unique_filename_from_url_td(void** state);

tests/unittests/test_http_common.c

@@ -1,75 +0,0 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-
-#include "config.h"
-
-#include "tools/http_common.c"
-
-typedef struct
-{
-    char* url;
-    char* basename;
-} url_test_t;
-
-void
-http_basename_from_url_td(void** state)
-{
-    int num_tests = 11;
-    url_test_t tests[] = {
-        (url_test_t){
-            .url = "https://host.test/image.jpeg",
-            .basename = "image.jpeg",
-        },
-        (url_test_t){
-            .url = "https://host.test/image.jpeg#somefragment",
-            .basename = "image.jpeg",
-        },
-        (url_test_t){
-            .url = "https://host.test/image.jpeg?query=param",
-            .basename = "image.jpeg",
-        },
-        (url_test_t){
-            .url = "https://host.test/image.jpeg?query=param&another=one",
-            .basename = "image.jpeg",
-        },
-        (url_test_t){
-            .url = "https://host.test/images/",
-            .basename = "images",
-        },
-        (url_test_t){
-            .url = "https://host.test/images/../../file",
-            .basename = "file",
-        },
-        (url_test_t){
-            .url = "https://host.test/images/../../file/..",
-            .basename = "index.html",
-        },
-        (url_test_t){
-            .url = "https://host.test/images/..//",
-            .basename = "index.html",
-        },
-        (url_test_t){
-            .url = "https://host.test/",
-            .basename = "index.html",
-        },
-        (url_test_t){
-            .url = "https://host.test",
-            .basename = "index.html",
-        },
-        (url_test_t){
-            .url = "aesgcm://host.test",
-            .basename = "index.html",
-        },
-    };
-
-    char* basename;
-    for (int i = 0; i < num_tests; i++) {
-        basename = http_basename_from_url(tests[i].url);
-        assert_string_equal(basename, tests[i].basename);
-    }
-}

tests/unittests/test_http_common.h

@@ -1 +0,0 @@
-void http_basename_from_url_td(void** state);

tests/unittests/tools/stub_http_download.c

@@ -18,4 +18,13 @@ typedef struct http_download_t
     int cancel;
 } HTTPDownload;
 
+void*
+http_file_get(void* userdata)
+{
+    return NULL;
+}
+
+void http_download_cancel_processes(){};
+void http_download_add_download(){};
+
 #endif

tests/unittests/unittests.c

@@ -38,7 +38,6 @@
 #include "test_form.h"
 #include "test_callbacks.h"
 #include "test_plugins_disco.h"
-#include "test_http_common.h"
 
 int
 main(int argc, char* argv[])
@@ -91,6 +90,7 @@ main(int argc, char* argv[])
         unit_test(strip_quotes_strips_first),
         unit_test(strip_quotes_strips_last),
         unit_test(strip_quotes_strips_both),
+        unit_test(unique_filename_from_url_td),
 
         unit_test(clear_empty),
         unit_test(reset_after_create),
@@ -627,8 +627,6 @@ main(int argc, char* argv[])
         unit_test(does_not_add_duplicate_feature),
         unit_test(removes_plugin_features),
         unit_test(does_not_remove_feature_when_more_than_one_reference),
-
-        unit_test(http_basename_from_url_td),
     };
 
     return run_tests(all_tests);