diff --git a/Dockerfile b/Dockerfile index 97177615..e702ea6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,8 +21,10 @@ HEALTHCHECK --start-period=2s --interval=5s --timeout=3s \ VOLUME /srv EXPOSE 80 +WORKDIR /app + COPY --from=base /app/docker_config.json /.filebrowser.json -COPY --from=base /app/filebrowser /filebrowser +COPY --from=base /app/filebrowser ./filebrowser COPY --from=nbuild /app/dist/ ./frontend/dist/ -ENTRYPOINT [ "/filebrowser" ] \ No newline at end of file +ENTRYPOINT [ "./filebrowser" ] \ No newline at end of file diff --git a/README.md b/README.md index 93a9eb42..1f4e5e6d 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ -## My fork of filebrowser +## Gtstef fork of filebrowser **Note: Intended to be used in docker only.** This fork makes the following significant changes to filebrowser for origin: - 1. Improves search to use index instead of filesystem. - - lightning fast - - realtime results as you type - 1. Preview enhancments + 1. [x] Improves search to use index instead of filesystem. + - [x] lightning fast + - [ ] realtime results as you type + 1. [ ] Preview enhancements - preview default view is constrained to files subwindow, which can be toggled to fullscreen. - 1. Updated node version and dependancies - - uses latest npm and node version - - removes deprecated npm packages - 1. Improved routing + 1. [ ] Updated node version and dependencies + - [ ] uses latest npm and node version + - [ ] removes deprecated npm packages + 1. [ ] Improved routing - fixed bugs in original version - 1. Added authentication type + 1. [ ] Added authentication type - Using bearer token with remote authentication server ## About @@ -26,9 +26,10 @@ filebrowser provides a file managing interface within a specified directory and Using docker: -1. docker run: +1. docker run: ``` +docker run -it -v /path/to/folder:/srv -p 8080:80 gtstef/filebrowser:0.1.0 ``` 1. docker-compose: @@ -56,7 +57,7 @@ services: filebrowser: volumes: - 'nas:/srv' - #- './database/:/database/' + #- './database/:/database/' #- './config.json:/.filebrowser.json' ports: - '8080:80' diff --git a/src/backend/auth/auth.go b/src/backend/auth/auth.go index 53d5d839..c3b143a8 100644 --- a/src/backend/auth/auth.go +++ b/src/backend/auth/auth.go @@ -3,8 +3,8 @@ package auth import ( "net/http" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) // Auther is the authentication interface. diff --git a/src/backend/auth/hook.go b/src/backend/auth/hook.go index 3e57560e..0517699e 100644 --- a/src/backend/auth/hook.go +++ b/src/backend/auth/hook.go @@ -9,10 +9,10 @@ import ( "os/exec" "strings" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/files" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/files" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) // MethodHookAuth is used to identify hook auth. diff --git a/src/backend/auth/json.go b/src/backend/auth/json.go index 48f4c599..36e1d14a 100644 --- a/src/backend/auth/json.go +++ b/src/backend/auth/json.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) // MethodJSONAuth is used to identify json auth. diff --git a/src/backend/auth/none.go b/src/backend/auth/none.go index f137ebc1..2621e870 100644 --- a/src/backend/auth/none.go +++ b/src/backend/auth/none.go @@ -3,8 +3,8 @@ package auth import ( "net/http" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) // MethodNoAuth is used to identify no auth. diff --git a/src/backend/auth/proxy.go b/src/backend/auth/proxy.go index d4b19315..ec313ce1 100644 --- a/src/backend/auth/proxy.go +++ b/src/backend/auth/proxy.go @@ -4,9 +4,9 @@ import ( "net/http" "os" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) // MethodProxyAuth is used to identify no auth. diff --git a/src/backend/auth/storage.go b/src/backend/auth/storage.go index c0723ba5..0b011391 100644 --- a/src/backend/auth/storage.go +++ b/src/backend/auth/storage.go @@ -1,8 +1,8 @@ package auth import ( - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) // StorageBackend is a storage backend for auth storage. diff --git a/src/backend/cmd/config.go b/src/backend/cmd/config.go index 4287f3c2..47d9cd42 100644 --- a/src/backend/cmd/config.go +++ b/src/backend/cmd/config.go @@ -11,9 +11,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/settings" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/settings" ) func init() { diff --git a/src/backend/cmd/config_import.go b/src/backend/cmd/config_import.go index b87eb4e3..98309612 100644 --- a/src/backend/cmd/config_import.go +++ b/src/backend/cmd/config_import.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/settings" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/settings" ) func init() { diff --git a/src/backend/cmd/config_init.go b/src/backend/cmd/config_init.go index 7848e706..9e3773fc 100644 --- a/src/backend/cmd/config_init.go +++ b/src/backend/cmd/config_init.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/settings" + "github.com/gtsteffaniak/filebrowser/settings" ) func init() { diff --git a/src/backend/cmd/hash.go b/src/backend/cmd/hash.go index 1d472a3c..41718afa 100644 --- a/src/backend/cmd/hash.go +++ b/src/backend/cmd/hash.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/root.go b/src/backend/cmd/root.go index 9a175b17..d7e3c7e3 100644 --- a/src/backend/cmd/root.go +++ b/src/backend/cmd/root.go @@ -21,13 +21,13 @@ import ( v "github.com/spf13/viper" lumberjack "gopkg.in/natefinch/lumberjack.v2" - "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/diskcache" - fbhttp "github.com/filebrowser/filebrowser/v2/http" - "github.com/filebrowser/filebrowser/v2/img" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/storage" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/diskcache" + fbhttp "github.com/gtsteffaniak/filebrowser/http" + "github.com/gtsteffaniak/filebrowser/img" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/storage" + "github.com/gtsteffaniak/filebrowser/users" ) var ( diff --git a/src/backend/cmd/rule_rm.go b/src/backend/cmd/rule_rm.go index 77751069..0aea796c 100644 --- a/src/backend/cmd/rule_rm.go +++ b/src/backend/cmd/rule_rm.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/rules.go b/src/backend/cmd/rules.go index 3bf91dd1..69df0d33 100644 --- a/src/backend/cmd/rules.go +++ b/src/backend/cmd/rules.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/filebrowser/filebrowser/v2/rules" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/storage" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/rules" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/storage" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/rules_add.go b/src/backend/cmd/rules_add.go index fcdc7fb4..768717bd 100644 --- a/src/backend/cmd/rules_add.go +++ b/src/backend/cmd/rules_add.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/rules" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/rules" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/users.go b/src/backend/cmd/users.go index 894a162c..3c835a18 100644 --- a/src/backend/cmd/users.go +++ b/src/backend/cmd/users.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/users_add.go b/src/backend/cmd/users_add.go index a51725da..f133a464 100644 --- a/src/backend/cmd/users_add.go +++ b/src/backend/cmd/users_add.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/users_find.go b/src/backend/cmd/users_find.go index b1b03bc1..b00959c4 100644 --- a/src/backend/cmd/users_find.go +++ b/src/backend/cmd/users_find.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/users_import.go b/src/backend/cmd/users_import.go index f0e1a513..d5be6e9c 100644 --- a/src/backend/cmd/users_import.go +++ b/src/backend/cmd/users_import.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/users_update.go b/src/backend/cmd/users_update.go index 822bb6dc..09bb4b8d 100644 --- a/src/backend/cmd/users_update.go +++ b/src/backend/cmd/users_update.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) func init() { diff --git a/src/backend/cmd/utils.go b/src/backend/cmd/utils.go index 2bd9e760..ef0b9a7c 100644 --- a/src/backend/cmd/utils.go +++ b/src/backend/cmd/utils.go @@ -14,9 +14,9 @@ import ( "github.com/spf13/pflag" yaml "gopkg.in/yaml.v2" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/storage" - "github.com/filebrowser/filebrowser/v2/storage/bolt" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/storage" + "github.com/gtsteffaniak/filebrowser/storage/bolt" ) func checkErr(err error) { diff --git a/src/backend/cmd/version.go b/src/backend/cmd/version.go index 5877505e..2e085103 100644 --- a/src/backend/cmd/version.go +++ b/src/backend/cmd/version.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/version" + "github.com/gtsteffaniak/filebrowser/version" ) func init() { diff --git a/src/backend/filebrowser b/src/backend/filebrowser new file mode 100755 index 00000000..494d3ad8 Binary files /dev/null and b/src/backend/filebrowser differ diff --git a/src/backend/files/file.go b/src/backend/files/file.go index 1daf384b..ac1ca0fe 100644 --- a/src/backend/files/file.go +++ b/src/backend/files/file.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/afero" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/rules" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/rules" ) // FileInfo describes a file. diff --git a/src/backend/go.mod b/src/backend/go.mod index bea98202..6080819d 100644 --- a/src/backend/go.mod +++ b/src/backend/go.mod @@ -1,4 +1,4 @@ -module filebrowser +module github.com/gtsteffaniak/filebrowser go 1.20 @@ -13,6 +13,7 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/maruel/natural v1.1.0 github.com/marusama/semaphore/v2 v2.5.0 + github.com/meilisearch/meilisearch-go v0.25.0 github.com/mholt/archiver/v3 v3.5.1 github.com/mitchellh/go-homedir v1.1.0 github.com/pelletier/go-toml/v2 v2.0.8 @@ -32,7 +33,7 @@ require ( ) require ( - github.com/andybalholm/brotli v1.0.1 // indirect + github.com/andybalholm/brotli v1.0.4 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect @@ -44,9 +45,11 @@ require ( github.com/golang/snappy v0.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/klauspost/compress v1.11.4 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/klauspost/compress v1.15.6 // indirect github.com/klauspost/pgzip v1.2.5 // indirect github.com/magiconair/properties v1.8.7 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/nwaples/rardecode v1.1.0 // indirect github.com/pierrec/lz4/v4 v4.1.2 // indirect @@ -56,6 +59,8 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/ulikunitz/xz v0.5.9 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.37.1-0.20220607072126-8a320890c08d // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect golang.org/x/net v0.10.0 // indirect diff --git a/src/backend/go.sum b/src/backend/go.sum index 3c329e72..b1e41364 100644 --- a/src/backend/go.sum +++ b/src/backend/go.sum @@ -42,8 +42,9 @@ github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863 h1:BRrxwOZBolJN4gIwvZMJY1tzqBvQgpaZiQRuIDD40jM= github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM= -github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/asdine/storm/v3 v3.2.1 h1:I5AqhkPK6nBZ/qJXySdI7ot5BlXSZ7qvDY1zAn5ZJac= github.com/asdine/storm/v3 v3.2.1/go.mod h1:LEpXwGt4pIqrE/XcTvCnZHT5MgZCV6Ub9q7yQzOFWr0= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -185,12 +186,16 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.11.4 h1:kz40R/YWls3iqT9zX9AHN3WoVsrAWVyui5sxuLqiXqU= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.6 h1:6D9PcO8QWu0JyaQ2zUMmu16T1T+zjjEpP91guRsvDfY= +github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -203,10 +208,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/maruel/natural v1.1.0 h1:2z1NgP/Vae+gYrtC0VuvrTJ6U35OuyUqDdfluLqMWuQ= github.com/maruel/natural v1.1.0/go.mod h1:eFVhYCcUOfZFxXoDZam8Ktya72wa79fNC3lc/leA0DQ= github.com/marusama/semaphore/v2 v2.5.0 h1:o/1QJD9DBYOWRnDhPwDVAXQn6mQYD0gZaS1Tpx6DJGM= github.com/marusama/semaphore/v2 v2.5.0/go.mod h1:z9nMiNUekt/LTpTUQdpp+4sJeYqUGpwMHfW0Z8V8fnQ= +github.com/meilisearch/meilisearch-go v0.25.0 h1:xIp+8YWterHuDvpdYlwQ4Qp7im3JlRHmSKiP0NvjyXs= +github.com/meilisearch/meilisearch-go v0.25.0/go.mod h1:SxuSqDcPBIykjWz1PX+KzsYzArNLSCadQodWs8extS0= github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo= github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -254,6 +263,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= @@ -266,6 +276,11 @@ github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoi github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.9 h1:RsKRIA2MO8x56wkkcd3LbtcE/uMszhb6DpRf+3uwa3I= github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.37.1-0.20220607072126-8a320890c08d h1:xS9QTPgKl9ewGsAOPc+xW7DeStJDqYPfisDmeSCcbco= +github.com/valyala/fasthttp v1.37.1-0.20220607072126-8a320890c08d/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= @@ -293,6 +308,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= @@ -368,6 +384,7 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -432,6 +449,8 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/src/backend/http/auth.go b/src/backend/http/auth.go index 4df68262..e5cb2a7e 100644 --- a/src/backend/http/auth.go +++ b/src/backend/http/auth.go @@ -11,8 +11,8 @@ import ( "github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4/request" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/users" ) const ( diff --git a/src/backend/http/commands.go b/src/backend/http/commands.go index 55075db4..cf886541 100644 --- a/src/backend/http/commands.go +++ b/src/backend/http/commands.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/websocket" - "github.com/filebrowser/filebrowser/v2/runner" + "github.com/gtsteffaniak/filebrowser/runner" ) const ( diff --git a/src/backend/http/data.go b/src/backend/http/data.go index 37345d3c..904e10b5 100644 --- a/src/backend/http/data.go +++ b/src/backend/http/data.go @@ -7,11 +7,11 @@ import ( "github.com/tomasen/realip" - "github.com/filebrowser/filebrowser/v2/rules" - "github.com/filebrowser/filebrowser/v2/runner" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/storage" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/rules" + "github.com/gtsteffaniak/filebrowser/runner" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/storage" + "github.com/gtsteffaniak/filebrowser/users" ) type handleFunc func(w http.ResponseWriter, r *http.Request, d *data) (int, error) diff --git a/src/backend/http/http.go b/src/backend/http/http.go index 1c23b242..2ef52c10 100644 --- a/src/backend/http/http.go +++ b/src/backend/http/http.go @@ -6,8 +6,8 @@ import ( "github.com/gorilla/mux" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/storage" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/storage" ) type modifyRequest struct { diff --git a/src/backend/http/preview.go b/src/backend/http/preview.go index 163d7e49..c7f87ca0 100644 --- a/src/backend/http/preview.go +++ b/src/backend/http/preview.go @@ -10,8 +10,8 @@ import ( "github.com/gorilla/mux" - "github.com/filebrowser/filebrowser/v2/files" - "github.com/filebrowser/filebrowser/v2/img" + "github.com/gtsteffaniak/filebrowser/files" + "github.com/gtsteffaniak/filebrowser/img" ) /* diff --git a/src/backend/http/public.go b/src/backend/http/public.go index 7f3a309f..890ded35 100644 --- a/src/backend/http/public.go +++ b/src/backend/http/public.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/afero" "golang.org/x/crypto/bcrypt" - "github.com/filebrowser/filebrowser/v2/files" - "github.com/filebrowser/filebrowser/v2/share" + "github.com/gtsteffaniak/filebrowser/files" + "github.com/gtsteffaniak/filebrowser/share" ) var withHashFile = func(fn handleFunc) handleFunc { diff --git a/src/backend/http/public_test.go b/src/backend/http/public_test.go index 9f89cbc0..5c010e19 100644 --- a/src/backend/http/public_test.go +++ b/src/backend/http/public_test.go @@ -10,10 +10,10 @@ import ( "github.com/asdine/storm/v3" "github.com/spf13/afero" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/share" - "github.com/filebrowser/filebrowser/v2/storage/bolt" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/share" + "github.com/gtsteffaniak/filebrowser/storage/bolt" + "github.com/gtsteffaniak/filebrowser/users" ) func TestPublicShareHandlerAuthentication(t *testing.T) { diff --git a/src/backend/http/raw.go b/src/backend/http/raw.go index 1312510b..41efa4a5 100644 --- a/src/backend/http/raw.go +++ b/src/backend/http/raw.go @@ -11,9 +11,9 @@ import ( "github.com/mholt/archiver/v3" - "github.com/filebrowser/filebrowser/v2/files" - "github.com/filebrowser/filebrowser/v2/fileutils" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/files" + "github.com/gtsteffaniak/filebrowser/fileutils" + "github.com/gtsteffaniak/filebrowser/users" ) func slashClean(name string) string { diff --git a/src/backend/http/resource.go b/src/backend/http/resource.go index 3a12538a..2dc43ffc 100644 --- a/src/backend/http/resource.go +++ b/src/backend/http/resource.go @@ -14,9 +14,9 @@ import ( "github.com/shirou/gopsutil/v3/disk" "github.com/spf13/afero" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/files" - "github.com/filebrowser/filebrowser/v2/fileutils" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/files" + "github.com/gtsteffaniak/filebrowser/fileutils" ) var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { diff --git a/src/backend/http/search.go b/src/backend/http/search.go index 1c78b781..dc9652b8 100644 --- a/src/backend/http/search.go +++ b/src/backend/http/search.go @@ -4,7 +4,7 @@ import ( "net/http" "os" - "github.com/filebrowser/filebrowser/v2/search" + "github.com/gtsteffaniak/filebrowser/search" ) var searchHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) { diff --git a/src/backend/http/settings.go b/src/backend/http/settings.go index 78ce9b0d..c412148b 100644 --- a/src/backend/http/settings.go +++ b/src/backend/http/settings.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/filebrowser/filebrowser/v2/rules" - "github.com/filebrowser/filebrowser/v2/settings" + "github.com/gtsteffaniak/filebrowser/rules" + "github.com/gtsteffaniak/filebrowser/settings" ) type settingsData struct { diff --git a/src/backend/http/share.go b/src/backend/http/share.go index 193f0913..36f2e4c0 100644 --- a/src/backend/http/share.go +++ b/src/backend/http/share.go @@ -13,8 +13,8 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/share" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/share" ) func withPermShare(fn handleFunc) handleFunc { diff --git a/src/backend/http/static.go b/src/backend/http/static.go index f438d76c..500bef8b 100644 --- a/src/backend/http/static.go +++ b/src/backend/http/static.go @@ -12,10 +12,10 @@ import ( "strings" "text/template" - "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/storage" - "github.com/filebrowser/filebrowser/v2/version" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/storage" + "github.com/gtsteffaniak/filebrowser/version" ) func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys fs.FS, file, contentType string) (int, error) { diff --git a/src/backend/http/users.go b/src/backend/http/users.go index 446057a0..cdcc58f1 100644 --- a/src/backend/http/users.go +++ b/src/backend/http/users.go @@ -11,8 +11,8 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/users" ) var ( diff --git a/src/backend/http/utils.go b/src/backend/http/utils.go index c1c3fa65..195f0c3f 100644 --- a/src/backend/http/utils.go +++ b/src/backend/http/utils.go @@ -8,7 +8,7 @@ import ( "os" "strings" - libErrors "github.com/filebrowser/filebrowser/v2/errors" + libErrors "github.com/gtsteffaniak/filebrowser/errors" ) func renderJSON(w http.ResponseWriter, _ *http.Request, data interface{}) (int, error) { diff --git a/src/backend/main.go b/src/backend/main.go index ab22ef45..0859625e 100644 --- a/src/backend/main.go +++ b/src/backend/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/filebrowser/filebrowser/v2/cmd" + "github.com/gtsteffaniak/filebrowser/cmd" ) func main() { diff --git a/src/backend/runner/parser.go b/src/backend/runner/parser.go index 65891f5f..84357cc5 100644 --- a/src/backend/runner/parser.go +++ b/src/backend/runner/parser.go @@ -3,7 +3,7 @@ package runner import ( "os/exec" - "github.com/filebrowser/filebrowser/v2/settings" + "github.com/gtsteffaniak/filebrowser/settings" ) // ParseCommand parses the command taking in account if the current diff --git a/src/backend/runner/runner.go b/src/backend/runner/runner.go index 2dbafa5c..066ef925 100644 --- a/src/backend/runner/runner.go +++ b/src/backend/runner/runner.go @@ -7,8 +7,8 @@ import ( "os/exec" "strings" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/users" ) // Runner is a commands runner. diff --git a/src/backend/search/indexing.go b/src/backend/search/indexing.go new file mode 100644 index 00000000..2054ca09 --- /dev/null +++ b/src/backend/search/indexing.go @@ -0,0 +1,135 @@ +package search + +import ( + "fmt" + "log" + "os" + "path/filepath" + "strings" + "time" +) + +type PathInfo struct { + PathNames []string + LastIndexed time.Time +} + +var indexes map[string]PathInfo + +func main() { + // Initialize the indexes map + indexes = make(map[string]PathInfo) + fmt.Println("Indexing files") + // Call the function to index files and directories + err := indexFiles("/Users/steffag/", 1) + if err != nil { + log.Fatal(err) + } + searchAllIndexes("new") +} + +func InitializeIndex(dir string) { + // Initialize the indexes map + indexes = make(map[string]PathInfo) + fmt.Println("Indexing files") + // Call the function to index files and directories + err := indexFiles(dir, 1) + if err != nil { + log.Fatal(err) + } +} + +// Define a function to recursively index files and directories +func indexFiles(path string, depth int) error { + // Check if the current directory has been modified since last indexing + dir, err := os.Open(path) + if err != nil { + // directory must have been deleted, remove from index + delete(indexes, path) + } + defer dir.Close() + dirInfo, err := dir.Stat() + if err != nil { + return err + } + // Compare the last modified time of the directory with the last indexed time + if dirInfo.ModTime().Before(indexes[path].LastIndexed) { + return nil + } + // Check if the directory path is more than 3 levels deep + if depth > 3 { + // Index the directory and its subdirectories + err = indexEverythingFlattened(path) + if err != nil { + return err + } + return err + } + // Read the directory contents + files, err := dir.Readdir(-1) + if err != nil { + return err + } + // Iterate over the files and directories + for _, file := range files { + filePath := filepath.Join(path, file.Name()) + if file.IsDir() { + // Recursively index subdirectories + err = indexFiles(filePath, depth+1) + } else { + addToIndex(path, filePath, file.ModTime()) + } + } + return nil +} + +func indexEverythingFlattened(path string) error { + // Index the directory and its subdirectories + err := filepath.Walk(path, func(filePath string, info os.FileInfo, err error) error { + if err != nil { + return err + } + addToIndex(path, filePath, info.ModTime()) + return nil + }) + return err +} + +func addToIndex(path string, filePath string, lastModified time.Time) { + currentTime := time.Now() + info, exists := indexes[path] + if !exists { + info = PathInfo{} + } + info.PathNames = append(info.PathNames, filePath) + info.LastIndexed = currentTime + indexes[path] = info +} + +func searchAllIndexes(searchTerm string) []string { + var matchingResults []string + // Iterate over the indexes + for _, subFiles := range indexes { + // Iterate over the path names + for _, pathName := range subFiles.PathNames { + // Check if the path name contains the search term + if containsSearchTerm(pathName, searchTerm) { + matchingResults = append(matchingResults, pathName) + } + } + } + return matchingResults +} + +func containsSearchTerm(pathName string, searchTerm string) bool { + path := getLastPathComponent(pathName) + // Perform case-insensitive search + pathNameLower := strings.ToLower(path) + searchTermLower := strings.ToLower(searchTerm) + + return strings.Contains(pathNameLower, searchTermLower) +} +func getLastPathComponent(path string) string { + // Use filepath.Base to extract the last component of the path + return filepath.Base(path) +} \ No newline at end of file diff --git a/src/backend/search/search.go b/src/backend/search/search.go index 8920f92c..68b25482 100644 --- a/src/backend/search/search.go +++ b/src/backend/search/search.go @@ -3,12 +3,13 @@ package search import ( "os" "path" + "log" + "fmt" "path/filepath" "strings" "github.com/spf13/afero" - - "github.com/filebrowser/filebrowser/v2/rules" + "github.com/gtsteffaniak/filebrowser/rules" ) type searchOptions struct { @@ -17,6 +18,18 @@ type searchOptions struct { Terms []string } +func IndexedSearch(query string, scope string) { + // Initialize the indexes map + indexes = make(map[string]PathInfo) + fmt.Println("Indexing files") + // Call the function to index files and directories + err := indexFiles(query, 1) + if err != nil { + log.Fatal(err) + } + searchAllIndexes("new") +} + // Search searches for a query in a fs. func Search(fs afero.Fs, scope, query string, checker rules.Checker, found func(path string, f os.FileInfo) error) error { search := parseSearch(query) diff --git a/src/backend/settings/defaults.go b/src/backend/settings/defaults.go index d60e36dc..160d2dd2 100644 --- a/src/backend/settings/defaults.go +++ b/src/backend/settings/defaults.go @@ -1,8 +1,8 @@ package settings import ( - "github.com/filebrowser/filebrowser/v2/files" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/files" + "github.com/gtsteffaniak/filebrowser/users" ) // UserDefaults is a type that holds the default values diff --git a/src/backend/settings/settings.go b/src/backend/settings/settings.go index 7df81fc4..a8ed4e11 100644 --- a/src/backend/settings/settings.go +++ b/src/backend/settings/settings.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "strings" - "github.com/filebrowser/filebrowser/v2/rules" + "github.com/gtsteffaniak/filebrowser/rules" ) const DefaultUsersHomeBasePath = "/users" diff --git a/src/backend/settings/storage.go b/src/backend/settings/storage.go index 8498d3bf..a027b4b3 100644 --- a/src/backend/settings/storage.go +++ b/src/backend/settings/storage.go @@ -1,9 +1,9 @@ package settings import ( - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/rules" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/rules" + "github.com/gtsteffaniak/filebrowser/users" ) // StorageBackend is a settings storage backend. diff --git a/src/backend/share/storage.go b/src/backend/share/storage.go index 4cd263de..41424242 100644 --- a/src/backend/share/storage.go +++ b/src/backend/share/storage.go @@ -3,7 +3,7 @@ package share import ( "time" - "github.com/filebrowser/filebrowser/v2/errors" + "github.com/gtsteffaniak/filebrowser/errors" ) // StorageBackend is the interface to implement for a share storage. diff --git a/src/backend/storage/bolt/auth.go b/src/backend/storage/bolt/auth.go index cf15a8fe..a0e8d1c8 100644 --- a/src/backend/storage/bolt/auth.go +++ b/src/backend/storage/bolt/auth.go @@ -3,9 +3,9 @@ package bolt import ( "github.com/asdine/storm/v3" - "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/settings" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/settings" ) type authBackend struct { diff --git a/src/backend/storage/bolt/bolt.go b/src/backend/storage/bolt/bolt.go index 6cf226d2..cc8c37fe 100644 --- a/src/backend/storage/bolt/bolt.go +++ b/src/backend/storage/bolt/bolt.go @@ -3,11 +3,11 @@ package bolt import ( "github.com/asdine/storm/v3" - "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/share" - "github.com/filebrowser/filebrowser/v2/storage" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/share" + "github.com/gtsteffaniak/filebrowser/storage" + "github.com/gtsteffaniak/filebrowser/users" ) // NewStorage creates a storage.Storage based on Bolt DB. diff --git a/src/backend/storage/bolt/config.go b/src/backend/storage/bolt/config.go index a4d40064..67f9eed9 100644 --- a/src/backend/storage/bolt/config.go +++ b/src/backend/storage/bolt/config.go @@ -3,7 +3,7 @@ package bolt import ( "github.com/asdine/storm/v3" - "github.com/filebrowser/filebrowser/v2/settings" + "github.com/gtsteffaniak/filebrowser/settings" ) type settingsBackend struct { diff --git a/src/backend/storage/bolt/importer/conf.go b/src/backend/storage/bolt/importer/conf.go index bafeb452..e31ba3fc 100644 --- a/src/backend/storage/bolt/importer/conf.go +++ b/src/backend/storage/bolt/importer/conf.go @@ -11,10 +11,10 @@ import ( "github.com/pelletier/go-toml/v2" "gopkg.in/yaml.v2" - "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/storage" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/storage" + "github.com/gtsteffaniak/filebrowser/users" ) type oldDefs struct { diff --git a/src/backend/storage/bolt/importer/importer.go b/src/backend/storage/bolt/importer/importer.go index 9c737756..1ecc70eb 100644 --- a/src/backend/storage/bolt/importer/importer.go +++ b/src/backend/storage/bolt/importer/importer.go @@ -3,7 +3,7 @@ package importer import ( "github.com/asdine/storm/v3" - "github.com/filebrowser/filebrowser/v2/storage/bolt" + "github.com/gtsteffaniak/filebrowser/storage/bolt" ) // Import imports an old configuration to a newer database. diff --git a/src/backend/storage/bolt/importer/users.go b/src/backend/storage/bolt/importer/users.go index 0483402d..4606fc2e 100644 --- a/src/backend/storage/bolt/importer/users.go +++ b/src/backend/storage/bolt/importer/users.go @@ -7,9 +7,9 @@ import ( "github.com/asdine/storm/v3" bolt "go.etcd.io/bbolt" - "github.com/filebrowser/filebrowser/v2/rules" - "github.com/filebrowser/filebrowser/v2/storage" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/rules" + "github.com/gtsteffaniak/filebrowser/storage" + "github.com/gtsteffaniak/filebrowser/users" ) type oldUser struct { diff --git a/src/backend/storage/bolt/share.go b/src/backend/storage/bolt/share.go index 99da8ad1..b08b2dc4 100644 --- a/src/backend/storage/bolt/share.go +++ b/src/backend/storage/bolt/share.go @@ -4,8 +4,8 @@ import ( "github.com/asdine/storm/v3" "github.com/asdine/storm/v3/q" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/share" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/share" ) type shareBackend struct { diff --git a/src/backend/storage/bolt/users.go b/src/backend/storage/bolt/users.go index b0984bbe..47876706 100644 --- a/src/backend/storage/bolt/users.go +++ b/src/backend/storage/bolt/users.go @@ -6,8 +6,8 @@ import ( "github.com/asdine/storm/v3" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/users" ) type usersBackend struct { diff --git a/src/backend/storage/bolt/utils.go b/src/backend/storage/bolt/utils.go index 20407e15..fa84e3c3 100644 --- a/src/backend/storage/bolt/utils.go +++ b/src/backend/storage/bolt/utils.go @@ -3,7 +3,7 @@ package bolt import ( "github.com/asdine/storm/v3" - "github.com/filebrowser/filebrowser/v2/errors" + "github.com/gtsteffaniak/filebrowser/errors" ) func get(db *storm.DB, name string, to interface{}) error { diff --git a/src/backend/storage/storage.go b/src/backend/storage/storage.go index d4f1a652..019c6e89 100644 --- a/src/backend/storage/storage.go +++ b/src/backend/storage/storage.go @@ -1,10 +1,10 @@ package storage import ( - "github.com/filebrowser/filebrowser/v2/auth" - "github.com/filebrowser/filebrowser/v2/settings" - "github.com/filebrowser/filebrowser/v2/share" - "github.com/filebrowser/filebrowser/v2/users" + "github.com/gtsteffaniak/filebrowser/auth" + "github.com/gtsteffaniak/filebrowser/settings" + "github.com/gtsteffaniak/filebrowser/share" + "github.com/gtsteffaniak/filebrowser/users" ) // Storage is a storage powered by a Backend which makes the necessary diff --git a/src/backend/tools/go.mod b/src/backend/tools/go.mod index bba93568..9f4c2c90 100644 --- a/src/backend/tools/go.mod +++ b/src/backend/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/filebrowser/filebrowser/v2/tools +module github.com/gtsteffaniak/filebrowser/tools go 1.18 diff --git a/src/backend/users/storage.go b/src/backend/users/storage.go index 163082fb..de939586 100644 --- a/src/backend/users/storage.go +++ b/src/backend/users/storage.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/filebrowser/filebrowser/v2/errors" + "github.com/gtsteffaniak/filebrowser/errors" ) // StorageBackend is the interface to implement for a users storage. diff --git a/src/backend/users/users.go b/src/backend/users/users.go index ec613856..91dcea68 100644 --- a/src/backend/users/users.go +++ b/src/backend/users/users.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/afero" - "github.com/filebrowser/filebrowser/v2/errors" - "github.com/filebrowser/filebrowser/v2/files" - "github.com/filebrowser/filebrowser/v2/rules" + "github.com/gtsteffaniak/filebrowser/errors" + "github.com/gtsteffaniak/filebrowser/files" + "github.com/gtsteffaniak/filebrowser/rules" ) // ViewMode describes a view mode.