From 05cc9fcd900a9d1cca6bcd7e4df5a449ebca23cb Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Tue, 8 Mar 2016 05:57:32 -0500 Subject: [PATCH] refactored folder layout added worlds folder, moved images to chunkymapdata/images and added compass-rose.png (not used yet) --- chunkymap-regen.py | 58 +++++++++++++----- etc/compass-rose.xcf | Bin 0 -> 15593 bytes web/chunkymap.php | 23 +++---- .../images/compass-rose.png | Bin 0 -> 2976 bytes .../images/start.png} | Bin .../images/target.png} | Bin .../images/target_start.png} | Bin .../images/zoom-in.png} | Bin .../images/zoom-in_disabled.png} | Bin .../images/zoom-out.png} | Bin .../images/zoom-out_disabled.png} | Bin .../markers/chunk_markers_x0z0.yml | 4 -- web/chunkymapdata_default/world/markers/0.yml | 4 ++ .../{ => world}/players/singleplayer.png | Bin 14 files changed, 57 insertions(+), 32 deletions(-) create mode 100644 etc/compass-rose.xcf create mode 100644 web/chunkymapdata_default/images/compass-rose.png rename web/{images/chunkymap_start.png => chunkymapdata_default/images/start.png} (100%) rename web/{images/chunkymap_target.png => chunkymapdata_default/images/target.png} (100%) rename web/{images/chunkymap_target_start.png => chunkymapdata_default/images/target_start.png} (100%) rename web/{images/chunkymap_zoom-in.png => chunkymapdata_default/images/zoom-in.png} (100%) rename web/{images/chunkymap_zoom-in_disabled.png => chunkymapdata_default/images/zoom-in_disabled.png} (100%) rename web/{images/chunkymap_zoom-out.png => chunkymapdata_default/images/zoom-out.png} (100%) rename web/{images/chunkymap_zoom-out_disabled.png => chunkymapdata_default/images/zoom-out_disabled.png} (100%) delete mode 100644 web/chunkymapdata_default/markers/chunk_markers_x0z0.yml create mode 100644 web/chunkymapdata_default/world/markers/0.yml rename web/chunkymapdata_default/{ => world}/players/singleplayer.png (100%) diff --git a/chunkymap-regen.py b/chunkymap-regen.py index 7b8dcf4..3ed764e 100644 --- a/chunkymap-regen.py +++ b/chunkymap-regen.py @@ -331,6 +331,7 @@ class MTChunk: class MTChunks: chunkymap_data_path = None + chunkymapdata_worlds_path = None is_save_output_ok = None minetestmapper_fast_sqlite_path = None minetestmapper_custom_path = None @@ -575,6 +576,7 @@ class MTChunks: sys.exit() self.chunkymap_data_path=os.path.join(self.config["www_minetest_path"],"chunkymapdata") + self.chunkymapdata_worlds_path=os.path.join(self.chunkymap_data_path, "worlds") print("Using chunkymap_data_path '"+self.chunkymap_data_path+"'") #if not os.path.isdir(self.chunkymap_data_path): # os.mkdir(self.chunkymap_data_path) @@ -586,8 +588,18 @@ class MTChunks: self.deny_http_access(self.chunkymap_data_path) print(" (created .htaccess)") + htaccess_path = os.path.join(self.chunkymapdata_worlds_path,".htaccess") + if not os.path.isdir(self.chunkymapdata_worlds_path): + os.makedirs(self.chunkymapdata_worlds_path) + print("Created '"+self.chunkymapdata_worlds_path+"'") + if not os.path.isfile(htaccess_path): + self.deny_http_access(self.chunkymapdata_worlds_path) + print(" (created .htaccess)") + + + self.world_name = os.path.basename(self.config["world_path"]) - self.chunkymap_thisworld_data_path = os.path.join(self.chunkymap_data_path, self.world_name) + self.chunkymap_thisworld_data_path = os.path.join(self.chunkymapdata_worlds_path, self.world_name) if not os.path.isdir(self.chunkymap_thisworld_data_path): os.makedirs(self.chunkymap_thisworld_data_path) print("Created '"+self.chunkymap_thisworld_data_path+"'") @@ -614,7 +626,7 @@ class MTChunks: #TODO: deny recursively under these folders? doesn't seem that important for security so maybe not (no player info is there) - self.install_website() + self.install_default_world_data() self.chunkymap_players_name = "players" self.chunkymap_players_path = os.path.join(self.chunkymap_thisworld_data_path, self.chunkymap_players_name) @@ -683,22 +695,34 @@ class MTChunks: if is_config_changed: self.save_config() - def install_website(self): - this_source_dir_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "web") - this_dest_dir_path = self.config["www_minetest_path"] + #def install_default_world_data(self): + #source_web_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "web") + #dest_web_chunkymapdata_world_path = self.chunkymap_thisworld_data_path + #dest_web_chunkymapdata_world_players_path = os.path.join(self.chunkymap_thisworld_data_path, "players") + #install_list.append(InstalledFile("singleplayer.png", source_chunkymapdata_players, dest_chunkymapdata_players)) + + + #formerly install_website + def install_default_world_data(self): + source_web_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "web") + source_web_chunkymapdata_path = os.path.join(source_web_path, "chunkymapdata_default") + source_web_chunkymapdata_world_path = os.path.join(source_web_chunkymapdata_path, "world") + source_web_chunkymapdata_images_path = os.path.join(source_web_chunkymapdata_path, "images") + dest_web_path = self.config["www_minetest_path"] + dest_web_chunkymapdata_path = os.path.join(self.config["www_minetest_path"],"chunkymapdata") + dest_web_chunkymapdata_images_path = os.path.join(dest_web_chunkymapdata_path,"images") install_list = list() - install_list.append(InstalledFile("browser.php",this_source_dir_path,this_dest_dir_path)) - install_list.append(InstalledFile("chunkymap.php",this_source_dir_path,this_dest_dir_path)) - install_list.append(InstalledFile("example.php",this_source_dir_path,this_dest_dir_path)) - source_web_images_path = os.path.join( os.path.join(os.path.dirname(os.path.abspath(self.minetestmapper_py_path)), "web"), "images") - dest_web_images_path = os.path.join( self.config["www_minetest_path"], "images") - install_list.append(InstalledFile("chunkymap_zoom-in.png", source_web_images_path, dest_web_images_path)) - install_list.append(InstalledFile("chunkymap_zoom-out.png", source_web_images_path, dest_web_images_path)) - install_list.append(InstalledFile("chunkymap_zoom-in_disabled.png", source_web_images_path, dest_web_images_path)) - install_list.append(InstalledFile("chunkymap_zoom-out_disabled.png", source_web_images_path, dest_web_images_path)) - install_list.append(InstalledFile("chunkymap_start.png", source_web_images_path, dest_web_images_path)) - source_chunkymapdata = os.path.join( os.path.join(os.path.dirname(os.path.abspath(self.minetestmapper_py_path)), "web"), "chunkymapdata_default") - source_chunkymapdata_players = os.path.join(source_chunkymapdata, "players") + install_list.append(InstalledFile("browser.php",source_web_path,dest_web_path)) + install_list.append(InstalledFile("chunkymap.php",source_web_path,dest_web_path)) + install_list.append(InstalledFile("example.php",source_web_path,dest_web_path)) + install_list.append(InstalledFile("zoom-in.png", source_web_chunkymapdata_images_path, dest_web_chunkymapdata_images_path)) + install_list.append(InstalledFile("zoom-out.png", source_web_chunkymapdata_images_path, dest_web_chunkymapdata_images_path)) + install_list.append(InstalledFile("zoom-in_disabled.png", source_web_chunkymapdata_images_path, dest_web_chunkymapdata_images_path)) + install_list.append(InstalledFile("zoom-out_disabled.png", source_web_chunkymapdata_images_path, dest_web_chunkymapdata_images_path)) + install_list.append(InstalledFile("start.png", source_web_chunkymapdata_images_path, dest_web_chunkymapdata_images_path)) + install_list.append(InstalledFile("target_start.png", source_web_chunkymapdata_images_path, dest_web_chunkymapdata_images_path)) + install_list.append(InstalledFile("compass-rose.png", source_web_chunkymapdata_images_path, dest_web_chunkymapdata_images_path)) + source_chunkymapdata_players = os.path.join(source_web_chunkymapdata_world_path, "players") dest_chunkymapdata_players = os.path.join(self.chunkymap_thisworld_data_path, "players") install_list.append(InstalledFile("singleplayer.png", source_chunkymapdata_players, dest_chunkymapdata_players)) for this_object in install_list: diff --git a/etc/compass-rose.xcf b/etc/compass-rose.xcf new file mode 100644 index 0000000000000000000000000000000000000000..c97c9dde5c089a22ba02fb5150e5cb1c4d584c58 GIT binary patch literal 15593 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 literal 0 HcmV?d00001 diff --git a/web/chunkymap.php b/web/chunkymap.php index 6969dbf..a5f2da5 100644 --- a/web/chunkymap.php +++ b/web/chunkymap.php @@ -37,8 +37,8 @@ if (!isset($chunkymap_view_zoom_multiplier)) { $chunkymap_view_zoom_multiplier=.25; } -// OPTIONAL: $chunkymapdata_path = "chunkymapdata"; +$chunkymapdata_worlds_path = $chunkymapdata_path."/worlds"; $chunkymapdata_thisworld_path = null; $showplayers=true; @@ -137,8 +137,8 @@ function echo_chunkymap_controls($callback_php_path) { global $chunkymap_anchor_name; $is_in=false; $is_out=false; - $in_img_name = "chunkymap_zoom-in.png"; - $out_img_name = "chunkymap_zoom-out.png"; + $in_img_name = "zoom-in.png"; + $out_img_name = "zoom-out.png"; $in_zoom = $chunkymap_view_zoom_multiplier; if ($in_zoom<$chunkymap_view_zoom_max) { @@ -146,14 +146,14 @@ function echo_chunkymap_controls($callback_php_path) { $in_zoom = $chunkymap_view_zoom_multiplier*2.0; //echo "in:$in_zoom "; } - else $in_img_name = "chunkymap_zoom-in_disabled.png"; + else $in_img_name = "zoom-in_disabled.png"; $out_zoom = $chunkymap_view_zoom_multiplier; if ($out_zoom>$chunkymap_view_zoom_min) { $is_out=true; $out_zoom = ($chunkymap_view_zoom_multiplier/2.0); } - else $out_img_name = "chunkymap_zoom-out_disabled.png"; + else $out_img_name = "zoom-out_disabled.png"; $zoom_clip = $chunkymap_view_zoom_max; $found=false; @@ -206,8 +206,8 @@ function echo_chunkymap_controls($callback_php_path) { } if (!$found) $in_zoom=$chunkymap_view_zoom_max; - $in_html=""; - $out_html=""; + $in_html=""; + $out_html=""; global $world_name; $append_vars="&"; if (isset($world_name)) { @@ -287,6 +287,7 @@ function echo_entire_chunkymap_as_chunk_table() { global $chunkymap_view_zoom_max; global $chunkymap_view_zoom_min; global $chunkymapdata_path; + global $chunkymapdata_worlds_path; global $map_dict; global $is_verbose; global $chunkymap_tile_original_w; @@ -313,7 +314,7 @@ function echo_entire_chunkymap_as_chunk_table() { $character_icon_h=8; global $chunkymapdata_thisworld_path; if (isset($world_name)) { - $chunkymapdata_thisworld_path = $chunkymapdata_path."/".$world_name; + $chunkymapdata_thisworld_path = $chunkymapdata_worlds_path."/".$world_name; $generated_yml_path = $chunkymapdata_thisworld_path."/generated.yml"; if (is_file($generated_yml_path)) { $map_dict = get_dict_from_conf($generated_yml_path,":"); @@ -630,7 +631,7 @@ function echo_entire_chunkymap_as_chunk_table() { $img_style.="opacity: 0.4; filter: alpha(opacity=40);"; //filter is for IE8 and below $text_style="color:white; opacity: 0.4; filter: alpha(opacity=40);"; //filter is for IE8 and below } - echo_hold( "
$player_name
" ); + echo_hold( "
$player_name
" ); } //$position_offset_x+=$character_icon_w; } @@ -653,7 +654,7 @@ function echo_entire_chunkymap_as_chunk_table() { else { //not isset($world_name) echo "

Choose world:

"; echo "
    "; - if ($chunkymapdata_handle = opendir($chunkymapdata_path)) { + if ($chunkymapdata_handle = opendir($chunkymapdata_worlds_path)) { $append_vars="&"; if (isset($chunkymap_view_zoom_multiplier)) { $prefix = ""; @@ -672,7 +673,7 @@ function echo_entire_chunkymap_as_chunk_table() { global $chunkymap_anchor_name; while (false !== ($this_world_name = readdir($chunkymapdata_handle))) { if (substr($this_world_name, 0, 1) != ".") { - $this_world_path = $chunkymapdata_path."/".$this_world_name; + $this_world_path = $chunkymapdata_worlds_path."/".$this_world_name; echo "
  • $this_world_name
    • "; } } diff --git a/web/chunkymapdata_default/images/compass-rose.png b/web/chunkymapdata_default/images/compass-rose.png new file mode 100644 index 0000000000000000000000000000000000000000..a51b7a44367d096bbabe85ed664d139e6e2ab123 GIT binary patch literal 2976 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 WxtmIlfV?sQ0000