feat(google_drive): add hash_info, ctime, thumbnail (#5334)

alist-org · Oct 6, 2023 · 1a283bb · 1a283bb
1 parent a008f54
commit 1a283bb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/drivers/google_drive/types.go b/drivers/google_drive/types.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -23,12 +24,17 @@ type File struct {
 	Name            string    `json:"name"`
 	MimeType        string    `json:"mimeType"`
 	ModifiedTime    time.Time `json:"modifiedTime"`
+	CreatedTime     time.Time `json:"createdTime"`
 	Size            string    `json:"size"`
 	ThumbnailLink   string    `json:"thumbnailLink"`
 	ShortcutDetails struct {
 		TargetId       string `json:"targetId"`
 		TargetMimeType string `json:"targetMimeType"`
 	} `json:"shortcutDetails"`
+
+	MD5Checksum    string `json:"md5Checksum"`
+	SHA1Checksum   string `json:"sha1Checksum"`
+	SHA256Checksum string `json:"sha256Checksum"`
 }
 
 func fileToObj(f File) *model.ObjThumb {
@@ -39,10 +45,18 @@ func fileToObj(f File) *model.ObjThumb {
 			ID:       f.Id,
 			Name:     f.Name,
 			Size:     size,
+			Ctime:    f.CreatedTime,
 			Modified: f.ModifiedTime,
 			IsFolder: f.MimeType == "application/vnd.google-apps.folder",
+			HashInfo: utils.NewHashInfoByMap(map[*utils.HashType]string{
+				utils.MD5:    f.MD5Checksum,
+				utils.SHA1:   f.SHA1Checksum,
+				utils.SHA256: f.SHA256Checksum,
+			}),
+		},
+		Thumbnail: model.Thumbnail{
+			Thumbnail: f.ThumbnailLink,
 		},
-		Thumbnail: model.Thumbnail{},
 	}
 	if f.MimeType == "application/vnd.google-apps.shortcut" {
 		obj.ID = f.ShortcutDetails.TargetId

diff --git a/drivers/google_drive/util.go b/drivers/google_drive/util.go
@@ -5,14 +5,15 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"github.com/alist-org/alist/v3/pkg/http_range"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"regexp"
 	"strconv"
 	"time"
 
+	"github.com/alist-org/alist/v3/pkg/http_range"
+
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/utils"
@@ -195,7 +196,7 @@ func (d *GoogleDrive) getFiles(id string) ([]File, error) {
 		}
 		query := map[string]string{
 			"orderBy":  orderBy,
-			"fields":   "files(id,name,mimeType,size,modifiedTime,thumbnailLink,shortcutDetails),nextPageToken",
+			"fields":   "files(id,name,mimeType,size,modifiedTime,createdTime,thumbnailLink,shortcutDetails,md5Checksum,sha1Checksum,sha256Checksum),nextPageToken",
 			"pageSize": "1000",
 			"q":        fmt.Sprintf("'%s' in parents and trashed = false", id),
 			//"includeItemsFromAllDrives": "true",

diff --git a/pkg/utils/hash.go b/pkg/utils/hash.go
@@ -184,6 +184,10 @@ type HashInfo struct {
 	h map[*HashType]string `json:"hashInfo"`
 }
 
+func NewHashInfoByMap(h map[*HashType]string) HashInfo {
+	return HashInfo{h}
+}
+
 func NewHashInfo(ht *HashType, str string) HashInfo {
 	m := make(map[*HashType]string)
 	if ht != nil {