From 05a59113c97c396e4a4d1a3dab063c34573230b1 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sun, 16 Jun 2024 23:24:54 +0800
Subject: [PATCH] :art: Update project structure

---
 .idea/workspace.xml                          | 44 ++++++++++++++++++--
 Dockerfile                                   |  2 +-
 pkg/{ => internal}/database/migrator.go      |  0
 pkg/{ => internal}/database/source.go        |  0
 pkg/{ => internal}/grpc/attachments.go       |  4 +-
 pkg/{ => internal}/grpc/client.go            |  0
 pkg/{ => internal}/grpc/server.go            |  2 +-
 pkg/{ => internal}/meta.go                   |  0
 pkg/{ => internal}/models/accounts.go        |  0
 pkg/{ => internal}/models/attachments.go     |  0
 pkg/{ => internal}/models/base.go            |  0
 pkg/{ => internal}/models/destination.go     |  0
 pkg/{ => internal}/models/metadata.go        |  0
 pkg/{ => internal}/server/attachments_api.go |  4 +-
 pkg/{ => internal}/server/auth.go            |  0
 pkg/{ => internal}/server/startup.go         |  0
 pkg/{ => internal}/server/utils.go           |  0
 pkg/{ => internal}/server/well_known_api.go  |  0
 pkg/{ => internal}/services/attachments.go   |  2 +-
 pkg/{ => internal}/services/auth.go          |  4 +-
 pkg/{ => internal}/services/cleaner.go       |  6 +--
 pkg/{ => internal}/services/jwt.go           |  0
 pkg/{ => internal}/services/recycler.go      |  0
 pkg/{ => internal}/services/uploader.go      |  0
 pkg/{cmd => }/main.go                        | 22 +++++-----
 pkg/{grpc => }/proto/attachments.pb.go       |  0
 pkg/{grpc => }/proto/attachments.proto       |  0
 pkg/{grpc => }/proto/attachments_grpc.pb.go  |  0
 28 files changed, 63 insertions(+), 27 deletions(-)
 rename pkg/{ => internal}/database/migrator.go (100%)
 rename pkg/{ => internal}/database/source.go (100%)
 rename pkg/{ => internal}/grpc/attachments.go (94%)
 rename pkg/{ => internal}/grpc/client.go (100%)
 rename pkg/{ => internal}/grpc/server.go (89%)
 rename pkg/{ => internal}/meta.go (100%)
 rename pkg/{ => internal}/models/accounts.go (100%)
 rename pkg/{ => internal}/models/attachments.go (100%)
 rename pkg/{ => internal}/models/base.go (100%)
 rename pkg/{ => internal}/models/destination.go (100%)
 rename pkg/{ => internal}/models/metadata.go (100%)
 rename pkg/{ => internal}/server/attachments_api.go (97%)
 rename pkg/{ => internal}/server/auth.go (100%)
 rename pkg/{ => internal}/server/startup.go (100%)
 rename pkg/{ => internal}/server/utils.go (100%)
 rename pkg/{ => internal}/server/well_known_api.go (100%)
 rename pkg/{ => internal}/services/attachments.go (97%)
 rename pkg/{ => internal}/services/auth.go (94%)
 rename pkg/{ => internal}/services/cleaner.go (70%)
 rename pkg/{ => internal}/services/jwt.go (100%)
 rename pkg/{ => internal}/services/recycler.go (100%)
 rename pkg/{ => internal}/services/uploader.go (100%)
 rename pkg/{cmd => }/main.go (68%)
 rename pkg/{grpc => }/proto/attachments.pb.go (100%)
 rename pkg/{grpc => }/proto/attachments.proto (100%)
 rename pkg/{grpc => }/proto/attachments_grpc.pb.go (100%)

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 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="18dd0d68-b4b8-40db-9734-9119b5c848bd" name="更改" comment=":bug: Fix uuid duplicate when link exists" />
+    <list default="true" id="18dd0d68-b4b8-40db-9734-9119b5c848bd" name="更改" comment=":bug: Fix uuid duplicate when link exists">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/cmd/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/main.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/database/migrator.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/database/migrator.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/database/source.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/database/source.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/grpc/attachments.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/attachments.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/grpc/client.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/client.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/grpc/proto/attachments.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/proto/attachments.pb.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/grpc/proto/attachments.proto" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/proto/attachments.proto" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/grpc/proto/attachments_grpc.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/proto/attachments_grpc.pb.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/grpc/server.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/server.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/meta.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/meta.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/models/accounts.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/accounts.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/models/attachments.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/attachments.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/models/base.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/base.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/models/destination.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/destination.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/models/metadata.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/metadata.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/server/attachments_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/attachments_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/server/auth.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/auth.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/server/startup.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/startup.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/server/utils.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/utils.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/server/well_known_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/well_known_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/services/attachments.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/attachments.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/services/auth.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/auth.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/services/cleaner.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/cleaner.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/services/jwt.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/jwt.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/services/recycler.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/recycler.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/services/uploader.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/uploader.go" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -41,13 +70,20 @@
     &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;
   }
 }</component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/pkg" />
+      <recent name="$PROJECT_DIR$/pkg/internal" />
+    </key>
+  </component>
   <component name="RunManager">
     <configuration name="Backend" type="GoApplicationRunConfiguration" factoryName="Go Application">
       <module name="Paperclip" />
       <working_directory value="$PROJECT_DIR$" />
       <kind value="FILE" />
+      <package value="git.solsynth.dev/hydrogen/paperclip" />
       <directory value="$PROJECT_DIR$" />
-      <filePath value="$PROJECT_DIR$/pkg/cmd/main.go" />
+      <filePath value="$PROJECT_DIR$/pkg/main.go" />
       <output_directory value="$PROJECT_DIR$/dist" />
       <method v="2" />
     </configuration>
@@ -55,8 +91,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-gosdk-33c477a475b1-b97fc8a1e17c-org.jetbrains.plugins.go.sharedIndexes.bundled-GO-241.14494.238" />
-        <option value="bundled-js-predefined-1d06a55b98c1-74d2a5396914-JavaScript-GO-241.14494.238" />
+        <option value="bundled-gosdk-33c477a475b1-e0158606a674-org.jetbrains.plugins.go.sharedIndexes.bundled-GO-241.17890.21" />
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-GO-241.17890.21" />
       </set>
     </attachedChunks>
   </component>
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