v2024.3.1-prealpha

photostructure · Mar 8, 2024 · 4e53987 · 4e53987
1 parent 7617234
commit 4e53987
Show file tree

Hide file tree

Showing 38 changed files with 99 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,12 +23,28 @@ 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. -->
 
+<a id="v2024.3.1-prealpha"></a>
+## v2024.3.1-prealpha ["Zep"](https://discord.com/channels/818905168107012097/818905168690413611/1215774241979502612)
+
+**Released 2023-03-08**
+
+- 🐛 Extended database migration timeouts to 2 minutes by default. See `dbMaintenanceTimeoutMs` setting for details. Should resolve [this issue](https://discord.com/channels/818905168107012097/818907922767544340/1215748274401710191).
+
+- 🐛 Added new migration to re-assert the `Progress` table schema. Should resolve [this issue](https://discord.com/channels/818905168107012097/1215730724020293752).
+
+- 🐛 The webservice now re-writes `settings.toml` files from prior versions, to ensure the latest settings are visible. Thanks for reporting, [@tkohhh](https://discord.com/channels/818905168107012097/1215760858664140841)! Older versions of `settings.toml` are now moved to `./archive` (it had been `./old`).
+
+- 🐛 `sync` won't be started if any health checks post fatal errors.
+
+- 🐛 `main` renders service startup errors to `stderr` now _and still tries to spin up the web service_ (in an effort to try to get the health check page to the user)
+
 <a id="v2024.1.0-alpha"></a>
 <a id="v2024.2.0-alpha"></a>
+<a id="v2024.3.0-alpha"></a>
 
-## v2024.3.0-alpha
+## v2024.3.0-prealpha
 
-**To be released**
+**Released 2023-03-08**
 
 ### ✒️ Version format change
 
@@ -40,7 +56,7 @@ As an example, a build might be `v2024.1.7-beta`. If it proves sufficiently stab
 
 PhotoStructure now adds `Where/Country/Region/City` tags for those photos and videos with Latitude and Longitude metadata.
 
-Note that this feature is uses an embedded geo database, so no network access is required. This initial implementation only inclues cities with a population of 1000 or greater. See the new `tagGeo` and `tagGeoTemplate` [settings](/go/settings) for more details. 
+Note that this feature is uses an embedded geo database, so no network access is required. This initial implementation only inclues cities with a population of 1000 or greater. See the new `tagGeo` and `tagGeoTemplate` [settings](/go/settings) for more details.
 
 ### 🔃 Sync improvements
 

diff --git a/VERSION.json b/VERSION.json
@@ -1,12 +1,12 @@
 {
-  "version": "2024.3.0-prealpha",
+  "version": "2024.3.1-prealpha",
   "versionMajor": 2024,
   "versionMinor": 3,
-  "versionPatch": 0,
+  "versionPatch": 1,
   "versionPrerelease": [
     "prealpha"
   ],
-  "release": "2024.3.0-prealpha+20240308102353",
-  "gitSha": "92cba1b21937cb9ca770f6a339e44b0fbee04bf9",
-  "gitDate": "2024-03-08T18:23:53.000Z"
+  "release": "2024.3.1-prealpha+20240308150212",
+  "gitSha": "d92384e8659ff46fbae8e6f81fa5867114a4a843",
+  "gitDate": "2024-03-08T23:02:12.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/data/migrations/models/20240307_rebuild_progress_nofk.sql b/data/migrations/models/20240307_rebuild_progress_nofk.sql
@@ -0,0 +1,57 @@
+CREATE TABLE Progress_new (
+  -- records sync process state
+  id INTEGER NOT NULL PRIMARY KEY,
+  uri TEXT NOT NULL,
+  hostname TEXT NOT NULL,
+  pid INTEGER NOT NULL,
+  volume TEXT NOT NULL,
+  state TEXT,
+  hed TEXT,
+  dekJSON TEXT,
+  completePct REAL,
+  incompletePct REAL,
+  scanningPct REAL,
+  createdAt INTEGER NOT NULL,
+  updatedAt INTEGER NOT NULL,
+  completedAt INTEGER
+) STRICT;
+
+INSERT INTO
+  Progress_new (
+    id,
+    uri,
+    hostname,
+    pid,
+    volume,
+    state,
+    hed,
+    dekJSON,
+    completePct,
+    incompletePct,
+    scanningPct,
+    createdAt,
+    updatedAt,
+    completedAt
+  )
+SELECT
+  id,
+  uri,
+  hostname,
+  pid,
+  volume,
+  state,
+  hed,
+  dekJSON,
+  completePct,
+  incompletePct,
+  scanningPct,
+  createdAt,
+  updatedAt,
+  completedAt
+FROM
+  Progress;
+
+DROP TABLE Progress;
+
+ALTER TABLE Progress_new
+RENAME TO Progress;
diff --git a/defaults.env b/defaults.env
@@ -1797,14 +1797,15 @@
 # PS_DB_MAINTENANCE_TIMEOUT_MS or dbMaintenanceTimeoutMs
 # ------------------------------------------------------
 #
-# How long is a reasonable time to wait for the library database to vacuum,
-# quick check, validate foreign keys, or validate the schema?
+# How long is a reasonable time to wait for the library database to apply a
+# migration, vacuum, quick check, validate foreign keys, or validate the
+# schema?
 #
-# Note that the default of 1 minute is very generous--these operations should
-# only take a second or two unless your library is very large and/or your disk
-# is very slow.
+# Note that the default of 2 minutes should be very generous--these operations
+# should only take a second or two unless your library is very large and/or
+# your disk is very slow.
 #
-# PS_DB_MAINTENANCE_TIMEOUT_MS="1m"
+# PS_DB_MAINTENANCE_TIMEOUT_MS="2m"
 
 
 # ----------------------------------------

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "photostructure",
   "productName": "PhotoStructure",
   "author": "PhotoStructure, Inc. <[email protected]>",
-  "version": "2024.3.0-prealpha",
+  "version": "2024.3.1-prealpha",
   "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/about.js.map.gz b/public/app/about.js.map.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/app.js.map.gz b/public/app/app.js.map.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/health.js.map.gz b/public/app/health.js.map.gz
diff --git a/public/app/install.js.gz b/public/app/install.js.gz
diff --git a/public/app/install.js.map.gz b/public/app/install.js.map.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/settings.js.map.gz b/public/app/settings.js.map.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/public/app/splash.js.map.gz b/public/app/splash.js.map.gz