Backend: Simplify and fix path names for development

Signed-off-by: Michael Mayer <michael@liquidbytes.net>

docker-compose.travis.yml

@@ -32,8 +32,8 @@ services:
       PHOTOPRISM_TEST_DSN: ".test.db"
       PHOTOPRISM_ASSETS_PATH: "/go/src/github.com/photoprism/photoprism/assets"
       PHOTOPRISM_STORAGE_PATH: "/go/src/github.com/photoprism/photoprism/storage"
-      PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/photos/originals"
+      PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/storage/originals"
-      PHOTOPRISM_IMPORT_PATH: "/go/src/github.com/photoprism/photoprism/photos/import"
+      PHOTOPRISM_IMPORT_PATH: "/go/src/github.com/photoprism/photoprism/storage/import"
       PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear
       PHOTOPRISM_THUMB_UNCACHED: "true" # On-demand rendering of default thumbnails (high memory and cpu usage)
       PHOTOPRISM_THUMB_SIZE: 2048 # Default thumbnail size limit (default 2048, min 720, max 3840)

docker-compose.yml

@@ -34,8 +34,8 @@ services:
       PHOTOPRISM_TEST_DSN: ".test.db"
       PHOTOPRISM_ASSETS_PATH: "/go/src/github.com/photoprism/photoprism/assets"
       PHOTOPRISM_STORAGE_PATH: "/go/src/github.com/photoprism/photoprism/storage"
-      PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/photos/originals"
+      PHOTOPRISM_ORIGINALS_PATH: "/go/src/github.com/photoprism/photoprism/storage/originals"
-      PHOTOPRISM_IMPORT_PATH: "/go/src/github.com/photoprism/photoprism/photos/import"
+      PHOTOPRISM_IMPORT_PATH: "/go/src/github.com/photoprism/photoprism/storage/import"
       PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear
       PHOTOPRISM_THUMB_UNCACHED: "true" # On-demand rendering of default thumbnails (high memory and cpu usage)
       PHOTOPRISM_THUMB_SIZE: 2048 # Default thumbnail size limit (default 2048, min 720, max 3840)

photos/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

pkg/fs/dirs.go

@@ -12,6 +12,7 @@ import (
 
 var OriginalPaths = []string{
 	"/photoprism/photos/originals",
+	"/photoprism/storage/originals",
 	"/photoprism/originals",
 	"photoprism/originals",
 	"PhotoPrism/Originals",
@@ -23,6 +24,7 @@ var OriginalPaths = []string{
 	"Pictures/Original",
 	"photos/originals",
 	"Photos/Originals",
+	"storage/originals",
 	"photos/original",
 	"Photos/Original",
 	"originals",
@@ -65,6 +67,7 @@ var OriginalPaths = []string{
 
 var ImportPaths = []string{
 	"/photoprism/photos/import",
+	"/photoprism/storage/import",
 	"/photoprism/import",
 	"photoprism/import",
 	"PhotoPrism/Import",
@@ -72,6 +75,7 @@ var ImportPaths = []string{
 	"Pictures/Import",
 	"photos/import",
 	"Photos/Import",
+	"storage/import",
 	"import",
 	"Import",
 	"~/pictures/import",

scripts/download-nasnet.sh

@@ -8,13 +8,13 @@ MODEL_PATH="assets/nasnet"
 MODEL_ZIP="/tmp/photoprism/nasnet.zip"
 MODEL_HASH="f18b801354e95cade497b4f12e8d2537d04c04f6  $MODEL_ZIP"
 MODEL_VERSION="$MODEL_PATH/version.txt"
-MODEL_BACKUP="assets/backups/nasnet-$TODAY"
+MODEL_BACKUP="storage/backups/nasnet-$TODAY"
 
 echo "Installing $MODEL_NAME model for TensorFlow..."
 
 # Create directories
 mkdir -p /tmp/photoprism
-mkdir -p assets/backups
+mkdir -p storage/backups
 
 # Check for update
 if [[ -f ${MODEL_ZIP} ]] && [[ `sha1sum ${MODEL_ZIP}` == ${MODEL_HASH} ]]; then

scripts/download-nsfw.sh

@@ -8,13 +8,13 @@ MODEL_PATH="assets/nsfw"
 MODEL_ZIP="/tmp/photoprism/nsfw.zip"
 MODEL_HASH="2e03ad3c6aec27c270c650d0574ff2a6291d992b  $MODEL_ZIP"
 MODEL_VERSION="$MODEL_PATH/version.txt"
-MODEL_BACKUP="assets/backups/nsfw-$TODAY"
+MODEL_BACKUP="storage/backups/nsfw-$TODAY"
 
 echo "Installing $MODEL_NAME model for TensorFlow..."
 
 # Create directories
 mkdir -p /tmp/photoprism
-mkdir -p assets/backups
+mkdir -p storage/backups
 
 # Check for update
 if [[ -f ${MODEL_ZIP} ]] && [[ `sha1sum ${MODEL_ZIP}` == ${MODEL_HASH} ]]; then

storage/cache/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

storage/settings/photoprism.yml

@@ -1,27 +0,0 @@
-url: "https://demo.photoprism.org/"
-title: "PhotoPrism"
-subtitle: "Browse your life"
-description: "Personal Photo Management powered by Go and Google TensorFlow. Free and open-source."
-author: "Anonymous"
-twitter: "@browseyourlife"
-debug: false
-read-only: false
-public: false
-experimental: false
-admin-password: photoprism
-assets-path: ~/.photoprism/assets
-storage-path: ~/.photoprism/storage
-pid-filename: ~/.photoprism/photoprism.pid
-log-filename: ~/.photoprism/photoprism.log
-originals-path: ~/Pictures/Originals
-import-path: ~/Pictures/Import
-http-host:
-http-mode: release
-http-port: 2342
-database-driver: sqlite
-detach-server: false
-sidecar-json: false
-sidecar-yaml: false
-sidecar-hidden: true
-jpeg-quality: 90
-jpeg-hidden: true

storage/settings/settings.yml

@@ -1,29 +0,0 @@
-theme: default
-language: en
-templates:
-  default: index.tmpl
-maps:
-  animate: 0
-  style: streets
-features:
-  archive: true
-  private: true
-  review: true
-  upload: true
-  import: true
-  files: true
-  moments: true
-  labels: true
-  places: true
-  download: true
-  edit: true
-  share: true
-  logs: true
-import:
-  path: /
-  move: false
-index:
-  path: /
-  convert: true
-  rescan: false
-  group: true