From aa608b4c298b8436dc1a3ceb293c0e4892a781b1 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Sat, 30 Oct 2021 11:01:27 -0400 Subject: [PATCH] metadata: support extracting thumbnails from footer Signed-off-by: Eric Callahan --- moonraker/components/file_manager/metadata.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py index d4a4794..4c0d51e 100644 --- a/moonraker/components/file_manager/metadata.py +++ b/moonraker/components/file_manager/metadata.py @@ -248,9 +248,12 @@ class PrusaSlicer(BaseSlicer): return round(total_time, 2) def parse_thumbnails(self) -> Optional[List[Dict[str, Any]]]: - thumb_matches: List[str] = re.findall( - r"; thumbnail begin[;/\+=\w\s]+?; thumbnail end", self.header_data) - if not thumb_matches: + for data in [self.header_data, self.footer_data]: + thumb_matches: List[str] = re.findall( + r"; thumbnail begin[;/\+=\w\s]+?; thumbnail end", data) + if thumb_matches: + break + else: return None thumb_dir = os.path.join(os.path.dirname(self.path), ".thumbs") if not os.path.exists(thumb_dir):