Reimplement animated covers with Pillow

This commit is contained in:
kramo
2023-04-11 14:49:18 +02:00
parent 3c6639ae07
commit 0f6a989142
8 changed files with 152 additions and 57 deletions

View File

@@ -22,7 +22,7 @@ import os
import shlex
import time
from gi.repository import Adw, GdkPixbuf, Gio, GLib, GObject, Gtk
from gi.repository import Adw, Gio, GLib, GObject, Gtk
from .game_cover import GameCover
from .create_dialog import create_dialog
@@ -37,7 +37,6 @@ def create_details_window(parent_widget, game_id=None):
)
games = parent_widget.games
pixbuf = None
cover_deleted = False
cover_button_edit = Gtk.Button(
@@ -59,13 +58,12 @@ def create_details_window(parent_widget, game_id=None):
)
def delete_pixbuf(_widget):
nonlocal pixbuf
nonlocal game_cover
nonlocal cover_deleted
GameCover(cover)
game_cover.new_pixbuf()
cover_button_delete_revealer.set_reveal_child(False)
pixbuf = None
cover_deleted = True
cover_button_delete.connect("clicked", delete_pixbuf)
@@ -77,17 +75,17 @@ def create_details_window(parent_widget, game_id=None):
)
cover = Gtk.Picture.new()
game_cover = GameCover(cover)
if not game_id:
window.set_title(_("Add New Game"))
GameCover(cover)
name = Gtk.Entry()
developer = Gtk.Entry()
executable = Gtk.Entry()
apply_button = Gtk.Button.new_with_label(_("Confirm"))
else:
window.set_title(_("Edit Game Details"))
GameCover(cover, parent_widget.games[game_id].pixbuf)
game_cover.new_pixbuf(path=parent_widget.games[game_id].get_cover())
developer = Gtk.Entry.new_with_buffer(
Gtk.EntryBuffer.new(games[game_id].developer, -1)
)
@@ -221,28 +219,22 @@ def create_details_window(parent_widget, game_id=None):
filechooser.open(window, None, set_cover, None)
def set_cover(_source, result, _unused):
nonlocal pixbuf
nonlocal game_cover
nonlocal cover_deleted
try:
path = filechooser.open_finish(result).get_path()
except GLib.GError:
return
try:
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(path, 200, 300, False)
except GLib.GError:
animated_pixbuf = GdkPixbuf.PixbufAnimation.new_from_file(path)
pixbuf = animated_pixbuf.get_static_image().scale_simple(
200, 300, GdkPixbuf.InterpType.BILINEAR
)
cover_button_delete_revealer.set_reveal_child(True)
GameCover(cover, pixbuf)
cover_deleted = True
game_cover.new_pixbuf(path=path)
def close_window(_widget, _callback=None):
window.close()
def apply_preferences(_widget, _callback=None):
nonlocal pixbuf
nonlocal cover_deleted
nonlocal game_id
@@ -321,18 +313,26 @@ def create_details_window(parent_widget, game_id=None):
(
parent_widget.data_dir / "cartridges" / "covers" / f"{game_id}.tiff"
).unlink(missing_ok=True)
parent_widget.pixbufs.pop(game_id)
(
parent_widget.data_dir
/ "cartridges"
/ "animated_covers"
/ f"{game_id}.gif"
).unlink(missing_ok=True)
if pixbuf:
if game_id in parent_widget.pixbufs:
parent_widget.pixbufs.pop(game_id)
save_cover(parent_widget, game_id, None, pixbuf)
elif not (
parent_widget.data_dir / "cartridges" / "covers" / f"{game_id}.tiff"
).is_file():
SGDBSave(parent_widget, {(game_id, values["name"])})
save_cover(
parent_widget,
game_id,
None,
game_cover.get_pixbuf(),
game_cover.get_animation(),
)
path = parent_widget.data_dir / "cartridges" / "games" / f"{game_id}.json"
if path.exists():

View File

@@ -18,18 +18,48 @@
# SPDX-License-Identifier: GPL-3.0-or-later
from gi.repository import GdkPixbuf, Gio
from pathlib import Path
from shutil import copyfile
from gi.repository import GdkPixbuf, Gio, GLib
from PIL import Image, ImageSequence
def save_cover(parent_widget, game_id, cover_path=None, pixbuf=None):
def resize_animation(cover_path):
image = Image.open(cover_path)
frames = tuple(
frame.copy().resize((200, 300)) for frame in ImageSequence.Iterator(image)
)
tmp_path = Path(Gio.File.new_tmp(None)[0].get_path())
frames[0].save(
tmp_path,
format="gif",
save_all=True,
append_images=frames[1:],
)
return tmp_path
def save_cover(
parent_widget, game_id, cover_path=None, pixbuf=None, animation_path=None
):
covers_dir = parent_widget.data_dir / "cartridges" / "covers"
covers_dir.mkdir(parents=True, exist_ok=True)
if not pixbuf:
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(
str(cover_path), 400, 600, False
)
if animation_path:
pixbuf = GdkPixbuf.PixbufAnimation.new_from_file(
str(animation_path)
).get_static_image()
elif not pixbuf:
try:
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(
str(cover_path), 400, 600, False
)
except GLib.GError:
return
open_file = Gio.File.new_for_path(str(covers_dir / f"{game_id}.tiff"))
pixbuf.save_to_streamv(
@@ -38,3 +68,9 @@ def save_cover(parent_widget, game_id, cover_path=None, pixbuf=None):
["compression"],
["8"] if parent_widget.schema.get_boolean("high-quality-images") else ["7"],
)
if animation_path:
animation_dir = parent_widget.data_dir / "cartridges" / "animated_covers"
animation_dir.mkdir(parents=True, exist_ok=True)
copyfile(animation_path, animation_dir / f"{game_id}.gif")