|
|
|
@ -28,6 +28,15 @@ type MediaSource struct { |
|
|
|
|
set Set |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
type Media struct { |
|
|
|
|
Type string |
|
|
|
|
Name string |
|
|
|
|
Size image.Rectangle |
|
|
|
|
FullName string |
|
|
|
|
|
|
|
|
|
metadata *metadata.Metadata |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func (ms *MediaSource) LocationOrig(m Media) string { |
|
|
|
|
return path.Join(ms.StorageDir, m.Name) |
|
|
|
|
} |
|
|
|
@ -70,15 +79,6 @@ func (ms *MediaSource) ReceiveNewMedia(name string, r io.Reader) error { |
|
|
|
|
return f.Close() |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
type Media struct { |
|
|
|
|
Type string |
|
|
|
|
Name string |
|
|
|
|
Size image.Rectangle |
|
|
|
|
FullName string |
|
|
|
|
|
|
|
|
|
metadata *metadata.Metadata |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func (m *Media) Date() time.Time { |
|
|
|
|
m.getMetadata() |
|
|
|
|
|
|
|
|
@ -168,18 +168,16 @@ func (ms *MediaSource) ThumbMax(m Media, maxDim int) (string, image.Rectangle, e |
|
|
|
|
return "", image.ZR, err |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
img, _, err := image.Decode(f) |
|
|
|
|
if err != nil { |
|
|
|
|
return "", image.ZR, err |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
src, err := ms.ThumbImage(img, m, size) |
|
|
|
|
src, err := ms.thumbReader(f, m, size) |
|
|
|
|
return src, size, err |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func (ms *MediaSource) HasThumb(m Media, size image.Rectangle) bool { |
|
|
|
|
_, err := os.Stat(ms.ThumbFilename(m, size)) |
|
|
|
|
return err == nil |
|
|
|
|
fi, err := os.Stat(ms.ThumbFilename(m, size)) |
|
|
|
|
if err != nil { |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
return m.Date().Before(fi.ModTime()) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func (ms *MediaSource) ByName(name string) *Media { |
|
|
|
@ -204,7 +202,11 @@ func (ms *MediaSource) Thumb(m Media, size image.Rectangle) (string, error) { |
|
|
|
|
} |
|
|
|
|
defer f.Close() |
|
|
|
|
|
|
|
|
|
img, _, err := image.Decode(f) |
|
|
|
|
return ms.thumbReader(f, m, size) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func (ms *MediaSource) thumbReader(r io.Reader, m Media, size image.Rectangle) (string, error) { |
|
|
|
|
img, _, err := image.Decode(r) |
|
|
|
|
if err != nil { |
|
|
|
|
return "", err |
|
|
|
|
} |
|
|
|
@ -213,7 +215,6 @@ func (ms *MediaSource) Thumb(m Media, size image.Rectangle) (string, error) { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func (ms *MediaSource) ThumbImage(img image.Image, m Media, size image.Rectangle) (string, error) { |
|
|
|
|
|
|
|
|
|
thumbLoc := ms.ThumbFilename(m, size) |
|
|
|
|
os.MkdirAll(path.Dir(thumbLoc), 0755) |
|
|
|
|
fthumb, err := os.OpenFile(thumbLoc, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0655) |
|
|
|
|