fmt: go mod tidy

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -54,4 +54,3 @@ body:
       description: |
         Please copy and paste any relevant log output.
         请复制粘贴错误日志，或者截图
-      render: shell

.github/workflows/auto_lang.yml

@@ -7,6 +7,8 @@ on:
     paths:
       - 'drivers/**'
       - 'internal/bootstrap/data/setting.go'
+      - 'internal/conf/const.go'
+      - 'cmd/lang.go'
   workflow_dispatch:
 
 jobs:
@@ -42,6 +44,7 @@ jobs:
           cd alist
           go run ./main.go lang
           cd ..
+
       - name: Copy lang file
         run: |
           cp -f ./alist/lang/*.json ./alist-web/src/lang/en/ 2>/dev/null || :
@@ -61,4 +64,4 @@ jobs:
           github_token: ${{ secrets.MY_TOKEN }}
           branch: main
           directory: alist-web
-          repository: alist-org/alist-web
+          repository: alist-org/alist-web

.github/workflows/build.yml

@@ -2,9 +2,9 @@ name: build
 
 on:
   push:
-    branches: [ '**' ]
+    branches: [ 'main' ]
   pull_request:
-    branches: [ '**' ]
+    branches: [ 'main' ]
 
 jobs:
   build:

.gitignore

@@ -20,11 +20,12 @@ output/
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
-bin/*
+/bin/*
 *.json
-data/
-log/
-lang/
-daemon/
-public/dist/*
-!public/dist/README.md
+/build
+/data/
+/log/
+/lang/
+/daemon/
+/public/dist/*
+/!public/dist/README.md

Dockerfile

@@ -10,6 +10,9 @@ LABEL MAINTAINER="i@nn.ci"
 VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
 COPY --from=builder /app/bin/alist ./
-RUN apk add ca-certificates
+COPY entrypoint.sh /entrypoint.sh
+RUN apk add ca-certificates bash su-exec; \
+    chmod +x /entrypoint.sh
+ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 5244
-CMD [ "./alist", "server", "--no-prefix" ]
+ENTRYPOINT [ "/entrypoint.sh" ]

README.md

@@ -9,7 +9,7 @@
     <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
   </a>
   <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
-    <img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build" alt="Build status" />
+    <img src="https://img.shields.io/github/actions/workflow/status/Xhofe/alist/build.yml?branch=main" alt="Build status" />
   </a>
   <a href="https://github.com/Xhofe/alist/releases">
     <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />

README_cn.md

@@ -9,7 +9,7 @@
     <img src="https://img.shields.io/github/license/Xhofe/alist" alt="License" />
   </a>
   <a href="https://github.com/Xhofe/alist/actions?query=workflow%3ABuild">
-    <img src="https://img.shields.io/github/workflow/status/Xhofe/alist/build" alt="Build status" />
+    <img src="https://img.shields.io/github/actions/workflow/status/Xhofe/alist/build.yml?branch=main" alt="Build status" />
   </a>
   <a href="https://github.com/Xhofe/alist/releases">
     <img src="https://img.shields.io/github/release/Xhofe/alist" alt="latest version" />

cmd/admin.go

@@ -4,19 +4,19 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/alist-org/alist/v3/internal/db"
+	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
-// passwordCmd represents the password command
-var passwordCmd = &cobra.Command{
+// PasswordCmd represents the password command
+var PasswordCmd = &cobra.Command{
 	Use:     "admin",
 	Aliases: []string{"password"},
 	Short:   "Show admin user's info",
 	Run: func(cmd *cobra.Command, args []string) {
 		Init()
-		admin, err := db.GetAdmin()
+		admin, err := op.GetAdmin()
 		if err != nil {
 			utils.Log.Errorf("failed get admin user: %+v", err)
 		} else {
@@ -26,7 +26,7 @@ var passwordCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(passwordCmd)
+	RootCmd.AddCommand(PasswordCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/cancel2FA.go

@@ -4,22 +4,22 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"github.com/alist-org/alist/v3/internal/db"
+	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
-// cancel2FACmd represents the delete2fa command
-var cancel2FACmd = &cobra.Command{
+// Cancel2FACmd represents the delete2fa command
+var Cancel2FACmd = &cobra.Command{
 	Use:   "cancel2fa",
 	Short: "Delete 2FA of admin user",
 	Run: func(cmd *cobra.Command, args []string) {
 		Init()
-		admin, err := db.GetAdmin()
+		admin, err := op.GetAdmin()
 		if err != nil {
 			utils.Log.Errorf("failed to get admin user: %+v", err)
 		} else {
-			err := db.Cancel2FAByUser(admin)
+			err := op.Cancel2FAByUser(admin)
 			if err != nil {
 				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
 			}
@@ -28,7 +28,7 @@ var cancel2FACmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(cancel2FACmd)
+	RootCmd.AddCommand(Cancel2FACmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/common.go

@@ -16,6 +16,7 @@ func Init() {
 	bootstrap.Log()
 	bootstrap.InitDB()
 	data.InitData()
+	bootstrap.InitIndex()
 }
 
 var pid = -1

cmd/lang.go

@@ -71,7 +71,7 @@ func writeFile(name string, data interface{}) {
 	} else {
 		log.Infof("%s.json changed, update file", name)
 		//log.Infof("old: %+v\nnew:%+v", oldData, data)
-		utils.WriteJsonToFile(fmt.Sprintf("lang/%s.json", name), data)
+		utils.WriteJsonToFile(fmt.Sprintf("lang/%s.json", name), newData, true)
 	}
 }
 
@@ -123,8 +123,8 @@ func generateSettingsJson() {
 	//utils.WriteJsonToFile("lang/settings.json", settingsLang)
 }
 
-// langCmd represents the lang command
-var langCmd = &cobra.Command{
+// LangCmd represents the lang command
+var LangCmd = &cobra.Command{
 	Use:   "lang",
 	Short: "Generate language json file",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -138,7 +138,7 @@ var langCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(langCmd)
+	RootCmd.AddCommand(LangCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/restart.go

@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// restartCmd represents the restart command
-var restartCmd = &cobra.Command{
+// RestartCmd represents the restart command
+var RestartCmd = &cobra.Command{
 	Use:   "restart",
 	Short: "Restart alist server by daemon/pid file",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -18,7 +18,7 @@ var restartCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(restartCmd)
+	RootCmd.AddCommand(RestartCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/root.go

@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var rootCmd = &cobra.Command{
+var RootCmd = &cobra.Command{
 	Use:   "alist",
 	Short: "A file list program that supports multiple storage.",
 	Long: `A file list program that supports multiple storage,
@@ -17,16 +17,16 @@ Complete documentation is available at https://alist.nn.ci/`,
 }
 
 func Execute() {
-	if err := rootCmd.Execute(); err != nil {
+	if err := RootCmd.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 }
 
 func init() {
-	rootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "config file")
-	rootCmd.PersistentFlags().BoolVar(&flags.Debug, "debug", false, "start with debug mode")
-	rootCmd.PersistentFlags().BoolVar(&flags.NoPrefix, "no-prefix", false, "disable env prefix")
-	rootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
-	rootCmd.PersistentFlags().BoolVar(&flags.ForceBinDir, "force-bin-dir", false, "Force to use the directory where the binary file is located as data directory")
+	RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "config file")
+	RootCmd.PersistentFlags().BoolVar(&flags.Debug, "debug", false, "start with debug mode")
+	RootCmd.PersistentFlags().BoolVar(&flags.NoPrefix, "no-prefix", false, "disable env prefix")
+	RootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
+	RootCmd.PersistentFlags().BoolVar(&flags.ForceBinDir, "force-bin-dir", false, "Force to use the directory where the binary file is located as data directory")
 }

cmd/server.go

@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// serverCmd represents the server command
-var serverCmd = &cobra.Command{
+// ServerCmd represents the server command
+var ServerCmd = &cobra.Command{
 	Use:   "server",
 	Short: "Start the server at the specified address",
 	Long: `Start the server at the specified address
@@ -76,7 +76,7 @@ the address is defined in config file`,
 }
 
 func init() {
-	rootCmd.AddCommand(serverCmd)
+	RootCmd.AddCommand(ServerCmd)
 
 	// Here you will define your flags and configuration settings.
 
@@ -95,5 +95,5 @@ func OutAlistInit() {
 		cmd  *cobra.Command
 		args []string
 	)
-	serverCmd.Run(cmd, args)
+	ServerCmd.Run(cmd, args)
 }

cmd/start.go

@@ -13,8 +13,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// startCmd represents the start command
-var startCmd = &cobra.Command{
+// StartCmd represents the start command
+var StartCmd = &cobra.Command{
 	Use:   "start",
 	Short: "Silent start alist server with `--force-bin-dir`",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -57,7 +57,7 @@ func start() {
 }
 
 func init() {
-	rootCmd.AddCommand(startCmd)
+	RootCmd.AddCommand(StartCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/stop.go

@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// stopCmd represents the stop command
-var stopCmd = &cobra.Command{
+// StopCmd represents the stop command
+var StopCmd = &cobra.Command{
 	Use:   "stop",
 	Short: "Stop alist server by daemon/pid file",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -44,7 +44,7 @@ func stop() {
 }
 
 func init() {
-	rootCmd.AddCommand(stopCmd)
+	RootCmd.AddCommand(StopCmd)
 
 	// Here you will define your flags and configuration settings.
 

cmd/version.go

@@ -1,6 +1,5 @@
 /*
 Copyright © 2022 NAME HERE <EMAIL ADDRESS>
-
 */
 package cmd
 
@@ -12,8 +11,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// versionCmd represents the version command
-var versionCmd = &cobra.Command{
+// VersionCmd represents the version command
+var VersionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Show current version of AList",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -30,7 +29,7 @@ WebVersion: %s
 }
 
 func init() {
-	rootCmd.AddCommand(versionCmd)
+	RootCmd.AddCommand(VersionCmd)
 
 	// Here you will define your flags and configuration settings.
 

docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3.3'
+services:
+  alist:
+    restart: always
+    volumes:
+      - '/etc/alist:/opt/alist/data'
+    ports:
+      - '5244:5244'
+    environment:
+      - PUID=0
+      - PGID=0
+      - UMASK=022
+    container_name: alist
+    image: 'xhofe/alist:latest'

drivers/115/driver.go

@@ -22,15 +22,10 @@ func (d *Pan115) Config() driver.Config {
 }
 
 func (d *Pan115) GetAddition() driver.Additional {
-	return d.Addition
+	return &d.Addition
 }
 
-func (d *Pan115) Init(ctx context.Context, storage model.Storage) error {
-	d.Storage = storage
-	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
-	if err != nil {
-		return err
-	}
+func (d *Pan115) Init(ctx context.Context) error {
 	return d.login()
 }
 

drivers/115/meta.go

@@ -6,7 +6,7 @@ import (
 )
 
 type Addition struct {
-	Cookie        string `json:"cookie"`
+	Cookie      string `json:"cookie"`
 	QRCodeToken string `json:"qrcode_token"`
 	driver.RootID
 }
@@ -18,10 +18,8 @@ var config = driver.Config{
 	OnlyLocal:   true,
 }
 
-func New() driver.Driver {
-	return &Pan115{}
-}
-
 func init() {
-	op.RegisterDriver(config, New)
+	op.RegisterDriver(func() driver.Driver {
+		return &Pan115{}
+	})
 }