From 118680fb9590b08b84f7709e488651f94398ba38 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Wed, 8 Nov 2023 16:05:28 -0600 Subject: [PATCH] Docker PySide6 revert Fingers uncrossed --- docs/changelog.md | 1 - docs/old_changelog.html | 1 - static/build_files/docker/client/Dockerfile | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 249a2ffd..fc225d1b 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -29,7 +29,6 @@ title: Changelog * fixed a counting typo error with the delete files code when you delete the last file in a domain but the domain thinks it already has 0 files * fixed up similar code across the database to forestall future typos on SQLite SUMs * improved and unified the 'hydrus temp dir' management code. if the specific per-process hydrus temp dir is cleared out by an external factor (I'm guessing just the OS cleaning up during a long running client session), hydrus should just simply make a new folder as needed. with luck, this will fix a problem with drag and drop export that ran into this -* fingers crossed (I have little idea what I am doing and no convenient test platform!), the Docker build of the client will now have PDF and Charts support ### many file move/copy error handling improvements diff --git a/docs/old_changelog.html b/docs/old_changelog.html index e847f9c8..6a8e904f 100644 --- a/docs/old_changelog.html +++ b/docs/old_changelog.html @@ -54,7 +54,6 @@
  • fixed a counting typo error with the delete files code when you delete the last file in a domain but the domain thinks it already has 0 files
  • fixed up similar code across the database to forestall future typos on SQLite SUMs
  • improved and unified the 'hydrus temp dir' management code. if the specific per-process hydrus temp dir is cleared out by an external factor (I'm guessing just the OS cleaning up during a long running client session), hydrus should just simply make a new folder as needed. with luck, this will fix a problem with drag and drop export that ran into this
    • -
  • fingers crossed (I have little idea what I am doing and no convenient test platform!), the Docker build of the client will now have PDF and Charts support

  • many file move/copy error handling improvements

  • _tl;dr: if hydrus can't put a file somewhere, it deals with that better now_
  • improved how file move/merge function reports its errors, and how all its callers handle them
    • diff --git a/static/build_files/docker/client/Dockerfile b/static/build_files/docker/client/Dockerfile index 136bfd3a..215a10e5 100644 --- a/static/build_files/docker/client/Dockerfile +++ b/static/build_files/docker/client/Dockerfile @@ -9,9 +9,9 @@ LABEL git="https://github.com/hydrusnetwork/hydrus" RUN apk --no-cache add fvwm x11vnc xvfb supervisor opencv mpv mpv-libs ffmpeg jq \ openssl nodejs patch font-noto font-noto-emoji font-noto-cjk \ - py3-beautifulsoup4 py3-pillow py3-numpy py3-openssl py3-cryptography py3-pip py3-opencv py3-lxml py3-chardet \ + py3-pyside6 py3-beautifulsoup4 py3-pillow py3-numpy py3-openssl py3-cryptography py3-pip py3-opencv py3-lxml py3-chardet \ py3-psutil py3-pysocks py3-requests py3-twisted py3-yaml py3-lz4 py3-html5lib py3-dateutil -RUN pip install qtpy Send2Trash python-mpv cloudscraper pyparsing cbor2 Pympler PySide6 +RUN pip install qtpy Send2Trash python-mpv cloudscraper pyparsing cbor2 Pympler RUN set -xe \ && mkdir -p /opt/hydrus \