Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
4c1952d7
Commit
4c1952d7
authored
4 months ago
by
magicfelix
Browse files
Options
Downloads
Patches
Plain Diff
Fix PDF rendering by using Firefox instead of Chromium
parent
9d32afb3
No related branches found
No related tags found
1 merge request
!1706
Resolve "Chromium crash while rendering pdf"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+0
-2
0 additions, 2 deletions
Dockerfile
aleksis/core/util/pdf.py
+17
-19
17 additions, 19 deletions
aleksis/core/util/pdf.py
with
17 additions
and
21 deletions
Dockerfile
+
0
−
2
View file @
4c1952d7
...
@@ -30,8 +30,6 @@ RUN apt-get -y update && \
...
@@ -30,8 +30,6 @@ RUN apt-get -y update && \
eatmydata apt-get
-y
upgrade
&&
\
eatmydata apt-get
-y
upgrade
&&
\
eatmydata apt-get
install
-y
--no-install-recommends
\
eatmydata apt-get
install
-y
--no-install-recommends
\
build-essential
\
build-essential
\
chromium
\
chromium-driver
\
curl
\
curl
\
dumb-init
\
dumb-init
\
gettext
\
gettext
\
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/util/pdf.py
+
17
−
19
View file @
4c1952d7
...
@@ -28,34 +28,32 @@ from aleksis.core.util.celery_progress import recorded_task, render_progress_pag
...
@@ -28,34 +28,32 @@ from aleksis.core.util.celery_progress import recorded_task, render_progress_pag
from
aleksis.core.util.core_helpers
import
has_person
,
process_custom_context_processors
from
aleksis.core.util.core_helpers
import
has_person
,
process_custom_context_processors
def
_generate_pdf_with_
chromium
(
temp_dir
,
pdf_path
,
html_url
,
lang
):
def
_generate_pdf_with_
webdriver
(
temp_dir
,
pdf_path
,
html_url
,
lang
):
"""
Generate a PDF file from a HTML file.
"""
"""
Generate a PDF file from a HTML file.
"""
chrome
_options
=
webdriver
.
Chrome
Options
()
driver
_options
=
webdriver
.
Firefox
Options
()
chrome
_options
.
add_argument
(
"
--kiosk-printing
"
)
driver
_options
.
add_argument
(
"
--kiosk-printing
"
)
chrome
_options
.
add_argument
(
"
--headless
"
)
driver
_options
.
add_argument
(
"
--headless
"
)
chrome
_options
.
add_argument
(
"
--no-sandbox
"
)
driver
_options
.
add_argument
(
"
--no-sandbox
"
)
chrome
_options
.
add_argument
(
"
--disable-gpu
"
)
driver
_options
.
add_argument
(
"
--disable-gpu
"
)
chrome
_options
.
add_argument
(
"
--disable-dev-shm-usage
"
)
driver
_options
.
add_argument
(
"
--disable-dev-shm-usage
"
)
chrome
_options
.
add_argument
(
"
--disable-setuid-sandbox
"
)
driver
_options
.
add_argument
(
"
--disable-setuid-sandbox
"
)
chrome
_options
.
add_argument
(
"
--dbus-stub
"
)
driver
_options
.
add_argument
(
"
--dbus-stub
"
)
chrome
_options
.
add_argument
(
"
--temp-profile
"
)
driver
_options
.
add_argument
(
"
--temp-profile
"
)
chrome
_options
.
add_argument
(
f
"
--lang=
{
lang
}
"
)
driver
_options
.
add_argument
(
f
"
--lang=
{
lang
}
"
)
driver
=
webdriver
.
Chrome
(
options
=
chrome
_options
)
driver
=
webdriver
.
Firefox
(
options
=
driver
_options
)
driver
.
get
(
html_url
)
driver
.
get
(
html_url
)
pdf
=
driver
.
execute_cdp_cmd
(
pdf
=
driver
.
print_page
()
"
Page.printToPDF
"
,
{
"
printBackground
"
:
True
,
"
preferCSSPageSize
"
:
True
}
)
driver
.
close
()
driver
.
close
()
with
open
(
pdf_path
,
"
wb
"
)
as
f
:
with
open
(
pdf_path
,
"
wb
"
)
as
f
:
f
.
write
(
base64
.
b64decode
(
pdf
[
"
data
"
]
))
f
.
write
(
base64
.
b64decode
(
pdf
))
@recorded_task
@recorded_task
def
generate_pdf
(
def
generate_pdf
(
file_pk
:
int
,
html_url
:
str
,
recorder
:
ProgressRecorder
,
lang
:
Optional
[
str
]
=
None
file_pk
:
int
,
html_url
:
str
,
recorder
:
ProgressRecorder
,
lang
:
Optional
[
str
]
=
None
):
):
"""
Generate a PDF file by rendering the HTML code using a headless
Chromium
.
"""
"""
Generate a PDF file by rendering the HTML code using a headless
Firefox
.
"""
file_object
=
get_object_or_404
(
PDFFile
,
pk
=
file_pk
)
file_object
=
get_object_or_404
(
PDFFile
,
pk
=
file_pk
)
recorder
.
set_progress
(
0
,
1
)
recorder
.
set_progress
(
0
,
1
)
...
@@ -65,7 +63,7 @@ def generate_pdf(
...
@@ -65,7 +63,7 @@ def generate_pdf(
pdf_path
=
os
.
path
.
join
(
temp_dir
,
"
print.pdf
"
)
pdf_path
=
os
.
path
.
join
(
temp_dir
,
"
print.pdf
"
)
lang
=
lang
or
get_language
()
lang
=
lang
or
get_language
()
_generate_pdf_with_
chromium
(
temp_dir
,
pdf_path
,
html_url
,
lang
)
_generate_pdf_with_
webdriver
(
temp_dir
,
pdf_path
,
html_url
,
lang
)
# Upload PDF file to media storage
# Upload PDF file to media storage
with
open
(
pdf_path
,
"
rb
"
)
as
f
:
with
open
(
pdf_path
,
"
rb
"
)
as
f
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment