kyle
/
lifecam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

return the zipfile path

This commit is contained in:
Kyle Isom 2022-02-22 23:53:55 -08:00
parent 591a5e7171
commit 508d22a3a4
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lifecam.go
View File

@ -59,10 +59,7 @@ func main() {
pkg, err := fl.Package() pkg, err := fl.Package()
die.If(err) die.If(err)
path, err := pkg.Frames.Name() path, err := lifecam.PackageZip(pkg, *clean)
die.If(err)
err = lifecam.PackageZip(pkg, *clean)
die.If(err) die.If(err)
if *upload { if *upload {

13
lifecam/zip.go
View File

@ -17,7 +17,6 @@ func zipName(p string, top bool) string {
} }
func pathHeader(p string, top bool) (*zip.FileHeader, error) { func pathHeader(p string, top bool) (*zip.FileHeader, error) {
fi, err := os.Stat(p) fi, err := os.Stat(p)
if err != nil { if err != nil {
return nil, err return nil, err
@ -127,24 +126,24 @@ func newZipFile(path string, clean bool) (*zipFile, error) {
return zf, nil return zf, nil
} }
func PackageZip(p *Package, clean bool) (err error) { func PackageZip(p *Package, clean bool) (path string, err error) {
path := strings.TrimSuffix(p.Video, path = strings.TrimSuffix(p.Video,
filepath.Ext(p.Video)) + ".zip" filepath.Ext(p.Video)) + ".zip"
zf, err := newZipFile(path, clean) zf, err := newZipFile(path, clean)
if err != nil { if err != nil {
return err return
} }
defer zf.Close() defer zf.Close()
err = zf.AddVideo(p.Video) err = zf.AddVideo(p.Video)
if err != nil { if err != nil {
return err return
} }
for _, frame := range p.Frames { for _, frame := range p.Frames {
err = zf.AddFrame(frame.Path) err = zf.AddFrame(frame.Path)
if err != nil { if err != nil {
return err return
} }
} }
@ -154,5 +153,5 @@ func PackageZip(p *Package, clean bool) (err error) {
err = zf.Clean() err = zf.Clean()
} }
return err return
} }