Merge branch 'xbapps:master' into impatient

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
         node-version: '12'
 
     - name: Checkout code
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
 
     - name: Check code formatting using gofmt
       uses: Jerome1337/gofmt-action@v1.0.5

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
         with:
           submodules: 'true'
           fetch-depth: 0

.gitpod.yml

@@ -2,7 +2,7 @@ image:
   file: .gitpod.dockerfile
 tasks:
   - name: Continuous Build
-    command: yarn global add concurrently && go install github.com/cosmtrek/air@latest && cd /workspace/xbvr && go generate && go get && yarn && yarn dev
+    command: yarn config set ignore-engines true && yarn global add concurrently && go install github.com/cosmtrek/air@latest && cd /workspace/xbvr && go generate && go get && yarn && yarn dev
 ports:
   - port: 9999
     onOpen: open-preview

README.md

@@ -136,17 +136,19 @@ left arrow - cycles backwards in gallery
 right arrow - cycles forward in gallery  
 esc - closes details pane
 
-#### using Command Line Arguments
-| Command line parameter | Type | Description |
-|------------------------|-------|--------------
-| `--enableLocalStorage` | boolean |Use local folder to store application data|
-|	`--app_dir` | String|path to the application directory|
-|	`--cache_dir` | String|path to the tempoarary scraper cache directory|
-|	`--imgproxy_dir` | String|path to the imageproxy directory|
-|	`--search_dir` | String| path to the Search Index directory|
-|	`--preview_dir` | String| path to the Scraper Cache directory|
-|	`--scriptsheatmap_dir` | String| path to the scripts_heatmap directory|
-|	`--myfiles_dir` | String| path to the myfiles directory for serving users own content (eg images|
-|	`--databaseurl` | String|override default database path|
-|	`--web_port` | Int| override default Web Page port 9999|
-|	`--ws_addr` | String| override default Websocket address from the default 0.0.0.0:9998|
+#### using Command Line Arguments/Environment Variables
+| Command line parameter | Environment Variable | Type | Description |
+|------------------------|--------------|------|-------------|
+| `--enableLocalStorage` | | boolean |Use local folder to store application data|
+|	`--app_dir` | XBVR_APPDIR | String|path to the application directory|
+|	`--cache_dir` | XBVR_CACHEDIR | String|path to the tempoarary scraper cache directory|
+|	`--imgproxy_dir` | XBVR_IMAGEPROXYDIR | String|path to the imageproxy directory|
+|	`--search_dir` | XBVR_SEARCHDIR | String| path to the Search Index directory|
+|	`--preview_dir` | XBVR_VIDEOPREVIEWDIR | String| path to the Scraper Cache directory|
+|	`--scriptsheatmap_dir` | XBVR_SCRIPTHEATMAPDIR | String| path to the scripts_heatmap directory|
+|	`--myfiles_dir` | XBVR_MYFILESDIR | String| path to the myfiles directory for serving users own content (eg images|
+|	`--databaseurl` | DATABASE_URL | String|override default database path|
+|	`--web_port` | XBVR_WEB_PORT | Int| override default Web Page port 9999|
+|	`--ws_addr` | XBVR_WS_ADDR | String| override default Websocket address from the default 0.0.0.0:9998|
+|	`--db_connection_pool_size` | DB_CONNECTION_POOL_SIZE | Int| sets the connection pool size for mariadb databases|
+|	`--concurrent_scrapers` | CONCURRENT_SCRAPERS | String| set the number of scrapers that run concurrently default 9999|

go.mod

@@ -9,16 +9,16 @@ require (
 	github.com/anacrolix/ffprobe v1.1.0
 	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
 	github.com/avast/retry-go/v4 v4.5.1
-	github.com/blevesearch/bleve/v2 v2.3.10
+	github.com/blevesearch/bleve/v2 v2.4.0
 	github.com/bregydoc/gtranslate v0.0.0-20200913051839-1bd07f6c1fc5
 	github.com/creasty/defaults v1.7.0
 	github.com/darwayne/go-timecode v1.1.0
 	github.com/disintegration/imaging v1.6.2
 	github.com/djherbis/times v1.6.0
 	github.com/dustin/go-humanize v1.0.1
-	github.com/emicklei/go-restful-openapi/v2 v2.9.1
-	github.com/emicklei/go-restful/v3 v3.11.2
-	github.com/gammazero/nexus/v3 v3.2.1
+	github.com/emicklei/go-restful-openapi/v2 v2.10.2
+	github.com/emicklei/go-restful/v3 v3.12.0
+	github.com/gammazero/nexus/v3 v3.2.2
 	github.com/getlantern/systray v1.2.2
 	github.com/go-openapi/spec v0.20.14
 	github.com/go-resty/resty/v2 v2.11.0
@@ -52,19 +52,23 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/thoas/go-funk v0.9.3
-	github.com/tidwall/gjson v1.17.0
+	github.com/tidwall/gjson v1.17.1
 	github.com/x-cray/logrus-prefixed-formatter v0.5.2
 	github.com/xo/dburl v0.21.1
-	golang.org/x/crypto v0.18.0
-	golang.org/x/net v0.20.0
-	golang.org/x/oauth2 v0.16.0
-	golang.org/x/sys v0.16.0
+	golang.org/x/crypto v0.21.0
+	golang.org/x/net v0.23.0
+	golang.org/x/oauth2 v0.17.0
+	golang.org/x/sys v0.18.0
 	golang.org/x/text v0.14.0
 	gopkg.in/gormigrate.v1 v1.6.0
 	willnorris.com/go/imageproxy v0.11.3-0.20231113231555-ef50c1f9a64e
 )
 
-require gopkg.in/yaml.v3 v3.0.1 // indirect
+require (
+	github.com/blevesearch/go-faiss v1.0.13 // indirect
+	github.com/blevesearch/zapx/v16 v16.0.12 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
 
 require (
 	github.com/RoaringBitmap/roaring v1.2.3 // indirect
@@ -74,12 +78,12 @@ require (
 	github.com/antchfx/xpath v1.1.10 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.2.0 // indirect
-	github.com/blevesearch/bleve_index_api v1.1.5
-	github.com/blevesearch/geo v0.1.18 // indirect
+	github.com/blevesearch/bleve_index_api v1.1.6
+	github.com/blevesearch/geo v0.1.20 // indirect
 	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
 	github.com/blevesearch/gtreap v0.1.1 // indirect
 	github.com/blevesearch/mmap-go v1.0.4 // indirect
-	github.com/blevesearch/scorch_segment_api/v2 v2.1.6 // indirect
+	github.com/blevesearch/scorch_segment_api/v2 v2.2.9 // indirect
 	github.com/blevesearch/segment v0.9.1 // indirect
 	github.com/blevesearch/snowballstem v0.9.0 // indirect
 	github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
@@ -145,9 +149,9 @@ require (
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
 	golang.org/x/image v0.10.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 	willnorris.com/go/gifresize v1.0.0 // indirect
 )