Clean-up and delete old code

pull/7/head
Toni Melisma 3 years ago
parent 5cec311634
commit 869f28def5
No known key found for this signature in database
GPG Key ID: FFF9A7EDDEA34756

@ -970,6 +970,7 @@ func cleanDirectory(gallery directory, dryRun bool) {
for _, dir := range gallery.subdirectories {
if !dir.exists {
// TODO cleanup functionality, reserved directories
// TODO recurse in the wrong order, go deep first and start from leafs
// TODO directory bug - only after files are deleted we know which directories are empty
// What about reserved directories for thumbnails, pictures and originals?
// Implement logic to mark non-existent gallery directories
@ -1012,7 +1013,6 @@ func signalHandler(signalChan chan os.Signal) {
log.Println("Ctrl-C received, cleaning up and aborting...")
wipJobMutex.Lock()
for _, job := range wipJobs {
fmt.Println("cleaning:", job.filename)
os.Remove(job.thumbnailFilepath)
os.Remove(job.fullsizeFilepath)
os.Remove(job.originalFilepath)
@ -1030,6 +1030,7 @@ func main() {
CleanUp bool `arg:"-c,--cleanup" help:"cleanup, delete files and directories in gallery which don't exist in source"`
NoVideos bool `arg:"--no-videos" help:"ignore videos, only include images"`
}
// TODO implement verbose
// Parse command-line arguments
arg.MustParse(&args)

File diff suppressed because it is too large Load Diff

@ -1,44 +0,0 @@
package main
import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestIsVideoFile(t *testing.T) {
assert.Equal(t, isVideoFile("test.txt"), false, "false positive")
assert.Equal(t, isVideoFile(""), false, "false positive")
assert.Equal(t, isVideoFile("test.mp4"), true, "false negative")
assert.Equal(t, isVideoFile("test.mov"), true, "false negative")
assert.Equal(t, isVideoFile("test.3gp"), true, "false negative")
assert.Equal(t, isVideoFile("test.avi"), true, "false negative")
assert.Equal(t, isVideoFile("test.mts"), true, "false negative")
assert.Equal(t, isVideoFile("test.m4v"), true, "false negative")
assert.Equal(t, isVideoFile("test.mpg"), true, "false negative")
assert.Equal(t, isVideoFile("test.MP4"), true, "false negative")
}
func TestIsImageFile(t *testing.T) {
assert.Equal(t, isImageFile("test.txt"), false, "false positive")
assert.Equal(t, isImageFile(""), false, "false positive")
assert.Equal(t, isImageFile("test.jpg"), true, "false negative")
assert.Equal(t, isImageFile("test.JPG"), true, "false negative")
assert.Equal(t, isImageFile("test.jpeg"), true, "false negative")
assert.Equal(t, isImageFile("test.heic"), true, "false negative")
assert.Equal(t, isImageFile("test.png"), true, "false negative")
assert.Equal(t, isImageFile("test.tif"), true, "false negative")
assert.Equal(t, isImageFile("test.tiff"), true, "false negative")
}
func TestIsMediaFile(t *testing.T) {
assert.Equal(t, isMediaFile("test.txt"), false, "false positive")
assert.Equal(t, isMediaFile("test.jpg"), true, "false negative")
assert.Equal(t, isMediaFile("test.mp4"), true, "false negative")
}
func TestStripExtension(t *testing.T) {
assert.Equal(t, stripExtension("../tmp/filename.txt"), "../tmp/filename", "mismatch")
assert.Equal(t, stripExtension("/tmp/filename.txt"), "/tmp/filename", "mismatch")
assert.Equal(t, stripExtension("filename.txt"), "filename", "mismatch")
}
Loading…
Cancel
Save