WiP, trying to work again on the cURL based download from pgrandin #1134
Conversation
hoehnp
changed the title
hoehnp
force-pushed
the
curl_download
branch
4 times, most recently
from
c3348af to
df928c0
Compare
navit/gui/internal/gui_internal.c
Outdated
| cJSON_ArrayForEach(continent, continents) { | ||
| // add item for continent | ||
| if (cJSON_IsArray(continent)) { | ||
| countries = continent->child; | ||
| cJSON_ArrayForEach(country, countries){ | ||
| // add item for country | ||
| if (cJSON_IsArray(country)) { | ||
| cJSON_ArrayForEach(region, regions){ | ||
| // add item for country | ||
| } | ||
| } |
There was a problem hiding this comment.
If possible i would like this to be a own function so we can change this out later, also this can probably be simplified by recursion. As later it will not be given to have planet->continent->country
There was a problem hiding this comment.
the function would need to be larger, basically in these loops I will try to build up to list with information to build up the menu afterwards.
There was a problem hiding this comment.
I removed now the cJSON for the creation of the menus since it just overcomplicates things. The menu file will be a simple .tsv file as before.
| strcpy (dl_info.url, | ||
| g_strdup_printf ("https://github.com/jkoan/gh-actions-mapserver/releases/download/2021-07-21/europe-germany-thueringen-2021-07-21.bin")); | ||
| strcpy (dl_info.url, | ||
| g_strdup_printf ("https://github.com/jkoan/gh-actions-mapserver/releases/download/2021-07-21/europe-germany-schleswig-holstein-2021-07-21.bin")); | ||
| strcpy (dl_info.url, | ||
| g_strdup_printf ("https://github.com/jkoan/gh-actions-mapserver/releases/download/2021-07-21/australia-oceania-cook-islands-2021-07-21.bin")); |
There was a problem hiding this comment.
I assume this is placeholder code? ;-) Probably you can pass the region from the parsing (here 7813c54#diff-f7ea80979ff1653871da1c74f286683feeef5f3631b2d5ac6444523389cc0ceeR1828) as a payload to get the url from later. Or you create a own container to pass the url as a payload (data)
There was a problem hiding this comment.
this here is indeed old code which will be replaced later on.
ändrad: ci/build_tomtom_plugin.sh ändrad: scripts/xdotools.sh
ändrad: .circleci/config.yml
ändrad: scripts/setup_sanitycheck_requirements.sh
to be defined together with @jkoan ändrad: navit/gui/internal/gui_internal_map_downloader.c
ändrad: navit/osd/core/osd_core.c
ny fil: navit/gui/internal/cJSON.c ny fil: navit/gui/internal/cJSON.h
ny fil: generate_json.py
ändrad: navit/gui/internal/CMakeLists.txt
ändrad: CMakeLists.txt ändrad: navit/gui/internal/CMakeLists.txt borttagen: navit/gui/internal/cJSON.c borttagen: navit/gui/internal/cJSON.h
ändrad: navit/gui/internal/gui_internal.c ändrad: navit/gui/internal/gui_internal_command.c ändrad: navit/gui/internal/gui_internal_map_downloader.c
…#1205) * Add:ci:Run F-Droid build on fdroidserver image Signed-off-by: mvglasow <michael -at- vonglasow.com> * Add:ci:Fix some environment variables for F-Droid build Signed-off-by: mvglasow <michael -at- vonglasow.com> Signed-off-by: mvglasow <michael -at- vonglasow.com> Co-authored-by: mvglasow <michael -at- vonglasow.com>
This allows future implementations to not rely solely on libcurl
When looking at #1112, I discussed with @jkoan and decided maybe best way would be to try to finally get this code to a mergable state. Hopefully then we can download all maps on all our platforms without much hastle.