1
0
mirror of https://github.com/minio/mc.git synced 2025-11-14 23:42:27 +03:00

Handle json and regular printing for all commands in their own respective files for readability

This commit is contained in:
Harshavardhana
2015-08-19 12:49:55 -07:00
parent 9b07069623
commit 4c521fa2b2
8 changed files with 282 additions and 175 deletions

51
ls-json.go Normal file
View File

@@ -0,0 +1,51 @@
/*
* Minio Client (C) 2015 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package main
import (
"encoding/json"
"github.com/minio/mc/pkg/console"
)
// ContentMessage container for content message structure
type ContentMessage struct {
Filetype string `json:"type"`
Time string `json:"last-modified"`
Size string `json:"size"`
Name string `json:"name"`
}
// String string printer for Content metadata
func (c ContentMessage) String() string {
if !globalJSONFlag {
message := console.Time("[%s] ", c.Time)
message = message + console.Size("%6s ", c.Size)
message = func() string {
if c.Filetype == "folder" {
return message + console.Dir("%s", c.Name)
}
return message + console.File("%s", c.Name)
}()
return message + "\n"
}
jsonMessageBytes, err := json.Marshal(c)
if err != nil {
panic(err)
}
return string(jsonMessageBytes) + "\n"
}