diff --git a/Makefile b/Makefile index afede5c..8a6772a 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,16 @@ all: deps test build deps: $(GO) get ./... +build: + $(GO) build -o bin/fastgallery cmd/fastgallery/main.go + test: $(GO) test -v ./... -build: - $(GO) build -o bin/fastgallery cmd/fastgallery/main.go +testgallery: build + rm -rf testing/gallery/ + rm -f /tmp/fastgallery.log + bin/fastgallery --log /tmp/fastgallery.log --cleanup testing/source/ testing/gallery/ clean: rm bin/fastgallery diff --git a/cmd/fastgallery/assets/manifest.json.tmpl b/cmd/fastgallery/assets/manifest.json.tmpl index dd2413d..156ac91 100644 --- a/cmd/fastgallery/assets/manifest.json.tmpl +++ b/cmd/fastgallery/assets/manifest.json.tmpl @@ -2,11 +2,12 @@ "short_name": "{{ .Shortname }}", "start_url": "./", "icons": [ - {{ range .Icons }} + {{ range $i, $e := .Icons }} + {{ if $i }},{{ end }} { - "src": "{ .Src }", - "sizes": "{ .Size }", - "type": "{ .Type }" + "src": "{{ .Src }}", + "sizes": "{{ .Size }}", + "type": "{{ .Type }}" } {{ end }} ], diff --git a/cmd/fastgallery/main.go b/cmd/fastgallery/main.go index 94bc0a0..9a993fd 100644 --- a/cmd/fastgallery/main.go +++ b/cmd/fastgallery/main.go @@ -8,7 +8,9 @@ import ( "os" "os/exec" "os/signal" + "path" "path/filepath" + "regexp" "runtime" "strconv" "strings" @@ -126,6 +128,7 @@ type directory struct { } // htmlData struct is loaded with all the information required to generate the html from template +// TODO refactor structure inside only function where its used type htmlData struct { Title string Subdirectories []string @@ -629,6 +632,36 @@ func copyFile(source string, destination string) { } */ +// getIconSize returns a square size (e.g. 48x48) of an icon based on its filename +// Icon filename must have a substring starting with a string of numbers followed by a consequential +// letter x and a string of more numbers +func getIconSize(iconPath string) (size string, err error) { + iconPath = path.Base(iconPath) + + re := regexp.MustCompile(`[0-9]+x[0-9]+`) + size = re.FindString(iconPath) + + if size == "" { + err = errors.New("size not found in path: " + iconPath) + return size, err + } + + return size, nil +} + +// getIconType returns icon file format type (e.g. image/png) of an icon based on its filename +func getIconType(iconPath string) (filetype string, err error) { + iconPath = path.Base(iconPath) + + switch filepath.Ext(iconPath) { + case ".png": + return "image/png", nil + } + + err = errors.New("could not decide icon filetype: " + iconPath) + return "", err +} + // createPWAManifest creates a customized manifest.json for a PWA if PWA url is supplied in args func createPWAManifest(gallery directory, source directory, dryRun bool, config configuration) { // TODO Fill in data structure, load template and execute it @@ -636,6 +669,84 @@ func createPWAManifest(gallery directory, source directory, dryRun bool, config // TODO Add manifest link to HTMLs // TODO Add apple-touch-icon to HTML // TODO register service worker in HTML, add manifest and apple-touch-icon links to head + + var PWAData = struct { + Shortname string + Icons []struct { + Src string + Size string + Type string + } + }{ + Shortname: source.name, + } + + assetDirectoryListing, err := assets.ReadDir(config.assets.assetsDir) + if err != nil { + log.Println("couldn't open embedded assets:", err.Error()) + exit(1) + } + + re := regexp.MustCompile(`^icon`) + + for _, entry := range assetDirectoryListing { + if !entry.IsDir() { + filename := filepath.Base(entry.Name()) + // check if asset filename starts with the string "icon" + if re.MatchString(filename) { + iconSize, err := getIconSize(filename) + if err != nil { + log.Println("couldn't define icon size:", err.Error()) + exit(1) + } + + iconType, err := getIconType(filename) + if err != nil { + log.Println("couldn't define icon type:", err.Error()) + exit(1) + } + + PWAData.Icons = append(PWAData.Icons, struct { + Src string + Size string + Type string + }{ + Src: filename, + Size: iconSize, + Type: iconType, + }) + } + } + } + + manifestFilePath := filepath.Join(gallery.absPath, config.assets.manifestFile) + if dryRun { + log.Println("Would create web app manifest file:", manifestFilePath) + } else { + templatePath := filepath.Join(config.assets.assetsDir, config.assets.manifestTemplate) + cookedTemplate, err := template.ParseFS(assets, templatePath) + if err != nil { + log.Println("couldn't parse manifest template", templatePath, ":", err.Error()) + exit(1) + } + + manifestFileHandle, err := os.Create(manifestFilePath) + if err != nil { + log.Println("couldn't create manifest file", manifestFilePath, ":", err.Error()) + exit(1) + } + + err = cookedTemplate.Execute(manifestFileHandle, PWAData) + if err != nil { + log.Println("couldn't execute manifest template", manifestFilePath, ":", err.Error()) + exit(1) + } + + manifestFileHandle.Sync() + manifestFileHandle.Close() + + log.Println("Created manifest file:", manifestFilePath) + } } // copyRootAssets copies all the embedded assets to the root directory of the gallery @@ -1199,12 +1310,6 @@ func main() { // Check which source media exists in gallery compareDirectoryTrees(&source, &gallery, config) - // Copy updated web assets (JS, CSS, icons, etc) into gallery root - copyRootAssets(gallery, args.DryRun, config) - - // Copy PWA web manifest and fill-in relevant details - createPWAManifest(gallery, source, args.DryRun, config) - // If there are changes in the source, update the media files newSourceFiles := countChanges(source, config) @@ -1230,6 +1335,12 @@ func main() { defer vips.Shutdown() } + // Copy updated web assets (JS, CSS, icons, etc) into gallery root + copyRootAssets(gallery, args.DryRun, config) + + // Copy PWA web manifest and fill-in relevant details + createPWAManifest(gallery, source, args.DryRun, config) + // Handle ctrl-C or other signals setupSignalHandler() diff --git a/cmd/fastgallery/main_test.go b/cmd/fastgallery/main_test.go index b406246..510cc41 100644 --- a/cmd/fastgallery/main_test.go +++ b/cmd/fastgallery/main_test.go @@ -399,6 +399,38 @@ func testTransformFileAndVideo(t *testing.T) { assert.FileExists(t, testJob.originalFilepath) } +func TestGetIconSize(t *testing.T) { + iconSize, err := getIconSize("/tmp/icon-48x48.png") + assert.NoError(t, err) + assert.EqualValues(t, "48x48", iconSize) + + iconSize, err = getIconSize("test192x192-apple.svg") + assert.NoError(t, err) + assert.EqualValues(t, "192x192", iconSize) + + iconSize, err = getIconSize("test-xicon-64x64.ico") + assert.NoError(t, err) + assert.EqualValues(t, "64x64", iconSize) + + iconSize, err = getIconSize("test-xicon.ico") + assert.Error(t, err) + assert.EqualValues(t, "", iconSize) +} + +func TestGetIconType(t *testing.T) { + iconType, err := getIconType("/tmp/icon-48x48.png") + assert.NoError(t, err) + assert.EqualValues(t, "image/png", iconType) + + iconType, err = getIconType("icon-48x48.png") + assert.NoError(t, err) + assert.EqualValues(t, "image/png", iconType) + + iconType, err = getIconType("icon-48x48.jpg") + assert.Error(t, err) + assert.EqualValues(t, "", iconType) +} + // TODO tests for // isDirectory with symlinked dir // isSymlinkDir diff --git a/testing/gallery/_fullsize/2020-05-22 16.41.02.jpg b/testing/gallery/_fullsize/2020-05-22 16.41.02.jpg deleted file mode 100644 index 76567fb..0000000 Binary files a/testing/gallery/_fullsize/2020-05-22 16.41.02.jpg and /dev/null differ diff --git a/testing/gallery/_fullsize/2021-01-01 17.11.35.jpg b/testing/gallery/_fullsize/2021-01-01 17.11.35.jpg deleted file mode 100644 index e14de36..0000000 Binary files a/testing/gallery/_fullsize/2021-01-01 17.11.35.jpg and /dev/null differ diff --git a/testing/gallery/_fullsize/2021-01-02 23.51.34.mp4 b/testing/gallery/_fullsize/2021-01-02 23.51.34.mp4 deleted file mode 100644 index f9a0926..0000000 Binary files a/testing/gallery/_fullsize/2021-01-02 23.51.34.mp4 and /dev/null differ diff --git a/testing/gallery/_fullsize/2021-02-22 15.36.43-1.jpg b/testing/gallery/_fullsize/2021-02-22 15.36.43-1.jpg deleted file mode 100644 index ba2d95f..0000000 Binary files a/testing/gallery/_fullsize/2021-02-22 15.36.43-1.jpg and /dev/null differ diff --git a/testing/gallery/_fullsize/2021-02-25 15.40.44.jpg b/testing/gallery/_fullsize/2021-02-25 15.40.44.jpg deleted file mode 100644 index 3f85b9e..0000000 Binary files a/testing/gallery/_fullsize/2021-02-25 15.40.44.jpg and /dev/null differ diff --git a/testing/gallery/_fullsize/_DSC9363_DxO.jpg b/testing/gallery/_fullsize/_DSC9363_DxO.jpg deleted file mode 100644 index ec769e7..0000000 Binary files a/testing/gallery/_fullsize/_DSC9363_DxO.jpg and /dev/null differ diff --git a/testing/gallery/_fullsize/_DSC9439.jpg b/testing/gallery/_fullsize/_DSC9439.jpg deleted file mode 100644 index 607dc8b..0000000 Binary files a/testing/gallery/_fullsize/_DSC9439.jpg and /dev/null differ diff --git a/testing/gallery/_fullsize/cranes.jpg b/testing/gallery/_fullsize/cranes.jpg new file mode 100644 index 0000000..da9727a Binary files /dev/null and b/testing/gallery/_fullsize/cranes.jpg differ diff --git a/testing/gallery/_fullsize/dog.jpg b/testing/gallery/_fullsize/dog.jpg new file mode 100644 index 0000000..dbc3646 Binary files /dev/null and b/testing/gallery/_fullsize/dog.jpg differ diff --git a/testing/gallery/_fullsize/panorama.jpg b/testing/gallery/_fullsize/panorama.jpg new file mode 100644 index 0000000..2461ebc Binary files /dev/null and b/testing/gallery/_fullsize/panorama.jpg differ diff --git a/testing/gallery/_fullsize/screenshot.jpg b/testing/gallery/_fullsize/screenshot.jpg new file mode 100644 index 0000000..00c1677 Binary files /dev/null and b/testing/gallery/_fullsize/screenshot.jpg differ diff --git a/testing/gallery/_fullsize/street.jpg b/testing/gallery/_fullsize/street.jpg new file mode 100644 index 0000000..e56e456 Binary files /dev/null and b/testing/gallery/_fullsize/street.jpg differ diff --git a/testing/gallery/_fullsize/tablet.jpg b/testing/gallery/_fullsize/tablet.jpg new file mode 100644 index 0000000..5ff43e9 Binary files /dev/null and b/testing/gallery/_fullsize/tablet.jpg differ diff --git a/testing/gallery/_fullsize/video.mp4 b/testing/gallery/_fullsize/video.mp4 new file mode 100644 index 0000000..0cb381a Binary files /dev/null and b/testing/gallery/_fullsize/video.mp4 differ diff --git a/testing/gallery/_original/2020-05-22 16.41.02.heic b/testing/gallery/_original/2020-05-22 16.41.02.heic deleted file mode 120000 index 98db0f8..0000000 --- a/testing/gallery/_original/2020-05-22 16.41.02.heic +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/2020-05-22 16.41.02.heic \ No newline at end of file diff --git a/testing/gallery/_original/2021-01-01 17.11.35.heic b/testing/gallery/_original/2021-01-01 17.11.35.heic deleted file mode 120000 index 7d3d995..0000000 --- a/testing/gallery/_original/2021-01-01 17.11.35.heic +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/2021-01-01 17.11.35.heic \ No newline at end of file diff --git a/testing/gallery/_original/2021-01-02 23.51.34.mp4 b/testing/gallery/_original/2021-01-02 23.51.34.mp4 deleted file mode 120000 index c017102..0000000 --- a/testing/gallery/_original/2021-01-02 23.51.34.mp4 +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/2021-01-02 23.51.34.mp4 \ No newline at end of file diff --git a/testing/gallery/_original/2021-02-22 15.36.43-1.heic b/testing/gallery/_original/2021-02-22 15.36.43-1.heic deleted file mode 120000 index 8073b7e..0000000 --- a/testing/gallery/_original/2021-02-22 15.36.43-1.heic +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/2021-02-22 15.36.43-1.heic \ No newline at end of file diff --git a/testing/gallery/_original/2021-02-25 15.40.44.png b/testing/gallery/_original/2021-02-25 15.40.44.png deleted file mode 120000 index 577bb4f..0000000 --- a/testing/gallery/_original/2021-02-25 15.40.44.png +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/2021-02-25 15.40.44.png \ No newline at end of file diff --git a/testing/gallery/_original/_DSC9363_DxO.jpg b/testing/gallery/_original/_DSC9363_DxO.jpg deleted file mode 120000 index ebe26b9..0000000 --- a/testing/gallery/_original/_DSC9363_DxO.jpg +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/_DSC9363_DxO.jpg \ No newline at end of file diff --git a/testing/gallery/_original/_DSC9439.jpg b/testing/gallery/_original/_DSC9439.jpg deleted file mode 120000 index 1484cef..0000000 --- a/testing/gallery/_original/_DSC9439.jpg +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/_DSC9439.jpg \ No newline at end of file diff --git a/testing/gallery/_original/cranes.jpg b/testing/gallery/_original/cranes.jpg new file mode 120000 index 0000000..d63facf --- /dev/null +++ b/testing/gallery/_original/cranes.jpg @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/cranes.jpg \ No newline at end of file diff --git a/testing/gallery/_original/dog.heic b/testing/gallery/_original/dog.heic new file mode 120000 index 0000000..0350f3d --- /dev/null +++ b/testing/gallery/_original/dog.heic @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/dog.heic \ No newline at end of file diff --git a/testing/gallery/_original/panorama.heic b/testing/gallery/_original/panorama.heic new file mode 120000 index 0000000..85a48c7 --- /dev/null +++ b/testing/gallery/_original/panorama.heic @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/panorama.heic \ No newline at end of file diff --git a/testing/gallery/_original/screenshot.png b/testing/gallery/_original/screenshot.png new file mode 120000 index 0000000..fbf0fb3 --- /dev/null +++ b/testing/gallery/_original/screenshot.png @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/screenshot.png \ No newline at end of file diff --git a/testing/gallery/_original/street.jpg b/testing/gallery/_original/street.jpg new file mode 120000 index 0000000..f132c26 --- /dev/null +++ b/testing/gallery/_original/street.jpg @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/street.jpg \ No newline at end of file diff --git a/testing/gallery/_original/tablet.heic b/testing/gallery/_original/tablet.heic new file mode 120000 index 0000000..dcd0a0a --- /dev/null +++ b/testing/gallery/_original/tablet.heic @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/tablet.heic \ No newline at end of file diff --git a/testing/gallery/_original/video.mp4 b/testing/gallery/_original/video.mp4 new file mode 120000 index 0000000..8d14b6a --- /dev/null +++ b/testing/gallery/_original/video.mp4 @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/video.mp4 \ No newline at end of file diff --git a/testing/gallery/_thumbnail/2020-05-22 16.41.02.jpg b/testing/gallery/_thumbnail/2020-05-22 16.41.02.jpg deleted file mode 100644 index 56d204c..0000000 Binary files a/testing/gallery/_thumbnail/2020-05-22 16.41.02.jpg and /dev/null differ diff --git a/testing/gallery/_thumbnail/2021-01-01 17.11.35.jpg b/testing/gallery/_thumbnail/2021-01-01 17.11.35.jpg deleted file mode 100644 index 8700a0b..0000000 Binary files a/testing/gallery/_thumbnail/2021-01-01 17.11.35.jpg and /dev/null differ diff --git a/testing/gallery/_thumbnail/2021-02-22 15.36.43-1.jpg b/testing/gallery/_thumbnail/2021-02-22 15.36.43-1.jpg deleted file mode 100644 index d46843d..0000000 Binary files a/testing/gallery/_thumbnail/2021-02-22 15.36.43-1.jpg and /dev/null differ diff --git a/testing/gallery/_thumbnail/2021-02-25 15.40.44.jpg b/testing/gallery/_thumbnail/2021-02-25 15.40.44.jpg deleted file mode 100644 index f1419db..0000000 Binary files a/testing/gallery/_thumbnail/2021-02-25 15.40.44.jpg and /dev/null differ diff --git a/testing/gallery/_thumbnail/_DSC9439.jpg b/testing/gallery/_thumbnail/_DSC9439.jpg deleted file mode 100644 index bb07a8c..0000000 Binary files a/testing/gallery/_thumbnail/_DSC9439.jpg and /dev/null differ diff --git a/testing/gallery/_thumbnail/cranes.jpg b/testing/gallery/_thumbnail/cranes.jpg new file mode 100644 index 0000000..41ce841 Binary files /dev/null and b/testing/gallery/_thumbnail/cranes.jpg differ diff --git a/testing/gallery/_thumbnail/dog.jpg b/testing/gallery/_thumbnail/dog.jpg new file mode 100644 index 0000000..3693ba7 Binary files /dev/null and b/testing/gallery/_thumbnail/dog.jpg differ diff --git a/testing/gallery/_thumbnail/panorama.jpg b/testing/gallery/_thumbnail/panorama.jpg new file mode 100644 index 0000000..45fa71a Binary files /dev/null and b/testing/gallery/_thumbnail/panorama.jpg differ diff --git a/testing/gallery/_thumbnail/screenshot.jpg b/testing/gallery/_thumbnail/screenshot.jpg new file mode 100644 index 0000000..6815ab7 Binary files /dev/null and b/testing/gallery/_thumbnail/screenshot.jpg differ diff --git a/testing/gallery/_thumbnail/_DSC9363_DxO.jpg b/testing/gallery/_thumbnail/street.jpg similarity index 71% rename from testing/gallery/_thumbnail/_DSC9363_DxO.jpg rename to testing/gallery/_thumbnail/street.jpg index 8f540cd..3a8ff89 100644 Binary files a/testing/gallery/_thumbnail/_DSC9363_DxO.jpg and b/testing/gallery/_thumbnail/street.jpg differ diff --git a/testing/gallery/_thumbnail/tablet.jpg b/testing/gallery/_thumbnail/tablet.jpg new file mode 100644 index 0000000..aaffa24 Binary files /dev/null and b/testing/gallery/_thumbnail/tablet.jpg differ diff --git a/testing/gallery/_thumbnail/2021-01-02 23.51.34.jpg b/testing/gallery/_thumbnail/video.jpg similarity index 100% rename from testing/gallery/_thumbnail/2021-01-02 23.51.34.jpg rename to testing/gallery/_thumbnail/video.jpg diff --git a/testing/gallery/icon-180x180.png b/testing/gallery/icon-180x180.png new file mode 100644 index 0000000..d5858d5 Binary files /dev/null and b/testing/gallery/icon-180x180.png differ diff --git a/testing/gallery/icon-192x192.png b/testing/gallery/icon-192x192.png new file mode 100644 index 0000000..0dfa010 Binary files /dev/null and b/testing/gallery/icon-192x192.png differ diff --git a/testing/gallery/icon-36x36.png b/testing/gallery/icon-36x36.png new file mode 100644 index 0000000..fd11fcd Binary files /dev/null and b/testing/gallery/icon-36x36.png differ diff --git a/testing/gallery/icon-48x48.png b/testing/gallery/icon-48x48.png new file mode 100644 index 0000000..dc99d0f Binary files /dev/null and b/testing/gallery/icon-48x48.png differ diff --git a/testing/gallery/icon-512x512.png b/testing/gallery/icon-512x512.png new file mode 100644 index 0000000..dcfc4a2 Binary files /dev/null and b/testing/gallery/icon-512x512.png differ diff --git a/testing/gallery/index.html b/testing/gallery/index.html index 444151c..9505ab5 100644 --- a/testing/gallery/index.html +++ b/testing/gallery/index.html @@ -32,38 +32,38 @@
- 2020-05-22 16.41.02.heic - 2020-05-22 16.41.02.heic + cranes.jpg + cranes.jpg
- 2021-01-01 17.11.35.heic - 2021-01-01 17.11.35.heic + dog.heic + dog.heic
- 2021-01-02 23.51.34.mp4 - 2021-01-02 23.51.34.mp4 + panorama.heic + panorama.heic
- 2021-02-22 15.36.43-1.heic - 2021-02-22 15.36.43-1.heic + screenshot.png + screenshot.png
- 2021-02-25 15.40.44.png - 2021-02-25 15.40.44.png + street.jpg + street.jpg
- _DSC9363_DxO.jpg - _DSC9363_DxO.jpg + tablet.heic + tablet.heic
- _DSC9439.jpg - _DSC9439.jpg + video.mp4 + video.mp4
@@ -102,58 +102,58 @@ { - thumbnail: "_thumbnail/2020-05-22 16.41.02.jpg", - fullsize: "_fullsize/2020-05-22 16.41.02.jpg", - original: "_original/2020-05-22 16.41.02.heic", - filename: "2020-05-22 16.41.02.heic" + thumbnail: "_thumbnail/cranes.jpg", + fullsize: "_fullsize/cranes.jpg", + original: "_original/cranes.jpg", + filename: "cranes.jpg" } , { - thumbnail: "_thumbnail/2021-01-01 17.11.35.jpg", - fullsize: "_fullsize/2021-01-01 17.11.35.jpg", - original: "_original/2021-01-01 17.11.35.heic", - filename: "2021-01-01 17.11.35.heic" + thumbnail: "_thumbnail/dog.jpg", + fullsize: "_fullsize/dog.jpg", + original: "_original/dog.heic", + filename: "dog.heic" } , { - thumbnail: "_thumbnail/2021-01-02 23.51.34.jpg", - fullsize: "_fullsize/2021-01-02 23.51.34.mp4", - original: "_original/2021-01-02 23.51.34.mp4", - filename: "2021-01-02 23.51.34.mp4" + thumbnail: "_thumbnail/panorama.jpg", + fullsize: "_fullsize/panorama.jpg", + original: "_original/panorama.heic", + filename: "panorama.heic" } , { - thumbnail: "_thumbnail/2021-02-22 15.36.43-1.jpg", - fullsize: "_fullsize/2021-02-22 15.36.43-1.jpg", - original: "_original/2021-02-22 15.36.43-1.heic", - filename: "2021-02-22 15.36.43-1.heic" + thumbnail: "_thumbnail/screenshot.jpg", + fullsize: "_fullsize/screenshot.jpg", + original: "_original/screenshot.png", + filename: "screenshot.png" } , { - thumbnail: "_thumbnail/2021-02-25 15.40.44.jpg", - fullsize: "_fullsize/2021-02-25 15.40.44.jpg", - original: "_original/2021-02-25 15.40.44.png", - filename: "2021-02-25 15.40.44.png" + thumbnail: "_thumbnail/street.jpg", + fullsize: "_fullsize/street.jpg", + original: "_original/street.jpg", + filename: "street.jpg" } , { - thumbnail: "_thumbnail/_DSC9363_DxO.jpg", - fullsize: "_fullsize/_DSC9363_DxO.jpg", - original: "_original/_DSC9363_DxO.jpg", - filename: "_DSC9363_DxO.jpg" + thumbnail: "_thumbnail/tablet.jpg", + fullsize: "_fullsize/tablet.jpg", + original: "_original/tablet.heic", + filename: "tablet.heic" } , { - thumbnail: "_thumbnail/_DSC9439.jpg", - fullsize: "_fullsize/_DSC9439.jpg", - original: "_original/_DSC9439.jpg", - filename: "_DSC9439.jpg" + thumbnail: "_thumbnail/video.jpg", + fullsize: "_fullsize/video.mp4", + original: "_original/video.mp4", + filename: "video.mp4" } ] @@ -163,6 +163,8 @@ + + diff --git a/testing/gallery/manifest.json b/testing/gallery/manifest.json new file mode 100644 index 0000000..2663ef5 --- /dev/null +++ b/testing/gallery/manifest.json @@ -0,0 +1,34 @@ +{ + "short_name": "source", + "start_url": "./", + "icons": [ + { + "src": "icon-180x180.png", + "sizes": "180x180", + "type": "image/png" + }, + { + "src": "icon-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icon-36x36.png", + "sizes": "36x36", + "type": "image/png" + }, + { + "src": "icon-48x48.png", + "sizes": "48x48", + "type": "image/png" + }, + { + "src": "icon-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "background_color": "#DDDDDD", + "theme_color": "#111111", + "display": "minimal-ui" +} \ No newline at end of file diff --git a/testing/gallery/serviceWorker.js b/testing/gallery/serviceWorker.js new file mode 100644 index 0000000..2b09903 --- /dev/null +++ b/testing/gallery/serviceWorker.js @@ -0,0 +1,13 @@ +self.addEventListener('install', (event) => { + console.log("Service worker installed") +}); + +self.addEventListener('activate', (event) => { + console.log("Service worker activated") +}); + +self.addEventListener('fetch', (event) => { + event.respondWith( + fetch(event.request) + ); +}); \ No newline at end of file diff --git a/testing/gallery/subdir/_fullsize/2021-01-13 18.19.20.jpg b/testing/gallery/subdir/_fullsize/2021-01-13 18.19.20.jpg deleted file mode 100644 index 69acf89..0000000 Binary files a/testing/gallery/subdir/_fullsize/2021-01-13 18.19.20.jpg and /dev/null differ diff --git a/testing/gallery/subdir/_fullsize/2021-02-04 13.46.20.jpg b/testing/gallery/subdir/_fullsize/2021-02-04 13.46.20.jpg deleted file mode 100644 index a854439..0000000 Binary files a/testing/gallery/subdir/_fullsize/2021-02-04 13.46.20.jpg and /dev/null differ diff --git a/testing/gallery/subdir/_fullsize/gate.jpg b/testing/gallery/subdir/_fullsize/gate.jpg new file mode 100644 index 0000000..d7226de Binary files /dev/null and b/testing/gallery/subdir/_fullsize/gate.jpg differ diff --git a/testing/gallery/subdir/_fullsize/winter.jpg b/testing/gallery/subdir/_fullsize/winter.jpg new file mode 100644 index 0000000..a338dab Binary files /dev/null and b/testing/gallery/subdir/_fullsize/winter.jpg differ diff --git a/testing/gallery/subdir/_original/2021-01-13 18.19.20.heic b/testing/gallery/subdir/_original/2021-01-13 18.19.20.heic deleted file mode 120000 index 67e2ad3..0000000 --- a/testing/gallery/subdir/_original/2021-01-13 18.19.20.heic +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/subdir/2021-01-13 18.19.20.heic \ No newline at end of file diff --git a/testing/gallery/subdir/_original/2021-02-04 13.46.20.heic b/testing/gallery/subdir/_original/2021-02-04 13.46.20.heic deleted file mode 120000 index 5ee046f..0000000 --- a/testing/gallery/subdir/_original/2021-02-04 13.46.20.heic +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/subdir/2021-02-04 13.46.20.heic \ No newline at end of file diff --git a/testing/gallery/subdir/_original/gate.heic b/testing/gallery/subdir/_original/gate.heic new file mode 120000 index 0000000..1ce60b9 --- /dev/null +++ b/testing/gallery/subdir/_original/gate.heic @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/subdir/gate.heic \ No newline at end of file diff --git a/testing/gallery/subdir/_original/winter.heic b/testing/gallery/subdir/_original/winter.heic new file mode 120000 index 0000000..355dd45 --- /dev/null +++ b/testing/gallery/subdir/_original/winter.heic @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/subdir/winter.heic \ No newline at end of file diff --git a/testing/gallery/subdir/_thumbnail/2021-01-13 18.19.20.jpg b/testing/gallery/subdir/_thumbnail/2021-01-13 18.19.20.jpg deleted file mode 100644 index 4e53b54..0000000 Binary files a/testing/gallery/subdir/_thumbnail/2021-01-13 18.19.20.jpg and /dev/null differ diff --git a/testing/gallery/subdir/_thumbnail/2021-02-04 13.46.20.jpg b/testing/gallery/subdir/_thumbnail/2021-02-04 13.46.20.jpg deleted file mode 100644 index 16d8664..0000000 Binary files a/testing/gallery/subdir/_thumbnail/2021-02-04 13.46.20.jpg and /dev/null differ diff --git a/testing/gallery/subdir/_thumbnail/gate.jpg b/testing/gallery/subdir/_thumbnail/gate.jpg new file mode 100644 index 0000000..ae2be93 Binary files /dev/null and b/testing/gallery/subdir/_thumbnail/gate.jpg differ diff --git a/testing/gallery/subdir/_thumbnail/winter.jpg b/testing/gallery/subdir/_thumbnail/winter.jpg new file mode 100644 index 0000000..4f8a083 Binary files /dev/null and b/testing/gallery/subdir/_thumbnail/winter.jpg differ diff --git a/testing/gallery/subdir/index.html b/testing/gallery/subdir/index.html index b883d0d..3eae87b 100644 --- a/testing/gallery/subdir/index.html +++ b/testing/gallery/subdir/index.html @@ -39,13 +39,13 @@
- 2021-01-13 18.19.20.heic - 2021-01-13 18.19.20.heic + gate.heic + gate.heic
- 2021-02-04 13.46.20.heic - 2021-02-04 13.46.20.heic + winter.heic + winter.heic
@@ -84,18 +84,18 @@ { - thumbnail: "_thumbnail/2021-01-13 18.19.20.jpg", - fullsize: "_fullsize/2021-01-13 18.19.20.jpg", - original: "_original/2021-01-13 18.19.20.heic", - filename: "2021-01-13 18.19.20.heic" + thumbnail: "_thumbnail/gate.jpg", + fullsize: "_fullsize/gate.jpg", + original: "_original/gate.heic", + filename: "gate.heic" } , { - thumbnail: "_thumbnail/2021-02-04 13.46.20.jpg", - fullsize: "_fullsize/2021-02-04 13.46.20.jpg", - original: "_original/2021-02-04 13.46.20.heic", - filename: "2021-02-04 13.46.20.heic" + thumbnail: "_thumbnail/winter.jpg", + fullsize: "_fullsize/winter.jpg", + original: "_original/winter.heic", + filename: "winter.heic" } ] @@ -105,6 +105,8 @@ + + diff --git a/testing/gallery/subdir/subsubdir/_fullsize/2021-02-17 18.59.30.jpg b/testing/gallery/subdir/subsubdir/_fullsize/2021-02-17 18.59.30.jpg deleted file mode 100644 index 0fe0675..0000000 Binary files a/testing/gallery/subdir/subsubdir/_fullsize/2021-02-17 18.59.30.jpg and /dev/null differ diff --git a/testing/gallery/subdir/subsubdir/_fullsize/recorder.jpg b/testing/gallery/subdir/subsubdir/_fullsize/recorder.jpg new file mode 100644 index 0000000..aa1b646 Binary files /dev/null and b/testing/gallery/subdir/subsubdir/_fullsize/recorder.jpg differ diff --git a/testing/gallery/subdir/subsubdir/_original/2021-02-17 18.59.30.heic b/testing/gallery/subdir/subsubdir/_original/2021-02-17 18.59.30.heic deleted file mode 120000 index 327866b..0000000 --- a/testing/gallery/subdir/subsubdir/_original/2021-02-17 18.59.30.heic +++ /dev/null @@ -1 +0,0 @@ -/home/toni/go/src/github.com/tonimelisma/fastgallery/testing/source/subdir/subsubdir/2021-02-17 18.59.30.heic \ No newline at end of file diff --git a/testing/gallery/subdir/subsubdir/_original/recorder.heic b/testing/gallery/subdir/subsubdir/_original/recorder.heic new file mode 120000 index 0000000..ffa285e --- /dev/null +++ b/testing/gallery/subdir/subsubdir/_original/recorder.heic @@ -0,0 +1 @@ +/Users/tonimelisma/go/src/github.com/tonimelisma/fastgallery/testing/source/subdir/subsubdir/recorder.heic \ No newline at end of file diff --git a/testing/gallery/subdir/subsubdir/_thumbnail/2021-02-17 18.59.30.jpg b/testing/gallery/subdir/subsubdir/_thumbnail/2021-02-17 18.59.30.jpg deleted file mode 100644 index 96b2e1f..0000000 Binary files a/testing/gallery/subdir/subsubdir/_thumbnail/2021-02-17 18.59.30.jpg and /dev/null differ diff --git a/testing/gallery/subdir/subsubdir/_thumbnail/recorder.jpg b/testing/gallery/subdir/subsubdir/_thumbnail/recorder.jpg new file mode 100644 index 0000000..5f659af Binary files /dev/null and b/testing/gallery/subdir/subsubdir/_thumbnail/recorder.jpg differ diff --git a/testing/gallery/subdir/subsubdir/index.html b/testing/gallery/subdir/subsubdir/index.html index a033117..8902d0f 100644 --- a/testing/gallery/subdir/subsubdir/index.html +++ b/testing/gallery/subdir/subsubdir/index.html @@ -32,8 +32,8 @@
- 2021-02-17 18.59.30.heic - 2021-02-17 18.59.30.heic + recorder.heic + recorder.heic
@@ -72,10 +72,10 @@ { - thumbnail: "_thumbnail/2021-02-17 18.59.30.jpg", - fullsize: "_fullsize/2021-02-17 18.59.30.jpg", - original: "_original/2021-02-17 18.59.30.heic", - filename: "2021-02-17 18.59.30.heic" + thumbnail: "_thumbnail/recorder.jpg", + fullsize: "_fullsize/recorder.jpg", + original: "_original/recorder.heic", + filename: "recorder.heic" } ] @@ -85,6 +85,8 @@ + +