v2023.12.0-alpha.5

photostructure · Dec 18, 2023 · 2d60b90 · 2d60b90
1 parent 8b160c7
commit 2d60b90
Show file tree

Hide file tree

Showing 32 changed files with 46 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,26 @@ This is a detailed list of changes in each version.
 
 <!-- fix "tag context" for "next previous" context. I'd always done a search, clicked a thumb, and then clicked esc to go back to the search results. But...  if you click a thumb from a search,  and then click "next" or "previous", it ignores that you can from a search, and does the chronological next asset, which is very confusing/irritating. -->
 
+## v2023.12.0-alpha.5
+
+**Released 17 December 2023**
+
+- 🐛 Fixed PhotoStructure for Node on Windows to find tooling like SQLite. Thanks for [reporting](https://discord.com/channels/818905168107012097/818907922767544340/1186061474490232854), @mackid1993!
+
+- 🐛 Fixed macOS `./start.sh` error if `timeout` was missing (rather than requiring users to `brew install coreutils`). Thanks for [reporting](https://discord.com/channels/818905168107012097/818907922767544340/1186074684001878067), @Zandr!
+
+- 🐛 Database validation would [fail if the database was locked](https://discord.com/channels/818905168107012097/1186045650446598274). We now retry each validation step if we get lock errors. See the `maxBusyDbMs` setting for details.
+
+- 📦 On Windows we now add `%ProgramData%\chocolatey\bin` as a backfill `%PATH%` entry (to help find `ffmpeg.exe`). Thanks for [reporting](https://discord.com/channels/818905168107012097/818907922767544340/1186099486389452922), @Leaky!
+
+- 📦 Prior builds relied on the `ffmpegPath` setting to be resolvable. We now use the `pathTo()` function (which includes backfill default paths) for all `ffmpeg` commands
+
+- 📦 Added the current userid/groupid to the library directory health check message to [simplify finding the correct PUID/PGID values](https://forum.photostructure.com/t/raspberry-pi-and-docker-image/1789/9?u=mrm).
+
+- 📦 Added `toolsDir`, `osToolsDir`, `ffmpeg`, and `sqlite` paths to `photostructure info` to aid in future debugging
+
+- 📦 Added `jpegtran` health check. You know you all wanted it.
+
 <a id="v2023.11.0-alpha.2"></a>
 
 ## v2023.12.0-alpha.3

diff --git a/VERSION.json b/VERSION.json
@@ -1,13 +1,13 @@
 {
-  "version": "2023.12.0-alpha.3",
+  "version": "2023.12.0-alpha.5",
   "versionMajor": 2023,
   "versionMinor": 12,
   "versionPatch": 0,
   "versionPrerelease": [
     "alpha",
-    3
+    5
   ],
-  "release": "2023.12.0-alpha.3+20231217114350",
-  "gitSha": "6d4a11203579380df325cf7d63b3dacba2dd2da1",
-  "gitDate": "2023-12-17T19:43:50.000Z"
+  "release": "2023.12.0-alpha.5+20231217214814",
+  "gitSha": "9cdc7207350c3cab07b8b5255f2134dc354de3a3",
+  "gitDate": "2023-12-18T05:48:14.000Z"
 }
diff --git a/bin/info.js b/bin/info.js
diff --git a/bin/list.js b/bin/list.js
diff --git a/bin/logcat.js b/bin/logcat.js
diff --git a/bin/logtail.js b/bin/logtail.js
diff --git a/bin/main.js b/bin/main.js
diff --git a/bin/photostructure.js b/bin/photostructure.js
diff --git a/bin/sync.js b/bin/sync.js
diff --git a/bin/web.js b/bin/web.js
diff --git a/bin/worker.js b/bin/worker.js
diff --git a/defaults.env b/defaults.env
@@ -1,5 +1,5 @@
 #
-# Welcome to PhotoStructure! These are the settings for version 2023.11.0.
+# Welcome to PhotoStructure! These are the settings for version 2023.12.0.
 #
 # Please see https://photostructure.com/environment-variables for more
 # information about using environment variables with PhotoStructure.
@@ -2617,6 +2617,7 @@
 #   "system-volumes",
 #   "tools-exiftool",
 #   "tools-heif",
+#   "tools-jpegtran",
 #   "tools-powershell",
 #   "tools-sharp",
 #   "tools-sqlite-version",

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "photostructure",
   "productName": "PhotoStructure",
   "author": "PhotoStructure, Inc. <[email protected]>",
-  "version": "2023.12.0-alpha.3",
+  "version": "2023.12.0-alpha.5",
   "license": "SEE LICENSE IN LICENSE.md",
   "description": "PhotoStructure for Servers",
   "homepage": "https://photostructure.com/server/photostructure-for-node/",

diff --git a/photostructure b/photostructure
diff --git a/public/3rd-party-licenses.txt.gz b/public/3rd-party-licenses.txt.gz
diff --git a/public/app/about.css.gz b/public/app/about.css.gz
diff --git a/public/app/about.css.map.gz b/public/app/about.css.map.gz
diff --git a/public/app/about.js.gz b/public/app/about.js.gz
diff --git a/public/app/app.css.gz b/public/app/app.css.gz
diff --git a/public/app/app.css.map.gz b/public/app/app.css.map.gz
diff --git a/public/app/app.js.gz b/public/app/app.js.gz
diff --git a/public/app/health.css.gz b/public/app/health.css.gz
diff --git a/public/app/health.css.map.gz b/public/app/health.css.map.gz
diff --git a/public/app/health.js.gz b/public/app/health.js.gz
diff --git a/public/app/install.js.gz b/public/app/install.js.gz
diff --git a/public/app/settings.css.gz b/public/app/settings.css.gz
diff --git a/public/app/settings.css.map.gz b/public/app/settings.css.map.gz
diff --git a/public/app/settings.js.gz b/public/app/settings.js.gz
diff --git a/public/app/splash.css.gz b/public/app/splash.css.gz
diff --git a/public/app/splash.css.map.gz b/public/app/splash.css.map.gz
diff --git a/public/app/splash.js.gz b/public/app/splash.js.gz
diff --git a/start.sh b/start.sh
@@ -86,17 +86,15 @@ if [ "$NODE_VERSION" -lt "$(version "18.16.0")" ]; then
   die "Please install Node.js v18 or v20."
 fi
 
-# Add `timeout` to git commands if `timeout` is available, as external network
-# may not be available (yet)
-
+# Add a `timeout1m` function, if `timeout` is installed. On macOS, you can
+# `brew install coreutils`.
 if command -v timeout >/dev/null; then
-
-  timeout() {
-    command timeout "$@"
+  timeout1m() {
+    timeout 1m "$@"
   }
 else
-  timeout() {
-    command "$@"
+  timeout1m() {
+    env "$@"
   }
 fi
 
@@ -106,14 +104,10 @@ if [ "$NOGIT" != "1" ] && [ "$PS_CHECK_UPDATES" != "none" ]; then
   echo "$GIT" stash --include-untracked
 
   # This may be running at system startup, and network may not be available
-  # yet--try, but timeout after a minute.
+  # yet, so let's try, but timeout after a minute.
 
   # `git pull` ensures we're always running the latest version of this branch:
-  if command -v timeout >/dev/null; then
-    timeout 60 "$GIT" pull || echo "$GIT pull timed out"
-  else
-    "$GIT" pull || die "git pull failed."
-  fi
+  timeout1m "$GIT" pull # don't fail here if git pull fails--it might be a network issue.
 fi
 
 clean() {