diff --git a/Makefile b/Makefile index a0e05b662..ab39e99c1 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,6 @@ test-pkg: reset-sqlite run-test-pkg test-api: reset-sqlite run-test-api test-short: reset-sqlite run-test-short test-mariadb: reset-acceptance run-test-mariadb -test-mariadb-internal: reset-acceptance run-test-mariadb-internal acceptance-private-run-chromium: acceptance-private-restart acceptance-private acceptance-private-stop acceptance-public-run-chromium: acceptance-restart acceptance acceptance-stop acceptance-private-run-firefox: acceptance-private-restart acceptance-private-firefox acceptance-private-stop @@ -245,9 +244,6 @@ run-test-go: run-test-mariadb: $(info Running all Go unit tests on MariaDB...) PHOTOPRISM_TEST_DRIVER="mysql" PHOTOPRISM_TEST_DSN="root:photoprism@tcp(mariadb:4001)/acceptance?charset=utf8mb4,utf8&collation=utf8mb4_unicode_ci&parseTime=true" $(GOTEST) -parallel 1 -count 1 -cpu 1 -tags slow -timeout 20m ./pkg/... ./internal/... -run-test-mariadb-internal: - $(info Running all Go unit tests on MariaDB...) - PHOTOPRISM_TEST_DRIVER="mysql" PHOTOPRISM_TEST_DSN="root:photoprism@tcp(mariadb:4001)/acceptance?charset=utf8mb4,utf8&collation=utf8mb4_unicode_ci&parseTime=true" $(GOTEST) -parallel 1 -count 1 -cpu 1 -tags slow -timeout 20m ./internal/acl ./internal/api ./internal/entity run-test-pkg: $(info Running all Go unit tests in "/pkg"...) $(GOTEST) -parallel 2 -count 1 -cpu 2 -tags slow -timeout 20m ./pkg/... diff --git a/docker-compose.latest.yml b/docker-compose.latest.yml index 3e4afcb65..4969e1be6 100644 --- a/docker-compose.latest.yml +++ b/docker-compose.latest.yml @@ -36,10 +36,10 @@ services: PHOTOPRISM_HTTP_PORT: 2342 PHOTOPRISM_HTTP_COMPRESSION: "gzip" # improves transfer speed and bandwidth utilization (none or gzip) PHOTOPRISM_DATABASE_DRIVER: "mysql" - PHOTOPRISM_DATABASE_SERVER: "mariadb-10-8:4001" - PHOTOPRISM_DATABASE_NAME: "photoprism" - PHOTOPRISM_DATABASE_USER: "photoprism" - PHOTOPRISM_DATABASE_PASSWORD: "photoprism" + PHOTOPRISM_DATABASE_SERVER: "mariadb:4001" + PHOTOPRISM_DATABASE_NAME: "latest" + PHOTOPRISM_DATABASE_USER: "latest" + PHOTOPRISM_DATABASE_PASSWORD: "latest" PHOTOPRISM_DISABLE_CHOWN: "false" # disables storage permission updates on startup PHOTOPRISM_DISABLE_BACKUPS: "false" # disables backing up albums and photo metadata to YAML files PHOTOPRISM_DISABLE_WEBDAV: "false" # disables built-in WebDAV server diff --git a/docker-compose.yml b/docker-compose.yml index 86f498602..0ff9b0794 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,6 @@ services: PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" PHOTOPRISM_SITE_DESCRIPTION: "Tags and finds pictures without getting in your way!" PHOTOPRISM_SITE_AUTHOR: "@photoprism_app" - PHOTOPRISM_IMPRINT: "Beijing ICP Certificate No. 030123" PHOTOPRISM_DEBUG: "true" PHOTOPRISM_READONLY: "false" PHOTOPRISM_PUBLIC: "true" diff --git a/internal/meta/data.go b/internal/meta/data.go index 0d0dd9792..6949d8c7c 100644 --- a/internal/meta/data.go +++ b/internal/meta/data.go @@ -17,8 +17,8 @@ type Data struct { FileName string `meta:"FileName"` DocumentID string `meta:"BurstUUID,MediaGroupUUID,ImageUniqueID,OriginalDocumentID,DocumentID,DigitalImageGUID"` InstanceID string `meta:"InstanceID,DocumentID"` - TakenAt time.Time `meta:"SubSecDateTimeOriginal,SubSecCreateDate,DateTimeOriginal,CreationDate,CreateDate,DateCreated,MediaCreateDate,ContentCreateDate,DateTimeDigitized,DateTime" xmp:"DateCreated"` - TakenAtLocal time.Time `meta:"SubSecDateTimeOriginal,SubSecCreateDate,DateTimeOriginal,CreationDate,CreateDate,DateCreated,MediaCreateDate,ContentCreateDate,DateTimeDigitized,DateTime"` + TakenAt time.Time `meta:"SubSecDateTimeOriginal,SubSecCreateDate,DateTimeOriginal,CreationDate,CreateDate,MediaCreateDate,ContentCreateDate,DateTimeDigitized,DateTime" xmp:"DateCreated"` + TakenAtLocal time.Time `meta:"SubSecDateTimeOriginal,SubSecCreateDate,DateTimeOriginal,CreationDate,CreateDate,MediaCreateDate,ContentCreateDate,DateTimeDigitized,DateTime"` TakenGps time.Time `meta:"GPSDateTime,GPSDateStamp"` TakenNs int `meta:"-"` TimeZone string `meta:"-"`