From cadb24a01595ef529aee26dadd7bb8a63024e360 Mon Sep 17 00:00:00 2001 From: Nicolas F Date: Wed, 24 Jun 2020 17:57:12 +0200 Subject: [PATCH] assetmanager: rename icons dir to markers, symlink This fixes a name collision with Apache's default config. Closes #1773. Install nginx already. --- docs/signs.rst | 4 ++-- overviewer_core/assetmanager.py | 16 ++++++++++++---- .../{icons => markers}/marker_anvil.png | Bin .../{icons => markers}/marker_anvil_red.png | Bin .../{icons => markers}/marker_base_plain.svg | 0 .../marker_base_plain_red.svg | 0 .../{icons => markers}/marker_factory.png | Bin .../{icons => markers}/marker_factory_red.png | Bin .../{icons => markers}/marker_hoe.png | Bin .../{icons => markers}/marker_hoe_red.png | Bin .../{icons => markers}/marker_home.png | Bin .../{icons => markers}/marker_home_2x.png | Bin .../{icons => markers}/marker_location.png | Bin .../{icons => markers}/marker_location_2x.png | Bin .../{icons => markers}/marker_mine.png | Bin .../{icons => markers}/marker_mine_red.png | Bin .../{icons => markers}/marker_ship.png | Bin .../{icons => markers}/marker_ship_red.png | Bin .../{icons => markers}/marker_tower.png | Bin .../{icons => markers}/marker_tower_red.png | Bin .../{icons => markers}/marker_town.png | Bin .../{icons => markers}/marker_town_red.png | Bin 22 files changed, 14 insertions(+), 6 deletions(-) rename overviewer_core/data/web_assets/{icons => markers}/marker_anvil.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_anvil_red.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_base_plain.svg (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_base_plain_red.svg (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_factory.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_factory_red.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_hoe.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_hoe_red.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_home.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_home_2x.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_location.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_location_2x.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_mine.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_mine_red.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_ship.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_ship_red.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_tower.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_tower_red.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_town.png (100%) rename overviewer_core/data/web_assets/{icons => markers}/marker_town_red.png (100%) diff --git a/docs/signs.rst b/docs/signs.rst index 9a90099..306b1b2 100644 --- a/docs/signs.rst +++ b/docs/signs.rst @@ -156,7 +156,7 @@ Here is a more complex example where not every marker of a certain id has a cert 'y':85, 'z':-234, 'name':'Bar'}], - 'markers': [dict(name="Towns", filterFunction=townFilter, icon="icons/marker_town.png")], + 'markers': [dict(name="Towns", filterFunction=townFilter, icon="markers/marker_town.png")], ### Note: The 'icon' parameter allows you to specify a custom icon, as per ### standard markers. This icon must exist in the same folder as your ### custom webassets or in the same folder as the generated index.html @@ -271,7 +271,7 @@ Marker Icons Overviewer ships by default ======================================== Overviewer comes with multiple small icons that you can use for your markers. -You can find them in the ``overviewer_core/data/web_assets/icons`` directory. +You can find them in the ``overviewer_core/data/web_assets/markers`` directory. If you want to make your own in the same style, you can use the provided ``marker_base_plain.svg`` and ``marker_base_plain_red.svg`` as template, with diff --git a/overviewer_core/assetmanager.py b/overviewer_core/assetmanager.py index af83b36..bb02e7f 100644 --- a/overviewer_core/assetmanager.py +++ b/overviewer_core/assetmanager.py @@ -98,10 +98,10 @@ top-level directory. 'defaultMarker': 'signpost.png', 'signMarker': 'signpost_icon.png', 'bedMarker': 'bed.png', - 'spawnMarker': 'icons/marker_home.png', - 'spawnMarker2x': 'icons/marker_home_2x.png', - 'queryMarker': 'icons/marker_location.png', - 'queryMarker2x': 'icons/marker_location_2x.png' + 'spawnMarker': 'markers/marker_home.png', + 'spawnMarker2x': 'markers/marker_home_2x.png', + 'queryMarker': 'markers/marker_location.png', + 'queryMarker2x': 'markers/marker_location_2x.png' } dump['CONST']['mapDivId'] = 'mcmap' dump['CONST']['UPPERLEFT'] = world.UPPER_LEFT @@ -174,6 +174,14 @@ top-level directory. mirror_dir(self.custom_assets_dir, self.outputdir, capabilities=self.fs_caps, force_writable=True) + # symlink old icons dir because apache sux + if (os.name == "posix" and os.symlink in os.supports_dir_fd and + not os.path.islink(os.path.join(self.outputdir, "icons"))): + od_fd = os.open(self.outputdir, os.O_DIRECTORY) + try: + os.symlink("markers", "icons", target_is_directory=True, dir_fd=od_fd) + finally: + os.close(od_fd) # write a dummy baseMarkers.js if none exists basemarkers_path = os.path.join(self.outputdir, "baseMarkers.js") if not os.path.exists(basemarkers_path): diff --git a/overviewer_core/data/web_assets/icons/marker_anvil.png b/overviewer_core/data/web_assets/markers/marker_anvil.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_anvil.png rename to overviewer_core/data/web_assets/markers/marker_anvil.png diff --git a/overviewer_core/data/web_assets/icons/marker_anvil_red.png b/overviewer_core/data/web_assets/markers/marker_anvil_red.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_anvil_red.png rename to overviewer_core/data/web_assets/markers/marker_anvil_red.png diff --git a/overviewer_core/data/web_assets/icons/marker_base_plain.svg b/overviewer_core/data/web_assets/markers/marker_base_plain.svg similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_base_plain.svg rename to overviewer_core/data/web_assets/markers/marker_base_plain.svg diff --git a/overviewer_core/data/web_assets/icons/marker_base_plain_red.svg b/overviewer_core/data/web_assets/markers/marker_base_plain_red.svg similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_base_plain_red.svg rename to overviewer_core/data/web_assets/markers/marker_base_plain_red.svg diff --git a/overviewer_core/data/web_assets/icons/marker_factory.png b/overviewer_core/data/web_assets/markers/marker_factory.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_factory.png rename to overviewer_core/data/web_assets/markers/marker_factory.png diff --git a/overviewer_core/data/web_assets/icons/marker_factory_red.png b/overviewer_core/data/web_assets/markers/marker_factory_red.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_factory_red.png rename to overviewer_core/data/web_assets/markers/marker_factory_red.png diff --git a/overviewer_core/data/web_assets/icons/marker_hoe.png b/overviewer_core/data/web_assets/markers/marker_hoe.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_hoe.png rename to overviewer_core/data/web_assets/markers/marker_hoe.png diff --git a/overviewer_core/data/web_assets/icons/marker_hoe_red.png b/overviewer_core/data/web_assets/markers/marker_hoe_red.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_hoe_red.png rename to overviewer_core/data/web_assets/markers/marker_hoe_red.png diff --git a/overviewer_core/data/web_assets/icons/marker_home.png b/overviewer_core/data/web_assets/markers/marker_home.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_home.png rename to overviewer_core/data/web_assets/markers/marker_home.png diff --git a/overviewer_core/data/web_assets/icons/marker_home_2x.png b/overviewer_core/data/web_assets/markers/marker_home_2x.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_home_2x.png rename to overviewer_core/data/web_assets/markers/marker_home_2x.png diff --git a/overviewer_core/data/web_assets/icons/marker_location.png b/overviewer_core/data/web_assets/markers/marker_location.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_location.png rename to overviewer_core/data/web_assets/markers/marker_location.png diff --git a/overviewer_core/data/web_assets/icons/marker_location_2x.png b/overviewer_core/data/web_assets/markers/marker_location_2x.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_location_2x.png rename to overviewer_core/data/web_assets/markers/marker_location_2x.png diff --git a/overviewer_core/data/web_assets/icons/marker_mine.png b/overviewer_core/data/web_assets/markers/marker_mine.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_mine.png rename to overviewer_core/data/web_assets/markers/marker_mine.png diff --git a/overviewer_core/data/web_assets/icons/marker_mine_red.png b/overviewer_core/data/web_assets/markers/marker_mine_red.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_mine_red.png rename to overviewer_core/data/web_assets/markers/marker_mine_red.png diff --git a/overviewer_core/data/web_assets/icons/marker_ship.png b/overviewer_core/data/web_assets/markers/marker_ship.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_ship.png rename to overviewer_core/data/web_assets/markers/marker_ship.png diff --git a/overviewer_core/data/web_assets/icons/marker_ship_red.png b/overviewer_core/data/web_assets/markers/marker_ship_red.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_ship_red.png rename to overviewer_core/data/web_assets/markers/marker_ship_red.png diff --git a/overviewer_core/data/web_assets/icons/marker_tower.png b/overviewer_core/data/web_assets/markers/marker_tower.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_tower.png rename to overviewer_core/data/web_assets/markers/marker_tower.png diff --git a/overviewer_core/data/web_assets/icons/marker_tower_red.png b/overviewer_core/data/web_assets/markers/marker_tower_red.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_tower_red.png rename to overviewer_core/data/web_assets/markers/marker_tower_red.png diff --git a/overviewer_core/data/web_assets/icons/marker_town.png b/overviewer_core/data/web_assets/markers/marker_town.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_town.png rename to overviewer_core/data/web_assets/markers/marker_town.png diff --git a/overviewer_core/data/web_assets/icons/marker_town_red.png b/overviewer_core/data/web_assets/markers/marker_town_red.png similarity index 100% rename from overviewer_core/data/web_assets/icons/marker_town_red.png rename to overviewer_core/data/web_assets/markers/marker_town_red.png