Merge branch 'master' of https://github.com/Evil-Code/Minecraft-Overviewer into Evil-Code-master
Conflicts: quadtree.py
This commit is contained in:
11
quadtree.py
11
quadtree.py
@@ -27,6 +27,7 @@ import logging
|
|||||||
import util
|
import util
|
||||||
import cPickle
|
import cPickle
|
||||||
import stat
|
import stat
|
||||||
|
from time import gmtime, strftime
|
||||||
|
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
|
|
||||||
@@ -170,6 +171,16 @@ class QuadtreeGen(object):
|
|||||||
# copy web assets into destdir:
|
# copy web assets into destdir:
|
||||||
mirror_dir(os.path.join(util.get_program_path(), "web_assets"), self.destdir)
|
mirror_dir(os.path.join(util.get_program_path(), "web_assets"), self.destdir)
|
||||||
|
|
||||||
|
# Add time in index.html
|
||||||
|
indexpath = os.path.join(self.destdir, "index.html")
|
||||||
|
|
||||||
|
index = open(indexpath, 'r').read()
|
||||||
|
index = index.replace(
|
||||||
|
"{time}", str(strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime())))
|
||||||
|
|
||||||
|
with open(os.path.join(self.destdir, "index.html"), 'w') as output:
|
||||||
|
output.write(index)
|
||||||
|
|
||||||
if skipjs:
|
if skipjs:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
<script type="text/javascript" src="markers.js"></script>
|
<script type="text/javascript" src="markers.js"></script>
|
||||||
<script type="text/javascript" src="regions.js"></script>
|
<script type="text/javascript" src="regions.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
<!-- Generated at: {time} -->
|
||||||
<body onload="initialize()">
|
<body onload="initialize()">
|
||||||
<div id="mcmap" style="width:100%; height:100%"></div>
|
<div id="mcmap" style="width:100%; height:100%"></div>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
Reference in New Issue
Block a user