+
+
diff --git a/src/html/templates/songbook_edit/songbook_edit.js b/src/html/templates/songbook_edit/songbook_edit.js
index 2634e404..09f2d972 100644
--- a/src/html/templates/songbook_edit/songbook_edit.js
+++ b/src/html/templates/songbook_edit/songbook_edit.js
@@ -632,10 +632,14 @@ async function renderPDF() {
const urlParams = new URLSearchParams(window.location.search);
const branch = urlParams.get('branch') || 'main';
+ // Get paper size
+ const paperSizeSelect = document.getElementById('paperSize');
+ const paperSize = paperSizeSelect ? paperSizeSelect.value : 'a4';
+
const payload = {
yaml_content: yaml,
branch: branch,
- papersize: "a4"
+ papersize: paperSize
};
const btn = document.getElementById('btnRenderPdf');
@@ -656,17 +660,6 @@ async function renderPDF() {
}
if (pdfDownloadLink) pdfDownloadLink.style.display = 'none';
- // Open blank window immediately to satisfy popup blocker
- let pdfWindow = null;
- try {
- pdfWindow = window.open('about:blank', '_blank');
- if (pdfWindow) {
- pdfWindow.document.write(`
Trwa generowanie śpiewnika PDF... Proszę czekać (szacowany czas: około ${estimatedSeconds} sekund).
`);
- }
- } catch (e) {
- console.warn("Could not open new window automatically", e);
- }
-
renderPdfCloudRun(
payload,
"/api/render/songbook_yaml",
@@ -683,7 +676,6 @@ async function renderPDF() {
pdfDownloadLink.href = url;
pdfDownloadLink.style.display = 'block';
}
- if (pdfWindow) pdfWindow.location.href = url;
},
(err, errUrl) => {
alert(err);
@@ -692,8 +684,6 @@ async function renderPDF() {
btn.textContent = originalBtnText;
}
if (pdfStatusText) pdfStatusText.textContent = err;
- if (pdfWindow && errUrl) pdfWindow.location.href = errUrl;
- else if (pdfWindow) pdfWindow.close();
}
);
}
diff --git a/src/latex/songbook2tex.py b/src/latex/songbook2tex.py
index 101ff780..862b5e1e 100644
--- a/src/latex/songbook2tex.py
+++ b/src/latex/songbook2tex.py
@@ -48,8 +48,14 @@ def create_ready_tex(songbook, papersize):
.replace(":subtitle:", str2tex(songbook.subtitle()))
.replace(":place:", str2tex(songbook.place() + ", ") if songbook.place() else "")
.replace(":url:", str2tex(songbook.url()))
- .replace(":publisher:", str2tex(songbook.publisher()))
- .replace(":imagePdfPath:", songbook.imagePdfPath()))
+ .replace(":publisher:", str2tex(songbook.publisher())))
+
+ if songbook.imagePdfPath():
+ image_tex = f"\\includegraphics[height=5 cm]{{{songbook.imagePdfPath()}}}"
+ else:
+ image_tex = ""
+
+ content = content.replace(":imagePdfPath:", image_tex)
content += "".join([s2t.song2tex(file) for _, file in list_title_file])
diff --git a/src/lib/img2cover/img2cover.py b/src/lib/img2cover/img2cover.py
index 99cfaa44..c03b002a 100644
--- a/src/lib/img2cover/img2cover.py
+++ b/src/lib/img2cover/img2cover.py
@@ -109,28 +109,29 @@ def draw_smart_text(position, text, base_font_path, initial_size, max_width, max
# 5. Load, resize, and position the logo
try:
- if not os.path.exists(logo_path):
- raise FileNotFoundError(f"The logo file was not found at '{logo_path}'")
-
- if logo_path.lower().endswith('.svg'):
- png_data = cairosvg.svg2png(url=logo_path)
- logo_img = Image.open(io.BytesIO(png_data))
- elif logo_path.lower().endswith(('.png', '.jpg', '.jpeg')):
- logo_img = Image.open(logo_path)
- else:
- raise ValueError(f"Unsupported logo format: {os.path.basename(logo_path)}. Please use PNG, JPG, or SVG.")
-
- logo_area_y_start = last_y
- logo_area_height = height_px - logo_area_y_start - (margin * 2)
- logo_max_width = width_px * 0.7
-
- logo_img.thumbnail((logo_max_width, logo_area_height), Image.Resampling.LANCZOS)
-
- logo_x = (width_px - logo_img.width) / 2
- logo_y = logo_area_y_start + (logo_area_height - logo_img.height) / 2
-
- cover.paste(logo_img, (int(logo_x), int(logo_y)), logo_img.convert('RGBA'))
- last_y = logo_y + logo_img.height
+ if logo_path:
+ if not os.path.exists(logo_path):
+ raise FileNotFoundError(f"The logo file was not found at '{logo_path}'")
+
+ if logo_path.lower().endswith('.svg'):
+ png_data = cairosvg.svg2png(url=logo_path)
+ logo_img = Image.open(io.BytesIO(png_data))
+ elif logo_path.lower().endswith(('.png', '.jpg', '.jpeg')):
+ logo_img = Image.open(logo_path)
+ else:
+ raise ValueError(f"Unsupported logo format: {os.path.basename(logo_path)}. Please use PNG, JPG, or SVG.")
+
+ logo_area_y_start = last_y
+ logo_area_height = height_px - logo_area_y_start - (margin * 2)
+ logo_max_width = width_px * 0.7
+
+ logo_img.thumbnail((logo_max_width, logo_area_height), Image.Resampling.LANCZOS)
+
+ logo_x = (width_px - logo_img.width) / 2
+ logo_y = logo_area_y_start + (logo_area_height - logo_img.height) / 2
+
+ cover.paste(logo_img, (int(logo_x), int(logo_y)), logo_img.convert('RGBA'))
+ last_y = logo_y + logo_img.height
except Exception as e:
# Re-raise exceptions to be handled by the caller
diff --git a/src/lib/songbook.py b/src/lib/songbook.py
index 91685738..c230c98c 100644
--- a/src/lib/songbook.py
+++ b/src/lib/songbook.py
@@ -78,28 +78,30 @@ def hidden(self):
return self.spec["hidden"] if "hidden" in self.spec else False
def imagePdfPath(self):
- return resolvePath(self.spec["image"]["pdf"] if "image" in self.spec and "pdf" in self.spec["image"] else "songbooks/wdw21/znak21.pdf", start=self.basedir)
+ if "image" in self.spec and "pdf" in self.spec["image"]:
+ return resolvePath(self.spec["image"]["pdf"], start=self.basedir)
+ return None
def imageWebPath(self):
if "image" in self.spec:
if "png" in self.spec["image"]: return resolvePath(self.spec["image"]["png"], start=self.basedir)
if "svg" in self.spec["image"]: return resolvePath(self.spec["image"]["svg"], start=self.basedir)
if "jpg" in self.spec["image"]: return resolvePath(self.spec["image"]["jpg"], start=self.basedir)
- return resolvePath("songbooks/wdw21/znak21.jpg", start=self.basedir)
+ return None
def imageWebExt(self):
if "image" in self.spec:
if "png" in self.spec["image"]: return "png"
if "svg" in self.spec["image"]: return "svg"
if "jpg" in self.spec["image"]: return "jpg"
- return "image/jpeg"
+ return None
def imageWebMime(self):
if "image" in self.spec:
if "png" in self.spec["image"]: return "image/png"
if "svg" in self.spec["image"]: return "image/svg+xml"
if "jpg" in self.spec["image"]: return "image/jpeg"
- return "image/jpeg"
+ return None
def load_songbook_spec_from_yaml(filename, title=None, songFiles=None):
with open(filename) as stream: