comaps-map-distributor 0.2.0__tar.gz → 0.4.0__tar.gz

{comaps_map_distributor-0.2.0 → comaps_map_distributor-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comaps-map-distributor
-Version: 0.2.0
+Version: 0.4.0
 Summary: A small CLI tool to download and then serve map files for CoMaps.
 Keywords: comaps,openstreetmap,map server
 Author: Bastian Greshake Tzovaras

{comaps_map_distributor-0.2.0 → comaps_map_distributor-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comaps-map-distributor"
-version = "0.2.0"
+version = "0.4.0"
 description = "A small CLI tool to download and then serve map files for CoMaps."
 readme = "README.md"
 authors = [

{comaps_map_distributor-0.2.0 → comaps_map_distributor-0.4.0}/src/comaps_map_distributor/app.py

@@ -41,8 +41,8 @@ def cli_download_maps(directory, map_version, download_server):
     map_version, country_list = get_map_names(download_server,
                                               map_version,
                                               user_specified_server)
-    selected_maps = select_maps(country_list)
     download_location = select_download_path(map_version,directory)
+    selected_maps = select_maps(country_list, download_location)
     download_maps(selected_maps,
                   download_server,
                   map_version,

{comaps_map_distributor-0.2.0 → comaps_map_distributor-0.4.0}/src/comaps_map_distributor/downloader.py

@@ -66,7 +66,7 @@ def recurse_map_json(countries, name_list=[]):
     return name_list
 
 
-def select_maps(country_list):
+def select_maps(country_list, download_location):
     """
     build fuzzy match UI for selecting which maps to download
     """
@@ -83,8 +83,12 @@ def select_maps(country_list):
 }
 
     # make world map and world coast map selected by default
+    # also pre-select existing maps to help find which maps already exist
+    # (existing files won't be re-downloaded from 0.4.0)
 
-    country_list = list(map(lambda x: Choice(x, enabled=True) if x == 'World' or x == 'WorldCoasts' else x, country_list))
+    old_maps = [i.name.replace('.mwm','') for i in Path(download_location).glob("*.mwm")]
+
+    country_list = list(map(lambda x: Choice(x, enabled=True) if (x == 'World') or (x == 'WorldCoasts') or (x in old_maps) else x, country_list))
 
     questions = [
         {
@@ -154,20 +158,28 @@ def download_maps(selected_maps, base_url, map_version, download_location):
     for map_name in selected_maps:
         download_url = create_download_url(base_url, map_version, map_name)
         local_filename = "{}/{}.mwm".format(download_location, map_name)
-        with requests.get(download_url, stream=True) as r:
-            r.raise_for_status()
-            per_file_progress = download_progress.add_task(
-                    "[yellow]File: {}".format(map_name),
-                    total=int(r.headers.get("content-length", 0)))
-            with open(local_filename, 'wb') as f:
-                for chunk in r.iter_content(chunk_size=8192):
-                    f.write(chunk)
-                    download_progress.update(per_file_progress, advance=8192)
-            download_progress.update(per_file_progress, visible=False)
-        download_progress.update(overall_progress, advance=1)
-        print(":white_check_mark:[bold] Downloaded: [/bold][italic]{}[/italic] from {}".format(
-            map_name,
-            download_url))
+        if Path(local_filename).is_file():
+            # if local file is already existing, skip downloading it
+            print(":white_check_mark:[bold] Already existed: [/bold][italic]{}[/italic]".format(
+                map_name,
+                ))
+            continue
+        else:
+            with requests.get(download_url, stream=True) as r:
+                r.raise_for_status()
+                per_file_progress = download_progress.add_task(
+                        "[yellow]File: {}".format(map_name),
+                        total=int(r.headers.get("content-length", 0)))
+                with open(local_filename+".part", 'wb') as f:
+                    for chunk in r.iter_content(chunk_size=8192):
+                        f.write(chunk)
+                        download_progress.update(per_file_progress, advance=8192)
+                download_progress.update(per_file_progress, visible=False)
+            os.rename(local_filename+".part", local_filename)
+            download_progress.update(overall_progress, advance=1)
+            print(":white_check_mark:[bold] Downloaded: [/bold][italic]{}[/italic] from {}".format(
+                map_name,
+                download_url))
     download_progress.stop()
     print("[bold]:rocket: All files downloaded! [/bold]")