fix(google_driver): fix google link file display size (#1335)

* fix file link display size

* fix performance and field

* cn to en notes

---------

Co-authored-by: ShenLin <773933146@qq.com>

drivers/base/client.go

@@ -25,6 +25,7 @@ func InitClient() {
 		}),
 	).SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
 	NoRedirectClient.SetHeader("user-agent", UserAgent)
+	net.SetRestyProxyIfConfigured(NoRedirectClient)
 
 	RestyClient = NewRestyClient()
 	HttpClient = net.NewHttpClient()
@@ -37,5 +38,7 @@ func NewRestyClient() *resty.Client {
 		SetRetryResetReaders(true).
 		SetTimeout(DefaultTimeout).
 		SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
+
+	net.SetRestyProxyIfConfigured(client)
 	return client
 }

drivers/google_drive/util.go

@@ -27,6 +27,14 @@ import (
 
 // do others that not defined in Driver interface
 
+// Google Drive API field constants
+const (
+	// File list query fields
+	FilesListFields = "files(id,name,mimeType,size,modifiedTime,createdTime,thumbnailLink,shortcutDetails,md5Checksum,sha1Checksum,sha256Checksum),nextPageToken"
+	// Single file query fields
+	FileInfoFields = "id,name,mimeType,size,md5Checksum,sha1Checksum,sha256Checksum"
+)
+
 type googleDriveServiceAccount struct {
 	// Type                    string `json:"type"`
 	// ProjectID               string `json:"project_id"`
@@ -235,7 +243,7 @@ func (d *GoogleDrive) getFiles(id string) ([]File, error) {
 		}
 		query := map[string]string{
 			"orderBy":  orderBy,
-			"fields":   "files(id,name,mimeType,size,modifiedTime,createdTime,thumbnailLink,shortcutDetails,md5Checksum,sha1Checksum,sha256Checksum),nextPageToken",
+			"fields":   FilesListFields,
 			"pageSize": "1000",
 			"q":        fmt.Sprintf("'%s' in parents and trashed = false", id),
 			//"includeItemsFromAllDrives": "true",
@@ -249,11 +257,82 @@ func (d *GoogleDrive) getFiles(id string) ([]File, error) {
 			return nil, err
 		}
 		pageToken = resp.NextPageToken
+
+		// Batch process shortcuts, API calls only for file shortcuts
+		shortcutTargetIds := make([]string, 0)
+		shortcutIndices := make([]int, 0)
+
+		// Collect target IDs of all file shortcuts (skip folder shortcuts)
+		for i := range resp.Files {
+			if resp.Files[i].MimeType == "application/vnd.google-apps.shortcut" &&
+				resp.Files[i].ShortcutDetails.TargetId != "" &&
+				resp.Files[i].ShortcutDetails.TargetMimeType != "application/vnd.google-apps.folder" {
+				shortcutTargetIds = append(shortcutTargetIds, resp.Files[i].ShortcutDetails.TargetId)
+				shortcutIndices = append(shortcutIndices, i)
+			}
+		}
+
+		// Batch get target file info (only for file shortcuts)
+		if len(shortcutTargetIds) > 0 {
+			targetFiles := d.batchGetTargetFilesInfo(shortcutTargetIds)
+			// Update shortcut file info
+			for j, targetId := range shortcutTargetIds {
+				if targetFile, exists := targetFiles[targetId]; exists {
+					fileIndex := shortcutIndices[j]
+					if targetFile.Size != "" {
+						resp.Files[fileIndex].Size = targetFile.Size
+					}
+					if targetFile.MD5Checksum != "" {
+						resp.Files[fileIndex].MD5Checksum = targetFile.MD5Checksum
+					}
+					if targetFile.SHA1Checksum != "" {
+						resp.Files[fileIndex].SHA1Checksum = targetFile.SHA1Checksum
+					}
+					if targetFile.SHA256Checksum != "" {
+						resp.Files[fileIndex].SHA256Checksum = targetFile.SHA256Checksum
+					}
+				}
+			}
+		}
+
 		res = append(res, resp.Files...)
 	}
 	return res, nil
 }
 
+// getTargetFileInfo gets target file details for shortcuts
+func (d *GoogleDrive) getTargetFileInfo(targetId string) (File, error) {
+	var targetFile File
+	url := fmt.Sprintf("https://www.googleapis.com/drive/v3/files/%s", targetId)
+	query := map[string]string{
+		"fields": FileInfoFields,
+	}
+	_, err := d.request(url, http.MethodGet, func(req *resty.Request) {
+		req.SetQueryParams(query)
+	}, &targetFile)
+	if err != nil {
+		return File{}, err
+	}
+	return targetFile, nil
+}
+
+// batchGetTargetFilesInfo batch gets target file info, sequential processing to avoid concurrency complexity
+func (d *GoogleDrive) batchGetTargetFilesInfo(targetIds []string) map[string]File {
+	if len(targetIds) == 0 {
+		return make(map[string]File)
+	}
+
+	result := make(map[string]File)
+	// Sequential processing to avoid concurrency complexity
+	for _, targetId := range targetIds {
+		file, err := d.getTargetFileInfo(targetId)
+		if err == nil {
+			result[targetId] = file
+		}
+	}
+	return result
+}
+
 func (d *GoogleDrive) chunkUpload(ctx context.Context, file model.FileStreamer, url string, up driver.UpdateProgress) error {
 	defaultChunkSize := d.ChunkSize * 1024 * 1024
 	ss, err := stream.NewStreamSectionReader(file, int(defaultChunkSize), &up)

internal/bootstrap/config.go

@@ -140,6 +140,10 @@ func InitConfig() {
 		log.Fatalf("create temp dir error: %+v", err)
 	}
 	log.Debugf("config: %+v", conf.Conf)
+
+	// Validate and display proxy configuration status
+	validateProxyConfig()
+
 	base.InitClient()
 	initURL()
 }
@@ -179,3 +183,14 @@ func CleanTempDir() {
 		}
 	}
 }
+
+// validateProxyConfig validates proxy configuration and displays status at startup
+func validateProxyConfig() {
+	if conf.Conf.ProxyAddress != "" {
+		if _, err := url.Parse(conf.Conf.ProxyAddress); err == nil {
+			log.Infof("Proxy enabled: %s", conf.Conf.ProxyAddress)
+		} else {
+			log.Errorf("Invalid proxy address format: %s, error: %v", conf.Conf.ProxyAddress, err)
+		}
+	}
+}

internal/conf/config.go

@@ -131,6 +131,7 @@ type Config struct {
 	FTP                   FTP         `json:"ftp" envPrefix:"FTP_"`
 	SFTP                  SFTP        `json:"sftp" envPrefix:"SFTP_"`
 	LastLaunchedVersion   string      `json:"last_launched_version"`
+	ProxyAddress          string      `json:"proxy_address" env:"PROXY_ADDRESS"`
 }
 
 func DefaultConfig(dataDir string) *Config {
@@ -244,5 +245,6 @@ func DefaultConfig(dataDir string) *Config {
 			Listen: ":5222",
 		},
 		LastLaunchedVersion: "",
+		ProxyAddress:        "",
 	}
 }

internal/net/serve.go

@@ -283,11 +283,15 @@ func HttpClient() *http.Client {
 }
 
 func NewHttpClient() *http.Client {
+	transport := &http.Transport{
+		Proxy:           http.ProxyFromEnvironment,
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify},
+	}
+
+	SetProxyIfConfigured(transport)
+
 	return &http.Client{
-		Timeout: time.Hour * 48,
-		Transport: &http.Transport{
-			Proxy:           http.ProxyFromEnvironment,
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify},
-		},
+		Timeout:   time.Hour * 48,
+		Transport: transport,
 	}
 }

internal/net/util.go

@@ -7,12 +7,15 @@ import (
 	"mime/multipart"
 	"net/http"
 	"net/textproto"
+	"net/url"
 	"strings"
 	"time"
 
+	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/pkg/utils"
 
 	"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
+	"github.com/go-resty/resty/v2"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -350,3 +353,23 @@ func GetRangedHttpReader(readCloser io.ReadCloser, offset, length int64) (io.Rea
 	// return an io.ReadCloser that is limited to `length` bytes.
 	return &LimitedReadCloser{readCloser, length_int}, nil
 }
+
+// SetProxyIfConfigured sets proxy for HTTP Transport if configured
+func SetProxyIfConfigured(transport *http.Transport) {
+	// If proxy address is configured, override environment variable settings
+	if conf.Conf.ProxyAddress != "" {
+		if proxyURL, err := url.Parse(conf.Conf.ProxyAddress); err == nil {
+			transport.Proxy = http.ProxyURL(proxyURL)
+		}
+	}
+}
+
+// SetRestyProxyIfConfigured sets proxy for Resty client if configured
+func SetRestyProxyIfConfigured(client *resty.Client) {
+	// If proxy address is configured, override environment variable settings
+	if conf.Conf.ProxyAddress != "" {
+		if proxyURL, err := url.Parse(conf.Conf.ProxyAddress); err == nil {
+			client.SetProxy(proxyURL.String())
+		}
+	}
+}