make main functions out of cmds

Author: chanmaoganda

cmd/client/download.go

@@ -1,11 +1,8 @@
 package client
 
 import (
-	"github.com/chanmaoganda/fileshare/internal/config"
-	"github.com/chanmaoganda/fileshare/internal/core/download"
 	"github.com/chanmaoganda/fileshare/internal/core/setup"
-	"github.com/chanmaoganda/fileshare/internal/pkg/grpc"
-	"github.com/sirupsen/logrus"
+	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/spf13/cobra"
 )
 
@@ -15,25 +12,6 @@ var DownloadCmd = &cobra.Command{
 	Args:    cobra.MinimumNArgs(1),
 	PreRunE: setup.Setup,
 	Run: func(cmd *cobra.Command, args []string) {
-		key := args[0]
-
-		cfg := config.Cfg()
-
-		logrus.Debug("Connecting to ", cfg.GrpcAddress)
-
-		conn, err := grpc.NewClientConn(cfg)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		client := download.NewDownloadClient(cmd.Context(), conn)
-
-		if err := client.DownloadFile(cmd.Context(), key); err != nil {
-			logrus.Error(err)
-		}
-
-		if err := conn.Close(); err != nil {
-			logrus.Error(err)
-		}
+		fileshare.Download(cmd.Context(), args)
 	},
 }

cmd/client/linkgen.go

@@ -1,11 +1,8 @@
 package client
 
 import (
-	"github.com/chanmaoganda/fileshare/internal/config"
 	"github.com/chanmaoganda/fileshare/internal/core/setup"
-	"github.com/chanmaoganda/fileshare/internal/core/sharelink"
-	"github.com/chanmaoganda/fileshare/internal/pkg/grpc"
-	"github.com/sirupsen/logrus"
+	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/spf13/cobra"
 )
 
@@ -15,22 +12,6 @@ var ShareLinkGenCmd = &cobra.Command{
 	Args:    cobra.MinimumNArgs(2),
 	PreRunE: setup.Setup,
 	Run: func(cmd *cobra.Command, args []string) {
-		cfg := config.Cfg()
-
-		logrus.Debug("Connecting to ", cfg.GrpcAddress)
-
-		conn, err := grpc.NewClientConn(cfg)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		client := sharelink.NewShareLinkClient(cmd.Context(), conn)
-
-		code := client.GenerateLink(args)
-		logrus.Infof("Generated Code is: [%s]", code)
-
-		if err := conn.Close(); err != nil {
-			logrus.Error(err)
-		}
+		fileshare.LinkGen(cmd.Context(), args)
 	},
 }

cmd/client/upload.go

@@ -1,11 +1,8 @@
 package client
 
 import (
-	"github.com/chanmaoganda/fileshare/internal/config"
 	"github.com/chanmaoganda/fileshare/internal/core/setup"
-	"github.com/chanmaoganda/fileshare/internal/core/upload"
-	"github.com/chanmaoganda/fileshare/internal/pkg/grpc"
-	"github.com/sirupsen/logrus"
+	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/spf13/cobra"
 )
 
@@ -15,25 +12,6 @@ var UploadCmd = &cobra.Command{
 	Args:    cobra.MinimumNArgs(1),
 	PreRunE: setup.Setup,
 	Run: func(cmd *cobra.Command, args []string) {
-		transferFile := args[0]
-
-		cfg := config.Cfg()
-
-		logrus.Debug("Uploading file to ", cfg.GrpcAddress)
-
-		conn, err := grpc.NewClientConn(cfg)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		client := upload.NewUploadClient(cmd.Context(), conn)
-
-		if err := client.UploadFile(cmd.Context(), transferFile); err != nil {
-			logrus.Error(err)
-		}
-
-		if err := conn.Close(); err != nil {
-			logrus.Error(err)
-		}
+		fileshare.Upload(cmd.Context(), args)
 	},
 }

cmd/server/server.go

@@ -1,20 +1,8 @@
 package server
 
 import (
-	"fmt"
-	"net"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/chanmaoganda/fileshare/internal/config"
-	"github.com/chanmaoganda/fileshare/internal/core/download"
 	"github.com/chanmaoganda/fileshare/internal/core/setup"
-	"github.com/chanmaoganda/fileshare/internal/core/sharelink"
-	"github.com/chanmaoganda/fileshare/internal/core/upload"
-	"github.com/chanmaoganda/fileshare/internal/pkg/grpc"
-	pb "github.com/chanmaoganda/fileshare/internal/proto/gen"
-	"github.com/sirupsen/logrus"
+	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/spf13/cobra"
 )
 
@@ -23,48 +11,6 @@ var ServerCmd = &cobra.Command{
 	Short:   "Starts fileshare server",
 	PreRunE: setup.Setup,
 	Run: func(cmd *cobra.Command, args []string) {
-		PrintBanner()
-
-		cfg := config.Cfg()
-
-		logrus.Debug("Server listening on ", cfg.GrpcAddress)
-
-		listen, err := net.Listen("tcp", cfg.GrpcAddress)
-		if err != nil {
-			logrus.Fatalln("cannot bind address")
-		}
-
-		grpcServer, err := grpc.NewServerConn(cfg)
-		if err != nil {
-			logrus.Fatal(err)
-		}
-
-		pb.RegisterUploadServiceServer(grpcServer, upload.NewUploadServer())
-		pb.RegisterDownloadServiceServer(grpcServer, download.NewDownloadServer())
-		pb.RegisterShareLinkServiceServer(grpcServer, sharelink.NewShareLinkServer())
-
-		go func() {
-			if err := grpcServer.Serve(listen); err != nil {
-				logrus.Error(err)
-			}
-		}()
-
-		// web := web.NewWebService(DB)
-		// go func() {
-		// 	if err := web.Run(settings.WebAddress); err != nil {
-		// 		logrus.Error(err)
-		// 	}
-		// }()
-
-		shutdown := make(chan os.Signal, 1)
-		signal.Notify(shutdown, os.Interrupt, syscall.SIGINT)
-		<-shutdown
-		logrus.Info("Shutting down servers...")
-		grpcServer.GracefulStop()
+		fileshare.Server()
 	},
 }
-
-func PrintBanner() {
-	banner := []byte{32, 32, 32, 32, 95, 95, 95, 95, 95, 32, 95, 95, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 95, 95, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 10, 32, 32, 32, 47, 32, 95, 95, 40, 95, 41, 32, 47, 95, 95, 32, 32, 32, 32, 32, 95, 95, 95, 95, 95, 47, 32, 47, 95, 32, 32, 95, 95, 95, 95, 32, 95, 95, 95, 95, 95, 95, 95, 95, 95, 32, 10, 32, 32, 47, 32, 47, 95, 47, 32, 47, 32, 47, 32, 95, 32, 92, 32, 32, 32, 47, 32, 95, 95, 95, 47, 32, 95, 95, 32, 92, 47, 32, 95, 95, 32, 96, 47, 32, 95, 95, 95, 47, 32, 95, 32, 92, 10, 32, 47, 32, 95, 95, 47, 32, 47, 32, 47, 32, 32, 95, 95, 47, 32, 32, 40, 95, 95, 32, 32, 41, 32, 47, 32, 47, 32, 47, 32, 47, 95, 47, 32, 47, 32, 47, 32, 32, 47, 32, 32, 95, 95, 47, 10, 47, 95, 47, 32, 47, 95, 47, 95, 47, 92, 95, 95, 95, 47, 32, 32, 47, 95, 95, 95, 95, 47, 95, 47, 32, 47, 95, 47, 92, 95, 95, 44, 95, 47, 95, 47, 32, 32, 32, 92, 95, 95, 95, 47, 32, 10}
-	fmt.Printf("\n%s\n\n\n", string(banner))
-}

internal/fileshare/client.go

@@ -0,0 +1,77 @@
+package fileshare
+
+import (
+	"github.com/chanmaoganda/fileshare/internal/config"
+	"github.com/chanmaoganda/fileshare/internal/core/download"
+	"github.com/chanmaoganda/fileshare/internal/core/sharelink"
+	"github.com/chanmaoganda/fileshare/internal/core/upload"
+	"github.com/chanmaoganda/fileshare/internal/pkg/grpc"
+	"github.com/sirupsen/logrus"
+	"golang.org/x/net/context"
+)
+
+func Upload(ctx context.Context, args []string) {
+	transferFile := args[0]
+
+	cfg := config.Cfg()
+
+	logrus.Debug("Uploading file to ", cfg.GrpcAddress)
+
+	conn, err := grpc.NewClientConn(cfg)
+	if err != nil {
+		logrus.Fatal(err)
+	}
+
+	client := upload.NewUploadClient(ctx, conn)
+
+	if err := client.UploadFile(ctx, transferFile); err != nil {
+		logrus.Error(err)
+	}
+
+	if err := conn.Close(); err != nil {
+		logrus.Error(err)
+	}
+}
+
+func LinkGen(ctx context.Context, args []string) {
+	cfg := config.Cfg()
+
+	logrus.Debug("Connecting to ", cfg.GrpcAddress)
+
+	conn, err := grpc.NewClientConn(cfg)
+	if err != nil {
+		logrus.Fatal(err)
+	}
+
+	client := sharelink.NewShareLinkClient(ctx, conn)
+
+	code := client.GenerateLink(args)
+	logrus.Infof("Generated Code is: [%s]", code)
+
+	if err := conn.Close(); err != nil {
+		logrus.Error(err)
+	}
+}
+
+func Download(ctx context.Context, args []string) {
+	key := args[0]
+
+	cfg := config.Cfg()
+
+	logrus.Debug("Connecting to ", cfg.GrpcAddress)
+
+	conn, err := grpc.NewClientConn(cfg)
+	if err != nil {
+		logrus.Fatal(err)
+	}
+
+	client := download.NewDownloadClient(ctx, conn)
+
+	if err := client.DownloadFile(ctx, key); err != nil {
+		logrus.Error(err)
+	}
+
+	if err := conn.Close(); err != nil {
+		logrus.Error(err)
+	}
+}

internal/fileshare/server.go

@@ -0,0 +1,63 @@
+package fileshare
+
+import (
+	"fmt"
+	"net"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/chanmaoganda/fileshare/internal/config"
+	"github.com/chanmaoganda/fileshare/internal/core/download"
+	"github.com/chanmaoganda/fileshare/internal/core/sharelink"
+	"github.com/chanmaoganda/fileshare/internal/core/upload"
+	"github.com/chanmaoganda/fileshare/internal/pkg/grpc"
+	pb "github.com/chanmaoganda/fileshare/internal/proto/gen"
+	"github.com/sirupsen/logrus"
+)
+
+func Server() {
+	printBanner()
+
+	cfg := config.Cfg()
+
+	logrus.Debug("Server listening on ", cfg.GrpcAddress)
+
+	listen, err := net.Listen("tcp", cfg.GrpcAddress)
+	if err != nil {
+		logrus.Fatalln("cannot bind address")
+	}
+
+	grpcServer, err := grpc.NewServerConn(cfg)
+	if err != nil {
+		logrus.Fatal(err)
+	}
+
+	pb.RegisterUploadServiceServer(grpcServer, upload.NewUploadServer())
+	pb.RegisterDownloadServiceServer(grpcServer, download.NewDownloadServer())
+	pb.RegisterShareLinkServiceServer(grpcServer, sharelink.NewShareLinkServer())
+
+	go func() {
+		if err := grpcServer.Serve(listen); err != nil {
+			logrus.Error(err)
+		}
+	}()
+
+	// web := web.NewWebService(DB)
+	// go func() {
+	// 	if err := web.Run(settings.WebAddress); err != nil {
+	// 		logrus.Error(err)
+	// 	}
+	// }()
+
+	shutdown := make(chan os.Signal, 1)
+	signal.Notify(shutdown, os.Interrupt, syscall.SIGINT)
+	<-shutdown
+	logrus.Info("Shutting down servers...")
+	grpcServer.GracefulStop()
+}
+
+func printBanner() {
+	banner := []byte{32, 32, 32, 32, 95, 95, 95, 95, 95, 32, 95, 95, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 95, 95, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 10, 32, 32, 32, 47, 32, 95, 95, 40, 95, 41, 32, 47, 95, 95, 32, 32, 32, 32, 32, 95, 95, 95, 95, 95, 47, 32, 47, 95, 32, 32, 95, 95, 95, 95, 32, 95, 95, 95, 95, 95, 95, 95, 95, 95, 32, 10, 32, 32, 47, 32, 47, 95, 47, 32, 47, 32, 47, 32, 95, 32, 92, 32, 32, 32, 47, 32, 95, 95, 95, 47, 32, 95, 95, 32, 92, 47, 32, 95, 95, 32, 96, 47, 32, 95, 95, 95, 47, 32, 95, 32, 92, 10, 32, 47, 32, 95, 95, 47, 32, 47, 32, 47, 32, 32, 95, 95, 47, 32, 32, 40, 95, 95, 32, 32, 41, 32, 47, 32, 47, 32, 47, 32, 47, 95, 47, 32, 47, 32, 47, 32, 32, 47, 32, 32, 95, 95, 47, 10, 47, 95, 47, 32, 47, 95, 47, 95, 47, 92, 95, 95, 95, 47, 32, 32, 47, 95, 95, 95, 95, 47, 95, 47, 32, 47, 95, 47, 92, 95, 95, 44, 95, 47, 95, 47, 32, 32, 32, 92, 95, 95, 95, 47, 32, 10}
+	fmt.Printf("\n%s\n\n\n", string(banner))
+}