Merge branch 'master' into master

Author: oniony

COMPILING.md

@@ -6,23 +6,20 @@ ZSH_COMP_INSTALL_DIR=$(DESTDIR)/usr/share/zsh/site-functions
 BASH_COMP_INSTALL_DIR=$(DESTDIR)/etc/bash_completion.d
 
 # other vars
-VER=$(shell grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+" src/github.com/oniony/TMSU/version/version.go)
+VER=$(shell grep -o "[0-9]\+\.[0-9]\+\.[0-9]\+" version/version.go)
 SHELL=/bin/sh
 ARCH=$(shell uname -m)
 DIST_NAME=tmsu-$(ARCH)-$(VER)
 DIST_DIR=$(DIST_NAME)
 DIST_FILE=$(DIST_NAME).tgz
 
-export GOPATH ?= /usr/lib/go:/usr/share/gocode
-export GOPATH := $(CURDIR):$(GOPATH)
-
 all: clean compile dist test
 
 clean:
 	@echo
 	@echo "CLEANING"
 	@echo
-	go clean github.com/oniony/TMSU
+	go clean
 	rm -Rf bin
 	rm -Rf $(DIST_DIR)
 	rm -f $(DIST_FILE)
@@ -32,15 +29,15 @@ compile:
 	@echo "COMPILING"
 	@echo
 	@mkdir -p bin
-	go build -o bin/tmsu github.com/oniony/TMSU
+	go build -o bin/tmsu
 
 test: unit-test integration-test
 
 unit-test: compile
 	@echo
 	@echo "RUNNING UNIT TESTS"
 	@echo
-	go test github.com/oniony/TMSU/...
+	go test ./...
 
 integration-test: compile
 	@echo
@@ -66,7 +63,7 @@ dist: compile
 	cp misc/bash/tmsu -t $(DIST_DIR)/misc/bash/
 	tar czf $(DIST_FILE) $(DIST_DIR)
 
-install:
+install: 
 	@echo
 	@echo "INSTALLING"
 	@echo

Makefile

@@ -33,18 +33,18 @@ var MountCommand = Command{
 	Name:     "mount",
 	Synopsis: "Mount the virtual filesystem",
 	Usages: []string{"tmsu mount",
-		"tmsu mount [OPTION]... [FILE] MOUNTPOINT"},
+		"tmsu mount [OPTION]... MOUNTPOINT"},
 	Description: `Without arguments, lists the currently mounted file-systems, otherwise mounts a virtual file-system at the path MOUNTPOINT.
 
-Where FILE is specified, the database at FILE is mounted.
+Use the --database global option or TMSU_DB environment variable (in order of precedence) to specify the path of the database to be mounted.
 
-If FILE is not specified but the TMSU_DB environment variable is defined then the database at TMSU_DB is mounted.
+Where neither --database is specified nor TMSU_DB defined then the default database is mounted.
 
-Where neither FILE is specified nor TMSU_DB defined then the default database is mounted.
+To allow other users access to the mounted filesystem, pass the 'allow_other' FUSE option, e.g. 'tmsu mount --options=allow_other mp'. (FUSE only allows the root user to use this option unless 'user_allow_other' is present in '/etc/fuse.conf'.)
 
-To allow other users access to the mounted filesystem, pass the 'allow_other' FUSE option, e.g. 'tmsu mount --options=allow_other mp'. (FUSE only allows the root user to use this option unless 'user_allow_other' is present in '/etc/fuse.conf'.)`,
+For further documentation on the usage of the --database option, refer to 'tmsu help', without specifying a subcommand`,
 	Examples: []string{"$ tmsu mount mp",
-		"$ tmsu mount /tmp/db mp",
+		"$ tmsu mount --database=/tmp/db mp",
 		"$ tmsu mount --options=allow_other mp"},
 	Options: Options{Option{"--options", "-o", "mount options (passed to fusermount)", true, ""}},
 	Exec:    mountExec,

README.md

@@ -131,12 +131,12 @@ func listValuesForTag(store *storage.Storage, tx *storage.Tx, tagName string, sh
 	} else {
 		if onePerLine {
 			for _, value := range values {
-				fmt.Println(escape(value.Name, '=', ' '))
+				fmt.Println(escape(value.Name, ' '))
 			}
 		} else {
 			valueNames := make([]string, len(values))
 			for index, value := range values {
-				valueNames[index] = escape(value.Name, '=', ' ')
+				valueNames[index] = escape(value.Name, ' ')
 			}
 
 			terminal.PrintColumns(valueNames)
@@ -172,13 +172,13 @@ func listValuesForTags(store *storage.Storage, tx *storage.Tx, tagNames []string
 			if onePerLine {
 				fmt.Println(tagName)
 				for _, value := range values {
-					fmt.Println(escape(value.Name, '=', ' '))
+					fmt.Println(escape(value.Name, ' '))
 				}
 				fmt.Println()
 			} else {
 				valueNames := make([]string, len(values))
 				for index, value := range values {
-					valueNames[index] = escape(value.Name, '=', ' ')
+					valueNames[index] = escape(value.Name, ' ')
 				}
 
 				fmt.Printf("%v: %v\n", tagName, strings.Join(valueNames, " "))

src/github.com/oniony/TMSU/cli/cli.go cli/cli.go

@@ -0,0 +1,9 @@
+module github.com/oniony/TMSU
+
+go 1.16
+
+require (
+	github.com/hanwen/go-fuse v1.0.0
+	github.com/mattn/go-sqlite3 v1.14.7
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
+)

src/github.com/oniony/TMSU/cli/command.go cli/command.go

@@ -0,0 +1,13 @@
+github.com/hanwen/go-fuse v1.0.0 h1:GxS9Zrn6c35/BnfiVsZVWmsG803xwE7eVRDvcf/BEVc=
+github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok=
+github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
+github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

src/github.com/oniony/TMSU/cli/commands.go cli/commands.go

@@ -4,6 +4,15 @@ export PATH
 
 # to allow other users access to the TMSU mount, enable the 'user_allow_other' option
 # in /etc/fuse.conf and then pass the 'allow_other' option below.
-#tmsu mount options=allow_other $1 $2
+#tmsu mount --options=allow_other $1 $2
 
-tmsu mount $1 $2
+# Mount passes the options given after -o in the 4th argument
+if [[ $4 = *"allow_other"* ]]; then
+    MOUNT_OPTIONS='allow_other'
+fi
+
+if [[ $MOUNT_OPTIONS ]]; then
+        tmsu mount --verbose --database="$1" "--options=${MOUNT_OPTIONS}" "$2"
+    else
+        tmsu mount --verbose --database="$1" "$2"
+fi

src/github.com/oniony/TMSU/cli/commands_windows.go cli/commands_windows.go

@@ -100,7 +100,7 @@ FROM file
 WHERE directory = ? OR directory LIKE ?`
 
 	if pathContainsRoot {
-		sql += `OR directory = '.' OR directory LIKE './%`
+		sql += `OR directory = '.' OR directory LIKE './%'`
 	}
 
 	sql += `

src/github.com/oniony/TMSU/cli/common.go cli/common.go

@@ -3,18 +3,20 @@
 # setup
 
 touch /tmp/tmsu/file1
-tmsu tag /tmp/tmsu/file1 year=2015 year=2016    >|/tmp/tmsu/stdout 2>|/tmp/tmsu/stderr
+tmsu tag /tmp/tmsu/file1 year=2015 year=2016 'tag=MMXXII\=2022'  >|/tmp/tmsu/stdout 2>|/tmp/tmsu/stderr
 
 # test
 
-tmsu values                                     >>/tmp/tmsu/stdout 2>>/tmp/tmsu/stderr
+tmsu values                                                      >>/tmp/tmsu/stdout 2>>/tmp/tmsu/stderr
 
 # verify
 
 diff /tmp/tmsu/stderr - <<EOF
 tmsu: new tag 'year'
 tmsu: new value '2015'
 tmsu: new value '2016'
+tmsu: new tag 'tag'
+tmsu: new value 'MMXXII=2022'
 EOF
 if [[ $? -ne 0 ]]; then
     exit 1
@@ -23,6 +25,7 @@ fi
 diff /tmp/tmsu/stdout - <<EOF
 2015
 2016
+MMXXII=2022
 EOF
 if [[ $? -ne 0 ]]; then
     exit 1

src/github.com/oniony/TMSU/cli/config.go cli/config.go

@@ -3,11 +3,11 @@
 # setup
 
 touch /tmp/tmsu/file1
-tmsu tag /tmp/tmsu/file1 vegetable=brocolli year=2015 year=2016    >|/tmp/tmsu/stdout 2>|/tmp/tmsu/stderr
+tmsu tag /tmp/tmsu/file1 vegetable=brocolli year=2015 year=2016 'year=MMXXII\=2022'  >|/tmp/tmsu/stdout 2>|/tmp/tmsu/stderr
 
 # test
 
-tmsu values year                                                   >>/tmp/tmsu/stdout 2>>/tmp/tmsu/stderr
+tmsu values year                                                                     >>/tmp/tmsu/stdout 2>>/tmp/tmsu/stderr
 
 # verify
 
@@ -17,6 +17,7 @@ tmsu: new value 'brocolli'
 tmsu: new tag 'year'
 tmsu: new value '2015'
 tmsu: new value '2016'
+tmsu: new value 'MMXXII=2022'
 EOF
 if [[ $? -ne 0 ]]; then
     exit 1
@@ -25,6 +26,7 @@ fi
 diff /tmp/tmsu/stdout - <<EOF
 2015
 2016
+MMXXII=2022
 EOF
 if [[ $? -ne 0 ]]; then
     exit 1