mirror of
https://github.com/mickael-kerjean/filestash.git
synced 2025-11-01 19:32:27 +08:00
fix (time): hide time whenever not available
This commit is contained in:
@ -323,7 +323,7 @@ class ExistingThingComponent extends React.Component {
|
||||
is_renaming={this.state.is_renaming}
|
||||
onRenameCancel={this.onRenameRequest.bind(this, false)} />
|
||||
<DateTime
|
||||
show={this.state.icon !== "loading"}
|
||||
show={this.state.icon !== "loading" || this.props.file.time !== 0}
|
||||
timestamp={this.props.file.time} />
|
||||
<ActionButton
|
||||
onClickRename={this.onRenameRequest.bind(this)}
|
||||
|
||||
@ -91,7 +91,8 @@ func (f File) Mode() os.FileMode {
|
||||
}
|
||||
func (f File) ModTime() time.Time {
|
||||
if f.FTime == 0 {
|
||||
return time.Now()
|
||||
t := new(time.Time)
|
||||
return *t
|
||||
}
|
||||
return time.Unix(f.FTime, 0)
|
||||
}
|
||||
|
||||
@ -125,16 +125,20 @@ func FileLs(ctx *App, res http.ResponseWriter, req *http.Request) {
|
||||
etagger.Write([]byte(path + strconv.Itoa(len(entries))))
|
||||
for i := 0; i < len(entries); i++ {
|
||||
name := entries[i].Name()
|
||||
modTime := entries[i].ModTime().UnixNano() / int64(time.Millisecond)
|
||||
files[i] = FileInfo{
|
||||
Name: name,
|
||||
Size: entries[i].Size(),
|
||||
Time: func(mt time.Time) (modTime int64) {
|
||||
if mt.IsZero() == false {
|
||||
modTime = mt.UnixNano() / int64(time.Millisecond)
|
||||
|
||||
}
|
||||
if i < 200 { // etag is generated from a few values to avoid large memory usage
|
||||
etagger.Write([]byte(name + strconv.Itoa(int(modTime))))
|
||||
}
|
||||
|
||||
files[i] = FileInfo{
|
||||
Name: name,
|
||||
Size: entries[i].Size(),
|
||||
Time: modTime,
|
||||
return modTime
|
||||
}(entries[i].ModTime()),
|
||||
Type: func(mode os.FileMode) string {
|
||||
if mode.IsRegular() {
|
||||
return "file"
|
||||
|
||||
@ -222,6 +222,7 @@ func (this S3Backend) Ls(path string) (files []os.FileInfo, err error) {
|
||||
files = append(files, &File{
|
||||
FName: filepath.Base(*object.Prefix),
|
||||
FType: "directory",
|
||||
FTime: 0,
|
||||
})
|
||||
}
|
||||
return aws.BoolValue(objs.IsTruncated)
|
||||
|
||||
Reference in New Issue
Block a user