Skip to content

Commit

Permalink
Merge branch 'xbapps:master' into impatient
Browse files Browse the repository at this point in the history
  • Loading branch information
vt-idiot authored Sep 4, 2023
2 parents d7c93b5 + d0c4e77 commit 496a151
Show file tree
Hide file tree
Showing 111 changed files with 11,569 additions and 1,044 deletions.
25 changes: 15 additions & 10 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,25 +159,27 @@ archives:
- xbvr-linux-amd64
- xbvr-linux-arm64
- xbvr-linux-armv7
replacements:
linux: Linux
windows: Windows
amd64: x86_64
name_template: >-
{{ .ProjectName }}_{{ .Version }}_Linux_
{{- if eq .Arch "amd64" }}x86_64
{{- else }}{{ .Arch }}{{ end }}
- id: archive-win
builds:
- xbvr-windows
format: zip
replacements:
windows: Windows
name_template: >-
{{ .ProjectName }}_{{ .Version }}_Windows_{{ .Arch }}
- id: archive-mac
builds:
- xbvr-mac-intel
- xbvr-mac-m1
format: zip
replacements:
darwin: macOS
amd64: intel
arm64: m1
name_template: >-
{{ .ProjectName }}_{{ .Version }}_macOS_
{{- if eq .Arch "amd64" }}intel
{{- else if eq .Arch "arm64" }}m1
{{- else }}{{ .Arch }}{{ end }}
# files:
# - XBVR.app/Contents/Resources/XBVR.icns
# - XBVR.app/Contents/Info.plist
Expand Down Expand Up @@ -207,6 +209,9 @@ changelog:
exclude:
- "^docs:"
- "^minor:"
- "^chore:"
- '^chore\(deps\):'
- '^fix\(deps\):'
- "^test:"

release:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ release-dry-run-snapshot:
-v `pwd`/sysroot:/sysroot \
-w /go/src \
ghcr.io/goreleaser/goreleaser-cross:${GORELEASER_CROSS_VERSION} \
--rm-dist --skip-validate --skip-publish --snapshot
--clean --skip-validate --skip-publish --snapshot

.PHONY: release-dry-run
release-dry-run:
Expand All @@ -35,7 +35,7 @@ release-dry-run:
-v `pwd`/sysroot:/sysroot \
-w /go/src \
ghcr.io/goreleaser/goreleaser-cross:${GORELEASER_CROSS_VERSION} \
--rm-dist --skip-validate --skip-publish
--clean --skip-validate --skip-publish

.PHONY: release-snapshot
release-snapshot:
Expand All @@ -53,7 +53,7 @@ release-snapshot:
-v `pwd`/sysroot:/sysroot \
-w /go/src \
ghcr.io/goreleaser/goreleaser-cross:${GORELEASER_CROSS_VERSION} \
release --rm-dist --snapshot
release --clean --snapshot

.PHONY: release
release:
Expand All @@ -71,4 +71,4 @@ release:
-v `pwd`/sysroot:/sysroot \
-w /go/src \
ghcr.io/goreleaser/goreleaser-cross:${GORELEASER_CROSS_VERSION} \
release --rm-dist
release --clean
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,12 @@ p - next file
left arrow - next page of search results
right arrow - previous page of search results
esc - closes matching pane
* Actor List
o or left arrow - previous page of actors
p or right arrow - next page of actors
* Actor Details
o - previous actor
p - next actor
left arrow - cycles backwards in gallery
right arrow - cycles forward in gallery
esc - closes details pane
67 changes: 34 additions & 33 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/abbot/go-http-auth v0.4.0
github.com/anacrolix/ffprobe v1.0.1
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
github.com/avast/retry-go/v4 v4.3.4
github.com/blevesearch/bleve/v2 v2.3.7
github.com/avast/retry-go/v4 v4.5.0
github.com/blevesearch/bleve/v2 v2.3.9
github.com/bregydoc/gtranslate v0.0.0-20200913051839-1bd07f6c1fc5
github.com/creasty/defaults v1.7.0
github.com/darwayne/go-timecode v1.1.0
Expand All @@ -19,12 +19,13 @@ require (
github.com/emicklei/go-restful-openapi/v2 v2.9.1
github.com/emicklei/go-restful/v3 v3.10.2
github.com/gammazero/nexus/v3 v3.2.0
github.com/getlantern/systray v1.2.1
github.com/getlantern/systray v1.2.2
github.com/go-openapi/spec v0.20.9
github.com/go-resty/resty/v2 v2.7.0
github.com/go-test/deep v1.1.0
github.com/gocolly/colly/v2 v2.1.0
github.com/gorilla/mux v1.8.0
github.com/gosimple/slug v1.13.1
github.com/gowww/log v1.0.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/jinzhu/gorm v1.9.16
Expand All @@ -35,8 +36,8 @@ require (
github.com/lomik/go-whisper v0.0.0-20170919072952-744ab80ef70d
github.com/lucasb-eyer/go-colorful v1.2.0
github.com/marcsauter/single v0.0.0-20201009143647-9f8d81240be2
github.com/markphelps/optional v0.10.0
github.com/mattn/go-sqlite3 v1.14.16
github.com/markphelps/optional v0.11.0
github.com/mattn/go-sqlite3 v1.14.17
github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2
github.com/mholt/archiver v3.1.1+incompatible
github.com/mozillazg/go-slugify v0.2.0
Expand All @@ -48,44 +49,44 @@ require (
github.com/robertkrimen/otto v0.2.1
github.com/robfig/cron/v3 v3.0.1
github.com/rs/cors v1.9.0
github.com/sirupsen/logrus v1.9.0
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.14.4
github.com/tidwall/gjson v1.15.0
github.com/x-cray/logrus-prefixed-formatter v0.5.2
github.com/xo/dburl v0.14.2
golang.org/x/crypto v0.8.0
golang.org/x/net v0.9.0
golang.org/x/oauth2 v0.7.0
golang.org/x/sys v0.8.0
golang.org/x/text v0.9.0
golang.org/x/crypto v0.12.0
golang.org/x/net v0.14.0
golang.org/x/oauth2 v0.10.0
golang.org/x/sys v0.11.0
golang.org/x/text v0.12.0
gopkg.in/gormigrate.v1 v1.6.0
willnorris.com/go/imageproxy v0.11.3-0.20230217221409-3815eb832be7
willnorris.com/go/imageproxy v0.11.3-0.20230802154432-da55ecefd3a9
)

require (
github.com/RoaringBitmap/roaring v0.9.4 // indirect
github.com/RoaringBitmap/roaring v1.2.3 // indirect
github.com/andybalholm/cascadia v1.3.1 // indirect
github.com/antchfx/htmlquery v1.2.3 // indirect
github.com/antchfx/xmlquery v1.3.1 // indirect
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.0.5 // indirect
github.com/blevesearch/bleve_index_api v1.0.5
github.com/blevesearch/geo v0.1.17 // 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.4 // indirect
github.com/blevesearch/scorch_segment_api/v2 v2.1.5 // 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
github.com/blevesearch/vellum v1.0.9 // indirect
github.com/blevesearch/zapx/v11 v11.3.7 // indirect
github.com/blevesearch/zapx/v12 v12.3.7 // indirect
github.com/blevesearch/zapx/v13 v13.3.7 // indirect
github.com/blevesearch/zapx/v14 v14.3.7 // indirect
github.com/blevesearch/zapx/v15 v15.3.9 // indirect
github.com/blevesearch/vellum v1.0.10 // indirect
github.com/blevesearch/zapx/v11 v11.3.9 // indirect
github.com/blevesearch/zapx/v12 v12.3.9 // indirect
github.com/blevesearch/zapx/v13 v13.3.9 // indirect
github.com/blevesearch/zapx/v14 v14.3.9 // indirect
github.com/blevesearch/zapx/v15 v15.3.12 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/fcjr/aia-transport-go v1.2.2
Expand All @@ -103,10 +104,11 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gosimple/unidecode v1.0.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/kennygrant/sanitize v1.2.4 // indirect
Expand All @@ -125,26 +127,25 @@ require (
github.com/onsi/gomega v1.4.3 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/pierrec/lz4 v2.0.5+incompatible // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect
github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect
github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18
github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02
github.com/temoto/robotstxt v1.1.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tkuchiki/go-timezone v0.2.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
go.etcd.io/bbolt v1.3.5 // indirect
golang.org/x/image v0.5.0 // indirect
golang.org/x/term v0.7.0 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
golang.org/x/image v0.10.0 // indirect
golang.org/x/term v0.11.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/sourcemap.v1 v1.0.5 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
willnorris.com/go/gifresize v1.0.0 // indirect
Expand Down
Loading

0 comments on commit 496a151

Please sign in to comment.