to go mod

config/config.go

@@ -2,9 +2,9 @@ package config
 
 import (
 	"fmt"
-	"local/args"
+	"gogs.inhome.blapointe.com/local/args"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
-	"local/storage"
+	"gogs.inhome.blapointe.com/local/storage"
 	"os"
 	"strings"
 )

go.mod

@@ -1,17 +1,17 @@
-module local/firestormy
+module gogs.inhome.blapointe.com/local/firestormy
 
 go 1.17
 
 require (
 	github.com/google/uuid v1.3.0
 	github.com/robfig/cron/v3 v3.0.1
-	local/args v0.0.0-00010101000000-000000000000
+	gogs.inhome.blapointe.com/local/args v0.0.0-20230410154220-44370f257b34
-	local/gziphttp v0.0.0-00010101000000-000000000000
+	gogs.inhome.blapointe.com/local/gziphttp v0.0.0-20230410154402-6b42100cf2a7
-	local/lastn v0.0.0-00010101000000-000000000000
+	gogs.inhome.blapointe.com/local/lastn v0.0.0-20230410162144-91237b6eea8c
-	local/logb v0.0.0-00010101000000-000000000000
+	gogs.inhome.blapointe.com/local/logb v0.0.0-20230410154319-880efa39d871
-	local/oauth2 v0.0.0-00010101000000-000000000000
+	gogs.inhome.blapointe.com/local/oauth2 v0.0.0-20230410162733-d39498ff8454
-	local/router v0.0.0-00010101000000-000000000000
+	gogs.inhome.blapointe.com/local/router v0.0.0-20230410162418-08ccdc13df87
-	local/storage v0.0.0-00010101000000-000000000000
+	gogs.inhome.blapointe.com/local/storage v0.0.0-20230410162102-db39d7b02e29
 )
 
 require (
@@ -20,9 +20,6 @@ require (
 	github.com/abbot/go-http-auth v0.4.0 // indirect
 	github.com/aws/aws-sdk-go v1.15.81 // indirect
 	github.com/boltdb/bolt v1.3.1 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
-	github.com/buraksezer/consistent v0.9.0 // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/golang/protobuf v1.2.0 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
@@ -53,7 +50,7 @@ require (
 	golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
 	golang.org/x/oauth2 v0.0.0-20181120190819-8f65e3013eba // indirect
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
 	golang.org/x/text v0.3.5 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	google.golang.org/api v0.0.0-20181120235003-faade3cbb06a // indirect
@@ -61,19 +58,3 @@ require (
 	gopkg.in/ini.v1 v1.42.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
-
-replace local/args => ../args
-
-replace local/gziphttp => ../gziphttp
-
-replace local/lastn => ../lastn
-
-replace local/logb => ../logb
-
-replace local/notes-server => ../notes-server
-
-replace local/oauth2 => ../oauth2
-
-replace local/router => ../router
-
-replace local/storage => ../storage

go.sum

@@ -5,8 +5,6 @@ github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9a
 github.com/Azure/azure-storage-blob-go v0.0.0-20181023070848-cf01652132cc/go.mod h1:oGfmITT1V6x//CswqY2gtAHND+xIP64/qL7a5QJix0Y=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Unknwon/goconfig v0.0.0-20181105214110-56bd8ab18619 h1:6X8iB881g299aNEv6KXrcjL31iLOH7yA6NXoQX+MbDg=
 github.com/Unknwon/goconfig v0.0.0-20181105214110-56bd8ab18619/go.mod h1:wngxua9XCNjvHjDiTiV26DaKDT+0c63QR6H5hjVUUxw=
 github.com/a8m/tree v0.0.0-20180321023834-3cf936ce15d6/go.mod h1:FSdwKX97koS5efgm8WevNf7XS3PqtyFkKDDXrz778cg=
@@ -18,12 +16,6 @@ github.com/aws/aws-sdk-go v1.15.81/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3A
 github.com/billziss-gh/cgofuse v1.1.0/go.mod h1:LJjoaUojlVjgo5GQoEJTcJNqZJeRU0nCR84CyxKt2YM=
 github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
-github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/buraksezer/consistent v0.9.0 h1:Zfs6bX62wbP3QlbPGKUhqDw7SmNkOzY5bHZIYXYpR5g=
-github.com/buraksezer/consistent v0.9.0/go.mod h1:6BrVajWq7wbKZlTOUPs/XVfR8c0maujuPowduSpZqmw=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/coreos/bbolt v0.0.0-20180318001526-af9db2027c98/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/cpuguy83/go-md2man v1.0.8/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -166,8 +158,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -195,6 +185,20 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul
 github.com/yunify/qingstor-sdk-go v2.2.15+incompatible/go.mod h1:w6wqLDQ5bBTzxGJ55581UrSwLrsTAsdo9N6yX/8d9RY=
 go.mongodb.org/mongo-driver v1.7.2 h1:pFttQyIiJUHEn50YfZgC9ECjITMT44oiN36uArf/OFg=
 go.mongodb.org/mongo-driver v1.7.2/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8=
+gogs.inhome.blapointe.com/local/args v0.0.0-20230410154220-44370f257b34 h1:0tuX5dfOksiOQD1vbJjVNVTVxTTIng7UrUdSLF5T+Ao=
+gogs.inhome.blapointe.com/local/args v0.0.0-20230410154220-44370f257b34/go.mod h1:YG9n3Clg7683ohkVnJK2hdX8bBS9EojIsd1qPZumX0Y=
+gogs.inhome.blapointe.com/local/gziphttp v0.0.0-20230410154402-6b42100cf2a7 h1:nXq9WZXIvYi1Y3lmf3UaCqe6+0C2Klx3VDEJvscFUho=
+gogs.inhome.blapointe.com/local/gziphttp v0.0.0-20230410154402-6b42100cf2a7/go.mod h1:Sdj/NB9h3xrzPDqViQAHoDhA5gmpHkrWRXUauvLSA74=
+gogs.inhome.blapointe.com/local/lastn v0.0.0-20230410162144-91237b6eea8c h1:6xV7NUsPFBHHx2EoiBi7xCDYPhXPE4nS9ME0gH66xXs=
+gogs.inhome.blapointe.com/local/lastn v0.0.0-20230410162144-91237b6eea8c/go.mod h1:17cjVc4c9i6s9vVtU+Rp7eOy3qbMpgyfWC9ySV9OAtI=
+gogs.inhome.blapointe.com/local/logb v0.0.0-20230410154319-880efa39d871 h1:cMGPiwvK/QGg4TfW8VasO6SsS/O7UQmwyKDErV/ozoA=
+gogs.inhome.blapointe.com/local/logb v0.0.0-20230410154319-880efa39d871/go.mod h1:E0pLNvMLzY0Kth1W078y+06z1AUyVMWnChMpRFf4w2Q=
+gogs.inhome.blapointe.com/local/oauth2 v0.0.0-20230410162733-d39498ff8454 h1:U8gUhe9E97/uG3ne6D1VONCCVC6jjBbF1gDMKn3GCeo=
+gogs.inhome.blapointe.com/local/oauth2 v0.0.0-20230410162733-d39498ff8454/go.mod h1:YDG4DAUbmKcQUDWdZAJyoUtX+N2zQIFQ0fz88lAPuiU=
+gogs.inhome.blapointe.com/local/router v0.0.0-20230410162418-08ccdc13df87 h1:jlIDVPGFk42puv6NYzRkGFMhsZ0L1AHGRyx5ooGb4Ew=
+gogs.inhome.blapointe.com/local/router v0.0.0-20230410162418-08ccdc13df87/go.mod h1:FCXhK6+lzJcxBsptnei6vw9pChuQvr4NtuosngjVJDk=
+gogs.inhome.blapointe.com/local/storage v0.0.0-20230410162102-db39d7b02e29 h1:SPSz7yQsEfScqyLlBS5uNSOGeT203BkIkFCL8jrm/FA=
+gogs.inhome.blapointe.com/local/storage v0.0.0-20230410162102-db39d7b02e29/go.mod h1:zk8Fe2Ezc2f6oOe2yllsbEhXqssUU1K2faoS0eQ9alY=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -226,8 +230,9 @@ golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2 h1:T5DasATyLQfmbTpfEXx/IOL9vfjzW6up+ZDkmHvIf2s=
 golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

logger/logger.go

@@ -1,7 +1,7 @@
 package logger
 
 import (
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 )
 
 type Logger struct{}

logger/logger_test.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 	"os"
 	"testing"
 

main.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/scheduler"
+	"gogs.inhome.blapointe.com/local/firestormy/scheduler"
-	"local/firestormy/server"
+	"gogs.inhome.blapointe.com/local/firestormy/server"
-	"local/lastn/lastn"
+	"gogs.inhome.blapointe.com/local/lastn/lastn"
 	"log"
 	"net/http"
 	"os"

scheduler/job.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"encoding/gob"
 	"fmt"
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/firestormy/logger"
+	"gogs.inhome.blapointe.com/local/firestormy/logger"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
-	"local/storage"
+	"gogs.inhome.blapointe.com/local/storage"
 	"os/exec"
 	"strings"
 	"time"

scheduler/job_test.go

@@ -3,9 +3,9 @@ package scheduler
 import (
 	"bytes"
 	"io/ioutil"
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
-	"local/storage"
+	"gogs.inhome.blapointe.com/local/storage"
 	"os"
 	"testing"
 	"time"

scheduler/scheduler.go

@@ -5,10 +5,10 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/firestormy/logger"
+	"gogs.inhome.blapointe.com/local/firestormy/logger"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 	"regexp"
 	"strings"
 	"time"

scheduler/scheduler_test.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/storage"
+	"gogs.inhome.blapointe.com/local/storage"
 	"os"
 	"testing"
 	"time"

server/.notes/create.go

@@ -2,7 +2,7 @@ package notes
 
 import (
 	"html"
-	"local/notes-server/filetree"
+	"gogs.inhome.blapointe.com/local/notes-server/filetree"
 	"net/http"
 	"path"
 	"strings"

server/.notes/notes.go

@@ -1,6 +1,6 @@
 package notes
 
-import "local/notes-server/config"
+import "gogs.inhome.blapointe.com/local/notes-server/config"
 
 type Notes struct {
 	root string

server/able.go

@@ -1,10 +1,10 @@
 package server
 
 import (
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/firestormy/scheduler"
+	"gogs.inhome.blapointe.com/local/firestormy/scheduler"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 	"net/http"
 	"strings"
 )

server/delete.go

@@ -1,10 +1,10 @@
 package server
 
 import (
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/firestormy/scheduler"
+	"gogs.inhome.blapointe.com/local/firestormy/scheduler"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 	"net/http"
 	"strings"
 )

server/get.go

@@ -2,10 +2,10 @@ package server
 
 import (
 	"encoding/json"
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/firestormy/scheduler"
+	"gogs.inhome.blapointe.com/local/firestormy/scheduler"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 	"net/http"
 	"strings"
 )

server/job.go

@@ -1,10 +1,11 @@
 package server
 
 import (
-	"local/firestormy/config"
-	"local/firestormy/config/ns"
-	"local/firestormy/scheduler"
 	"time"
+
+	"gogs.inhome.blapointe.com/local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/scheduler"
 )
 
 func toMap(j *scheduler.Job, output bool) map[string]interface{} {
@@ -26,8 +27,8 @@ func toMap(j *scheduler.Job, output bool) map[string]interface{} {
 		"status":  j.LastStatus,
 	}
 	if output {
-		"output":  j.LastOutput,
+		out["output"] = j.LastOutput
-		"status":  j.LastStatus,
+		out["status"] = j.LastStatus
 	}
 	return out
 }

server/list.go

@@ -2,10 +2,10 @@ package server
 
 import (
 	"encoding/json"
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/firestormy/scheduler"
+	"gogs.inhome.blapointe.com/local/firestormy/scheduler"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 	"net/http"
 	"sort"
 )

server/routes.go

@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"local/router"
+	"gogs.inhome.blapointe.com/local/router"
 	"net/http"
 )
 

server/run.go

@@ -1,10 +1,10 @@
 package server
 
 import (
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/firestormy/scheduler"
+	"gogs.inhome.blapointe.com/local/firestormy/scheduler"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 	"net/http"
 	"strings"
 )

server/server.go

@@ -1,10 +1,10 @@
 package server
 
 import (
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/gziphttp"
+	"gogs.inhome.blapointe.com/local/gziphttp"
-	"local/oauth2/oauth2client"
+	"gogs.inhome.blapointe.com/local/oauth2/oauth2client"
-	"local/router"
+	"gogs.inhome.blapointe.com/local/router"
 	"log"
 	"net/http"
 	"path/filepath"

server/upsert.go

@@ -5,10 +5,10 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"local/firestormy/config"
+	"gogs.inhome.blapointe.com/local/firestormy/config"
-	"local/firestormy/config/ns"
+	"gogs.inhome.blapointe.com/local/firestormy/config/ns"
-	"local/firestormy/scheduler"
+	"gogs.inhome.blapointe.com/local/firestormy/scheduler"
-	"local/logb"
+	"gogs.inhome.blapointe.com/local/logb"
 	"net/http"
 )