Skip to content

Optimize tile storage by preventing saving of fully transparent images. #2101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Optimize tile storage by preventing saving of fully transparent images. #2101

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdc22fb
Removed saving of redundant blank render tiles.
LogalDeveloper Apr 9, 2023
7d6500a
Removed unnecessary color parsing.
LogalDeveloper Apr 9, 2023
689c9a4
Removed composite tile render warning.
LogalDeveloper Apr 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions overviewer_core/tileset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,9 +984,6 @@ def _render_compositetile(self, dest, name):
# Ignore errors if it's "file doesn't exist"
if e.errno != errno.ENOENT:
raise
logging.warning(
"Tile %s was requested for render, but no children were found! "
"This is probably a bug.", imgpath)
return

# Create the actual image now
Expand Down Expand Up @@ -1049,7 +1046,8 @@ def _render_rendertile(self, tile):
The argument is a RenderTile object

The image is rendered and saved to disk in the place this tileset is
configured to save images.
configured to save images, unless the rendered image is blank, in
which case no image is saved to disk.

"""

Expand All @@ -1073,18 +1071,6 @@ def _render_rendertile(self, tile):
logging.debug("%s deleted", tile)
return

# Create the directory if not exists
dirdest = os.path.dirname(imgpath)
if not os.path.exists(dirdest):
try:
os.makedirs(dirdest)
except OSError as e:
# Ignore errno EEXIST: file exists. Due to a race condition,
# two processes could conceivably try and create the same
# directory at the same time
if e.errno != errno.EEXIST:
raise

# Compile this image
tileimg = Image.new("RGBA", (384, 384), self.options['bgcolor'])

Expand Down Expand Up @@ -1120,6 +1106,24 @@ def _render_rendertile(self, tile):
logging.error("Full error was:", exc_info=1)
sys.exit(1)

# Don't save if the output is blank (384*384 pixels all colored bgcolor at 0% opacity)
# The viewer will fill in this missing tile with the default blank tile created in the
# AssetManager, so there's no need to spend compute time on compressing and disk space
# & network traffic on serving a blank image.
if tileimg.getcolors() == [(147456, self.options['bgcolor'])]:
return

# Create the directory if not exists
dirdest = os.path.dirname(imgpath)
if not os.path.exists(dirdest):
try:
os.makedirs(dirdest)
except OSError as e:
# Ignore errno EEXIST: file exists. Due to a race condition,
# two processes could conceivably try and create the same
# directory at the same time
if e.errno != errno.EEXIST:
raise
# Save them
with FileReplacer(imgpath, capabilities=self.fs_caps) as tmppath:
if self.imgextension == 'jpg':
Expand Down