github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 20:39:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

lsjson: add option to show the original object IDs

Browse Source
This commit is contained in:
Fabian Möller 2018-07-26 17:47:23 +02:00 committed by Nick Craig-Wood
parent eb6aafbd14
commit 38381d3786
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/lsjson/lsjson.go
View File

@ -22,6 +22,7 @@ var (
recurse bool recurse bool
showHash bool showHash bool
showEncrypted bool showEncrypted bool
showOrigIDs bool
noModTime bool noModTime bool
) )
@ -31,6 +32,7 @@ func init() {
commandDefintion.Flags().BoolVarP(&showHash, "hash", "", false, "Include hashes in the output (may take longer).") commandDefintion.Flags().BoolVarP(&showHash, "hash", "", false, "Include hashes in the output (may take longer).")
commandDefintion.Flags().BoolVarP(&noModTime, "no-modtime", "", false, "Don't read the modification time (can speed things up).") commandDefintion.Flags().BoolVarP(&noModTime, "no-modtime", "", false, "Don't read the modification time (can speed things up).")
commandDefintion.Flags().BoolVarP(&showEncrypted, "encrypted", "M", false, "Show the encrypted names.") commandDefintion.Flags().BoolVarP(&showEncrypted, "encrypted", "M", false, "Show the encrypted names.")
commandDefintion.Flags().BoolVarP(&showOrigIDs, "original", "", false, "Show the ID of the underlying Object.")
} }
// lsJSON in the struct which gets marshalled for each line // lsJSON in the struct which gets marshalled for each line
@ -44,6 +46,7 @@ type lsJSON struct {
IsDir bool IsDir bool
Hashes map[string]string `json:",omitempty"` Hashes map[string]string `json:",omitempty"`
ID string `json:",omitempty"` ID string `json:",omitempty"`
OrigID string `json:",omitempty"`
} }
// Timestamp a time in RFC3339 format with Nanosecond precision secongs // Timestamp a time in RFC3339 format with Nanosecond precision secongs
@ -72,6 +75,7 @@ The output is an array of Items, where each Item looks like this
"DropboxHash" : "ecb65bb98f9d905b70458986c39fcbad7715e5f2fcc3b1f07767d7c83e2438cc" "DropboxHash" : "ecb65bb98f9d905b70458986c39fcbad7715e5f2fcc3b1f07767d7c83e2438cc"
}, },
"ID": "y2djkhiujf83u33", "ID": "y2djkhiujf83u33",
"OrigID": "UYOJVTUW00Q1RzTDA",
"IsDir" : false, "IsDir" : false,
"MimeType" : "application/octet-stream", "MimeType" : "application/octet-stream",
"ModTime" : "2017-05-31T16:15:57.034468261+01:00", "ModTime" : "2017-05-31T16:15:57.034468261+01:00",
@ -146,6 +150,23 @@ can be processed line by line as each item is written one to a line.
if do, ok := entry.(fs.IDer); ok { if do, ok := entry.(fs.IDer); ok {
item.ID = do.ID() item.ID = do.ID()
} }
if showOrigIDs {
cur := entry
for {
u, ok := cur.(fs.ObjectUnWrapper)
if !ok {
break // not a wrapped object, use current id
}
next := u.UnWrap()
if next == nil {
break // no base object found, use current id
}
cur = next
}
if do, ok := cur.(fs.IDer); ok {
item.OrigID = do.ID()
}
}
switch x := entry.(type) { switch x := entry.(type) {
case fs.Directory: case fs.Directory:
item.IsDir = true item.IsDir = true