WiP, trying to work again on the cURL based download from pgrandin

.circleci/config.yml

@@ -8,6 +8,9 @@ jobs:
       - image: circleci/android:api-29-ndk
     steps:
       - checkout
+      - run:
+          name: setup sanity check requirements
+          command: bash scripts/setup_sanitycheck_requirements.sh
       - run:
           name: run sanity check script
           command: bash scripts/ci_sanity_checks.sh
@@ -32,7 +35,7 @@ jobs:
           name: Setup requirements
           command: |
             bash scripts/setup_common_requirements.sh
-            apt-get install -y libpng-dev libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl
+            apt-get install -y libpng-dev libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl libcurl4-gnutls-dev
       - run:
           name: Build for Linux
           command: bash scripts/build_linux.sh
@@ -180,6 +183,7 @@ jobs:
 
             # APP_CI: just build our own app
             $fdroid build --verbose --on-server --no-tarball
+
       - store_artifacts:
            name: Store APK
            path: unsigned
@@ -199,7 +203,7 @@ jobs:
             apt-get install -y software-properties-common
             add-apt-repository -y ppa:george-edison55/cmake-3.x
             apt-get remove -y cmake
-            apt-get install -y cmake3 mingw-w64 mingw-w64-tools default-jdk nsis libsaxonb-java curl
+            apt-get install -y cmake3 mingw-w64 mingw-w64-tools default-jdk nsis libsaxonb-java curl libcurl4-gnutls-dev
       - run:
           name: Build for Windows
           command: |

CMakeLists.txt

@@ -127,6 +127,7 @@ add_module(vehicle/qt5 "Qt5 libraries not found" FALSE)
 add_module(speech/speech_dispatcher "speech_dispatcher lib not found" FALSE)
 add_module(map/garmin "Garmin library not found" FALSE)
 add_feature(USE_NATIVE_LANGUAGE_SUPPORT "Gettext not found and not on Windows" FALSE)
+add_feature(USE_DOWNLOAD "libcurl not found" FALSE)
 set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/cpack.cmake")
 set(CPACK_PACKAGE_VENDOR "Navit team")
 set(CPACK_PACKAGE_VERSION_MAJOR ${NAVIT_VERSION_MAJOR})
@@ -238,6 +239,8 @@ find_package(Gettext)
 find_package(PNG)
 find_package(PythonLibs)
 find_package(Threads)
+find_package(CURL)
+find_package(cJSON)
 
 #Qt detection
 if (NOT DISABLE_QT)
@@ -511,6 +514,21 @@ if (GETTEXT_FOUND)
 	set_with_reason(USE_NATIVE_LANGUAGE_SUPPORT "Gettext found" TRUE)
 endif(GETTEXT_FOUND)
 
+if (CURL_FOUND)
+    set_with_reason(USE_DOWNLOAD "libcurl found" TRUE)
+    list(APPEND NAVIT_LIBS "-lcurl")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -u download_map")
+    set(USE_DOWNLOAD 1)
+endif(CURL_FOUND)
+
+if (cJSON_FOUND)
+    set(HAVE_CJSON 1)
+    include_directories(${CJSON_INCLUDE_DIRS})
+    list(APPEND NAVIT_LIBS ${CJSON_LIBRARIES})
+else(cJSON_FOUND)
+    set_with_reason(support/cjson "cJSON not found" TRUE ${INTL_LIBS})
+endif(cJSON_FOUND)
+
 #Independent modules
 add_module(graphics/null "Default" TRUE)
 add_module(osd/core "Default" TRUE)

config.h.in

@@ -105,3 +105,4 @@
 
 #cmakedefine ENABLE_ROLL 1
 
+#cmakedefine USE_DOWNLOAD 1

navit/CMakeLists.txt

@@ -13,6 +13,10 @@ set(NAVIT_SRC announcement.c atom.c attr.c cache.c callback.c command.c config_.
 	profile.c profile_option.c projection.c roadprofile.c route.c script.c search.c speech.c start_real.c sunriset.c transform.c track.c
 	search_houseno_interpol.c traffic.c util.c vehicle.c vehicleprofile.c xmlconfig.c )
 
+if(USE_DOWNLOAD)
+  list(APPEND NAVIT_SRC network.c)
+endif(USE_DOWNLOAD)
+
 if(NOT USE_PLUGINS)
 	list(APPEND NAVIT_SRC  ${CMAKE_CURRENT_BINARY_DIR}/builtin.c)
 endif(NOT USE_PLUGINS)

navit/gui/internal/CMakeLists.txt

@@ -2,6 +2,10 @@ if (GUI_INTERNAL_VISUAL_DBG)
 	add_definitions ("-DGUI_INTERNAL_VISUAL_DBG")
 endif(GUI_INTERNAL_VISUAL_DBG)
 
-module_add_library(gui_internal gui_internal.c gui_internal_bookmark.c gui_internal_command.c gui_internal_gesture.c
-                   gui_internal_html.c gui_internal_menu.c gui_internal_poi.c gui_internal_search.c gui_internal_widget.c
-                   gui_internal_keyboard.c)
+if(USE_DOWNLOAD)
+	set(map_downloader_sources gui_internal_map_downloader.c )
+endif(USE_DOWNLOAD)
+
+module_add_library(gui_internal ${map_downloader_sources} gui_internal.c gui_internal_bookmark.c gui_internal_command.c
+	           gui_internal_gesture.c gui_internal_html.c gui_internal_menu.c gui_internal_poi.c gui_internal_search.c
+		   gui_internal_widget.c gui_internal_keyboard.c)

navit/gui/internal/gui_internal.c

@@ -89,7 +89,7 @@
 #include "gui_internal_poi.h"
 #include "gui_internal_command.h"
 #include "gui_internal_keyboard.h"
-
+#include "network.h"
 
 /**
  * Indexes into the config_profiles array.
@@ -1714,44 +1714,13 @@ static void gui_internal_window_closed(struct gui_priv *this) {
 static void gui_internal_cmd_map_download_do(struct gui_priv *this, struct widget *wm, void *data) {
     char *text=g_strdup_printf(_("Download %s"),wm->name);
     struct widget *w, *wb;
-    struct map *map=data;
-    double bllon,bllat,trlon,trlat;
-
-    wb=gui_internal_menu(this, text);
-    g_free(text);
-    w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
-    w->spy=this->spacing*3;
-    gui_internal_widget_append(wb, w);
-    if (sscanf(wm->prefix,"%lf,%lf,%lf,%lf",&bllon,&bllat,&trlon,&trlat) == 4) {
-        struct coord_geo g;
-        struct map_selection sel;
-        struct map_rect *mr;
-        struct item *item;
-
-        sel.next=NULL;
-        sel.order=255;
-        g.lng=bllon;
-        g.lat=trlat;
-        transform_from_geo(projection_mg, &g, &sel.u.c_rect.lu);
-        g.lng=trlon;
-        g.lat=bllat;
-        transform_from_geo(projection_mg, &g, &sel.u.c_rect.rl);
-        sel.range.min=type_none;
-        sel.range.max=type_last;
-        mr=map_rect_new(map, &sel);
-        while ((item=map_rect_get_item(mr))) {
-            dbg(lvl_info,"item");
-        }
-        map_rect_destroy(mr);
-    }
-
-    dbg(lvl_info,"bbox=%s",wm->prefix);
-    gui_internal_menu_render(this);
+    struct map_download_info *dl_info=data;
+    download_map(dl_info);
 }
 
 void gui_internal_cmd_map_download(struct gui_priv *this, struct widget *wm, void *data) {
     struct attr on, off, download_enabled, download_disabled;
-    struct widget *w,*wb,*wma;
+    struct widget *w,*wb,*wma, *wl, *row;
     struct map *map=data;
     FILE *f;
     char *search,buffer[256];
@@ -1772,9 +1741,9 @@ void gui_internal_cmd_map_download(struct gui_priv *this, struct widget *wm, voi
     on.u.num=1;
     off.u.num=0;
     wb=gui_internal_menu(this, wm->name?wm->name:_("Map Download"));
-    w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill);
-    w->spy=this->spacing*3;
+    w=gui_internal_widget_table_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill,1);
     gui_internal_widget_append(wb, w);
+
     if (!search) {
         wma=gui_internal_button_map_attr_new(this, _("Active"), gravity_left_center|orientation_horizontal|flags_fill, map, &on,
                                              &off, 1);
@@ -1784,52 +1753,25 @@ void gui_internal_cmd_map_download(struct gui_priv *this, struct widget *wm, voi
     download_enabled.type=download_disabled.type=attr_update;
     download_enabled.u.num=1;
     download_disabled.u.num=0;
-    wma=gui_internal_button_map_attr_new(this
-                                         , _("Download Enabled")
-                                         , gravity_left_center|orientation_horizontal|flags_fill
-                                         , map
-                                         , &download_enabled
-                                         , &download_disabled
-                                         , 0);
-    gui_internal_widget_append(w, wma);
-
+    f = fopen("maps/menu.tsv", "r");
 
-    f=fopen("maps/areas.tsv","r");
+
     while (f && fgets(buffer, sizeof(buffer), f)) {
-        char *nl,*description,*description_size,*bbox,*size=NULL;
-        int sp=0;
-        if ((nl=strchr(buffer,'\n')))
-            *nl='\0';
-        if ((nl=strchr(buffer,'\r')))
-            *nl='\0';
-        while(buffer[sp] == ' ')
-            sp++;
-        if ((bbox=strchr(buffer,'\t')))
-            *bbox++='\0';
-        if (bbox && (size=strchr(bbox,'\t')))
-            *size++='\0';
-        if (search && !strcmp(buffer, search)) {
-            wma=gui_internal_button_new_with_callback(this, _("Download completely"), NULL,
-                    gravity_left_center|orientation_horizontal|flags_fill, gui_internal_cmd_map_download_do, map);
-            wma->name=g_strdup(buffer+sp);
-            wma->prefix=g_strdup(bbox);
-            gui_internal_widget_append(w, wma);
-            found=1;
-        } else if (sp < sp_match)
-            found=0;
-        if (sp == sp_match && found && buffer[sp]) {
-            description=g_strdup(buffer+sp);
-            if (size)
-                description_size=g_strdup_printf("%s (%s)",description,size);
-            else
-                description_size=g_strdup(description);
-            wma=gui_internal_button_new_with_callback(this, description_size, NULL,
-                    gravity_left_center|orientation_horizontal|flags_fill, gui_internal_cmd_map_download, map);
-            g_free(description_size);
-            wma->prefix=g_strdup(buffer);
-            wma->name=description;
-            gui_internal_widget_append(w, wma);
-        }
+	gui_internal_widget_append(w, row=gui_internal_widget_table_row_new(this,
+                                   gravity_left|orientation_horizontal|flags_fill));
+
+	struct map_download_info *dl_info = g_malloc(sizeof(struct map_download_info));
+
+	dl_info->name = g_strsplit(buffer,"\t",0)[0];
+        dl_info->path = g_strjoin(NULL, navit_get_user_data_directory(TRUE), "/maps/", dl_info->name, ".bin",  NULL);
+        dl_info->xml = g_strjoin(NULL, navit_get_user_data_directory(TRUE), "/maps/", dl_info->name, ".xml",  NULL);
+	dl_info->url = g_strjoin(NULL, "https://github.com/navit-gps/gh-actions-mapserver/releases/download/", g_date_time_format(g_date_time_new_now_local(), "%Y-%m-%d"), "/", dl_info->name, "-", g_date_time_format(g_date_time_new_now_local(), "%Y-%m-%d"), ".bin", NULL); 
+
+        wl=gui_internal_button_new_with_callback(this, buffer, NULL,
+                    gravity_left_center|orientation_horizontal|flags_fill, gui_internal_cmd_map_download_do, dl_info);
+
+	gui_internal_widget_append(row, wl);
+
     }
 
     gui_internal_menu_render(this);

navit/gui/internal/gui_internal_command.c

@@ -40,6 +40,9 @@
 #include <ifaddrs.h>
 #include <arpa/inet.h>
 #endif
+#ifdef USE_DOWNLOAD
+#include "gui_internal_map_downloader.h"
+#endif
 
 static int gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, struct attr ***out) {
     struct attr escaped;
@@ -1214,6 +1217,38 @@ static struct command_table commands[] = {
 #if HAS_IFADDRS
     {"network_info",command_cast(gui_internal_cmd2)},
 #endif
+#ifdef USE_DOWNLOAD
+    {"map_downloader", command_cast (gui_internal_cmd_map_download)},
+#endif
+	{"E",command_cast(gui_internal_cmd_escape)},
+	{"abort_navigation",command_cast(gui_internal_cmd2_abort_navigation)},
+	{"back",command_cast(gui_internal_cmd2_back)},
+	{"back_to_map",command_cast(gui_internal_cmd2_back_to_map)},
+	{"bookmarks",command_cast(gui_internal_cmd2)},
+	{"debug",command_cast(gui_internal_cmd_debug)},
+	{"formerdests",command_cast(gui_internal_cmd2)},
+	{"get_data",command_cast(gui_internal_get_data)},
+	{"img",command_cast(gui_internal_cmd_img)},
+	{"locale",command_cast(gui_internal_cmd2)},
+	{"log",command_cast(gui_internal_cmd_log)},
+	{"menu",command_cast(gui_internal_cmd_menu2)},
+	{"position",command_cast(gui_internal_cmd2_position)},
+	{"pois",command_cast(gui_internal_cmd2)},
+	{"redraw_map",command_cast(gui_internal_cmd_redraw_map)},
+	{"refresh",command_cast(gui_internal_cmd2_refresh)},
+	{"route_description",command_cast(gui_internal_cmd2)},
+	{"route_height_profile",command_cast(gui_internal_cmd2)},
+	{"set",command_cast(gui_internal_cmd2_set)},
+	{"setting_layout",command_cast(gui_internal_cmd2)},
+	{"setting_maps",command_cast(gui_internal_cmd2)},
+	{"setting_rules",command_cast(gui_internal_cmd2)},
+	{"setting_vehicle",command_cast(gui_internal_cmd2)},
+	{"town",command_cast(gui_internal_cmd2)},
+	{"enter_coord",command_cast(gui_internal_cmd2)},
+	{"quit",command_cast(gui_internal_cmd2_quit)},
+	{"waypoints",command_cast(gui_internal_cmd2)},
+	{"write",command_cast(gui_internal_cmd_write)},
+	{"about",command_cast(gui_internal_cmd2)},
 };
 
 void gui_internal_command_init(struct gui_priv *this, struct attr **attrs) {