diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5b7d1fa..4e96ad0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -41,13 +70,20 @@
"settings.editor.selected.configurable": "preferences.lookFeel"
}
}
+
+
+
+
+
+
+
-
+
@@ -55,8 +91,8 @@
-
-
+
+
diff --git a/Dockerfile b/Dockerfile
index 9fb6309..364cbac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN apk add nodejs npm
WORKDIR /source
COPY . .
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildvcs -o /dist ./pkg/cmd/main.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildvcs -o /dist ./pkg/main.go
# Runtime
FROM golang:alpine
diff --git a/pkg/database/migrator.go b/pkg/internal/database/migrator.go
similarity index 100%
rename from pkg/database/migrator.go
rename to pkg/internal/database/migrator.go
diff --git a/pkg/database/source.go b/pkg/internal/database/source.go
similarity index 100%
rename from pkg/database/source.go
rename to pkg/internal/database/source.go
diff --git a/pkg/grpc/attachments.go b/pkg/internal/grpc/attachments.go
similarity index 94%
rename from pkg/grpc/attachments.go
rename to pkg/internal/grpc/attachments.go
index a9b1066..398fd97 100644
--- a/pkg/grpc/attachments.go
+++ b/pkg/internal/grpc/attachments.go
@@ -3,10 +3,10 @@ package grpc
import (
"context"
"fmt"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/proto"
"google.golang.org/protobuf/types/known/emptypb"
- "git.solsynth.dev/hydrogen/paperclip/pkg/database"
- "git.solsynth.dev/hydrogen/paperclip/pkg/grpc/proto"
"git.solsynth.dev/hydrogen/paperclip/pkg/models"
jsoniter "github.com/json-iterator/go"
)
diff --git a/pkg/grpc/client.go b/pkg/internal/grpc/client.go
similarity index 100%
rename from pkg/grpc/client.go
rename to pkg/internal/grpc/client.go
diff --git a/pkg/grpc/server.go b/pkg/internal/grpc/server.go
similarity index 89%
rename from pkg/grpc/server.go
rename to pkg/internal/grpc/server.go
index 33d84a2..3d10a39 100644
--- a/pkg/grpc/server.go
+++ b/pkg/internal/grpc/server.go
@@ -1,9 +1,9 @@
package grpc
import (
+ "git.solsynth.dev/hydrogen/paperclip/pkg/proto"
"net"
- "git.solsynth.dev/hydrogen/paperclip/pkg/grpc/proto"
"github.com/spf13/viper"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
diff --git a/pkg/meta.go b/pkg/internal/meta.go
similarity index 100%
rename from pkg/meta.go
rename to pkg/internal/meta.go
diff --git a/pkg/models/accounts.go b/pkg/internal/models/accounts.go
similarity index 100%
rename from pkg/models/accounts.go
rename to pkg/internal/models/accounts.go
diff --git a/pkg/models/attachments.go b/pkg/internal/models/attachments.go
similarity index 100%
rename from pkg/models/attachments.go
rename to pkg/internal/models/attachments.go
diff --git a/pkg/models/base.go b/pkg/internal/models/base.go
similarity index 100%
rename from pkg/models/base.go
rename to pkg/internal/models/base.go
diff --git a/pkg/models/destination.go b/pkg/internal/models/destination.go
similarity index 100%
rename from pkg/models/destination.go
rename to pkg/internal/models/destination.go
diff --git a/pkg/models/metadata.go b/pkg/internal/models/metadata.go
similarity index 100%
rename from pkg/models/metadata.go
rename to pkg/internal/models/metadata.go
diff --git a/pkg/server/attachments_api.go b/pkg/internal/server/attachments_api.go
similarity index 97%
rename from pkg/server/attachments_api.go
rename to pkg/internal/server/attachments_api.go
index 37323b2..6131129 100644
--- a/pkg/server/attachments_api.go
+++ b/pkg/internal/server/attachments_api.go
@@ -3,13 +3,13 @@ package server
import (
"context"
"fmt"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal/grpc"
"net/url"
"path/filepath"
- "git.solsynth.dev/hydrogen/paperclip/pkg/grpc"
"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
- "git.solsynth.dev/hydrogen/paperclip/pkg/database"
"git.solsynth.dev/hydrogen/paperclip/pkg/models"
"git.solsynth.dev/hydrogen/paperclip/pkg/services"
"github.com/gofiber/fiber/v2"
diff --git a/pkg/server/auth.go b/pkg/internal/server/auth.go
similarity index 100%
rename from pkg/server/auth.go
rename to pkg/internal/server/auth.go
diff --git a/pkg/server/startup.go b/pkg/internal/server/startup.go
similarity index 100%
rename from pkg/server/startup.go
rename to pkg/internal/server/startup.go
diff --git a/pkg/server/utils.go b/pkg/internal/server/utils.go
similarity index 100%
rename from pkg/server/utils.go
rename to pkg/internal/server/utils.go
diff --git a/pkg/server/well_known_api.go b/pkg/internal/server/well_known_api.go
similarity index 100%
rename from pkg/server/well_known_api.go
rename to pkg/internal/server/well_known_api.go
diff --git a/pkg/services/attachments.go b/pkg/internal/services/attachments.go
similarity index 97%
rename from pkg/services/attachments.go
rename to pkg/internal/services/attachments.go
index b0c9e71..aa57e1c 100644
--- a/pkg/services/attachments.go
+++ b/pkg/internal/services/attachments.go
@@ -2,12 +2,12 @@ package services
import (
"fmt"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
"mime"
"mime/multipart"
"net/http"
"path/filepath"
- "git.solsynth.dev/hydrogen/paperclip/pkg/database"
"git.solsynth.dev/hydrogen/paperclip/pkg/models"
"github.com/google/uuid"
"gorm.io/gorm"
diff --git a/pkg/services/auth.go b/pkg/internal/services/auth.go
similarity index 94%
rename from pkg/services/auth.go
rename to pkg/internal/services/auth.go
index 1e91dd1..08e4a6a 100644
--- a/pkg/services/auth.go
+++ b/pkg/internal/services/auth.go
@@ -4,11 +4,11 @@ import (
"context"
"errors"
"fmt"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal/grpc"
"reflect"
"time"
- "git.solsynth.dev/hydrogen/paperclip/pkg/database"
- "git.solsynth.dev/hydrogen/paperclip/pkg/grpc"
"git.solsynth.dev/hydrogen/paperclip/pkg/models"
"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
"gorm.io/gorm"
diff --git a/pkg/services/cleaner.go b/pkg/internal/services/cleaner.go
similarity index 70%
rename from pkg/services/cleaner.go
rename to pkg/internal/services/cleaner.go
index f746132..811171e 100644
--- a/pkg/services/cleaner.go
+++ b/pkg/internal/services/cleaner.go
@@ -1,9 +1,9 @@
package services
import (
+ database2 "git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
"time"
- "git.solsynth.dev/hydrogen/paperclip/pkg/database"
"github.com/rs/zerolog/log"
)
@@ -12,8 +12,8 @@ func DoAutoDatabaseCleanup() {
log.Debug().Time("deadline", deadline).Msg("Now cleaning up entire database...")
var count int64
- for _, model := range database.AutoMaintainRange {
- tx := database.C.Unscoped().Delete(model, "deleted_at >= ?", deadline)
+ for _, model := range database2.AutoMaintainRange {
+ tx := database2.C.Unscoped().Delete(model, "deleted_at >= ?", deadline)
if tx.Error != nil {
log.Error().Err(tx.Error).Msg("An error occurred when running auth context cleanup...")
}
diff --git a/pkg/services/jwt.go b/pkg/internal/services/jwt.go
similarity index 100%
rename from pkg/services/jwt.go
rename to pkg/internal/services/jwt.go
diff --git a/pkg/services/recycler.go b/pkg/internal/services/recycler.go
similarity index 100%
rename from pkg/services/recycler.go
rename to pkg/internal/services/recycler.go
diff --git a/pkg/services/uploader.go b/pkg/internal/services/uploader.go
similarity index 100%
rename from pkg/services/uploader.go
rename to pkg/internal/services/uploader.go
diff --git a/pkg/cmd/main.go b/pkg/main.go
similarity index 68%
rename from pkg/cmd/main.go
rename to pkg/main.go
index 8fe6365..1778b38 100644
--- a/pkg/cmd/main.go
+++ b/pkg/main.go
@@ -1,17 +1,17 @@
package main
import (
+ database2 "git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
+ grpc2 "git.solsynth.dev/hydrogen/paperclip/pkg/internal/grpc"
"os"
"os/signal"
"syscall"
- "git.solsynth.dev/hydrogen/paperclip/pkg/grpc"
- "git.solsynth.dev/hydrogen/paperclip/pkg/server"
- "git.solsynth.dev/hydrogen/paperclip/pkg/services"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal/server"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal/services"
"github.com/robfig/cron/v3"
- paperclip "git.solsynth.dev/hydrogen/paperclip/pkg"
- "git.solsynth.dev/hydrogen/paperclip/pkg/database"
+ "git.solsynth.dev/hydrogen/paperclip/pkg/internal"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
@@ -35,14 +35,14 @@ func main() {
}
// Connect to database
- if err := database.NewSource(); err != nil {
+ if err := database2.NewSource(); err != nil {
log.Fatal().Err(err).Msg("An error occurred when connect to database.")
- } else if err := database.RunMigration(database.C); err != nil {
+ } else if err := database2.RunMigration(database2.C); err != nil {
log.Fatal().Err(err).Msg("An error occurred when running database auto migration.")
}
// Connect other services
- if err := grpc.ConnectPassport(); err != nil {
+ if err := grpc2.ConnectPassport(); err != nil {
log.Fatal().Err(err).Msg("An error occurred when connecting to passport grpc endpoint...")
}
@@ -57,19 +57,19 @@ func main() {
// Grpc Server
go func() {
- if err := grpc.StartGrpc(); err != nil {
+ if err := grpc2.StartGrpc(); err != nil {
log.Fatal().Err(err).Msg("An message occurred when starting grpc server.")
}
}()
// Messages
- log.Info().Msgf("Paperclip v%s is started...", paperclip.AppVersion)
+ log.Info().Msgf("Paperclip v%s is started...", pkg.AppVersion)
quit := make(chan os.Signal, 1)
signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
<-quit
- log.Info().Msgf("Paperclip v%s is quitting...", paperclip.AppVersion)
+ log.Info().Msgf("Paperclip v%s is quitting...", pkg.AppVersion)
quartz.Stop()
}
diff --git a/pkg/grpc/proto/attachments.pb.go b/pkg/proto/attachments.pb.go
similarity index 100%
rename from pkg/grpc/proto/attachments.pb.go
rename to pkg/proto/attachments.pb.go
diff --git a/pkg/grpc/proto/attachments.proto b/pkg/proto/attachments.proto
similarity index 100%
rename from pkg/grpc/proto/attachments.proto
rename to pkg/proto/attachments.proto
diff --git a/pkg/grpc/proto/attachments_grpc.pb.go b/pkg/proto/attachments_grpc.pb.go
similarity index 100%
rename from pkg/grpc/proto/attachments_grpc.pb.go
rename to pkg/proto/attachments_grpc.pb.go