Skip to content

Commit

Permalink
replaced logger with debug arg name.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bengarrett
bengarrett committed Aug 2, 2024
1 parent 8279a99 commit eacecce
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 70 deletions.
6 changes: 3 additions & 3 deletions internal/command/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func RemoveMe(unid, dir string) error {
}

// CopyFile copies the src file to the dst file and path.
func CopyFile(logger *zap.SugaredLogger, src, dst string) error {
func CopyFile(debug *zap.SugaredLogger, src, dst string) error {
s, err := os.Open(src)
if err != nil {
return fmt.Errorf("copy file open %w", err)
Expand All @@ -176,8 +176,8 @@ func CopyFile(logger *zap.SugaredLogger, src, dst string) error {
if err != nil {
return fmt.Errorf("copy file io.copy %w", err)
}
if logger != nil {
logger.Infof("copyfile: copied %d bytes to %s\n", i, dst)
if debug != nil {
debug.Infof("copyfile: copied %d bytes to %s\n", i, dst)
}
if err := d.Sync(); err != nil {
return fmt.Errorf("copy file sync %w", err)
Expand Down
93 changes: 27 additions & 66 deletions internal/command/compress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ import (
// [compression methods]: https://www.hanshq.net/zip.html
//
// [unzip]: https://sourceforge.net/projects/infozip
func ExtractOne(logger *zap.SugaredLogger, src, dst, extHint, name string) error {
if logger == nil {
return ErrZap
}

func ExtractOne(debug *zap.SugaredLogger, src, dst, extHint, name string) error {
st, err := os.Stat(src)
if err != nil {
return fmt.Errorf("extract one stat %w", err)
Expand All @@ -54,12 +50,10 @@ func ExtractOne(logger *zap.SugaredLogger, src, dst, extHint, name string) error
return fmt.Errorf("extract one make temp dir %w", err)
}
defer os.RemoveAll(tmp)

r := runner{src: src, tmp: tmp, name: name, logger: logger}
r := runner{src: src, tmp: tmp, name: name, debug: debug}
if err = r.extract(extHint); err != nil {
return fmt.Errorf("extract one extraction %w", err)
}

extracted := filepath.Join(tmp, r.name)
st, err = os.Stat(extracted)
if err != nil {
Expand All @@ -71,17 +65,17 @@ func ExtractOne(logger *zap.SugaredLogger, src, dst, extHint, name string) error
if st.Size() == 0 {
return fmt.Errorf("extract one extracted %w: %q", ErrEmpty, extracted)
}
if err := CopyFile(logger, extracted, dst); err != nil {
if err := CopyFile(debug, extracted, dst); err != nil {
return fmt.Errorf("extract one copy extracted %w", err)
}
return nil
}

type runner struct {
src string // src is the absolute path to the source archive.
tmp string // tmp is the absolute path to a temporary, destination directory.
name string // name is the name of the file to extract from the archive.
logger *zap.SugaredLogger
src string // src is the absolute path to the source archive.
tmp string // tmp is the absolute path to a temporary, destination directory.
name string // name is the name of the file to extract from the archive.
debug *zap.SugaredLogger
}

// extract extracts the named file from the src archive.
Expand All @@ -106,22 +100,22 @@ func (r runner) extract(ext string) error {
func (r runner) arc() error {
// the arc command doesn't offer a target directory option
tmpArc := filepath.Join(r.tmp, "archive.arc")
if err := CopyFile(r.logger, r.src, tmpArc); err != nil {
if err := CopyFile(r.debug, r.src, tmpArc); err != nil {
return fmt.Errorf("decompress arc copy file %w", err)
}
arg := []string{
"xwo", // Extract files from archive.
tmpArc, // Source archive.
r.name, // File to extract from the archive.
}
return RunWD(r.logger, Arc, r.tmp, arg...)
return RunWD(r.debug, Arc, r.tmp, arg...)
}

// arj extracts the named file from the src arj archive.
func (r runner) arj() error {
// the arj command requires the source archive to have an .arj extension
tmpArj := filepath.Join(r.tmp, "archive.arj")
if err := CopyFile(r.logger, r.src, tmpArj); err != nil {
if err := CopyFile(r.debug, r.src, tmpArj); err != nil {
return fmt.Errorf("decompress arj copy file %w", err)
}
arg := []string{
Expand All @@ -130,9 +124,9 @@ func (r runner) arj() error {
r.name, // File to extract from the archive.
"-ht" + r.tmp, // Set Target directory, ie: "ht/destdir".
}
if err := Run(r.logger, Arj, arg...); err != nil {
if err := Run(r.debug, Arj, arg...); err != nil {
s := ArjExitStatus(err)
r.logger.Warnf("arj exit status: %s", s)
r.debug.Warnf("arj exit status: %s", s)
return fmt.Errorf("decompress arj %w: %s", err, s)
}
return nil
Expand All @@ -152,12 +146,12 @@ func (r *runner) zip7() error {
r.src, // Source archive.
name, // File to extract from the archive.
}
if err := Run(r.logger, Zip7, arg...); err != nil {
if err := Run(r.debug, Zip7, arg...); err != nil {
return fmt.Errorf("decompress 7z run %w", err)
}
// handle file extraction from a directory in the archive
r.name = filepath.Base(name)
if err := Run(r.logger, Zip7, arg...); err != nil {
if err := Run(r.debug, Zip7, arg...); err != nil {
return fmt.Errorf("decompress 7z subdirectory run %w, %s", err, r.name)
}
return nil
Expand All @@ -171,9 +165,9 @@ func (r *runner) rar() error {
r.src, // Source archive.
r.name, // File to extract from the archive.
}
if err := RunWD(r.logger, Unrar, r.tmp, arg...); err != nil {
if err := RunWD(r.debug, Unrar, r.tmp, arg...); err != nil {
s := UnRarExitStatus(err)
r.logger.Warnf("unrar exit status: %s", s)
r.debug.Warnf("unrar exit status: %s", s)
return fmt.Errorf("decompress rar run %w: %s", err, s)
}
// handle file extraction from a directory in the archive
Expand All @@ -190,17 +184,17 @@ func (r runner) tar() error {
"-C", r.tmp, // Target directory.
r.name, // File to extract from the archive.
}
return Run(r.logger, Tar, arg...)
return Run(r.debug, Tar, arg...)
}

// zip extracts the named file from the src zip archive.
func (r runner) zip() error {
arg := []string{r.src} // source zip archive
arg = append(arg, r.name) // target file to extract
arg = append(arg, "-d", r.tmp) // extract destination
if err := Run(r.logger, Unzip, arg...); err != nil {
if err := Run(r.debug, Unzip, arg...); err != nil {
s := unzipExitStatus(err)
r.logger.Warnf("unzip exit status: %s", s)
r.debug.Warnf("unzip exit status: %s", s)
return fmt.Errorf("decompress zip run %w: %s", err, s)
}
return nil
Expand Down Expand Up @@ -309,69 +303,36 @@ func unzipExitStatus(err error) string {
// The text file is converted to a PNG preview and a webp thumbnails.
// Any text file usable by the ansilove command is supported,
// including ANSI, codepage plain text, PCBoard, etc.
func (dir Dirs) ExtractAnsiLove(logger *zap.SugaredLogger, src, extHint, unid, name string) error {
if logger == nil {
return ErrZap
}

dst, err := extract(logger, src, extHint, name)
func (dir Dirs) ExtractAnsiLove(debug *zap.SugaredLogger, src, extHint, unid, name string) error {
dst, err := extract(debug, src, extHint, name)
if err != nil {
return fmt.Errorf("decompress extract ansilove: %w", err)
}
defer os.RemoveAll(dst)
return dir.TextImager(logger, dst, unid)
return dir.TextImager(debug, dst, unid)
}

// ExtractImage extracts the named image file from a zip archive.
// Based on the file extension, the image is converted to a webp preview and thumbnails.
// Named files with a PNG extension are optimized but kept as the preview image.
func (dir Dirs) ExtractImage(logger *zap.SugaredLogger, src, extHint, unid, name string) error {
if logger == nil {
return ErrZap
}

dst, err := extract(logger, src, extHint, name)
func (dir Dirs) ExtractImage(debug *zap.SugaredLogger, src, extHint, unid, name string) error {
dst, err := extract(debug, src, extHint, name)
if err != nil {
return fmt.Errorf("decompress extract image: %w", err)
}
defer os.RemoveAll(dst)

// TODO: replace this with PictureImager() method
ext := filepath.Ext(strings.ToLower(dst))
switch ext {
case gif:
err = dir.PreviewGIF(logger, dst, unid)
case bmp:
err = dir.PreviewPhoto(logger, dst, unid)
case png:
// optimize but keep the original png file as preview
err = dir.PreviewPixels(logger, dst, unid)
case jpeg, jpg, tiff, webp:
// convert to the optimal webp format
// as of 2023, webp is supported by all current browsers
// these format cases are supported by cwebp conversion tool
err = dir.PreviewWebP(logger, dst, unid)
default:
return fmt.Errorf("decompress extract image %w: %q", ErrImg, filepath.Ext(dst))
}
if err != nil {
return fmt.Errorf("decompress extract image preview %s: %w", ext, err)
}
return nil
return dir.PictureImager(debug, dst, unid)
}

// extract extracts the named file from a zip archive and returns the path to the file.
func extract(logger *zap.SugaredLogger, src, extHint, name string) (string, error) {
if logger == nil {
return "", ErrZap
}
func extract(debug *zap.SugaredLogger, src, extHint, name string) (string, error) {
tmp, err := os.MkdirTemp(os.TempDir(), pattern)
if err != nil {
return "", fmt.Errorf("decompress make dir temp %w", err)
}

dst := filepath.Join(tmp, filepath.Base(name))
if err = ExtractOne(logger, src, dst, extHint, name); err != nil {
if err = ExtractOne(debug, src, dst, extHint, name); err != nil {
return "", fmt.Errorf("decompress extract one %w", err)
}
st, err := os.Stat(dst)
Expand Down
2 changes: 1 addition & 1 deletion internal/command/images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (dir Dirs) PictureImager(debug *zap.SugaredLogger, src, unid string) error
case magicnumber.GIF:
return dir.PreviewGIF(debug, src, unid)
case magicnumber.WebP:
return nil // TODO
return dir.PreviewWebP(debug, src, unid)
case magicnumber.PNG:
return dir.PreviewPNG(debug, src, unid)
case magicnumber.TIFF,
Expand Down

0 comments on commit eacecce

Please sign in to comment.