Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3958da1983 | |||
| 76c98f63dd | |||
| 7a75083cf3 | |||
| 806d701535 | |||
| 3644001dbc |
32
.drone.yml
32
.drone.yml
@@ -14,7 +14,7 @@ steps:
|
|||||||
- ls -la dist
|
- ls -la dist
|
||||||
|
|
||||||
- name: build-deb-armhf
|
- name: build-deb-armhf
|
||||||
image: cache.coadcorp.com/library/buildpack-deps:jammy
|
image: cache.coadcorp.com/library/buildpack-deps:bullseye
|
||||||
environment:
|
environment:
|
||||||
DEBIAN_FRONTEND: noninteractive
|
DEBIAN_FRONTEND: noninteractive
|
||||||
ARM_CFLAGS: -march=armv6 -mfpu=vfp -mfloat-abi=hard -marm
|
ARM_CFLAGS: -march=armv6 -mfpu=vfp -mfloat-abi=hard -marm
|
||||||
@@ -22,14 +22,12 @@ steps:
|
|||||||
- dpkg --add-architecture armhf
|
- dpkg --add-architecture armhf
|
||||||
- |
|
- |
|
||||||
cat > /etc/apt/sources.list <<'EOF'
|
cat > /etc/apt/sources.list <<'EOF'
|
||||||
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main restricted universe multiverse
|
deb [arch=amd64] http://deb.debian.org/debian bullseye main contrib non-free
|
||||||
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse
|
deb [arch=amd64] http://deb.debian.org/debian bullseye-updates main contrib non-free
|
||||||
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse
|
deb [arch=amd64] http://security.debian.org/debian-security bullseye-security main contrib non-free
|
||||||
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main restricted universe multiverse
|
deb [arch=armhf] http://deb.debian.org/debian bullseye main contrib non-free
|
||||||
deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse
|
deb [arch=armhf] http://deb.debian.org/debian bullseye-updates main contrib non-free
|
||||||
deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse
|
deb [arch=armhf] http://security.debian.org/debian-security bullseye-security main contrib non-free
|
||||||
deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse
|
|
||||||
deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse
|
|
||||||
EOF
|
EOF
|
||||||
- apt-get update
|
- apt-get update
|
||||||
- apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf qtbase5-dev:armhf libqt5core5a:armhf libqt5gui5:armhf libqt5widgets5:armhf libqt5network5:armhf libexif-dev:armhf libmosquitto-dev:armhf qt5-image-formats-plugins:armhf
|
- apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf qtbase5-dev:armhf libqt5core5a:armhf libqt5gui5:armhf libqt5widgets5:armhf libqt5network5:armhf libexif-dev:armhf libmosquitto-dev:armhf qt5-image-formats-plugins:armhf
|
||||||
@@ -37,7 +35,7 @@ steps:
|
|||||||
- ls -la dist
|
- ls -la dist
|
||||||
|
|
||||||
- name: build-deb-arm64
|
- name: build-deb-arm64
|
||||||
image: cache.coadcorp.com/library/buildpack-deps:jammy
|
image: cache.coadcorp.com/library/buildpack-deps:bullseye
|
||||||
environment:
|
environment:
|
||||||
DEBIAN_FRONTEND: noninteractive
|
DEBIAN_FRONTEND: noninteractive
|
||||||
ARM64_CFLAGS: -march=armv8-a
|
ARM64_CFLAGS: -march=armv8-a
|
||||||
@@ -45,14 +43,12 @@ steps:
|
|||||||
- dpkg --add-architecture arm64
|
- dpkg --add-architecture arm64
|
||||||
- |
|
- |
|
||||||
cat > /etc/apt/sources.list <<'EOF'
|
cat > /etc/apt/sources.list <<'EOF'
|
||||||
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main restricted universe multiverse
|
deb [arch=amd64] http://deb.debian.org/debian bullseye main contrib non-free
|
||||||
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse
|
deb [arch=amd64] http://deb.debian.org/debian bullseye-updates main contrib non-free
|
||||||
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse
|
deb [arch=amd64] http://security.debian.org/debian-security bullseye-security main contrib non-free
|
||||||
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main restricted universe multiverse
|
deb [arch=arm64] http://deb.debian.org/debian bullseye main contrib non-free
|
||||||
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse
|
deb [arch=arm64] http://deb.debian.org/debian bullseye-updates main contrib non-free
|
||||||
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse
|
deb [arch=arm64] http://security.debian.org/debian-security bullseye-security main contrib non-free
|
||||||
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse
|
|
||||||
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse
|
|
||||||
EOF
|
EOF
|
||||||
- apt-get update
|
- apt-get update
|
||||||
- apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qtbase5-dev:arm64 libqt5core5a:arm64 libqt5gui5:arm64 libqt5widgets5:arm64 libqt5network5:arm64 libexif-dev:arm64 libmosquitto-dev:arm64 qt5-image-formats-plugins:arm64
|
- apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qtbase5-dev:arm64 libqt5core5a:arm64 libqt5gui5:arm64 libqt5widgets5:arm64 libqt5network5:arm64 libexif-dev:arm64 libmosquitto-dev:arm64 qt5-image-formats-plugins:arm64
|
||||||
|
|||||||
21
INSTALL.md
21
INSTALL.md
@@ -6,6 +6,8 @@ This project depends on the following dynamically linked libraries:
|
|||||||
|
|
||||||
* qt5
|
* qt5
|
||||||
* libexif
|
* libexif
|
||||||
|
* qt5-image-formats-plugins
|
||||||
|
* libmosquitto1
|
||||||
|
|
||||||
### OSX
|
### OSX
|
||||||
|
|
||||||
@@ -13,28 +15,29 @@ This project depends on the following dynamically linked libraries:
|
|||||||
brew install qt libexif
|
brew install qt libexif
|
||||||
```
|
```
|
||||||
|
|
||||||
### Raspbian Stretch
|
### Debian / Ubuntu / Raspberry Pi OS (runtime dependencies)
|
||||||
|
|
||||||
```
|
```
|
||||||
brew install qt5 libexif12
|
sudo apt-get install -y qt5-image-formats-plugins libmosquitto1
|
||||||
```
|
```
|
||||||
|
|
||||||
## Extract binaries
|
### Raspberry Pi Zero / Raspbian (additional image format support)
|
||||||
|
|
||||||
```
|
```
|
||||||
tar xf slide_<arch>_<version>.tar.gz
|
sudo apt-get install -y qt5-image-formats-plugins libmosquitto1 libmng1
|
||||||
```
|
```
|
||||||
|
|
||||||
## Move binary to executable folder
|
## Install .deb package
|
||||||
|
|
||||||
### OSX
|
Use apt so dependencies are resolved automatically:
|
||||||
|
|
||||||
```
|
```
|
||||||
mv slide_<version>/slide.app/Contents/MacOS/slide /usr/local/bin/
|
sudo apt-get install ./slide_<version>_<arch>.deb
|
||||||
```
|
```
|
||||||
|
|
||||||
### Linux
|
If you must use dpkg, install runtime dependencies first:
|
||||||
|
|
||||||
```
|
```
|
||||||
mv slide_<version>/slide /usr/bin/
|
sudo apt-get install -y qt5-image-formats-plugins libmosquitto1
|
||||||
|
sudo dpkg -i slide_<version>_<arch>.deb
|
||||||
```
|
```
|
||||||
|
|||||||
37
README.md
37
README.md
@@ -23,7 +23,7 @@ slide [-t rotation_seconds] [-T transition_seconds] [-h/--overlay-color overlay_
|
|||||||
|
|
||||||
* `image_folder`: where to search for images (.jpg files)
|
* `image_folder`: where to search for images (.jpg files)
|
||||||
* `-i imageFile,...`: comma delimited list of full paths to image files to display
|
* `-i imageFile,...`: comma delimited list of full paths to image files to display
|
||||||
* `-c path_to_config_json`: the path to an optional slide.options.json file containing configuration parameters
|
* `-c path_to_config_json`: path to a JSON config file, or a directory containing `slide.options.json`
|
||||||
* `-t` how many seconds to display each picture for
|
* `-t` how many seconds to display each picture for
|
||||||
* `-r` for recursive traversal of `image_folder`
|
* `-r` for recursive traversal of `image_folder`
|
||||||
* `-s` for shuffle instead of random image rotation
|
* `-s` for shuffle instead of random image rotation
|
||||||
@@ -55,7 +55,7 @@ slide [-t rotation_seconds] [-T transition_seconds] [-h/--overlay-color overlay_
|
|||||||
To exit the application, press escape. If you're using a touch display, touch all 4 corners at the same time.
|
To exit the application, press escape. If you're using a touch display, touch all 4 corners at the same time.
|
||||||
|
|
||||||
## Configuration file
|
## Configuration file
|
||||||
Slide supports loading configuration from a JSON formatted file called `slide.options.json`. This file can be specified by the `-c` command line option, we will also attempt to read `~/.config/slide/slide.options.json` and `/etc/slide/slide.options.json` in that order. The first file to load is used and its options will override command line parameters.
|
Slide supports loading configuration from a JSON formatted file called `slide.options.json`. This file can be specified by the `-c` command line option (file path or directory), and we will also attempt to read `~/.config/slide/slide.options.json` and `/etc/slide/slide.options.json` in that order. The first file to load is used and its options will override command line parameters.
|
||||||
The file format is:
|
The file format is:
|
||||||
```
|
```
|
||||||
{
|
{
|
||||||
@@ -136,6 +136,7 @@ Example:
|
|||||||
"host": "mqtt.local",
|
"host": "mqtt.local",
|
||||||
"port": 1883,
|
"port": 1883,
|
||||||
"topic": "slide/control",
|
"topic": "slide/control",
|
||||||
|
"immichTopic": "slide/immich",
|
||||||
"clientId": "slide-frame",
|
"clientId": "slide-frame",
|
||||||
"username": "slide",
|
"username": "slide",
|
||||||
"password": "secret",
|
"password": "secret",
|
||||||
@@ -151,10 +152,33 @@ Commands:
|
|||||||
* `next` / `next-image` — advance to next image
|
* `next` / `next-image` — advance to next image
|
||||||
* `next-folder` — jump to next configured path (if multiple paths are configured)
|
* `next-folder` — jump to next configured path (if multiple paths are configured)
|
||||||
* `restart` / `reset` — recreate the selector and restart playback
|
* `restart` / `reset` — recreate the selector and restart playback
|
||||||
|
If `immichTopic` is not set, it defaults to `<topic>/immich`.
|
||||||
|
|
||||||
|
Immich control topic (`immichTopic`):
|
||||||
|
* `album:<id>` or `albumIds:id1,id2` — filter to one or more album IDs
|
||||||
|
* `person:<id>` or `personIds:id1,id2` — filter to one or more person IDs
|
||||||
|
* `user:<id>` / `userId:<id>` / `ownerId:<id>` — show all assets owned by a user (clears album/person filters)
|
||||||
|
* `extensions:jpg,jpeg,png` — filter by file extension (useful for RAW exclusion)
|
||||||
|
* `reset` / `clear` — clear album/person/user filters
|
||||||
|
* JSON payloads are also accepted, for example:
|
||||||
|
```
|
||||||
|
{"albumIds":["..."],"personIds":["..."],"order":"desc","size":"fullsize","userId":"...","extensions":["jpg","jpeg"]}
|
||||||
|
```
|
||||||
|
|
||||||
### Immich configuration (lightweight + low power)
|
### Immich configuration (lightweight + low power)
|
||||||
|
|
||||||
Immich uses an API key and a `/api` base path. This integration requests the asset search endpoint and downloads the configured image size into a local cache before displaying them. That keeps bandwidth and power usage low while still letting `slide` do its normal scaling and transitions.
|
Immich uses an API key and a `/api` base path. This integration requests the asset search endpoint and downloads the configured image size into a local cache before displaying them. That keeps bandwidth and power usage low while still letting `slide` do its normal scaling and transitions. If you have RAW/HEIC images, set `size` to `preview`/`thumbnail` or use `extensions` to limit results to JPEG/PNG; `slide` will also fall back to `preview` if a `fullsize` download isn't readable.
|
||||||
|
|
||||||
|
#### Getting an Immich API key
|
||||||
|
|
||||||
|
In the Immich web UI, go to Settings and find **API Keys** (menu labels can vary by version), then create a new key and copy it.
|
||||||
|
|
||||||
|
#### Required API key permissions
|
||||||
|
|
||||||
|
`slide` uses Immich search plus the asset view/download endpoints, so the API key should include:
|
||||||
|
* `asset.read` — required by Immich search endpoints (used to retrieve asset metadata).
|
||||||
|
* `asset.view` — required for the viewAsset endpoint (thumbnail/preview/fullsize).
|
||||||
|
* `asset.download` — required if you set `size` to `original` (download endpoint).
|
||||||
|
|
||||||
Example (single source):
|
Example (single source):
|
||||||
```
|
```
|
||||||
@@ -167,6 +191,7 @@ Example (single source):
|
|||||||
"order": "desc",
|
"order": "desc",
|
||||||
"pageSize": 200,
|
"pageSize": 200,
|
||||||
"maxAssets": 1000,
|
"maxAssets": 1000,
|
||||||
|
"refreshSeconds": 300,
|
||||||
"cachePath": "~/.cache/slide/immich",
|
"cachePath": "~/.cache/slide/immich",
|
||||||
"cacheMaxMB": 512,
|
"cacheMaxMB": 512,
|
||||||
"includeArchived": false
|
"includeArchived": false
|
||||||
@@ -194,14 +219,20 @@ Example (scheduler entry):
|
|||||||
Immich settings:
|
Immich settings:
|
||||||
* `url`: base Immich server URL (the integration appends `/api` automatically if missing).
|
* `url`: base Immich server URL (the integration appends `/api` automatically if missing).
|
||||||
* `apiKey`: Immich API key (needs `asset.view`, and `asset.download` if `size` is `original`).
|
* `apiKey`: Immich API key (needs `asset.view`, and `asset.download` if `size` is `original`).
|
||||||
|
* `userId`: optional user id to retrieve all assets owned by that user via the assets endpoint.
|
||||||
* `albumId` or `albumIds`: optional album filters.
|
* `albumId` or `albumIds`: optional album filters.
|
||||||
|
* `personId` or `personIds`: optional person filters.
|
||||||
|
* `extensions` / `allowedExtensions`: optional list of file extensions to include (for example `["jpg","jpeg","png"]`).
|
||||||
* `size`: `"fullsize"`, `"preview"`, `"thumbnail"`, or `"original"` (original uses the download endpoint).
|
* `size`: `"fullsize"`, `"preview"`, `"thumbnail"`, or `"original"` (original uses the download endpoint).
|
||||||
* `order`: `"asc"` or `"desc"` ordering for asset search.
|
* `order`: `"asc"` or `"desc"` ordering for asset search.
|
||||||
* `pageSize`: assets fetched per page.
|
* `pageSize`: assets fetched per page.
|
||||||
* `maxAssets`: cap on total assets fetched (0 means no cap).
|
* `maxAssets`: cap on total assets fetched (0 means no cap).
|
||||||
|
* `refreshSeconds`: refresh interval for reloading Immich assets (0 disables).
|
||||||
* `cachePath`: local cache directory for downloaded images.
|
* `cachePath`: local cache directory for downloaded images.
|
||||||
* `cacheMaxMB`: maximum cache size in MB (0 disables cleanup).
|
* `cacheMaxMB`: maximum cache size in MB (0 disables cleanup).
|
||||||
* `includeArchived`: include archived assets in search results.
|
* `includeArchived`: include archived assets in search results.
|
||||||
|
If you omit `albumId`/`albumIds`/`personIds`, Immich returns all assets visible to the API key’s user.
|
||||||
|
If `userId` is set, album/person filters are ignored and all assets for that user are fetched.
|
||||||
When `immich` is set on an entry, `path` and `imageList` are ignored.
|
When `immich` is set on an entry, `path` and `imageList` are ignored.
|
||||||
|
|
||||||
## Folder Options file
|
## Folder Options file
|
||||||
|
|||||||
@@ -66,4 +66,4 @@ Description: Lightweight slideshow for photo frames
|
|||||||
Simple, lightweight slideshow designed for low power devices.
|
Simple, lightweight slideshow designed for low power devices.
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
dpkg-deb --build "$STAGE_DIR" "$DIST_DIR/${PACKAGE_NAME}_${VERSION}_${ARCH}.deb"
|
dpkg-deb --build -Zgzip "$STAGE_DIR" "$DIST_DIR/${PACKAGE_NAME}_${VERSION}_${ARCH}.deb"
|
||||||
|
|||||||
@@ -71,6 +71,19 @@ std::vector<std::string> ParseJSONStrings(QJsonObject jsonDoc, const char *key)
|
|||||||
return values;
|
return values;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::vector<std::string> NormalizeExtensions(const std::vector<std::string> &values) {
|
||||||
|
std::vector<std::string> normalized;
|
||||||
|
for (const auto &value : values)
|
||||||
|
{
|
||||||
|
std::string s = value;
|
||||||
|
for (auto &c : s)
|
||||||
|
c = static_cast<char>(::tolower(c));
|
||||||
|
if (!s.empty())
|
||||||
|
normalized.push_back(s);
|
||||||
|
}
|
||||||
|
return normalized;
|
||||||
|
}
|
||||||
|
|
||||||
ImmichConfig ParseImmichConfigObject(QJsonObject immichJson) {
|
ImmichConfig ParseImmichConfigObject(QJsonObject immichJson) {
|
||||||
ImmichConfig config;
|
ImmichConfig config;
|
||||||
|
|
||||||
@@ -81,6 +94,13 @@ ImmichConfig ParseImmichConfigObject(QJsonObject immichJson) {
|
|||||||
if(!apiKey.empty())
|
if(!apiKey.empty())
|
||||||
config.apiKey = apiKey;
|
config.apiKey = apiKey;
|
||||||
|
|
||||||
|
std::string userId = ParseJSONString(immichJson, "userId");
|
||||||
|
if(!userId.empty())
|
||||||
|
config.userId = userId;
|
||||||
|
std::string ownerId = ParseJSONString(immichJson, "ownerId");
|
||||||
|
if(!ownerId.empty() && config.userId.empty())
|
||||||
|
config.userId = ownerId;
|
||||||
|
|
||||||
std::string size = ParseJSONString(immichJson, "size");
|
std::string size = ParseJSONString(immichJson, "size");
|
||||||
if(!size.empty())
|
if(!size.empty())
|
||||||
config.size = size;
|
config.size = size;
|
||||||
@@ -101,8 +121,24 @@ ImmichConfig ParseImmichConfigObject(QJsonObject immichJson) {
|
|||||||
if(albumIds.size() > 0)
|
if(albumIds.size() > 0)
|
||||||
config.albumIds = albumIds;
|
config.albumIds = albumIds;
|
||||||
|
|
||||||
|
std::string personId = ParseJSONString(immichJson, "personId");
|
||||||
|
if(!personId.empty())
|
||||||
|
config.personIds.push_back(personId);
|
||||||
|
|
||||||
|
std::vector<std::string> personIds = ParseJSONStrings(immichJson, "personIds");
|
||||||
|
if(personIds.size() > 0)
|
||||||
|
config.personIds = personIds;
|
||||||
|
|
||||||
|
std::vector<std::string> allowedExtensions = ParseJSONStrings(immichJson, "extensions");
|
||||||
|
if(allowedExtensions.size() == 0)
|
||||||
|
allowedExtensions = ParseJSONStrings(immichJson, "allowedExtensions");
|
||||||
|
if(allowedExtensions.size() > 0)
|
||||||
|
config.allowedExtensions = NormalizeExtensions(allowedExtensions);
|
||||||
|
|
||||||
SetJSONInt(config.pageSize, immichJson, "pageSize");
|
SetJSONInt(config.pageSize, immichJson, "pageSize");
|
||||||
SetJSONInt(config.maxAssets, immichJson, "maxAssets");
|
SetJSONInt(config.maxAssets, immichJson, "maxAssets");
|
||||||
|
SetJSONInt(config.refreshSeconds, immichJson, "refreshSeconds");
|
||||||
|
SetJSONInt(config.refreshSeconds, immichJson, "refreshIntervalSeconds");
|
||||||
SetJSONInt(config.cacheMaxMB, immichJson, "cacheMaxMB");
|
SetJSONInt(config.cacheMaxMB, immichJson, "cacheMaxMB");
|
||||||
SetJSONBool(config.includeArchived, immichJson, "includeArchived");
|
SetJSONBool(config.includeArchived, immichJson, "includeArchived");
|
||||||
|
|
||||||
@@ -123,6 +159,10 @@ MqttConfig ParseMqttConfigObject(QJsonObject mqttJson) {
|
|||||||
if(!topic.empty())
|
if(!topic.empty())
|
||||||
config.topic = topic;
|
config.topic = topic;
|
||||||
|
|
||||||
|
std::string immichTopic = ParseJSONString(mqttJson, "immichTopic");
|
||||||
|
if(!immichTopic.empty())
|
||||||
|
config.immichTopic = immichTopic;
|
||||||
|
|
||||||
std::string clientId = ParseJSONString(mqttJson, "clientId");
|
std::string clientId = ParseJSONString(mqttJson, "clientId");
|
||||||
if(!clientId.empty())
|
if(!clientId.empty())
|
||||||
config.clientId = clientId;
|
config.clientId = clientId;
|
||||||
@@ -139,6 +179,9 @@ MqttConfig ParseMqttConfigObject(QJsonObject mqttJson) {
|
|||||||
SetJSONInt(config.keepAlive, mqttJson, "keepAlive");
|
SetJSONInt(config.keepAlive, mqttJson, "keepAlive");
|
||||||
SetJSONInt(config.qos, mqttJson, "qos");
|
SetJSONInt(config.qos, mqttJson, "qos");
|
||||||
|
|
||||||
|
if(config.immichTopic.empty() && !config.topic.empty())
|
||||||
|
config.immichTopic = config.topic + "/immich";
|
||||||
|
|
||||||
if(!config.host.empty() && !config.topic.empty())
|
if(!config.host.empty() && !config.topic.empty())
|
||||||
config.enabled = true;
|
config.enabled = true;
|
||||||
|
|
||||||
@@ -233,28 +276,36 @@ QString getAppConfigFilePath(const std::string &configPath) {
|
|||||||
std::string systemConfigFolder = "/etc/slide";
|
std::string systemConfigFolder = "/etc/slide";
|
||||||
QString baseConfigFilename("slide.options.json");
|
QString baseConfigFilename("slide.options.json");
|
||||||
|
|
||||||
QDir directory(userConfigFolder.c_str());
|
|
||||||
QString jsonFile = "";
|
|
||||||
if (!configPath.empty())
|
if (!configPath.empty())
|
||||||
{
|
{
|
||||||
directory.setPath(configPath.c_str());
|
QFileInfo configInfo(QString::fromStdString(configPath));
|
||||||
jsonFile = directory.filePath(baseConfigFilename);
|
if (configInfo.exists() && configInfo.isFile())
|
||||||
}
|
|
||||||
if(!directory.exists(jsonFile))
|
|
||||||
{
|
{
|
||||||
directory.setPath(userConfigFolder.c_str());
|
return configInfo.absoluteFilePath();
|
||||||
jsonFile = directory.filePath(baseConfigFilename);
|
|
||||||
}
|
|
||||||
if(!directory.exists(jsonFile))
|
|
||||||
{
|
|
||||||
directory.setPath(systemConfigFolder.c_str());
|
|
||||||
jsonFile = directory.filePath(baseConfigFilename);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QDir directory(configInfo.isDir() ? configInfo.absoluteFilePath()
|
||||||
|
: QString::fromStdString(configPath));
|
||||||
|
QString jsonFile = directory.filePath(baseConfigFilename);
|
||||||
if (directory.exists(jsonFile))
|
if (directory.exists(jsonFile))
|
||||||
{
|
{
|
||||||
return jsonFile;
|
return jsonFile;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QDir userDir(userConfigFolder.c_str());
|
||||||
|
QString userFile = userDir.filePath(baseConfigFilename);
|
||||||
|
if (userDir.exists(userFile))
|
||||||
|
{
|
||||||
|
return userFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
QDir systemDir(systemConfigFolder.c_str());
|
||||||
|
QString systemFile = systemDir.filePath(baseConfigFilename);
|
||||||
|
if (systemDir.exists(systemFile))
|
||||||
|
{
|
||||||
|
return systemFile;
|
||||||
|
}
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,11 +10,15 @@ struct ImmichConfig {
|
|||||||
bool enabled = false;
|
bool enabled = false;
|
||||||
std::string url = "";
|
std::string url = "";
|
||||||
std::string apiKey = "";
|
std::string apiKey = "";
|
||||||
|
std::string userId = "";
|
||||||
std::vector<std::string> albumIds;
|
std::vector<std::string> albumIds;
|
||||||
|
std::vector<std::string> personIds;
|
||||||
|
std::vector<std::string> allowedExtensions;
|
||||||
std::string size = "fullsize";
|
std::string size = "fullsize";
|
||||||
std::string order = "desc";
|
std::string order = "desc";
|
||||||
int pageSize = 200;
|
int pageSize = 200;
|
||||||
int maxAssets = 1000;
|
int maxAssets = 1000;
|
||||||
|
int refreshSeconds = 300;
|
||||||
std::string cachePath = "";
|
std::string cachePath = "";
|
||||||
int cacheMaxMB = 512;
|
int cacheMaxMB = 512;
|
||||||
bool includeArchived = false;
|
bool includeArchived = false;
|
||||||
@@ -25,6 +29,8 @@ struct ImmichConfig {
|
|||||||
return false;
|
return false;
|
||||||
if (url != b.url || apiKey != b.apiKey)
|
if (url != b.url || apiKey != b.apiKey)
|
||||||
return false;
|
return false;
|
||||||
|
if (userId != b.userId)
|
||||||
|
return false;
|
||||||
if (size != b.size || order != b.order)
|
if (size != b.size || order != b.order)
|
||||||
return false;
|
return false;
|
||||||
if (pageSize != b.pageSize || maxAssets != b.maxAssets)
|
if (pageSize != b.pageSize || maxAssets != b.maxAssets)
|
||||||
@@ -40,6 +46,22 @@ struct ImmichConfig {
|
|||||||
if (albumIds[i] != b.albumIds[i])
|
if (albumIds[i] != b.albumIds[i])
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (personIds.size() != b.personIds.size())
|
||||||
|
return false;
|
||||||
|
for (size_t i = 0; i < personIds.size(); ++i)
|
||||||
|
{
|
||||||
|
if (personIds[i] != b.personIds[i])
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (allowedExtensions.size() != b.allowedExtensions.size())
|
||||||
|
return false;
|
||||||
|
for (size_t i = 0; i < allowedExtensions.size(); ++i)
|
||||||
|
{
|
||||||
|
if (allowedExtensions[i] != b.allowedExtensions[i])
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (refreshSeconds != b.refreshSeconds)
|
||||||
|
return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,6 +76,7 @@ struct MqttConfig {
|
|||||||
std::string host = "localhost";
|
std::string host = "localhost";
|
||||||
int port = 1883;
|
int port = 1883;
|
||||||
std::string topic = "slide/control";
|
std::string topic = "slide/control";
|
||||||
|
std::string immichTopic = "";
|
||||||
std::string clientId = "slide";
|
std::string clientId = "slide";
|
||||||
std::string username = "";
|
std::string username = "";
|
||||||
std::string password = "";
|
std::string password = "";
|
||||||
@@ -66,6 +89,7 @@ struct MqttConfig {
|
|||||||
host == b.host &&
|
host == b.host &&
|
||||||
port == b.port &&
|
port == b.port &&
|
||||||
topic == b.topic &&
|
topic == b.topic &&
|
||||||
|
immichTopic == b.immichTopic &&
|
||||||
clientId == b.clientId &&
|
clientId == b.clientId &&
|
||||||
username == b.username &&
|
username == b.username &&
|
||||||
password == b.password &&
|
password == b.password &&
|
||||||
|
|||||||
@@ -242,7 +242,7 @@ const ImageDetails ShuffleImageSelector::getNextImage(const ImageDisplayOptions
|
|||||||
|
|
||||||
void ShuffleImageSelector::reloadImagesIfNoneLeft()
|
void ShuffleImageSelector::reloadImagesIfNoneLeft()
|
||||||
{
|
{
|
||||||
if (images.size() == 0 || current_image_shuffle >= images.size())
|
if (images.size() == 0 || current_image_shuffle >= images.size() || pathTraverser->shouldReloadImages())
|
||||||
{
|
{
|
||||||
current_image_shuffle = 0;
|
current_image_shuffle = 0;
|
||||||
images = pathTraverser->getImages();
|
images = pathTraverser->getImages();
|
||||||
@@ -305,7 +305,7 @@ const ImageDetails SortedImageSelector::getNextImage(const ImageDisplayOptions &
|
|||||||
|
|
||||||
void SortedImageSelector::reloadImagesIfEmpty()
|
void SortedImageSelector::reloadImagesIfEmpty()
|
||||||
{
|
{
|
||||||
if (images.size() == 0)
|
if (images.size() == 0 || pathTraverser->shouldReloadImages())
|
||||||
{
|
{
|
||||||
images = pathTraverser->getImages();
|
images = pathTraverser->getImages();
|
||||||
std::sort(images.begin(), images.end());
|
std::sort(images.begin(), images.end());
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
#include <QEventLoop>
|
#include <QEventLoop>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
#include <QBuffer>
|
||||||
|
#include <QImageReader>
|
||||||
#include <QJsonArray>
|
#include <QJsonArray>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
@@ -12,10 +14,25 @@
|
|||||||
#include <QSaveFile>
|
#include <QSaveFile>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QUrlQuery>
|
#include <QUrlQuery>
|
||||||
|
#include <QFileInfo>
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
const int kMetadataTimeoutMs = 15000;
|
const int kMetadataTimeoutMs = 15000;
|
||||||
const int kAssetTimeoutMs = 30000;
|
const int kAssetTimeoutMs = 30000;
|
||||||
|
QString DetectImageExtension(const QByteArray &data)
|
||||||
|
{
|
||||||
|
QBuffer buffer;
|
||||||
|
buffer.setData(data);
|
||||||
|
if (!buffer.open(QIODevice::ReadOnly))
|
||||||
|
return "";
|
||||||
|
QImageReader reader(&buffer);
|
||||||
|
if (!reader.canRead())
|
||||||
|
return "";
|
||||||
|
QByteArray fmt = reader.format().toLower();
|
||||||
|
if (fmt == "jpeg")
|
||||||
|
fmt = "jpg";
|
||||||
|
return QString::fromUtf8(fmt);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ImmichClient::ImmichClient(const ImmichConfig &configIn)
|
ImmichClient::ImmichClient(const ImmichConfig &configIn)
|
||||||
@@ -93,18 +110,41 @@ QByteArray ImmichClient::getBytes(const QUrl &url, QString *contentType, int tim
|
|||||||
|
|
||||||
QVector<ImmichAsset> ImmichClient::fetchAssets()
|
QVector<ImmichAsset> ImmichClient::fetchAssets()
|
||||||
{
|
{
|
||||||
QVector<ImmichAsset> assets;
|
|
||||||
if (!config.enabled)
|
if (!config.enabled)
|
||||||
{
|
{
|
||||||
Log("Immich config is missing url or apiKey.");
|
Log("Immich config is missing url or apiKey.");
|
||||||
return assets;
|
return QVector<ImmichAsset>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!config.userId.empty() && config.albumIds.empty() && config.personIds.empty())
|
||||||
|
return fetchAssetsByUser();
|
||||||
|
|
||||||
|
if (!config.userId.empty() && (!config.albumIds.empty() || !config.personIds.empty()))
|
||||||
|
{
|
||||||
|
Log("Immich userId is set but album/person filters are also set; ignoring userId for search filters.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return fetchAssetsBySearch();
|
||||||
|
}
|
||||||
|
|
||||||
|
QVector<ImmichAsset> ImmichClient::fetchAssetsBySearch()
|
||||||
|
{
|
||||||
|
QVector<ImmichAsset> assets;
|
||||||
|
|
||||||
int pageSize = config.pageSize > 0 ? config.pageSize : 200;
|
int pageSize = config.pageSize > 0 ? config.pageSize : 200;
|
||||||
int maxAssets = config.maxAssets;
|
int maxAssets = config.maxAssets;
|
||||||
bool triedZero = false;
|
bool triedZero = false;
|
||||||
int page = 1;
|
int page = 1;
|
||||||
|
|
||||||
|
if (ShouldLog())
|
||||||
|
{
|
||||||
|
Log("Immich search: size=", config.size, ", order=", config.order,
|
||||||
|
", pageSize=", pageSize, ", maxAssets=", maxAssets,
|
||||||
|
", albumIds=", config.albumIds.size(),
|
||||||
|
", personIds=", config.personIds.size(),
|
||||||
|
", allowedExtensions=", config.allowedExtensions.size());
|
||||||
|
}
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
QJsonObject body;
|
QJsonObject body;
|
||||||
@@ -121,6 +161,13 @@ QVector<ImmichAsset> ImmichClient::fetchAssets()
|
|||||||
ids.append(QString::fromStdString(id));
|
ids.append(QString::fromStdString(id));
|
||||||
body["albumIds"] = ids;
|
body["albumIds"] = ids;
|
||||||
}
|
}
|
||||||
|
if (config.personIds.size() > 0)
|
||||||
|
{
|
||||||
|
QJsonArray ids;
|
||||||
|
for (const auto &id : config.personIds)
|
||||||
|
ids.append(QString::fromStdString(id));
|
||||||
|
body["personIds"] = ids;
|
||||||
|
}
|
||||||
|
|
||||||
QByteArray response = postJson(apiUrl("/search/metadata"), body, nullptr, kMetadataTimeoutMs);
|
QByteArray response = postJson(apiUrl("/search/metadata"), body, nullptr, kMetadataTimeoutMs);
|
||||||
if (response.isEmpty())
|
if (response.isEmpty())
|
||||||
@@ -134,6 +181,7 @@ QVector<ImmichAsset> ImmichClient::fetchAssets()
|
|||||||
QJsonObject assetsObj = root["assets"].toObject();
|
QJsonObject assetsObj = root["assets"].toObject();
|
||||||
QJsonArray items = assetsObj["items"].toArray();
|
QJsonArray items = assetsObj["items"].toArray();
|
||||||
int total = assetsObj["total"].toInt();
|
int total = assetsObj["total"].toInt();
|
||||||
|
Log("Immich page ", page, ": ", items.size(), " assets (total ", total, ")");
|
||||||
if (items.isEmpty())
|
if (items.isEmpty())
|
||||||
{
|
{
|
||||||
if (total > 0 && page == 1 && !triedZero)
|
if (total > 0 && page == 1 && !triedZero)
|
||||||
@@ -154,6 +202,11 @@ QVector<ImmichAsset> ImmichClient::fetchAssets()
|
|||||||
ImmichAsset asset;
|
ImmichAsset asset;
|
||||||
asset.id = id;
|
asset.id = id;
|
||||||
asset.originalFileName = item["originalFileName"].toString();
|
asset.originalFileName = item["originalFileName"].toString();
|
||||||
|
if (!extensionAllowed(asset.originalFileName))
|
||||||
|
{
|
||||||
|
Log("Immich skip by extension: ", asset.originalFileName.toStdString());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
assets.append(asset);
|
assets.append(asset);
|
||||||
if (maxAssets > 0 && assets.size() >= maxAssets)
|
if (maxAssets > 0 && assets.size() >= maxAssets)
|
||||||
return assets;
|
return assets;
|
||||||
@@ -167,12 +220,99 @@ QVector<ImmichAsset> ImmichClient::fetchAssets()
|
|||||||
return assets;
|
return assets;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QVector<ImmichAsset> ImmichClient::fetchAssetsByUser()
|
||||||
|
{
|
||||||
|
QVector<ImmichAsset> assets;
|
||||||
|
|
||||||
|
int pageSize = config.pageSize > 0 ? config.pageSize : 200;
|
||||||
|
int maxAssets = config.maxAssets;
|
||||||
|
int skip = 0;
|
||||||
|
|
||||||
|
if (ShouldLog())
|
||||||
|
{
|
||||||
|
Log("Immich assets: userId=", config.userId,
|
||||||
|
", pageSize=", pageSize,
|
||||||
|
", maxAssets=", maxAssets,
|
||||||
|
", includeArchived=", config.includeArchived);
|
||||||
|
}
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
QUrl url = apiUrl("/assets");
|
||||||
|
QUrlQuery query;
|
||||||
|
query.addQueryItem("take", QString::number(pageSize));
|
||||||
|
query.addQueryItem("skip", QString::number(skip));
|
||||||
|
query.addQueryItem("userId", QString::fromStdString(config.userId));
|
||||||
|
if (!config.includeArchived)
|
||||||
|
query.addQueryItem("isArchived", "false");
|
||||||
|
url.setQuery(query);
|
||||||
|
|
||||||
|
QByteArray response = getBytes(url, nullptr, kMetadataTimeoutMs);
|
||||||
|
if (response.isEmpty())
|
||||||
|
break;
|
||||||
|
|
||||||
|
QJsonDocument doc = QJsonDocument::fromJson(response);
|
||||||
|
if (!doc.isArray())
|
||||||
|
break;
|
||||||
|
|
||||||
|
QJsonArray items = doc.array();
|
||||||
|
Log("Immich user assets skip ", skip, ": ", items.size(), " assets");
|
||||||
|
if (items.isEmpty())
|
||||||
|
break;
|
||||||
|
|
||||||
|
for (const auto &value : items)
|
||||||
|
{
|
||||||
|
QJsonObject item = value.toObject();
|
||||||
|
QString id = item["id"].toString();
|
||||||
|
if (id.isEmpty())
|
||||||
|
continue;
|
||||||
|
ImmichAsset asset;
|
||||||
|
asset.id = id;
|
||||||
|
asset.originalFileName = item["originalFileName"].toString();
|
||||||
|
if (!extensionAllowed(asset.originalFileName))
|
||||||
|
{
|
||||||
|
Log("Immich skip by extension: ", asset.originalFileName.toStdString());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
assets.append(asset);
|
||||||
|
if (maxAssets > 0 && assets.size() >= maxAssets)
|
||||||
|
return assets;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (items.size() < pageSize)
|
||||||
|
break;
|
||||||
|
skip += pageSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
return assets;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ImmichClient::extensionAllowed(const QString &filename) const
|
||||||
|
{
|
||||||
|
if (config.allowedExtensions.empty())
|
||||||
|
return true;
|
||||||
|
QString ext = QFileInfo(filename).suffix().toLower();
|
||||||
|
if (ext.isEmpty())
|
||||||
|
return false;
|
||||||
|
for (const auto &allowed : config.allowedExtensions)
|
||||||
|
{
|
||||||
|
if (ext == QString::fromStdString(allowed))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
bool ImmichClient::downloadAsset(const QString &assetId, QByteArray &data, QString &contentType)
|
bool ImmichClient::downloadAsset(const QString &assetId, QByteArray &data, QString &contentType)
|
||||||
|
{
|
||||||
|
return downloadAssetWithSize(assetId, QString::fromStdString(config.size), data, contentType);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ImmichClient::downloadAssetWithSize(const QString &assetId, const QString &sizeOverride, QByteArray &data, QString &contentType)
|
||||||
{
|
{
|
||||||
if (!config.enabled)
|
if (!config.enabled)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
QString size = QString::fromStdString(config.size).trimmed().toLower();
|
QString size = sizeOverride.trimmed().toLower();
|
||||||
if (size.isEmpty())
|
if (size.isEmpty())
|
||||||
size = "fullsize";
|
size = "fullsize";
|
||||||
|
|
||||||
@@ -194,6 +334,7 @@ bool ImmichClient::downloadAsset(const QString &assetId, QByteArray &data, QStri
|
|||||||
url.setQuery(query);
|
url.setQuery(query);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Log("Immich download asset ", assetId.toStdString(), " (", size.toStdString(), ")");
|
||||||
QByteArray payload = getBytes(url, &contentType, kAssetTimeoutMs);
|
QByteArray payload = getBytes(url, &contentType, kAssetTimeoutMs);
|
||||||
if (payload.isEmpty())
|
if (payload.isEmpty())
|
||||||
return false;
|
return false;
|
||||||
@@ -236,6 +377,11 @@ QString ImmichAssetCache::findExisting(const QString &assetId) const
|
|||||||
QStringList matches = dir.entryList(QStringList() << (assetId + "_*"), QDir::Files, QDir::Time);
|
QStringList matches = dir.entryList(QStringList() << (assetId + "_*"), QDir::Files, QDir::Time);
|
||||||
if (matches.isEmpty())
|
if (matches.isEmpty())
|
||||||
return "";
|
return "";
|
||||||
|
for (const auto &match : matches)
|
||||||
|
{
|
||||||
|
if (match.endsWith(".skip"))
|
||||||
|
return dir.filePath(match);
|
||||||
|
}
|
||||||
return dir.filePath(matches.first());
|
return dir.filePath(matches.first());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -297,15 +443,84 @@ QString ImmichAssetCache::getCachedPath(const QString &assetId, const QString &a
|
|||||||
|
|
||||||
QString existing = findExisting(assetId);
|
QString existing = findExisting(assetId);
|
||||||
if (!existing.isEmpty())
|
if (!existing.isEmpty())
|
||||||
|
{
|
||||||
|
if (existing.endsWith(".skip"))
|
||||||
|
{
|
||||||
|
Log("Immich skip marker: ", assetId.toStdString());
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
QFileInfo info(existing);
|
||||||
|
if (info.size() <= 0)
|
||||||
|
{
|
||||||
|
QFile::remove(existing);
|
||||||
|
}
|
||||||
|
else if (existing.endsWith(".img"))
|
||||||
|
{
|
||||||
|
QImageReader reader(existing);
|
||||||
|
if (!reader.canRead())
|
||||||
|
{
|
||||||
|
Log("Immich cache invalid: ", existing.toStdString());
|
||||||
|
QFile::remove(existing);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log("Immich cache hit: ", assetId.toStdString());
|
||||||
return existing;
|
return existing;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log("Immich cache hit: ", assetId.toStdString());
|
||||||
|
return existing;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
QByteArray data;
|
QByteArray data;
|
||||||
QString contentType;
|
QString contentType;
|
||||||
if (!client.downloadAsset(assetId, data, contentType))
|
if (!client.downloadAsset(assetId, data, contentType))
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
|
QString detectedExt = DetectImageExtension(data);
|
||||||
|
if (detectedExt.isEmpty())
|
||||||
|
{
|
||||||
|
Log("Immich download not an image for asset: ", assetId.toStdString());
|
||||||
|
QByteArray fallbackData;
|
||||||
|
QString fallbackType;
|
||||||
|
if (client.downloadAssetWithSize(assetId, "preview", fallbackData, fallbackType))
|
||||||
|
{
|
||||||
|
QString fallbackExt = DetectImageExtension(fallbackData);
|
||||||
|
if (!fallbackExt.isEmpty())
|
||||||
|
{
|
||||||
|
Log("Immich fallback to preview succeeded for asset: ", assetId.toStdString());
|
||||||
|
data = fallbackData;
|
||||||
|
contentType = fallbackType;
|
||||||
|
detectedExt = fallbackExt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (detectedExt.isEmpty())
|
||||||
|
{
|
||||||
|
QString skipName = assetId + "_unsupported.skip";
|
||||||
|
QDir dir(cacheDirPath);
|
||||||
|
QFile skipFile(dir.filePath(skipName));
|
||||||
|
if (skipFile.open(QIODevice::WriteOnly))
|
||||||
|
{
|
||||||
|
skipFile.write("unsupported");
|
||||||
|
skipFile.close();
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
QString safeName = sanitizeFileName(assetName);
|
QString safeName = sanitizeFileName(assetName);
|
||||||
QString extension = extensionForContentType(contentType);
|
QString extension = detectedExt;
|
||||||
|
if (extension.isEmpty())
|
||||||
|
extension = extensionForContentType(contentType);
|
||||||
|
if (extension == "img")
|
||||||
|
{
|
||||||
|
QString suffix = QFileInfo(assetName).suffix().toLower();
|
||||||
|
if (!suffix.isEmpty())
|
||||||
|
extension = suffix;
|
||||||
|
}
|
||||||
QString filename = assetId + "_" + safeName + "." + extension;
|
QString filename = assetId + "_" + safeName + "." + extension;
|
||||||
|
|
||||||
QDir dir(cacheDirPath);
|
QDir dir(cacheDirPath);
|
||||||
@@ -318,6 +533,8 @@ QString ImmichAssetCache::getCachedPath(const QString &assetId, const QString &a
|
|||||||
if (!file.commit())
|
if (!file.commit())
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
|
Log("Immich cached asset: ", assetId.toStdString(), " -> ", filePath.toStdString());
|
||||||
|
|
||||||
if (cacheMaxBytes > 0)
|
if (cacheMaxBytes > 0)
|
||||||
{
|
{
|
||||||
if (!cacheSizeKnown)
|
if (!cacheSizeKnown)
|
||||||
|
|||||||
@@ -21,8 +21,12 @@ class ImmichClient {
|
|||||||
explicit ImmichClient(const ImmichConfig &config);
|
explicit ImmichClient(const ImmichConfig &config);
|
||||||
QVector<ImmichAsset> fetchAssets();
|
QVector<ImmichAsset> fetchAssets();
|
||||||
bool downloadAsset(const QString &assetId, QByteArray &data, QString &contentType);
|
bool downloadAsset(const QString &assetId, QByteArray &data, QString &contentType);
|
||||||
|
bool downloadAssetWithSize(const QString &assetId, const QString &sizeOverride, QByteArray &data, QString &contentType);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
QVector<ImmichAsset> fetchAssetsBySearch();
|
||||||
|
QVector<ImmichAsset> fetchAssetsByUser();
|
||||||
|
bool extensionAllowed(const QString &filename) const;
|
||||||
QUrl apiUrl(const QString &path) const;
|
QUrl apiUrl(const QString &path) const;
|
||||||
QNetworkRequest makeRequest(const QUrl &url) const;
|
QNetworkRequest makeRequest(const QUrl &url) const;
|
||||||
QByteArray postJson(const QUrl &url, const QJsonObject &body, QString *contentType, int timeoutMs);
|
QByteArray postJson(const QUrl &url, const QJsonObject &body, QString *contentType, int timeoutMs);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#include "immichpathtraverser.h"
|
#include "immichpathtraverser.h"
|
||||||
#include "logger.h"
|
#include "logger.h"
|
||||||
|
#include <QDateTime>
|
||||||
|
|
||||||
ImmichPathTraverser::ImmichPathTraverser(const ImmichConfig &configIn)
|
ImmichPathTraverser::ImmichPathTraverser(const ImmichConfig &configIn)
|
||||||
: PathTraverser(""),
|
: PathTraverser(""),
|
||||||
@@ -25,10 +26,16 @@ void ImmichPathTraverser::loadAssets()
|
|||||||
assetNames.insert(asset.id, asset.originalFileName);
|
assetNames.insert(asset.id, asset.originalFileName);
|
||||||
}
|
}
|
||||||
Log("Immich assets loaded: ", assetIds.size());
|
Log("Immich assets loaded: ", assetIds.size());
|
||||||
|
lastRefresh = QDateTime::currentDateTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList ImmichPathTraverser::getImages() const
|
QStringList ImmichPathTraverser::getImages() const
|
||||||
{
|
{
|
||||||
|
if (refreshDue())
|
||||||
|
{
|
||||||
|
Log("Immich refresh due, reloading assets.");
|
||||||
|
const_cast<ImmichPathTraverser*>(this)->loadAssets();
|
||||||
|
}
|
||||||
return assetIds;
|
return assetIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,3 +52,17 @@ ImageDisplayOptions ImmichPathTraverser::UpdateOptionsForImage(const std::string
|
|||||||
Q_UNUSED(filename);
|
Q_UNUSED(filename);
|
||||||
return options;
|
return options;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ImmichPathTraverser::refreshDue() const
|
||||||
|
{
|
||||||
|
if (config.refreshSeconds <= 0)
|
||||||
|
return false;
|
||||||
|
if (!lastRefresh.isValid())
|
||||||
|
return true;
|
||||||
|
return lastRefresh.secsTo(QDateTime::currentDateTime()) >= config.refreshSeconds;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ImmichPathTraverser::shouldReloadImages() const
|
||||||
|
{
|
||||||
|
return refreshDue();
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
#include "immichclient.h"
|
#include "immichclient.h"
|
||||||
|
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
|
#include <QDateTime>
|
||||||
|
|
||||||
class ImmichPathTraverser : public PathTraverser
|
class ImmichPathTraverser : public PathTraverser
|
||||||
{
|
{
|
||||||
@@ -14,15 +15,18 @@ class ImmichPathTraverser : public PathTraverser
|
|||||||
QStringList getImages() const override;
|
QStringList getImages() const override;
|
||||||
virtual const std::string getImagePath(const std::string image) const override;
|
virtual const std::string getImagePath(const std::string image) const override;
|
||||||
virtual ImageDisplayOptions UpdateOptionsForImage(const std::string& filename, const ImageDisplayOptions& options) const override;
|
virtual ImageDisplayOptions UpdateOptionsForImage(const std::string& filename, const ImageDisplayOptions& options) const override;
|
||||||
|
bool shouldReloadImages() const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void loadAssets();
|
void loadAssets();
|
||||||
|
bool refreshDue() const;
|
||||||
|
|
||||||
ImmichConfig config;
|
ImmichConfig config;
|
||||||
mutable ImmichClient client;
|
mutable ImmichClient client;
|
||||||
mutable ImmichAssetCache cache;
|
mutable ImmichAssetCache cache;
|
||||||
QStringList assetIds;
|
QStringList assetIds;
|
||||||
QHash<QString, QString> assetNames;
|
QHash<QString, QString> assetNames;
|
||||||
|
QDateTime lastRefresh;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // IMMICHPATHTRAVERSER_H
|
#endif // IMMICHPATHTRAVERSER_H
|
||||||
|
|||||||
330
src/main.cpp
330
src/main.cpp
@@ -19,6 +19,9 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <QJsonDocument>
|
||||||
|
#include <QJsonObject>
|
||||||
|
#include <QJsonArray>
|
||||||
|
|
||||||
void usage(std::string programName) {
|
void usage(std::string programName) {
|
||||||
std::cerr << "Usage: " << programName << " [-t rotation_seconds] [-T transition_seconds] [-h/--overlay-color #rrggbb] [-a aspect('l','p','a', 'm')] [-o background_opacity(0..255)] [-b blur_radius] -p image_folder [-r] [-s] [-S] [-v] [--verbose] [--stretch] [-c config_file_path]" << std::endl;
|
std::cerr << "Usage: " << programName << " [-t rotation_seconds] [-T transition_seconds] [-h/--overlay-color #rrggbb] [-a aspect('l','p','a', 'm')] [-o background_opacity(0..255)] [-b blur_radius] -p image_folder [-r] [-s] [-S] [-v] [--verbose] [--stretch] [-c config_file_path]" << std::endl;
|
||||||
@@ -243,6 +246,307 @@ void ReloadConfigIfNeeded(AppConfig &appConfig, MainWindow &w, ImageSwitcher *sw
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool ParseBooleanString(const QString &value, bool &outValue)
|
||||||
|
{
|
||||||
|
QString v = value.trimmed().toLower();
|
||||||
|
if (v == "true" || v == "1" || v == "yes" || v == "on")
|
||||||
|
{
|
||||||
|
outValue = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (v == "false" || v == "0" || v == "no" || v == "off")
|
||||||
|
{
|
||||||
|
outValue = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static std::vector<std::string> SplitCsv(const QString &value)
|
||||||
|
{
|
||||||
|
std::vector<std::string> output;
|
||||||
|
QStringList parts = value.split(',', Qt::SkipEmptyParts);
|
||||||
|
for (const auto &part : parts)
|
||||||
|
{
|
||||||
|
QString trimmed = part.trimmed();
|
||||||
|
if (!trimmed.isEmpty())
|
||||||
|
output.push_back(trimmed.toStdString());
|
||||||
|
}
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool ApplyImmichPayload(ImmichConfig &config, const QString &payload)
|
||||||
|
{
|
||||||
|
bool changed = false;
|
||||||
|
QString trimmed = payload.trimmed();
|
||||||
|
if (trimmed.isEmpty())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (trimmed.startsWith("{"))
|
||||||
|
{
|
||||||
|
QJsonDocument doc = QJsonDocument::fromJson(trimmed.toUtf8());
|
||||||
|
if (!doc.isObject())
|
||||||
|
return false;
|
||||||
|
QJsonObject obj = doc.object();
|
||||||
|
|
||||||
|
if (obj.contains("albumId") && obj["albumId"].isString())
|
||||||
|
{
|
||||||
|
config.albumIds = { obj["albumId"].toString().toStdString() };
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("albumIds") && obj["albumIds"].isArray())
|
||||||
|
{
|
||||||
|
config.albumIds.clear();
|
||||||
|
QJsonArray arr = obj["albumIds"].toArray();
|
||||||
|
for (const auto &value : arr)
|
||||||
|
{
|
||||||
|
if (value.isString())
|
||||||
|
config.albumIds.push_back(value.toString().toStdString());
|
||||||
|
}
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("personId") && obj["personId"].isString())
|
||||||
|
{
|
||||||
|
config.personIds = { obj["personId"].toString().toStdString() };
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("personIds") && obj["personIds"].isArray())
|
||||||
|
{
|
||||||
|
config.personIds.clear();
|
||||||
|
QJsonArray arr = obj["personIds"].toArray();
|
||||||
|
for (const auto &value : arr)
|
||||||
|
{
|
||||||
|
if (value.isString())
|
||||||
|
config.personIds.push_back(value.toString().toStdString());
|
||||||
|
}
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("userId") && obj["userId"].isString())
|
||||||
|
{
|
||||||
|
config.userId = obj["userId"].toString().toStdString();
|
||||||
|
config.albumIds.clear();
|
||||||
|
config.personIds.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("ownerId") && obj["ownerId"].isString())
|
||||||
|
{
|
||||||
|
config.userId = obj["ownerId"].toString().toStdString();
|
||||||
|
config.albumIds.clear();
|
||||||
|
config.personIds.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("order") && obj["order"].isString())
|
||||||
|
{
|
||||||
|
config.order = obj["order"].toString().toStdString();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("size") && obj["size"].isString())
|
||||||
|
{
|
||||||
|
config.size = obj["size"].toString().toStdString();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("pageSize") && obj["pageSize"].isDouble())
|
||||||
|
{
|
||||||
|
config.pageSize = (int)obj["pageSize"].toDouble();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("maxAssets") && obj["maxAssets"].isDouble())
|
||||||
|
{
|
||||||
|
config.maxAssets = (int)obj["maxAssets"].toDouble();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("refreshSeconds") && obj["refreshSeconds"].isDouble())
|
||||||
|
{
|
||||||
|
config.refreshSeconds = (int)obj["refreshSeconds"].toDouble();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("includeArchived"))
|
||||||
|
{
|
||||||
|
if (obj["includeArchived"].isBool())
|
||||||
|
{
|
||||||
|
config.includeArchived = obj["includeArchived"].toBool();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
else if (obj["includeArchived"].isString())
|
||||||
|
{
|
||||||
|
bool parsed = false;
|
||||||
|
bool boolValue = false;
|
||||||
|
parsed = ParseBooleanString(obj["includeArchived"].toString(), boolValue);
|
||||||
|
if (parsed)
|
||||||
|
{
|
||||||
|
config.includeArchived = boolValue;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (obj.contains("reset") && obj["reset"].isBool() && obj["reset"].toBool())
|
||||||
|
{
|
||||||
|
config.albumIds.clear();
|
||||||
|
config.personIds.clear();
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("extensions") && obj["extensions"].isArray())
|
||||||
|
{
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
QJsonArray arr = obj["extensions"].toArray();
|
||||||
|
for (const auto &value : arr)
|
||||||
|
{
|
||||||
|
if (value.isString())
|
||||||
|
config.allowedExtensions.push_back(value.toString().toLower().toStdString());
|
||||||
|
}
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (obj.contains("allowedExtensions") && obj["allowedExtensions"].isArray())
|
||||||
|
{
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
QJsonArray arr = obj["allowedExtensions"].toArray();
|
||||||
|
for (const auto &value : arr)
|
||||||
|
{
|
||||||
|
if (value.isString())
|
||||||
|
config.allowedExtensions.push_back(value.toString().toLower().toStdString());
|
||||||
|
}
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString key;
|
||||||
|
QString value;
|
||||||
|
int idx = trimmed.indexOf('=');
|
||||||
|
if (idx < 0)
|
||||||
|
idx = trimmed.indexOf(':');
|
||||||
|
if (idx < 0)
|
||||||
|
idx = trimmed.indexOf(' ');
|
||||||
|
|
||||||
|
if (idx >= 0)
|
||||||
|
{
|
||||||
|
key = trimmed.left(idx).trimmed().toLower();
|
||||||
|
value = trimmed.mid(idx + 1).trimmed();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
key = trimmed.toLower();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key == "reset" || key == "clear" || key == "all")
|
||||||
|
{
|
||||||
|
config.albumIds.clear();
|
||||||
|
config.personIds.clear();
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "album" || key == "albumid")
|
||||||
|
{
|
||||||
|
config.albumIds = { value.toStdString() };
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "albums" || key == "albumids")
|
||||||
|
{
|
||||||
|
config.albumIds = SplitCsv(value);
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "person" || key == "personid")
|
||||||
|
{
|
||||||
|
config.personIds = { value.toStdString() };
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "persons" || key == "personids")
|
||||||
|
{
|
||||||
|
config.personIds = SplitCsv(value);
|
||||||
|
config.userId.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "user" || key == "userid" || key == "ownerid")
|
||||||
|
{
|
||||||
|
config.userId = value.toStdString();
|
||||||
|
config.albumIds.clear();
|
||||||
|
config.personIds.clear();
|
||||||
|
config.allowedExtensions.clear();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "extensions" || key == "allowedextensions")
|
||||||
|
{
|
||||||
|
config.allowedExtensions = SplitCsv(value);
|
||||||
|
for (auto &ext : config.allowedExtensions)
|
||||||
|
{
|
||||||
|
for (auto &c : ext)
|
||||||
|
c = static_cast<char>(::tolower(c));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "order")
|
||||||
|
{
|
||||||
|
config.order = value.toStdString();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "size")
|
||||||
|
{
|
||||||
|
config.size = value.toStdString();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (key == "includearchived")
|
||||||
|
{
|
||||||
|
bool boolValue = false;
|
||||||
|
if (ParseBooleanString(value, boolValue))
|
||||||
|
{
|
||||||
|
config.includeArchived = boolValue;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (key == "pagesize")
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
int parsed = value.toInt(&ok);
|
||||||
|
if (ok)
|
||||||
|
{
|
||||||
|
config.pageSize = parsed;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (key == "maxassets")
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
int parsed = value.toInt(&ok);
|
||||||
|
if (ok)
|
||||||
|
{
|
||||||
|
config.maxAssets = parsed;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (key == "refreshseconds")
|
||||||
|
{
|
||||||
|
bool ok = false;
|
||||||
|
int parsed = value.toInt(&ok);
|
||||||
|
if (ok)
|
||||||
|
{
|
||||||
|
config.refreshSeconds = parsed;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
QApplication a(argc, argv);
|
QApplication a(argc, argv);
|
||||||
@@ -292,6 +596,32 @@ int main(int argc, char *argv[])
|
|||||||
std::unique_ptr<ImageSelector> newSelector = GetSelectorForApp(appConfig);
|
std::unique_ptr<ImageSelector> newSelector = GetSelectorForApp(appConfig);
|
||||||
switcher.restart(newSelector);
|
switcher.restart(newSelector);
|
||||||
});
|
});
|
||||||
|
QObject::connect(mqttController.get(), &MqttController::immichControl, [&appConfig, &switcher](const QString &payload) {
|
||||||
|
bool updated = false;
|
||||||
|
for (int i = 0; i < appConfig.paths.count(); ++i)
|
||||||
|
{
|
||||||
|
if (!appConfig.paths[i].immich.enabled)
|
||||||
|
continue;
|
||||||
|
ImmichConfig newConfig = appConfig.paths[i].immich;
|
||||||
|
if (ApplyImmichPayload(newConfig, payload))
|
||||||
|
{
|
||||||
|
appConfig.paths[i].immich = newConfig;
|
||||||
|
updated = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (updated)
|
||||||
|
{
|
||||||
|
Log("MQTT immich update applied.");
|
||||||
|
std::unique_ptr<ImageSelector> newSelector = GetSelectorForApp(appConfig);
|
||||||
|
switcher.setImageSelector(newSelector);
|
||||||
|
if (!switcher.isPaused())
|
||||||
|
switcher.scheduleImageUpdate();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log("MQTT immich update ignored: ", payload.toStdString());
|
||||||
|
}
|
||||||
|
});
|
||||||
mqttController->start();
|
mqttController->start();
|
||||||
}
|
}
|
||||||
switcher.start();
|
switcher.start();
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
#include <QGraphicsPixmapItem>
|
#include <QGraphicsPixmapItem>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QScreen>
|
#include <QScreen>
|
||||||
|
#include <QTransform>
|
||||||
|
|
||||||
MainWindow::MainWindow(QWidget *parent) :
|
MainWindow::MainWindow(QWidget *parent) :
|
||||||
QMainWindow(parent),
|
QMainWindow(parent),
|
||||||
@@ -170,16 +171,26 @@ void MainWindow::updateImage()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
QLabel *label = this->findChild<QLabel*>("image");
|
QLabel *label = this->findChild<QLabel*>("image");
|
||||||
const QPixmap* oldImage = label->pixmap();
|
QPixmap oldImage = label->pixmap(Qt::ReturnByValue);
|
||||||
if (oldImage != NULL && transitionSeconds > 0)
|
if (!oldImage.isNull() && transitionSeconds > 0)
|
||||||
{
|
{
|
||||||
QPalette palette;
|
QPalette palette;
|
||||||
palette.setBrush(QPalette::Background, *oldImage);
|
palette.setBrush(QPalette::Window, oldImage);
|
||||||
this->setPalette(palette);
|
this->setPalette(palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
QPixmap p;
|
QPixmap p;
|
||||||
p.load( currentImage.filename.c_str() );
|
p.load( currentImage.filename.c_str() );
|
||||||
|
if (p.isNull())
|
||||||
|
{
|
||||||
|
Log("Error: failed to load image: ", currentImage.filename);
|
||||||
|
warn("Failed to load image.");
|
||||||
|
if (switcher != nullptr)
|
||||||
|
{
|
||||||
|
switcher->scheduleImageUpdate();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Log("size:", p.width(), "x", p.height(), "(window:", width(), ",", height(), ")");
|
Log("size:", p.width(), "x", p.height(), "(window:", width(), ",", height(), ")");
|
||||||
|
|
||||||
@@ -213,7 +224,7 @@ void MainWindow::updateImage()
|
|||||||
|
|
||||||
label->setPixmap(background);
|
label->setPixmap(background);
|
||||||
|
|
||||||
if (oldImage != NULL && transitionSeconds > 0)
|
if (!oldImage.isNull() && transitionSeconds > 0)
|
||||||
{
|
{
|
||||||
auto effect = new QGraphicsOpacityEffect(label);
|
auto effect = new QGraphicsOpacityEffect(label);
|
||||||
effect->setOpacity(0.0);
|
effect->setOpacity(0.0);
|
||||||
@@ -273,9 +284,9 @@ QPixmap MainWindow::getBlurredBackground(const QPixmap& originalSize, const QPix
|
|||||||
|
|
||||||
QPixmap MainWindow::getRotatedPixmap(const QPixmap& p)
|
QPixmap MainWindow::getRotatedPixmap(const QPixmap& p)
|
||||||
{
|
{
|
||||||
QMatrix matrix;
|
QTransform transform;
|
||||||
matrix.rotate(currentImage.rotation);
|
transform.rotate(currentImage.rotation);
|
||||||
return p.transformed(matrix);
|
return p.transformed(transform);
|
||||||
}
|
}
|
||||||
|
|
||||||
QPixmap MainWindow::getScaledPixmap(const QPixmap& p)
|
QPixmap MainWindow::getScaledPixmap(const QPixmap& p)
|
||||||
@@ -325,12 +336,12 @@ void MainWindow::drawBackground(const QPixmap& originalSize, const QPixmap& scal
|
|||||||
QPixmap background = blur(originalSize.scaledToHeight(height()));
|
QPixmap background = blur(originalSize.scaledToHeight(height()));
|
||||||
QRect rect((background.width() - width())/2, 0, width(), height());
|
QRect rect((background.width() - width())/2, 0, width(), height());
|
||||||
background = background.copy(rect);
|
background = background.copy(rect);
|
||||||
palette.setBrush(QPalette::Background, background);
|
palette.setBrush(QPalette::Window, background);
|
||||||
} else {
|
} else {
|
||||||
QPixmap background = blur(originalSize.scaledToHeight(height()));
|
QPixmap background = blur(originalSize.scaledToHeight(height()));
|
||||||
QRect rect((background.width() - width())/2, 0, width(), height());
|
QRect rect((background.width() - width())/2, 0, width(), height());
|
||||||
background = background.copy(rect);
|
background = background.copy(rect);
|
||||||
palette.setBrush(QPalette::Background, background);
|
palette.setBrush(QPalette::Window, background);
|
||||||
}
|
}
|
||||||
this->setPalette(palette);
|
this->setPalette(palette);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ MqttController::MqttController(const MqttConfig &configIn, QObject *parent)
|
|||||||
mosquitto_lib_init();
|
mosquitto_lib_init();
|
||||||
g_mqttInitialized = true;
|
g_mqttInitialized = true;
|
||||||
}
|
}
|
||||||
|
controlTopic = QString::fromStdString(config.topic);
|
||||||
|
immichTopic = QString::fromStdString(config.immichTopic);
|
||||||
}
|
}
|
||||||
|
|
||||||
MqttController::~MqttController()
|
MqttController::~MqttController()
|
||||||
@@ -103,6 +105,18 @@ void MqttController::subscribe()
|
|||||||
{
|
{
|
||||||
Log("MQTT subscribed to ", config.topic);
|
Log("MQTT subscribed to ", config.topic);
|
||||||
}
|
}
|
||||||
|
if (!config.immichTopic.empty() && config.immichTopic != config.topic)
|
||||||
|
{
|
||||||
|
rc = mosquitto_subscribe(client, nullptr, config.immichTopic.c_str(), config.qos);
|
||||||
|
if (rc != MOSQ_ERR_SUCCESS)
|
||||||
|
{
|
||||||
|
Log("MQTT subscribe (immich) failed: ", mosquitto_strerror(rc));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log("MQTT subscribed to ", config.immichTopic);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MqttController::HandleMessage(struct mosquitto *mosq, void *userdata, const struct mosquitto_message *message)
|
void MqttController::HandleMessage(struct mosquitto *mosq, void *userdata, const struct mosquitto_message *message)
|
||||||
@@ -113,15 +127,26 @@ void MqttController::HandleMessage(struct mosquitto *mosq, void *userdata, const
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
QString payload = QString::fromUtf8(static_cast<const char *>(message->payload), message->payloadlen);
|
QString payload = QString::fromUtf8(static_cast<const char *>(message->payload), message->payloadlen);
|
||||||
QMetaObject::invokeMethod(self, "handleCommand", Qt::QueuedConnection, Q_ARG(QString, payload));
|
QString topic = QString::fromUtf8(message->topic);
|
||||||
|
QMetaObject::invokeMethod(self, "handleMessage", Qt::QueuedConnection,
|
||||||
|
Q_ARG(QString, topic),
|
||||||
|
Q_ARG(QString, payload));
|
||||||
}
|
}
|
||||||
|
|
||||||
void MqttController::handleCommand(const QString &payload)
|
void MqttController::handleMessage(const QString &topic, const QString &payload)
|
||||||
{
|
{
|
||||||
QString cmd = payload.trimmed().toLower();
|
QString cmd = payload.trimmed().toLower();
|
||||||
if (cmd.isEmpty())
|
if (cmd.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Log("MQTT message on ", topic.toStdString(), ": ", cmd.toStdString());
|
||||||
|
|
||||||
|
if (!immichTopic.isEmpty() && topic == immichTopic)
|
||||||
|
{
|
||||||
|
emit immichControl(payload);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (cmd == "play" || cmd == "resume")
|
if (cmd == "play" || cmd == "resume")
|
||||||
{
|
{
|
||||||
emit play();
|
emit play();
|
||||||
|
|||||||
@@ -24,9 +24,10 @@ signals:
|
|||||||
void nextImage();
|
void nextImage();
|
||||||
void nextFolder();
|
void nextFolder();
|
||||||
void restart();
|
void restart();
|
||||||
|
void immichControl(const QString &payload);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void handleCommand(const QString &payload);
|
void handleMessage(const QString &topic, const QString &payload);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static void HandleConnect(struct mosquitto *mosq, void *userdata, int rc);
|
static void HandleConnect(struct mosquitto *mosq, void *userdata, int rc);
|
||||||
@@ -35,6 +36,8 @@ private:
|
|||||||
void subscribe();
|
void subscribe();
|
||||||
|
|
||||||
MqttConfig config;
|
MqttConfig config;
|
||||||
|
QString controlTopic;
|
||||||
|
QString immichTopic;
|
||||||
struct mosquitto *client = nullptr;
|
struct mosquitto *client = nullptr;
|
||||||
bool connected = false;
|
bool connected = false;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ class PathTraverser
|
|||||||
virtual QStringList getImages() const = 0;
|
virtual QStringList getImages() const = 0;
|
||||||
virtual const std::string getImagePath(const std::string image) const = 0;
|
virtual const std::string getImagePath(const std::string image) const = 0;
|
||||||
virtual ImageDisplayOptions UpdateOptionsForImage(const std::string& filename, const ImageDisplayOptions& baseOptions) const = 0;
|
virtual ImageDisplayOptions UpdateOptionsForImage(const std::string& filename, const ImageDisplayOptions& baseOptions) const = 0;
|
||||||
|
virtual bool shouldReloadImages() const { return false; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
const std::string path;
|
const std::string path;
|
||||||
|
|||||||
Reference in New Issue
Block a user