diff --git a/templates/settings.html b/templates/settings.html
index ef382febf..0bb36c579 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -227,7 +227,7 @@
- {% if not context.is_balena %}
+ {% if not (context.is_balena or context.is_docker) %}
{# USB assets #}
diff --git a/templates/splash-page.html b/templates/splash-page.html
index 9bd5fed94..0a9bc07d1 100644
--- a/templates/splash-page.html
+++ b/templates/splash-page.html
@@ -23,13 +23,13 @@
- {% if context.ip_lookup %}
+ {% if context.my_ip %}
To manage the content on this screen, just point your browser to:
{% else %}
-
{{ context.msg }}
+
Unable to retrieve IP
{% endif %}
diff --git a/tests/viewer_test.py b/tests/viewer_test.py
index 33c51058f..519d84039 100644
--- a/tests/viewer_test.py
+++ b/tests/viewer_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-from nose.tools import ok_, eq_
+from nose.tools import eq_
from nose.plugins.attrib import attr
import mock
import unittest
@@ -24,9 +24,6 @@ def setUp(self):
self.m_cmd = mock.Mock(name='m_cmd')
self.p_cmd = mock.patch.object(self.u.sh, 'Command', self.m_cmd)
- self.m_send = mock.Mock(name='m_send')
- self.p_send = mock.patch.object(self.u, 'browser_send', self.m_send)
-
self.m_killall = mock.Mock(name='killall')
self.p_killall = mock.patch.object(self.u.sh, 'killall', self.m_killall)
@@ -52,55 +49,19 @@ def test_empty(self):
self.u.main()
-class TestBrowserSend(ViewerTestCase):
- def test_send(self):
- self.p_cmd.start()
- self.p_send.start()
- self.u.setup()
- self.u.load_browser()
- self.p_send.stop()
- self.p_cmd.stop()
-
- m_put = mock.Mock(name='uzbl_put')
- self.m_cmd.return_value.return_value.process.stdin.put = m_put
-
- self.u.browser_send('test_cmd')
- m_put.assert_called_once_with('test_cmd\n')
-
- self.u.browser_send('event TITLE 标题')
- m_put.assert_called_with('event TITLE \xe6\xa0\x87\xe9\xa2\x98\n')
-
- def test_dead(self):
- self.p_loadb.start()
- self.u.browser_send(None)
- self.m_loadb.assert_called_once()
- self.p_loadb.stop()
-
-
-class TestBrowserClear(ViewerTestCase):
- def test_clear(self):
- with mock.patch.object(self.u, 'browser_url', mock.Mock()) as m_url:
- self.u.setup()
- self.u.browser_clear()
- m_url.assert_called_once()
-
-
class TestLoadBrowser(ViewerTestCase):
+ @mock.patch('pydbus.SessionBus', mock.MagicMock())
def test_setup(self):
+ self.p_loadb.start()
self.u.setup()
- ok_(os.path.isdir(self.u.SCREENLY_HTML))
+ self.p_loadb.stop()
- def load_browser(self):
- m_uzbl = mock.Mock(name='uzbl')
- self.m_cmd.return_value = m_uzbl
+ def test_load_browser(self):
+ self.m_cmd.return_value.return_value.process.stdout = 'Screenly service start'
self.p_cmd.start()
- self.p_send.start()
self.u.load_browser()
- self.p_send.stop()
self.p_cmd.stop()
- self.m_cmd.assert_called_once_with('uzbl-browser')
- m_uzbl.assert_called_once_with(print_events=True, config='-', uri=None, _bg=True)
- m_send.assert_called_once()
+ self.m_cmd.assert_called_once_with('ScreenlyWebview')
class TestSignalHandlers(ViewerTestCase):
diff --git a/tools/assets-migration-to-screenly-pro.py b/tools/assets-migration-to-screenly-pro.py
index 8db832c51..c406eea58 100644
--- a/tools/assets-migration-to-screenly-pro.py
+++ b/tools/assets-migration-to-screenly-pro.py
@@ -14,10 +14,10 @@
HOME = os.getenv('HOME', '/home/pi')
BASE_API_SCREENLY_URL = 'https://api.screenlyapp.com'
-ASSETS_SCREENLY_OSE_API = 'http://127.0.0.1:8080/api/v1.1/assets'
+ASSETS_SCREENLY_OSE_API = 'http://127.0.0.1/api/v1.1/assets'
PORT_NGROK = 4040
-PORT = 8000
+PORT = 80
token = None
ngrok_public_url = None
diff --git a/viewer.py b/viewer.py
index dc4b1dc1f..4b5b12a4b 100755
--- a/viewer.py
+++ b/viewer.py
@@ -5,30 +5,29 @@
import pydbus
import random
import re
+import string
+from datetime import datetime, timedelta
+from os import path, getenv, utime, system
+from random import shuffle
+from signal import signal, SIGALRM, SIGUSR1
+from time import sleep
+from threading import Thread
import requests
import sh
-import string
import zmq
-from datetime import datetime, timedelta
from mixpanel import Mixpanel, MixpanelException
from netifaces import gateways
-from os import path, getenv, utime, system
-from platform import machine
-from random import shuffle
-from threading import Thread
from requests import get as req_get
-from signal import alarm, signal, SIGALRM, SIGUSR1
-from time import sleep
-
-from settings import settings, LISTEN, PORT, ZmqConsumer
-from lib import assets_helper, html_templates
+from lib import assets_helper
from lib import db
-from lib.diagnostics import get_git_branch, get_git_short_hash
+from lib.diagnostics import get_raspberry_code, get_raspberry_model, get_git_branch, get_git_short_hash
from lib.github import fetch_remote_hash, remote_branch_available
from lib.errors import SigalrmException
-from lib.utils import get_active_connections, url_fails, touch, is_balena_app, is_ci, get_node_ip
+from lib.media_player import VLCMediaPlayer, OMXMediaPlayer
+from lib.utils import get_active_connections, url_fails, touch, is_balena_app, is_ci, get_node_ip, string_to_bool
+from settings import settings, LISTEN, PORT, ZmqConsumer
__author__ = "Screenly, Inc"
@@ -40,21 +39,21 @@
EMPTY_PL_DELAY = 5 # secs
INITIALIZED_FILE = '/.screenly/initialized'
-BLACK_PAGE = '/tmp/screenly_html/black_page.html'
WATCHDOG_PATH = '/tmp/screenly.watchdog'
-SCREENLY_HTML = '/tmp/screenly_html/'
-LOAD_SCREEN = '/screenly/static/img/loading.png' # relative to $HOME
-UZBLRC = '/.config/uzbl/config-screenly' # relative to $HOME
-INTRO = '/screenly/intro-template.html'
+LOAD_SCREEN = 'http://{}:{}/{}'.format(LISTEN, PORT, 'static/img/loading.png')
current_browser_url = None
browser = None
loop_is_stopped = False
+browser_bus = None
+
+try:
+ media_player = VLCMediaPlayer() if get_raspberry_model(get_raspberry_code()) == 'Model 4B' else OMXMediaPlayer()
+except sh.ErrorReturnCode_1:
+ media_player = OMXMediaPlayer()
-VIDEO_TIMEOUT = 20 # secs
HOME = None
-arch = None
db_conn = None
scheduler = None
@@ -71,13 +70,9 @@ def sigusr1(signum, frame):
"""
The signal interrupts sleep() calls, so the currently
playing web or image asset is skipped.
- omxplayer is killed to skip any currently playing video assets.
"""
logging.info('USR1 received, skipping.')
- try:
- sh.killall('omxplayer.bin', _ok_code=[1])
- except OSError:
- pass
+ media_player.stop()
def skip_asset(back=False):
@@ -131,7 +126,7 @@ def __init__(self):
def run(self):
socket = self.context.socket(zmq.SUB)
- socket.connect('tcp://{}:10001'.format(LISTEN))
+ socket.connect('tcp://srly-ose-server:10001')
socket.setsockopt(zmq.SUBSCRIBE, 'viewer')
while True:
msg = socket.recv()
@@ -214,8 +209,7 @@ def update_playlist(self):
# Try to keep the same position in the play list. E.g. if a new asset is added to the end of the list, we
# don't want to start over from the beginning.
self.index = self.index % len(self.assets) if self.assets else 0
- logging.debug('update_playlist done, count %s, counter %s, index %s, deadline %s', len(self.assets),
- self.counter, self.index, self.deadline)
+ logging.debug('update_playlist done, count %s, counter %s, index %s, deadline %s', len(self.assets), self.counter, self.index, self.deadline)
def get_db_mtime(self):
# get database file last modification time
@@ -257,111 +251,57 @@ def watchdog():
utime(WATCHDOG_PATH, None)
-def load_browser(url=None):
- global browser, current_browser_url
+def load_browser():
+ global browser
logging.info('Loading browser...')
- if browser:
- logging.info('killing previous uzbl %s', browser.pid)
- browser.process.kill()
-
- if url is not None:
- current_browser_url = url
-
- # --config=- read commands (and config) from stdin
- # --print-events print events to stdout
- browser = sh.Command('uzbl-browser')(print_events=True, config='-', uri=current_browser_url, _bg=True)
- logging.info('Browser loading %s. Running as PID %s.', current_browser_url, browser.pid)
-
- uzbl_rc = 'set ssl_verify = {}\n'.format('1' if settings['verify_ssl'] else '0')
- with open(HOME + UZBLRC) as f: # load uzbl.rc
- uzbl_rc = f.read() + uzbl_rc
- browser_send(uzbl_rc)
-
-
-def browser_get_event():
- alarm(10)
- try:
- event = browser.next()
- except SigalrmException:
- return None
- alarm(0)
- return event
+ browser = sh.Command('ScreenlyWebview')(_bg=True, _err_to_out=True)
+ while 'Screenly service start' not in browser.process.stdout:
+ sleep(1)
-def browser_send(command, cb=lambda _: True):
- if not (browser is None) and browser.process.alive:
- while not browser.process._pipe_queue.empty(): # flush stdout
- browser_get_event()
+def view_webpage(uri):
+ global current_browser_url
- browser.process.stdin.put(command + '\n')
- while True: # loop until cb returns True
- try:
- browser_event = browser_get_event()
- except StopIteration:
- break
- if not browser_event:
- break
- if cb(browser_event):
- break
- else:
- logging.info('browser found dead, restarting')
+ if browser is None or not browser.process.alive:
load_browser()
+ if current_browser_url is not uri:
+ browser_bus.loadPage(uri)
+ current_browser_url = uri
+ logging.info('Current url is {0}'.format(current_browser_url))
-def browser_clear(force=False):
- """Load a black page. Default cb waits for the page to load."""
- browser_url('file://' + BLACK_PAGE, force=force,
- cb=lambda buf: 'LOAD_FINISH' in buf and BLACK_PAGE in buf)
-
-
-def browser_url(url, cb=lambda _: True, force=False):
+def view_image(uri):
global current_browser_url
- if url == current_browser_url and not force:
- logging.debug('Already showing %s, reloading it.', current_browser_url)
- else:
- current_browser_url = url
-
- """Uzbl handles full URI format incorrect: scheme://uname:passwd@domain:port/path
- We need to escape @"""
- escaped_url = current_browser_url.replace('@', '\\@').replace('&', '\\&')
-
- browser_send('uri ' + escaped_url, cb=cb)
- logging.info('current url is %s', current_browser_url)
-
+ if browser is None or not browser.process.alive:
+ load_browser()
+ if current_browser_url is not uri:
+ browser_bus.loadImage(uri)
+ current_browser_url = uri
+ logging.info('Current url is {0}'.format(current_browser_url))
-def view_image(uri):
- browser_clear()
- browser_send('js window.setimg("{0}")'.format(uri),
- cb=lambda b: 'COMMAND_EXECUTED' in b and 'setimg' in b)
+ if string_to_bool(getenv('WEBVIEW_DEBUG', '0')):
+ logging.info(browser.process.stdout)
def view_video(uri, duration):
logging.debug('Displaying video %s for %s ', uri, duration)
- if arch in ('armv6l', 'armv7l'):
- player_args = ['omxplayer', uri]
- player_kwargs = {'o': settings['audio_output'], '_bg': True, '_ok_code': [0, 124, 143]}
- else:
- player_args = ['mplayer', uri, '-nosound']
- player_kwargs = {'_bg': True, '_ok_code': [0, 124]}
-
- if duration and duration != 'N/A':
- player_args = ['timeout', VIDEO_TIMEOUT + int(duration.split('.')[0])] + player_args
+ media_player.set_asset(uri, duration)
+ media_player.play()
- run = sh.Command(player_args[0])(*player_args[1:], **player_kwargs)
+ view_image('null')
- browser_clear(force=True)
try:
- while run.process.alive:
+ while media_player.is_playing():
watchdog()
sleep(1)
- if run.exit_code == 124:
- logging.error('omxplayer timed out')
except sh.ErrorReturnCode_1:
logging.info('Resource URI is not correct, remote host is not responding or request was rejected.')
+ media_player.stop()
+
def check_update():
"""
@@ -428,7 +368,9 @@ def check_update():
def load_settings():
- """Load settings and set the log level."""
+ """
+ Load settings and set the log level.
+ """
settings.load()
logging.getLogger().setLevel(logging.DEBUG if settings['debug_logging'] else logging.INFO)
@@ -441,7 +383,7 @@ def asset_loop(scheduler):
if asset is None:
logging.info('Playlist is empty. Sleeping for %s seconds', EMPTY_PL_DELAY)
- view_image(HOME + LOAD_SCREEN)
+ view_image(LOAD_SCREEN)
sleep(EMPTY_PL_DELAY)
elif path.isfile(asset['uri']) or (not url_fails(asset['uri']) or asset['skip_asset_check']):
@@ -453,9 +395,7 @@ def asset_loop(scheduler):
if 'image' in mime:
view_image(uri)
elif 'web' in mime:
- # FIXME If we want to force periodic reloads of repeated web assets, force=True could be used here.
- # See e38e6fef3a70906e7f8739294ffd523af6ce66be.
- browser_url(uri)
+ view_webpage(uri)
elif 'video' or 'streaming' in mime:
view_video(uri, asset['duration'])
else:
@@ -472,9 +412,8 @@ def asset_loop(scheduler):
def setup():
- global HOME, arch, db_conn
+ global HOME, db_conn, browser_bus
HOME = getenv('HOME', '/home/pi')
- arch = machine()
signal(SIGUSR1, sigusr1)
signal(SIGALRM, sigalrm)
@@ -482,12 +421,13 @@ def setup():
load_settings()
db_conn = db.conn(settings['database'])
- sh.mkdir(SCREENLY_HTML, p=True)
- html_templates.black_page(BLACK_PAGE)
+ load_browser()
+ bus = pydbus.SessionBus()
+ browser_bus = bus.get('screenly.webview', '/Screenly')
def setup_hotspot():
- bus = pydbus.SystemBus()
+ bus = pydbus.SessionBus()
pattern_include = re.compile("wlan*")
pattern_exclude = re.compile("ScreenlyOSE-*")
@@ -506,11 +446,10 @@ def setup_hotspot():
)
# Displays the hotspot page
-
if not path.isfile(HOME + INITIALIZED_FILE) and not gateways().get('default'):
if len(wireless_connections) == 0:
url = 'http://{0}/hotspot'.format(LISTEN)
- load_browser(url=url)
+ view_webpage(url)
# Wait until the network is configured
while not path.isfile(HOME + INITIALIZED_FILE) and not gateways().get('default'):
@@ -562,19 +501,16 @@ def main():
wait_for_server(5)
- if is_balena_app():
- load_browser()
- else:
+ if not is_balena_app():
setup_hotspot()
- url = 'http://{0}:{1}/splash-page'.format(LISTEN, PORT) if settings['show_splash'] else 'file://' + BLACK_PAGE
- browser_url(url=url)
-
if settings['show_splash']:
+ url = 'http://{0}:{1}/splash-page'.format(LISTEN, PORT)
+ view_webpage(url)
sleep(SPLASH_DELAY)
# We don't want to show splash-page if there are active assets but all of them are not available
- view_image(HOME + LOAD_SCREEN)
+ view_image(LOAD_SCREEN)
logging.debug('Entering infinite loop.')
while True:
diff --git a/websocket_server_layer.py b/websocket_server_layer.py
index 28dbac626..abcd52571 100644
--- a/websocket_server_layer.py
+++ b/websocket_server_layer.py
@@ -34,7 +34,7 @@ def run(self):
socket_incoming = self.context.socket(zmq.SUB)
socket_outgoing = self.context.socket(zmq.PUB)
- socket_incoming.connect('tcp://{}:10001'.format(LISTEN))
+ socket_incoming.connect('tcp://srly-ose-server:10001')
socket_outgoing.bind('inproc://queue')
socket_incoming.setsockopt(zmq.SUBSCRIBE, "")
diff --git a/webview/.gitignore b/webview/.gitignore
new file mode 100644
index 000000000..722d236a0
--- /dev/null
+++ b/webview/.gitignore
@@ -0,0 +1,44 @@
+#.gitignore from github
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
diff --git a/webview/Dockerfile b/webview/Dockerfile
new file mode 100644
index 000000000..ae140cdca
--- /dev/null
+++ b/webview/Dockerfile
@@ -0,0 +1,194 @@
+FROM --platform=linux/arm/v7 balenalib/rpi-raspbian:buster as builder
+
+# There are likely a large number of dependencies that can be stripped out here
+# depending on your needs (and probably in general). My primary objective was just
+# to make things work.
+RUN apt-get update && \
+ apt-get install -y \
+ firebird-dev \
+ freetds-dev \
+ gstreamer-tools \
+ gstreamer1.0-plugins-base \
+ gstreamer1.0-plugins-good \
+ gstreamer1.0-plugins-ugly \
+ gstreamer1.0-x \
+ libasound2-dev \
+ libavcodec-dev \
+ libavformat-dev \
+ libavutil-dev \
+ libbz2-dev \
+ libcap-dev \
+ libdbus-1-dev \
+ libdbus-glib-1-dev \
+ libdrm-dev \
+ libegl1-mesa-dev \
+ libevent-dev \
+ libfontconfig1-dev \
+ libfreetype6-dev \
+ libgbm-dev \
+ libgcrypt20-dev \
+ libgles2-mesa-dev \
+ libglib2.0-dev \
+ libgst-dev \
+ libgstreamer-plugins-base1.0-dev \
+ libgstreamer1.0-dev \
+ libicu-dev \
+ libinput-dev \
+ libiodbc2-dev \
+ libjpeg62-turbo-dev \
+ libjsoncpp-dev \
+ libminizip-dev \
+ libnss3-dev \
+ libopus-dev \
+ libpci-dev \
+ libpng-dev \
+ libpng16-16 \
+ libpq-dev \
+ libpulse-dev \
+ libraspberrypi-bin \
+ libraspberrypi0 \
+ librsvg2-common \
+ libsnappy-dev \
+ libsqlite0-dev \
+ libsqlite3-dev \
+ libsrtp0-dev \
+ libsrtp2-dev \
+ libssl-dev \
+ libssl1.1 \
+ libswscale-dev \
+ libsystemd-dev \
+ libts-dev \
+ libudev-dev \
+ libvpx-dev \
+ libwayland-dev \
+ libwebp-dev \
+ libx11-dev \
+ libx11-xcb-dev \
+ libx11-xcb1 \
+ libxcb-glx0-dev \
+ libxcb-icccm4 \
+ libxcb-icccm4-dev \
+ libxcb-image0 \
+ libxcb-image0-dev \
+ libxcb-keysyms1 \
+ libxcb-keysyms1-dev \
+ libxcb-randr0-dev \
+ libxcb-render-util0 \
+ libxcb-render-util0-dev \
+ libxcb-shape0-dev \
+ libxcb-shm0 \
+ libxcb-shm0-dev \
+ libxcb-sync-dev \
+ libxcb-sync1 \
+ libxcb-xfixes0-dev \
+ libxcb-xinerama0 \
+ libxcb-xinerama0-dev \
+ libxcb1 \
+ libxcb1-dev \
+ libxext-dev \
+ libxi-dev \
+ libxkbcommon-dev \
+ libxrender-dev \
+ libxslt1-dev \
+ libxss-dev \
+ libxtst-dev \
+ nodejs \
+ ruby \
+ va-driver-all \
+ wget
+
+# Really make sure we don't have this package installed
+# as it will break the build of QTWebEngine
+# https://www.enricozini.org/blog/2020/qt5/build-qt5-cross-builder-with-raspbian-sysroot-compiling-with-the-sysroot-continued/
+RUN dpkg --purge libraspberrypi-dev
+
+FROM debian:buster
+
+# This list can most likely be slimmed down *a lot* but that's for another day.
+RUN apt-get update && \
+ apt-get -y install \
+ bison \
+ build-essential \
+ ccache \
+ cowsay \
+ flex \
+ freetds-dev \
+ g++ \
+ g++-multilib \
+ gcc-multilib \
+ git \
+ gperf \
+ gyp \
+ lib32z1-dev \
+ libasound2 \
+ libasound2-dev \
+ libavcodec-dev \
+ libavformat-dev \
+ libavutil-dev \
+ libbz2-dev \
+ libcap-dev \
+ libdbus-1-dev \
+ libdbus-glib-1-dev \
+ libdrm-dev \
+ libegl1-mesa-dev \
+ libevent-dev \
+ libfontconfig1 \
+ libfontconfig1-dev \
+ libfreetype6 \
+ libgbm-dev \
+ libgcrypt20-dev \
+ libgles2-mesa-dev \
+ libinput-dev \
+ libjpeg62-turbo-dev \
+ libjsoncpp-dev \
+ libminizip-dev \
+ libnss3 \
+ libnss3-dev \
+ libopus-dev \
+ libpci-dev \
+ libpng16-16 \
+ libpulse-dev \
+ libsecret-1-0 \
+ libsnappy-dev \
+ libsrtp2-dev \
+ libssl-dev \
+ libssl1.1 \
+ libtiff5 \
+ libts-dev \
+ libudev-dev \
+ libvpx-dev \
+ libwebp-dev \
+ libxss-dev \
+ libxss1 \
+ libxtst-dev \
+ lsb-release \
+ ninja-build \
+ nodejs \
+ python \
+ rsync \
+ ruby \
+ subversion \
+ wget \
+ make && \
+ apt-get clean
+
+WORKDIR /build
+
+RUN wget -q https://raw.githubusercontent.com/riscv/riscv-poky/master/scripts/sysroot-relativelinks.py \
+ -O /usr/local/bin/sysroot-relativelinks.py && \
+ chmod +x /usr/local/bin/sysroot-relativelinks.py
+
+RUN mkdir -p /sysroot/usr /sysroot/opt /sysroot/lib
+COPY --from=builder /lib/ /sysroot/lib/
+COPY --from=builder /usr/include/ /sysroot/usr/include/
+COPY --from=builder /usr/lib/ /sysroot/usr/lib/
+COPY --from=builder /opt/vc/ sysroot/opt/vc/
+
+ENV BUILD_WEBVIEW 1
+ENV CCACHE_MAXSIZE 10G
+ENV CCACHE_DIR /src/ccache
+ARG GIT_HASH=0
+ENV GIT_HASH=$GIT_HASH
+
+COPY build_qt5.sh /usr/local/bin/
+CMD /usr/local/bin/build_qt5.sh
diff --git a/webview/README.md b/webview/README.md
new file mode 100644
index 000000000..9796580aa
--- /dev/null
+++ b/webview/README.md
@@ -0,0 +1,57 @@
+## Building QT
+
+Since our entire build environment resides inside a Docker container, you don't need to install any packages on the host system. Everything is confined to the Docker image. Do however note that as of this writing, the multi-platform support is still in beta so, you need to enable this. Instructions for how to get started with multi-platform builds can be found [here](https://medium.com/@artur.klauser/building-multi-architecture-docker-images-with-buildx-27d80f7e2408).
+
+```
+$ cd webview
+$ docker build \
+ --build-arg GIT_HASH=$(git rev-parse --short HEAD) \
+ -t qt-builder .
+```
+
+You should now be able to invoke a run executing the following command:
+
+```
+$ docker run --rm -t \
+ -v ~/tmp/qt-src:/src \
+ -v ~/tmp/qt-build:/build \
+ -v $(pwd):/webview:ro \
+ qt-builder
+```
+
+This will launch `build-qt.sh` and start the process of building QT for *all* Raspberry Pi boards. The resulting files will be placed in `~/tmp/qt-build/`.
+
+### Build Arguments
+
+You can append the following environment variables to configure the build process:
+
+* `CLEAN_BUILD`: Set to `1` to ensure a clean build (not including the `ccache` cache).
+* `BUILD_WEBVIEW`: Set to `0` to disable the build of ScreenlyWebView.
+* `TARGET`: Specify a particular target (such as `pi3` or `pi4`) instead of all existing boards.
+
+## Usage
+
+DBus is used for communication.
+Webview registers `screenly.webview` object at `/Screenly` address on the session bus.
+
+Webview provides 2 methods:`loadPage` and `loadImage`.
+
+Example of interaction (python):
+
+```
+from pydbus import SessionBus
+
+bus = SessionBus()
+browser_bus = bus.get('screenly.webview', '/Screenly')
+
+browser_bus.loadPage("www.example.com")
+```
+
+Supported protocols: `http://`, `https://`
+
+## Debugging
+
+You can enable QT debugging by using the following:
+```
+export QT_LOGGING_RULES=qt.qpa.*=true
+```
diff --git a/webview/ScreenlyWebview.pro b/webview/ScreenlyWebview.pro
new file mode 100644
index 000000000..370d748f8
--- /dev/null
+++ b/webview/ScreenlyWebview.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+
+QT += webengine webenginewidgets dbus
+CONFIG += c++11
+
+SOURCES += src/main.cpp \
+ src/mainwindow.cpp \
+ src/view.cpp
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Default rules for deployment.
+include(src/deployment.pri)
+
+HEADERS += \
+ src/mainwindow.h \
+ src/view.h
diff --git a/webview/build_qt5.sh b/webview/build_qt5.sh
new file mode 100755
index 000000000..9ef68d0e4
--- /dev/null
+++ b/webview/build_qt5.sh
@@ -0,0 +1,284 @@
+#!/bin/bash
+
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# -*- sh-basic-offset: 4 -*-
+
+set -exuo pipefail
+
+BUILD_TARGET=/build
+SRC=/src
+QT_BRANCH="5.15.2"
+DEBIAN_VERSION=$(lsb_release -cs)
+MAKE_CORES="$(expr $(nproc) + 2)"
+
+mkdir -p "$BUILD_TARGET"
+mkdir -p "$SRC"
+
+/usr/games/cowsay -f tux "Building QT version $QT_BRANCH."
+if [ "${BUILD_WEBENGINE-x}" == "1" ]; then
+ /usr/games/cowsay -f tux "...with QTWebEngine."
+fi
+
+function fetch_cross_compile_tool () {
+ # The Raspberry Pi Foundation's cross compiling tools are too old so we need newer ones.
+ # References:
+ # * https://github.com/UvinduW/Cross-Compiling-Qt-for-Raspberry-Pi-4
+ # * https://releases.linaro.org/components/toolchain/binaries/latest-7/armv8l-linux-gnueabihf/
+ if [ ! -d "/src/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf" ]; then
+ pushd /src/
+ wget -q https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/arm-linux-gnueabihf/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz
+ tar xf gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz
+ rm gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz
+ popd
+ fi
+}
+
+function fetch_rpi_firmware () {
+ if [ ! -d "/src/opt" ]; then
+ pushd /src
+
+ # We do an `svn checkout` here as the entire git repo here is *huge*
+ # and `git` doesn't support partial checkouts well (yet)
+ svn checkout -q https://github.com/raspberrypi/firmware/trunk/opt
+ popd
+ fi
+
+ # We need to exclude all of these .h and android files to make QT build.
+ # In the blog post referenced, this is done using `dpkg --purge libraspberrypi-dev`,
+ # but since we're copying in the source, we're just going to exclude these from the rsync.
+ # https://www.enricozini.org/blog/2020/qt5/build-qt5-cross-builder-with-raspbian-sysroot-compiling-with-the-sysroot-continued/
+ rsync \
+ -aP \
+ --exclude '*android*' \
+ --exclude 'hello_pi' \
+ --exclude '.svn' \
+ /src/opt/ /sysroot/opt/
+}
+
+function patch_qt () {
+ # Yes, yes, this all should be converted to proper patches
+ # but I really just wanted to get it to work.
+
+ # QT is linking against the old libraries for Pi 1 - Pi 3
+ # https://bugreports.qt.io/browse/QTBUG-62216
+ sed -i 's/lEGL/lbrcmEGL/' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+ sed -i 's/lGLESv2/lbrcmGLESv2/' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+
+ # Qmake won't account for sysroot
+ # https://wiki.qt.io/RaspberryPi2EGLFS
+ sed -i 's#^VC_LIBRARY_PATH.*#VC_LIBRARY_PATH = $$[QT_SYSROOT]/opt/vc/lib#' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+ sed -i 's#^VC_INCLUDE_PATH.*#VC_INCLUDE_PATH = $$[QT_SYSROOT]/opt/vc/include#' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+ sed -i 's#^VC_LINK_LINE.*#VC_LINK_LINE = -L$${VC_LIBRARY_PATH}#' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+ sed -i 's#^QMAKE_LIBDIR_OPENGL_ES2.*#QMAKE_LIBDIR_OPENGL_ES2 = $${VC_LIBRARY_PATH}#' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+}
+
+function patch_qtwebengine () {
+ # Patch up WebEngine due to GCC bug
+ # https://www.enricozini.org/blog/2020/qt5/build-qt5-cross-builder-with-raspbian-sysroot-compiling-with-the-sysroot/
+ pushd "/src/qt5/qtwebengine"
+ sed -i '1s/^/#pragma GCC push_options\n#pragma GCC optimize ("O0")\n/' src/3rdparty/chromium/third_party/skia/third_party/skcms/skcms.cc
+ echo "#pragma GCC pop_options" >> src/3rdparty/chromium/third_party/skia/third_party/skcms/skcms.cc
+ popd
+}
+
+function fetch_qt5 () {
+ local SRC_DIR="/src/qt5"
+ pushd /src
+
+ if [ ! -d "$SRC_DIR" ]; then
+
+ if [ ! -f "qt-everywhere-src-5.15.2.tar.xz" ]; then
+ wget https://download.qt.io/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz
+ fi
+
+ if [ ! -f "md5sums.txt" ]; then
+ wget https://download.qt.io/archive/qt/5.15/5.15.2/single/md5sums.txt
+ fi
+ md5sum --ignore-missing -c md5sums.txt
+
+ # Extract and make a clone
+ tar xf qt-everywhere-src-5.15.2.tar.xz
+ rsync -aqP qt-everywhere-src-5.15.2/ qt5
+ else
+ rsync -aqP --delete qt-everywhere-src-5.15.2/ qt5
+ fi
+ popd
+}
+
+function build_qt () {
+ # This build process is inspired by
+ # https://www.tal.org/tutorials/building-qt-512-raspberry-pi
+ local SRC_DIR="/src/$1"
+
+
+ if [ ! -f "$BUILD_TARGET/qt5-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" ]; then
+ /usr/games/cowsay -f tux "Building QT for $1"
+
+ # Make sure we have a clean QT 5 tree
+ fetch_qt5
+
+ if [ "${CLEAN_BUILD-x}" == "1" ]; then
+ rm -rf "$SRC_DIR"
+ fi
+
+ mkdir -p "$SRC_DIR"
+ pushd "$SRC_DIR"
+
+ if [ "$1" = "pi1" ]; then
+ local BUILD_ARGS=(
+ "-device" "linux-rasp-pi-g++"
+ )
+ patch_qt "linux-rasp-pi-g++"
+ patch_qtwebengine
+ elif [ "$1" = "pi2" ]; then
+ local BUILD_ARGS=(
+ "-device" "linux-rasp-pi2-g++"
+ )
+ patch_qt "linux-rasp-pi2-g++"
+ elif [ "$1" = "pi3" ]; then
+ local BUILD_ARGS=(
+ "-device" "linux-rasp-pi3-g++"
+ )
+ patch_qt "linux-rasp-pi3-g++"
+
+ # The opengl flag only works on Pi 4. It breaks the QTWebEngine build
+ # process on any other model.
+ elif [ "$1" = "pi4" ]; then
+ local BUILD_ARGS=(
+ "-device" "linux-rasp-pi4-v3d-g++"
+ "-opengl" "es2"
+ )
+ else
+ echo "Unknown device. Exiting."
+ exit 1
+ fi
+
+ # @TODO: Add in the `-opengl es2` flag for Pi 1 - Pi 3.
+ # Currently this breaks the QTWebEngine process.
+ /src/qt5/configure \
+ "${BUILD_ARGS[@]}" \
+ -ccache \
+ -confirm-license \
+ -dbus-linked \
+ -device-option CROSS_COMPILE=/src/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf- \
+ -eglfs \
+ -evdev \
+ -extprefix "$SRC_DIR/qt5pi" \
+ -force-pkg-config \
+ -glib \
+ -make libs \
+ -no-compile-examples \
+ -no-cups \
+ -no-gbm \
+ -no-gtk \
+ -no-pch \
+ -no-use-gold-linker \
+ -no-xcb \
+ -no-xcb-xlib \
+ -nomake examples \
+ -nomake tests \
+ -opensource \
+ -prefix /usr/local/qt5pi \
+ -qpa eglfs \
+ -qt-pcre \
+ -reduce-exports \
+ -release \
+ -skip qt3d \
+ -skip qtactiveqt \
+ -skip qtandroidextras \
+ -skip qtcanvas3d \
+ -skip qtcharts \
+ -skip qtdatavis3d \
+ -skip qtgamepad \
+ -skip qtgraphicaleffects \
+ -skip qtlocation \
+ -skip qtlottie \
+ -skip qtmacextras \
+ -skip qtpurchasing \
+ -skip qtquick3d \
+ -skip qtquickcontrols \
+ -skip qtquickcontrols2 \
+ -skip qtquicktimeline \
+ -skip qtscript \
+ -skip qtscxml \
+ -skip qtsensors \
+ -skip qtserialbus \
+ -skip qtserialport \
+ -skip qtspeech \
+ -skip qttools \
+ -skip qttranslations \
+ -skip qtvirtualkeyboard \
+ -skip qtwayland \
+ -skip qtwebview \
+ -skip qtwinextras \
+ -skip qtx11extras \
+ -skip wayland \
+ -ssl \
+ -system-freetype \
+ -system-libjpeg \
+ -system-libpng \
+ -system-zlib \
+ -sysroot /sysroot
+
+ # The RAM consumption is proportional to the amount of cores.
+ # On an 8 core box, the build process will require ~16GB of RAM.
+ make -j"$MAKE_CORES"
+ make install
+
+ # I'm not sure we actually need this anymore. It's from an
+ # old build process for QT 4.9 that we used.
+ cp -r /usr/share/fonts/truetype/dejavu/ "$SRC_DIR/qt5pi/lib/fonts"
+
+ pushd "$SRC_DIR"
+ tar cfz "$BUILD_TARGET/qt5-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" qt5pi
+ popd
+
+ pushd "$BUILD_TARGET"
+ sha256sum "qt5-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" > "qt5-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz.sha256"
+ popd
+ else
+ echo "QT Build already exist."
+ fi
+
+ if [ ! -f "$BUILD_TARGET/webview-$QT_BRANCH-$DEBIAN_VERSION-$1-$GIT_HASH.tar.gz" ]; then
+ if [ "${BUILD_WEBVIEW-x}" == "1" ]; then
+ cp -rf /webview "$SRC_DIR/"
+
+ pushd "$SRC_DIR/webview"
+
+ "$SRC_DIR/qt5pi/bin/qmake"
+ make -j"$MAKE_CORES"
+ make install
+
+ mkdir -p fakeroot/bin fakeroot/share/ScreenlyWebview
+ mv ScreenlyWebview fakeroot/bin/
+ cp -rf /webview/res fakeroot/share/ScreenlyWebview/
+
+ pushd fakeroot
+ tar cfz "$BUILD_TARGET/webview-$QT_BRANCH-$DEBIAN_VERSION-$1-$GIT_HASH.tar.gz" .
+ popd
+
+ pushd "$BUILD_TARGET"
+ sha256sum "webview-$QT_BRANCH-$DEBIAN_VERSION-$1-$GIT_HASH.tar.gz" > "webview-$QT_BRANCH-$DEBIAN_VERSION-$1-$GIT_HASH.tar.gz.sha256"
+ popd
+ fi
+ else
+ echo "Webview Build already exist."
+ fi
+}
+
+# Modify paths for build process
+/usr/local/bin/sysroot-relativelinks.py /sysroot
+
+fetch_cross_compile_tool
+fetch_rpi_firmware
+
+if [ ! "${TARGET-}" ]; then
+ # Let's work our way through all Pis in order of relevance
+ for device in pi4 pi3 pi2 pi1; do
+ build_qt "$device"
+ done
+else
+ build_qt "$TARGET"
+fi
+
diff --git a/webview/build_qt6.sh b/webview/build_qt6.sh
new file mode 100755
index 000000000..ce5170e1d
--- /dev/null
+++ b/webview/build_qt6.sh
@@ -0,0 +1,275 @@
+#!/bin/bash
+
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# -*- sh-basic-offset: 4 -*-
+
+
+#
+# This is work in progress and will not work at all currently
+#
+
+set -exuo pipefail
+
+BUILD_TARGET=/build
+SRC=/src
+QT_BRANCH="6.0.0"
+DEBIAN_VERSION=$(lsb_release -cs)
+MAKE_CORES="$(expr $(nproc) + 2)"
+
+mkdir -p "$BUILD_TARGET"
+mkdir -p "$SRC"
+
+/usr/games/cowsay -f tux "Building QT version $QT_BRANCH."
+if [ "${BUILD_WEBENGINE-x}" == "1" ]; then
+ /usr/games/cowsay -f tux "...with QTWebEngine."
+fi
+
+function fetch_cross_compile_tool () {
+ # The Raspberry Pi Foundation's cross compiling tools are too old so we need newer ones.
+ # References:
+ # * https://github.com/UvinduW/Cross-Compiling-Qt-for-Raspberry-Pi-4
+ # * https://releases.linaro.org/components/toolchain/binaries/latest-7/armv8l-linux-gnueabihf/
+ if [ ! -d "/src/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf" ]; then
+ cd /src/
+ wget -q https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/arm-linux-gnueabihf/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz
+ tar xf gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz
+ rm gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz
+ fi
+}
+
+function fetch_rpi_firmware () {
+ if [ ! -d "/src/opt" ]; then
+ cd /src
+
+ # We do an `svn checkout` here as the entire git repo here is *huge*
+ # and `git` doesn't support partial checkouts well (yet)
+ svn checkout -q https://github.com/raspberrypi/firmware/trunk/opt
+ fi
+
+ # We need to exclude all of these .h and android files to make QT build.
+ # In the blog post referenced, this is done using `dpkg --purge libraspberrypi-dev`,
+ # but since we're copying in the source, we're just going to exclude these from the rsync.
+ # https://www.enricozini.org/blog/2020/qt5/build-qt5-cross-builder-with-raspbian-sysroot-compiling-with-the-sysroot-continued/
+ rsync \
+ -aP \
+ --exclude '*android*' \
+ --exclude 'hello_pi' \
+ --exclude '.svn' \
+ /src/opt/ /sysroot/opt/
+
+ # Adds more symlinks
+ #cd /sysroot/opt/vc/lib
+ #ln -sfr libEGL.so libEGL.so.1
+ #ln -sfr libGLESv2.so libGLESv2.so.2
+}
+
+function patch_qt () {
+ echo
+ # Yes, yes, this all should be converted to proper patches
+ # but I really just wanted to get it to work.
+
+ # QT is linking against the old libraries for Pi 1 - Pi 3
+ # https://bugreports.qt.io/browse/QTBUG-62216
+ #sed -i 's/lEGL/lbrcmEGL/' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+ #sed -i 's/lGLESv2/lbrcmGLESv2/' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+
+ # Qmake won't account for sysroot
+ # https://wiki.qt.io/RaspberryPi2EGLFS
+ #sed -i 's#^VC_LIBRARY_PATH.*#VC_LIBRARY_PATH = $$[QT_SYSROOT]/opt/vc/lib#' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+ #sed -i 's#^VC_INCLUDE_PATH.*#VC_INCLUDE_PATH = $$[QT_SYSROOT]/opt/vc/include#' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+ #sed -i 's#^VC_LINK_LINE.*#VC_LINK_LINE = -L$${VC_LIBRARY_PATH}#' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+ #sed -i 's#^QMAKE_LIBDIR_OPENGL_ES2.*#QMAKE_LIBDIR_OPENGL_ES2 = $${VC_LIBRARY_PATH}#' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+
+ #sed -i '23 a $${VC_INCLUDE_PATH}/interface/vcos \\' "/src/qt5/qtbase/mkspecs/devices/$1/qmake.conf"
+}
+
+function fetch_qt6 () {
+ local SRC_DIR="/src/qt6"
+ cd /src
+
+ if [ ! -d "$SRC_DIR" ]; then
+
+ if [ ! -f "qt-everywhere-src-6.0.0.tar.xz" ]; then
+ wget https://download.qt.io/archive/qt/6.0/6.0.0/single/qt-everywhere-src-6.0.0.tar.xz
+ fi
+
+ if [ ! -f "md5sums-6.txt" ]; then
+ wget -O md5sums-6.txt https://download.qt.io/archive/qt/6.0/6.0.0/single/md5sums.txt
+ fi
+ md5sum --ignore-missing -c md5sums-6.txt
+
+ # Extract and make a clone
+ tar xf qt-everywhere-src-6.0.0.tar.xz
+ rsync -aqP qt-everywhere-src-6.0.0/ qt6
+ else
+ rsync -aqP --delete qt-everywhere-src-6.0.0/ qt6
+ fi
+}
+
+function patch_qtwebengine () {
+ # Patch up WebEngine due to GCC bug
+ # https://www.enricozini.org/blog/2020/qt5/build-qt5-cross-builder-with-raspbian-sysroot-compiling-with-the-sysroot/
+ cd "/src/qt5/qtwebengine"
+ sed -i '1s/^/#pragma GCC push_options\n#pragma GCC optimize ("O0")\n/' src/3rdparty/chromium/third_party/skia/third_party/skcms/skcms.cc
+ echo "#pragma GCC pop_options" >> src/3rdparty/chromium/third_party/skia/third_party/skcms/skcms.cc
+}
+
+function build_qt () {
+ # This build process is inspired by
+ # https://www.tal.org/tutorials/building-qt-512-raspberry-pi
+ local SRC_DIR="/src/$1"
+
+ # Make sure we have a clean QT 5 tree
+ fetch_qt6
+
+ if [ ! -f "$BUILD_TARGET/qt6-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" ]; then
+ /usr/games/cowsay -f tux "Building QT for $1"
+
+ if [ "${CLEAN_BUILD-x}" == "1" ]; then
+ rm -rf "$SRC_DIR"
+ fi
+
+ mkdir -p "$SRC_DIR"
+ cd "$SRC_DIR"
+
+ if [ "$1" = "pi1" ]; then
+ local BUILD_ARGS=(
+ "-device" "linux-rasp-pi-g++"
+ )
+ patch_qt "linux-rasp-pi-g++"
+ elif [ "$1" = "pi2" ]; then
+ local BUILD_ARGS=(
+ "-device" "linux-rasp-pi2-g++"
+ )
+ patch_qt "linux-rasp-pi2-g++"
+ elif [ "$1" = "pi3" ]; then
+ local BUILD_ARGS=(
+ "-device" "linux-rasp-pi3-g++"
+ )
+ patch_qt "linux-rasp-pi3-g++"
+ elif [ "$1" = "pi4" ]; then
+ local BUILD_ARGS=(
+ "-device" "linux-rasp-pi4-v3d-g++"
+ )
+ else
+ echo "Unknown device. Exiting."
+ exit 1
+ fi
+
+ /src/qt6/configure \
+ "${BUILD_ARGS[@]}" \
+ -ccache \
+ -confirm-license \
+ -dbus-linked \
+ -device-option CROSS_COMPILE=/src/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf- \
+ -eglfs \
+ -evdev \
+ -extprefix "$SRC_DIR/qt6pi" \
+ -force-pkg-config \
+ -glib \
+ -make libs \
+ -no-compile-examples \
+ -no-cups \
+ -no-gbm \
+ -no-gtk \
+ -no-pch \
+ -no-use-gold-linker \
+ -no-xcb \
+ -no-xcb-xlib \
+ -nomake examples \
+ -nomake tests \
+ -opengl es2 \
+ -opensource \
+ -prefix /usr/local/qt6pi \
+ -qpa eglfs \
+ -qt-pcre \
+ -reduce-exports \
+ -release \
+ -skip qt3d \
+ -skip qtactiveqt \
+ -skip qtandroidextras \
+ -skip qtcanvas3d \
+ -skip qtcharts \
+ -skip qtdatavis3d \
+ -skip qtgamepad \
+ -skip qtgraphicaleffects \
+ -skip qtlocation \
+ -skip qtlottie \
+ -skip qtmacextras \
+ -skip qtpurchasing \
+ -skip qtquick3d \
+ -skip qtquickcontrols \
+ -skip qtquickcontrols2 \
+ -skip qtquicktimeline \
+ -skip qtscript \
+ -skip qtscxml \
+ -skip qtsensors \
+ -skip qtserialbus \
+ -skip qtserialport \
+ -skip qtspeech \
+ -skip qttools \
+ -skip qttranslations \
+ -skip qtvirtualkeyboard \
+ -skip qtwayland \
+ -skip qtwebview \
+ -skip qtwinextras \
+ -skip qtx11extras \
+ -skip wayland \
+ -ssl \
+ -system-freetype \
+ -system-libjpeg \
+ -system-libpng \
+ -system-zlib \
+ -sysroot /sysroot
+
+ # The RAM consumption is proportional to the amount of cores.
+ # On an 8 core box, the build process will require ~16GB of RAM.
+ make -j"$MAKE_CORES"
+ make install
+
+ # I'm not sure we actually need this anymore. It's from an
+ # old build process for QT 4.9 that we used.
+ cp -r /usr/share/fonts/truetype/dejavu/ "$SRC_DIR/qt6pi/lib/fonts"
+
+ if [ "${BUILD_WEBVIEW-x}" == "1" ]; then
+ cp -rf /webview "$SRC_DIR/"
+
+ cd "$SRC_DIR/webview"
+
+ "$SRC_DIR/qt6pi/bin/qmake"
+ make -j"$MAKE_CORES"
+ make install
+
+ mkdir -p fakeroot/bin fakeroot/share/ScreenlyWebview
+ mv ScreenlyWebview fakeroot/bin/
+ cp -rf /webview/res fakeroot/share/ScreenlyWebview/
+
+ cd fakeroot
+ tar cfz "$BUILD_TARGET/webview-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" .
+ cd "$BUILD_TARGET"
+ sha256sum "webview-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" > "webview-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz.sha256"
+ fi
+
+ cd "$SRC_DIR"
+ tar cfz "$BUILD_TARGET/qt-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" qt6pi
+ cd "$BUILD_TARGET"
+ sha256sum "qt-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz" > "qt-$QT_BRANCH-$DEBIAN_VERSION-$1.tar.gz.sha256"
+ else
+ echo "Build already exist."
+ fi
+}
+
+# Modify paths for build process
+/usr/local/bin/sysroot-relativelinks.py /sysroot
+
+fetch_cross_compile_tool
+fetch_rpi_firmware
+
+if [ ! "${TARGET-}" ]; then
+ # Let's work our way through all Pis in order of relevance
+ for device in pi4 pi3 pi2 pi1; do
+ build_qt "$device"
+ done
+else
+ build_qt "$TARGET"
+fi
diff --git a/webview/res/Roboto-Regular.ttf b/webview/res/Roboto-Regular.ttf
new file mode 100644
index 000000000..2c97eeadf
Binary files /dev/null and b/webview/res/Roboto-Regular.ttf differ
diff --git a/webview/res/access_denied.html b/webview/res/access_denied.html
new file mode 100755
index 000000000..aaded7d19
--- /dev/null
+++ b/webview/res/access_denied.html
@@ -0,0 +1,70 @@
+
+
+
+
+
Access denied
+
+
+
+
+
+
+
+
+
+
diff --git a/webview/res/google-roboto-regular-webfont.woff b/webview/res/google-roboto-regular-webfont.woff
new file mode 100644
index 000000000..cbf2f4b74
Binary files /dev/null and b/webview/res/google-roboto-regular-webfont.woff differ
diff --git a/webview/res/google-roboto-regular-webfont.woff2 b/webview/res/google-roboto-regular-webfont.woff2
new file mode 100644
index 000000000..3f88eec09
Binary files /dev/null and b/webview/res/google-roboto-regular-webfont.woff2 differ
diff --git a/webview/res/lock.png b/webview/res/lock.png
new file mode 100644
index 000000000..6b8852124
Binary files /dev/null and b/webview/res/lock.png differ
diff --git a/webview/res/screenly-logo.png b/webview/res/screenly-logo.png
new file mode 100644
index 000000000..b9c811344
Binary files /dev/null and b/webview/res/screenly-logo.png differ
diff --git a/webview/src/deployment.pri b/webview/src/deployment.pri
new file mode 100644
index 000000000..d589ad429
--- /dev/null
+++ b/webview/src/deployment.pri
@@ -0,0 +1,9 @@
+unix:!android {
+ isEmpty(target.path) {
+ target.path = $$(PREFIX)$${TARGET}_bin
+ export(target.path)
+ }
+ INSTALLS += target
+}
+
+export(INSTALLS)
diff --git a/webview/src/main.cpp b/webview/src/main.cpp
new file mode 100644
index 000000000..6a54df665
--- /dev/null
+++ b/webview/src/main.cpp
@@ -0,0 +1,37 @@
+#include
+#include
+#include
+#include
+#include
+
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+
+ QCursor cursor(Qt::BlankCursor);
+ QApplication::setOverrideCursor(cursor);
+ QApplication::changeOverrideCursor(cursor);
+
+ MainWindow *window = new MainWindow();
+ window -> show();
+
+ QDBusConnection connection = QDBusConnection::sessionBus();
+
+ if (!connection.registerObject("/Screenly", window, QDBusConnection::ExportAllSlots))
+ {
+ qWarning() << "Can't register object";
+ return 1;
+ }
+ qDebug() << "WebView connected to D-bus";
+
+ if (!connection.registerService("screenly.webview")) {
+ qWarning() << qPrintable(QDBusConnection::sessionBus().lastError().message());
+ return 1;
+ }
+ qDebug() << "Screenly service start";
+
+
+ return app.exec();
+}
diff --git a/webview/src/mainwindow.cpp b/webview/src/mainwindow.cpp
new file mode 100644
index 000000000..17c109b3f
--- /dev/null
+++ b/webview/src/mainwindow.cpp
@@ -0,0 +1,27 @@
+#include
+#include
+
+#include "mainwindow.h"
+#include "view.h"
+
+
+MainWindow::MainWindow() : QMainWindow()
+{
+ QWebEngineSettings::globalSettings() -> setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
+
+ // for QT5.10 and higher
+ QWebEngineSettings::globalSettings() -> setAttribute(QWebEngineSettings::ShowScrollBars, false);
+
+ view = new View(this);
+ setCentralWidget(view);
+}
+
+void MainWindow::loadPage(const QString &uri)
+{
+ view -> loadPage(uri);
+}
+
+void MainWindow:: loadImage(const QString &uri)
+{
+ view -> loadImage(uri);
+}
diff --git a/webview/src/mainwindow.h b/webview/src/mainwindow.h
new file mode 100644
index 000000000..b972b5e9d
--- /dev/null
+++ b/webview/src/mainwindow.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include
+#include
+
+#include "view.h"
+
+class MainWindow : public QMainWindow
+{
+ Q_OBJECT
+
+ public:
+ explicit MainWindow();
+
+ public slots:
+ void loadPage(const QString &uri);
+ void loadImage(const QString &uri);
+
+ private:
+ View *view;
+};
diff --git a/webview/src/view.cpp b/webview/src/view.cpp
new file mode 100644
index 000000000..a93acd22c
--- /dev/null
+++ b/webview/src/view.cpp
@@ -0,0 +1,76 @@
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "view.h"
+
+
+View::View(QWidget* parent) : QWebEngineView(parent)
+{
+ connect(
+ QWebEngineView::page(),
+ SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
+ this,
+ SLOT(handleAuthRequest(QNetworkReply*,QAuthenticator*))
+ );
+ pre_loader = new QWebEnginePage;
+}
+
+void View::loadPage(const QString &uri)
+{
+ qDebug() << "Type: Webpage";
+ stop();
+ load(QUrl(uri));
+}
+
+void View::loadImage(const QString &preUri)
+{
+ qDebug() << "Type: Image";
+ QFileInfo fileInfo = QFileInfo(preUri);
+ QString src;
+
+ if (fileInfo.isFile())
+ {
+ qDebug() << "Location: Local File";
+
+ QUrl url;
+ url.setScheme("http");
+ // url.setHost(qgetenv("LISTEN"));
+ url.setHost("srly-ose-nginx");
+ url.setPath("/screenly_assets/" + fileInfo.fileName());
+
+ src = url.toString();
+ }
+ else if (preUri == "null")
+ {
+ qDebug() << "Black page";
+ }
+ else
+ {
+ qDebug() << "Location: Remote URL";
+ src = preUri;
+ }
+
+ qDebug() << "Current src: " + src;
+
+ QString script = "window.setimg=function(n){var o=new Image;o.onload=function()"
+ "{document.body.style.backgroundSize=o.width>window.innerWidth||o.height>window.innerHeight?\"contain\":\"auto\",document.body.style.backgroundImage=\"url('\"+n+\"')\"},o.src=n};";
+ QString styles = "background: #000 center no-repeat";
+
+ stop();
+ pre_loader -> setHtml("");
+ connect(pre_loader,SIGNAL(loadFinished(bool)),&pre_loader_loop,SLOT(quit()));
+ QTimer::singleShot(5000, &pre_loader_loop, SLOT(quit()));
+ pre_loader_loop.exec();
+ pre_loader -> toHtml([&](const QString &result){ setHtml(result); });
+}
+
+void View::handleAuthRequest(QNetworkReply* reply, QAuthenticator* auth)
+{
+ Q_UNUSED(reply)
+ Q_UNUSED(auth)
+ load(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, "res/access_denied.html")));
+}
diff --git a/webview/src/view.h b/webview/src/view.h
new file mode 100644
index 000000000..a76c7bd16
--- /dev/null
+++ b/webview/src/view.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include
+#include
+#include
+#include
+
+class View : public QWebEngineView
+{
+ Q_OBJECT
+
+public:
+ explicit View(QWidget* parent);
+
+ void loadPage(const QString &uri);
+ void loadImage(const QString &uri);
+
+private slots:
+ void handleAuthRequest(QNetworkReply*, QAuthenticator*);
+
+private:
+ QWebEnginePage* pre_loader;
+ QEventLoop pre_loader_loop;
+};