Promote develop → main (2026-05-22 18:49 UTC) #43
@@ -462,8 +462,12 @@ def _build_export_metadata(
|
||||
organization_name: str | None,
|
||||
top_locations: list[str] | None,
|
||||
snapshot_count: int = 0,
|
||||
include_branding: bool = True,
|
||||
) -> dict:
|
||||
"""Einheitlicher Metadaten-Dict fuer PDF (HTML-Meta-Tags) und DOCX (core_properties)."""
|
||||
"""Einheitlicher Metadaten-Dict fuer PDF (HTML-Meta-Tags) und DOCX (core_properties).
|
||||
|
||||
include_branding=False neutralisiert alle AegisSight-Firmenbezeichnungen (White-Label-Export).
|
||||
"""
|
||||
is_research = incident.get("type") == "research"
|
||||
type_label = "Hintergrundrecherche" if is_research else "Live-Monitoring"
|
||||
category = "OSINT-Hintergrundrecherche" if is_research else "OSINT-Lagebericht"
|
||||
@@ -546,23 +550,37 @@ def _build_export_metadata(
|
||||
comments_lines.append("Orte: " + ", ".join(top_locations[:5]))
|
||||
comments = "\n".join(comments_lines)
|
||||
|
||||
# Branding-abhaengige Felder: bei include_branding=False neutralisiert (White-Label-Export)
|
||||
if include_branding:
|
||||
publisher = organization_name or "AegisSight"
|
||||
identifier = f"urn:aegissight:incident:{incident.get('id', '0')}:{now.strftime('%Y%m%dT%H%M%S')}"
|
||||
author = creator or "AegisSight Monitor"
|
||||
creator_app = "AegisSight Monitor"
|
||||
producer = "WeasyPrint + AegisSight Monitor"
|
||||
urn_ns = "aegissight"
|
||||
rights = (
|
||||
"Vertrauliche Lageanalyse — AegisSight Monitor. "
|
||||
"Weitergabe nur an autorisierte Empfänger."
|
||||
)
|
||||
else:
|
||||
publisher = organization_name or ""
|
||||
author = creator or "Unbekannt"
|
||||
creator_app = ""
|
||||
producer = "WeasyPrint"
|
||||
urn_ns = "report"
|
||||
rights = "Vertrauliche Lageanalyse. Weitergabe nur an autorisierte Empfänger."
|
||||
identifier = f"urn:{urn_ns}:incident:{incident.get('id', '0')}:{now.strftime('%Y%m%dT%H%M%S')}"
|
||||
|
||||
return {
|
||||
"title": title,
|
||||
"author": creator or "AegisSight Monitor",
|
||||
"author": author,
|
||||
"subject": subject,
|
||||
"keywords": unique_keywords,
|
||||
"keywords_comma": ", ".join(unique_keywords),
|
||||
"keywords_semicolon": "; ".join(unique_keywords),
|
||||
"category": category,
|
||||
"comments": comments,
|
||||
"creator_app": "AegisSight Monitor",
|
||||
"creator_app": creator_app,
|
||||
"producer": producer,
|
||||
"language": "de-DE",
|
||||
"created": created,
|
||||
"modified": modified,
|
||||
@@ -634,7 +652,7 @@ def _enrich_pdf_metadata(pdf_bytes: bytes, meta: dict) -> bytes:
|
||||
|
||||
# PDF Namespace
|
||||
xmp["pdf:Keywords"] = meta.get("keywords_comma", "")
|
||||
xmp["pdf:Producer"] = "WeasyPrint + AegisSight Monitor"
|
||||
xmp["pdf:Producer"] = meta.get("producer", "WeasyPrint + AegisSight Monitor")
|
||||
|
||||
# XMP Namespace
|
||||
xmp["xmp:CreatorTool"] = meta.get("creator_app", "AegisSight Monitor")
|
||||
@@ -681,6 +699,7 @@ async def generate_pdf(
|
||||
organization_name: str | None = None,
|
||||
top_locations: list[str] | None = None,
|
||||
snapshot_count: int = 0,
|
||||
include_branding: bool = True,
|
||||
) -> bytes:
|
||||
"""PDF-Report via WeasyPrint generieren."""
|
||||
# Sections aus scope ableiten wenn nicht explizit angegeben
|
||||
@@ -713,6 +732,7 @@ async def generate_pdf(
|
||||
meta = _build_export_metadata(
|
||||
incident, articles, fact_checks, all_sources, creator, scope, sections,
|
||||
organization_name, top_locations, snapshot_count=snapshot_count,
|
||||
include_branding=include_branding,
|
||||
)
|
||||
|
||||
env = Environment(loader=FileSystemLoader(str(TEMPLATE_DIR)))
|
||||
@@ -741,6 +761,7 @@ async def generate_pdf(
|
||||
timeline=_prepare_timeline(articles) if scope == "full" else [],
|
||||
articles=articles if scope == "full" else [],
|
||||
meta=meta,
|
||||
include_branding=include_branding,
|
||||
)
|
||||
|
||||
# Artikel pub_date aufbereiten
|
||||
@@ -764,6 +785,7 @@ async def generate_docx(
|
||||
organization_name: str | None = None,
|
||||
top_locations: list[str] | None = None,
|
||||
snapshot_count: int = 0,
|
||||
include_branding: bool = True,
|
||||
) -> bytes:
|
||||
"""Word-Report via python-docx generieren."""
|
||||
doc = Document()
|
||||
@@ -795,6 +817,7 @@ async def generate_docx(
|
||||
meta = _build_export_metadata(
|
||||
incident, articles, fact_checks, all_sources, creator, scope, sections,
|
||||
organization_name, top_locations, snapshot_count=snapshot_count,
|
||||
include_branding=include_branding,
|
||||
)
|
||||
|
||||
# Dateimetadaten setzen (sichtbar in Explorer/Finder, DMS-Systemen)
|
||||
@@ -823,6 +846,8 @@ async def generate_docx(
|
||||
for _ in range(6):
|
||||
doc.add_paragraph()
|
||||
|
||||
# Firmenname-Zeile nur im gebrandeten Export
|
||||
if include_branding:
|
||||
title_para = doc.add_paragraph()
|
||||
title_para.alignment = WD_ALIGN_PARAGRAPH.CENTER
|
||||
run = title_para.add_run("AegisSight Monitor")
|
||||
@@ -978,7 +1003,11 @@ async def generate_docx(
|
||||
doc.add_paragraph()
|
||||
footer = doc.add_paragraph()
|
||||
footer.alignment = WD_ALIGN_PARAGRAPH.CENTER
|
||||
run = footer.add_run(f"Erstellt mit AegisSight Monitor — aegis-sight.de — {now.strftime('%d.%m.%Y')}")
|
||||
if include_branding:
|
||||
footer_text = f"Erstellt mit AegisSight Monitor — aegis-sight.de — {now.strftime('%d.%m.%Y')}"
|
||||
else:
|
||||
footer_text = f"Stand: {now.strftime('%d.%m.%Y')}"
|
||||
run = footer.add_run(footer_text)
|
||||
run.font.size = Pt(8)
|
||||
run.font.color.rgb = RGBColor(0x0a, 0x18, 0x32)
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ tr:nth-child(even) { background: #f8f9fa; }
|
||||
<body>
|
||||
<!-- Deckblatt -->
|
||||
<div class="cover">
|
||||
<img src="data:image/svg+xml;base64,{{ logo_base64 }}" class="cover-logo" alt="AegisSight">
|
||||
{% if include_branding %}<img src="data:image/svg+xml;base64,{{ logo_base64 }}" class="cover-logo" alt="AegisSight">{% endif %}
|
||||
<div class="cover-type">{{ incident_type_label }}</div>
|
||||
<div class="cover-title">{{ incident.title }}</div>
|
||||
<div class="cover-meta">
|
||||
@@ -92,7 +92,7 @@ tr:nth-child(even) { background: #f8f9fa; }
|
||||
<div>Erstellt von: {{ creator }}</div>
|
||||
{% if incident.organization_name %}<div>Organisation: {{ incident.organization_name }}</div>{% endif %}
|
||||
</div>
|
||||
<div class="cover-brand">AegisSight Monitor</div>
|
||||
{% if include_branding %}<div class="cover-brand">AegisSight Monitor</div>{% endif %}
|
||||
</div>
|
||||
|
||||
<!-- Inhaltsverzeichnis -->
|
||||
@@ -208,7 +208,7 @@ tr:nth-child(even) { background: #f8f9fa; }
|
||||
{% endif %}
|
||||
|
||||
<div class="report-footer">
|
||||
Erstellt mit AegisSight Monitor — aegis-sight.de — {{ report_date }}
|
||||
{% if include_branding %}Erstellt mit AegisSight Monitor — aegis-sight.de — {{ report_date }}{% else %}Stand: {{ report_date }}{% endif %}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1152,6 +1152,7 @@ async def export_incident(
|
||||
format: str = Query("pdf", pattern="^(pdf|docx)$"),
|
||||
scope: str = Query("report", pattern="^(summary|report|full)$"),
|
||||
sections: str = Query(None),
|
||||
branding: str = Query("on", pattern="^(on|off)$"),
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
@@ -1268,6 +1269,7 @@ async def export_incident(
|
||||
organization_name=organization_name,
|
||||
top_locations=top_locations,
|
||||
snapshot_count=snapshot_count,
|
||||
include_branding=(branding == "on"),
|
||||
)
|
||||
filename = f"{slug}_{scope_labels_key}_{date_str}.pdf"
|
||||
return StreamingResponse(
|
||||
@@ -1282,6 +1284,7 @@ async def export_incident(
|
||||
organization_name=organization_name,
|
||||
top_locations=top_locations,
|
||||
snapshot_count=snapshot_count,
|
||||
include_branding=(branding == "on"),
|
||||
)
|
||||
filename = f"{slug}_{scope_labels_key}_{date_str}.docx"
|
||||
return StreamingResponse(
|
||||
|
||||
@@ -850,6 +850,11 @@
|
||||
<label class="export-radio"><input type="radio" name="export-format" value="pdf" checked><span>PDF</span></label>
|
||||
<label class="export-radio"><input type="radio" name="export-format" value="docx"><span data-i18n="export.format.docx">Word (DOCX)</span></label>
|
||||
</div>
|
||||
<div style="margin-bottom:16px;">
|
||||
<label style="font-size:11px;text-transform:uppercase;letter-spacing:1px;color:var(--text-secondary);display:block;margin-bottom:8px;" data-i18n="export.branding">Branding</label>
|
||||
<label class="export-radio"><input type="radio" name="export-branding" value="on" checked><span data-i18n="export.branding.on">Mit AegisSight-Branding</span></label>
|
||||
<label class="export-radio"><input type="radio" name="export-branding" value="off"><span data-i18n="export.branding.off">Ohne Firmen-Branding</span></label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer" style="padding:12px 20px;display:flex;justify-content:flex-end;gap:8px;border-top:1px solid var(--border);">
|
||||
<button class="btn btn-secondary" onclick="closeModal('modal-export')" data-i18n="common.cancel">Abbrechen</button>
|
||||
|
||||
@@ -210,6 +210,9 @@
|
||||
"export.format": "Format",
|
||||
"export.format.pdf": "PDF",
|
||||
"export.format.docx": "Word (DOCX)",
|
||||
"export.branding": "Branding",
|
||||
"export.branding.on": "Mit AegisSight-Branding",
|
||||
"export.branding.off": "Ohne Firmen-Branding",
|
||||
"export.submit": "Exportieren",
|
||||
"sources_modal.title": "Quellenverwaltung",
|
||||
"sources_modal.stats.rss": "RSS-Feeds",
|
||||
|
||||
@@ -210,6 +210,9 @@
|
||||
"export.format": "Format",
|
||||
"export.format.pdf": "PDF",
|
||||
"export.format.docx": "Word (DOCX)",
|
||||
"export.branding": "Branding",
|
||||
"export.branding.on": "With AegisSight branding",
|
||||
"export.branding.off": "Without company branding",
|
||||
"export.submit": "Export",
|
||||
"sources_modal.title": "Source management",
|
||||
"sources_modal.stats.rss": "RSS feeds",
|
||||
|
||||
@@ -330,7 +330,7 @@ const API = {
|
||||
resetTutorialState() {
|
||||
return this._request('DELETE', '/tutorial/state');
|
||||
},
|
||||
exportReport(id, format, scope, sections) {
|
||||
exportReport(id, format, scope, sections, includeBranding) {
|
||||
const token = localStorage.getItem('osint_token');
|
||||
let url = `${this.baseUrl}/incidents/${id}/export?format=${format}`;
|
||||
if (sections && sections.length > 0) {
|
||||
@@ -338,6 +338,9 @@ const API = {
|
||||
} else if (scope) {
|
||||
url += `&scope=${scope}`;
|
||||
}
|
||||
if (includeBranding === false) {
|
||||
url += `&branding=off`;
|
||||
}
|
||||
return fetch(url, {
|
||||
headers: { 'Authorization': `Bearer ${token}` },
|
||||
});
|
||||
|
||||
@@ -2637,6 +2637,8 @@ async handleRefresh() {
|
||||
return;
|
||||
}
|
||||
const format = document.querySelector('input[name="export-format"]:checked').value;
|
||||
const brandingEl = document.querySelector('input[name="export-branding"]:checked');
|
||||
const includeBranding = !brandingEl || brandingEl.value === 'on';
|
||||
|
||||
const btn = document.getElementById('export-submit-btn');
|
||||
const origText = btn.textContent;
|
||||
@@ -2644,7 +2646,7 @@ async handleRefresh() {
|
||||
btn.textContent = (typeof T === 'function' ? T('action.creating', 'Wird erstellt...') : 'Wird erstellt...');
|
||||
|
||||
try {
|
||||
const response = await API.exportReport(this.currentIncidentId, format, null, sections);
|
||||
const response = await API.exportReport(this.currentIncidentId, format, null, sections, includeBranding);
|
||||
if (!response.ok) {
|
||||
const err = await response.json().catch(() => ({}));
|
||||
throw new Error(err.detail || 'Fehler ' + response.status);
|
||||
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren