sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update thumbnails import paths and module name

Browse Source
This commit is contained in:
A.Unger
2020-09-18 13:03:45 +02:00
parent 530336a826
commit 45f8b7c403
41 changed files with 115 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
thumbnails/pkg/command/health.go
+3 -3
View File
@@ -5,8 +5,8 @@ import (
"net/http"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis-thumbnails/pkg/flagset"
"github.com/owncloud/ocis/thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/flagset"
)
// Health is the entrypoint for the health command.
@@ -46,4 +46,4 @@ func Health(cfg *config.Config) *cli.Command {
return nil
},
}
}
}
thumbnails/pkg/command/root.go
+3 -3
View File
@@ -6,9 +6,9 @@ import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis-thumbnails/pkg/flagset"
"github.com/owncloud/ocis-thumbnails/pkg/version"
"github.com/owncloud/ocis/thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/flagset"
"github.com/owncloud/ocis/thumbnails/pkg/version"
"github.com/spf13/viper"
)
thumbnails/pkg/command/server.go
+5 -5
View File
@@ -14,11 +14,11 @@ import (
"github.com/oklog/run"
openzipkin "github.com/openzipkin/zipkin-go"
zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis-thumbnails/pkg/flagset"
"github.com/owncloud/ocis-thumbnails/pkg/metrics"
"github.com/owncloud/ocis-thumbnails/pkg/server/debug"
"github.com/owncloud/ocis-thumbnails/pkg/server/grpc"
"github.com/owncloud/ocis/thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/flagset"
"github.com/owncloud/ocis/thumbnails/pkg/metrics"
"github.com/owncloud/ocis/thumbnails/pkg/server/debug"
"github.com/owncloud/ocis/thumbnails/pkg/server/grpc"
"go.opencensus.io/stats/view"
"go.opencensus.io/trace"
)
thumbnails/pkg/flagset/flagset.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"path/filepath"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/config"
)
// RootWithConfig applies cfg to the root flagset
thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go
+5 -5
View File
@@ -10,13 +10,13 @@ import (
"testing"
"github.com/owncloud/ocis-pkg/v2/service/grpc"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage"
"github.com/stretchr/testify/assert"
svc "github.com/owncloud/ocis-thumbnails/pkg/service/v0"
svc "github.com/owncloud/ocis/thumbnails/pkg/service/v0"
)
var service = grpc.Service{}
thumbnails/pkg/proto/v0/thumbnails.pb_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package proto_test
import (
"testing"
"github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
"github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
"github.com/stretchr/testify/assert"
)
thumbnails/pkg/server/debug/option.go
+1 -1
View File
@@ -2,7 +2,7 @@ package debug
import (
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/config"
)
// Option defines a single option function.
thumbnails/pkg/server/debug/server.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/service/debug"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis-thumbnails/pkg/version"
"github.com/owncloud/ocis/thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/version"
)
// Server initializes the debug service and server.
thumbnails/pkg/server/grpc/option.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis-thumbnails/pkg/metrics"
"github.com/owncloud/ocis/thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/metrics"
)
// Option defines a single option function.
thumbnails/pkg/server/grpc/server.go
+5 -5
View File
@@ -2,11 +2,11 @@ package grpc
import (
"github.com/owncloud/ocis-pkg/v2/service/grpc"
"github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
svc "github.com/owncloud/ocis-thumbnails/pkg/service/v0"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis-thumbnails/pkg/version"
"github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
svc "github.com/owncloud/ocis/thumbnails/pkg/service/v0"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/thumbnails/pkg/version"
)
// NewService initializes the grpc service and server.
thumbnails/pkg/service/v0/instrument.go
+2 -2
View File
@@ -3,8 +3,8 @@ package svc
import (
"context"
"github.com/owncloud/ocis-thumbnails/pkg/metrics"
v0proto "github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
"github.com/owncloud/ocis/thumbnails/pkg/metrics"
v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
"github.com/prometheus/client_golang/prometheus"
)
thumbnails/pkg/service/v0/logging.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"time"
"github.com/owncloud/ocis-pkg/v2/log"
v0proto "github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
)
// NewLogging returns a service that logs messages.
thumbnails/pkg/service/v0/option.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage"
)
// Option defines a single option function.
thumbnails/pkg/service/v0/service.go
+4 -4
View File
@@ -7,10 +7,10 @@ import (
merrors "github.com/micro/go-micro/v2/errors"
"github.com/owncloud/ocis-pkg/v2/log"
v0proto "github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/resolution"
v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/resolution"
"github.com/pkg/errors"
)
thumbnails/pkg/service/v0/tracing.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"context"
v0proto "github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0"
"go.opencensus.io/trace"
)
thumbnails/pkg/thumbnail/imgsource/filesystem.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"os"
"path/filepath"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/config"
)
// NewFileSystemSource return a new FileSystem instance
thumbnails/pkg/thumbnail/imgsource/webdav.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"net/url"
"path"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/config"
)
// NewWebDavSource creates a new webdav instance.
thumbnails/pkg/thumbnail/storage/filesystem.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"sync"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis-thumbnails/pkg/config"
"github.com/owncloud/ocis/thumbnails/pkg/config"
"github.com/pkg/errors"
)
thumbnails/pkg/thumbnail/storage/storage.go
+1 -1
View File
@@ -1,6 +1,6 @@
package storage
import "github.com/owncloud/ocis-thumbnails/pkg/thumbnail/resolution"
import "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/resolution"
// Request combines different attributes needed for storage operations.
type Request struct {
thumbnails/pkg/thumbnail/thumbnails.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/nfnt/resize"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/resolution"
"github.com/owncloud/ocis-thumbnails/pkg/thumbnail/storage"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/resolution"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage"
)
// Request bundles information needed to generate a thumbnail for afile