remove PreRunE in cobra, make generic functionality for fileshare

functions

Author: chanmaoganda

app.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/wailsapp/wails/v2/pkg/runtime"
 )
 
@@ -49,3 +50,7 @@ func (a *App) OpenFileSelectionDialog() (string, error) {
 
 	return selection, nil
 }
+
+func (a *App) UploadFile(args []string) {
+	fileshare.Upload(context.TODO(), args)
+}

cmd/cache/clean.go

@@ -4,17 +4,14 @@ import (
 	"os"
 
 	"github.com/chanmaoganda/fileshare/internal/config"
-	"github.com/chanmaoganda/fileshare/internal/core/setup"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
 var cleanCmd = &cobra.Command{
-	Use:     "clean",
-	Short:   "Cleans db file and cache folder by config.yml, if not set then clean the default ones(default.db, $HOME/.fileshare)",
-	PreRunE: setup.Setup,
+	Use:   "clean",
+	Short: "Cleans db file and cache folder by config.yml, if not set then clean the default ones(default.db, $HOME/.fileshare)",
 	Run: func(cmd *cobra.Command, args []string) {
-
 		cleanCache()
 	},
 }

cmd/client/download.go

@@ -1,16 +1,14 @@
 package client
 
 import (
-	"github.com/chanmaoganda/fileshare/internal/core/setup"
 	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/spf13/cobra"
 )
 
 var DownloadCmd = &cobra.Command{
-	Use:     "download <checksum256 | linkcode>",
-	Short:   "Download file, either with sharelink code or file checksum256 hash",
-	Args:    cobra.MinimumNArgs(1),
-	PreRunE: setup.Setup,
+	Use:   "download <checksum256 | linkcode>",
+	Short: "Download file, either with sharelink code or file checksum256 hash",
+	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		fileshare.Download(cmd.Context(), args)
 	},

cmd/client/linkgen.go

@@ -1,16 +1,14 @@
 package client
 
 import (
-	"github.com/chanmaoganda/fileshare/internal/core/setup"
 	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/spf13/cobra"
 )
 
 var ShareLinkGenCmd = &cobra.Command{
-	Use:     "linkgen <filename> <checksum256> <expire days(optional)>",
-	Short:   "Generates sharelink code for friends to easily download",
-	Args:    cobra.MinimumNArgs(2),
-	PreRunE: setup.Setup,
+	Use:   "linkgen <filename> <checksum256> <expire days(optional)>",
+	Short: "Generates sharelink code for friends to easily download",
+	Args:  cobra.MinimumNArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
 		fileshare.LinkGen(cmd.Context(), args)
 	},

cmd/client/upload.go

@@ -1,16 +1,14 @@
 package client
 
 import (
-	"github.com/chanmaoganda/fileshare/internal/core/setup"
 	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/spf13/cobra"
 )
 
 var UploadCmd = &cobra.Command{
-	Use:     "upload <filepath>",
-	Short:   "Uploads the file, requires the filepath as argument",
-	Args:    cobra.MinimumNArgs(1),
-	PreRunE: setup.Setup,
+	Use:   "upload <filepath>",
+	Short: "Uploads the file, requires the filepath as argument",
+	Args:  cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		fileshare.Upload(cmd.Context(), args)
 	},

cmd/server/server.go

@@ -1,15 +1,13 @@
 package server
 
 import (
-	"github.com/chanmaoganda/fileshare/internal/core/setup"
 	"github.com/chanmaoganda/fileshare/internal/fileshare"
 	"github.com/spf13/cobra"
 )
 
 var ServerCmd = &cobra.Command{
-	Use:     "server",
-	Short:   "Starts fileshare server",
-	PreRunE: setup.Setup,
+	Use:   "server",
+	Short: "Starts fileshare server",
 	Run: func(cmd *cobra.Command, args []string) {
 		fileshare.Server()
 	},

frontend/src/App.tsx

@@ -1,10 +1,7 @@
 import React, { useState } from "react";
 import "./App.css";
 
-import {
-  OpenFileSelectionDialog,
-  OpenMultipleFilesSelectionDialog,
-} from "../wailsjs/go/main/App";
+import { OpenFileSelectionDialog, UploadFile } from "../wailsjs/go/main/App";
 
 function App() {
   const [selectedFilePath, setSelectedFilePath] = useState<string>("");
@@ -26,27 +23,14 @@ function App() {
     }
   };
 
-  const handleOpenMultipleFiles = async () => {
-    setError("");
-    try {
-      const paths = await OpenMultipleFilesSelectionDialog();
-      if (paths && paths.length > 0) {
-        setSelectedFilePaths(paths);
-      } else {
-        setSelectedFilePaths(["No files selected."]);
-      }
-    } catch (err: any) {
-      setError(
-        `Error opening multiple files dialog: ${err.message || String(err)}`,
-      );
-      setSelectedFilePaths(["Error!"]);
-    }
+  const handleUpload = async () => {
+    UploadFile([selectedFilePath]);
   };
 
   return (
     <div className="App">
       <header className="App-header">
-        <h1>Wails File Dialog Demo</h1>
+        <h1>Wails Fileshare Client</h1>
 
         {error && <p style={{ color: "red" }}>{error}</p>}
 
@@ -56,10 +40,7 @@ function App() {
         </div>
 
         <div className="card">
-          <button onClick={handleOpenMultipleFiles}>
-            Open Multiple Files Dialog
-          </button>
-          <p>Selected Files: {selectedFilePaths.join(", ")}</p>
+          <button onClick={handleUpload}>Upload This File</button>
         </div>
       </header>
     </div>

frontend/wailsjs/go/main/App.d.ts

@@ -2,3 +2,5 @@
 // This file is automatically generated. DO NOT EDIT
 
 export function OpenFileSelectionDialog():Promise<string>;
+
+export function UploadFile(arg1:Array<string>):Promise<void>;

frontend/wailsjs/go/main/App.js

@@ -5,3 +5,7 @@
 export function OpenFileSelectionDialog() {
   return window['go']['main']['App']['OpenFileSelectionDialog']();
 }
+
+export function UploadFile(arg1) {
+  return window['go']['main']['App']['UploadFile'](arg1);
+}