beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

WebDAV: Sync video files #504

Browse source
This commit is contained in:
Michael Mayer 2020-12-05 02:18:45 +01:00
parent 56851f4892
commit 0b16a67c90
9 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/dialog/account/edit.vue
View file

@ -177,7 +177,7 @@
:disabled="!model.AccSync"
hide-details
color="secondary-dark"
:label="$gettext('Sync raw images')"
:label="$gettext('Sync raw and video files')"
v-model="model.SyncRaw"
></v-checkbox>
</v-flex>

BIN
frontend/src/locales/de.mo
View file

Binary file not shown.

44
frontend/src/locales/de.po
View file

@ -10,7 +10,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: easygettext\n"
"X-Generator: Poedit 2.4.2\n"
"X-Generator: Poedit 2.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/pages/albums.vue:273 src/share/albums.vue:248
@ -95,7 +95,7 @@ msgid "Add Server"
msgstr "Server hinzufügen"
#: src/component/album/clipboard.vue:132 src/component/file/clipboard.vue:85
#: src/component/label/clipboard.vue:63 src/component/photo/clipboard.vue:187
#: src/component/label/clipboard.vue:64 src/component/photo/clipboard.vue:187
#: src/dialog/photo/album.vue:17
msgid "Add to album"
msgstr "Hinzufügen"
@ -375,8 +375,8 @@ msgstr "Abbrechen"
msgid "Cards"
msgstr "Karteikarten"
#: src/component/photo/toolbar.vue:344 src/dialog/album/edit.vue:161
#: src/pages/about/feedback.vue:91 src/pages/albums.vue:104
#: src/component/photo/toolbar.vue:345 src/dialog/album/edit.vue:161
#: src/pages/about/feedback.vue:93 src/pages/albums.vue:104
msgid "Category"
msgstr "Kategorie"
@ -413,7 +413,7 @@ msgstr "Schließen"
msgid "Codec"
msgstr "Codec"
#: src/component/photo/toolbar.vue:320
#: src/component/photo/toolbar.vue:321
msgid "Color"
msgstr "Farbe"
@ -540,10 +540,10 @@ msgstr "Standard"
msgid "Default Folder"
msgstr "Standard Ordner"
#: src/component/album/clipboard.vue:153 src/component/label/clipboard.vue:84
#: src/component/album/clipboard.vue:153 src/component/label/clipboard.vue:85
#: src/dialog/account/remove.vue:15 src/dialog/album/delete.vue:18
#: src/dialog/file/delete.vue:18 src/dialog/label/delete.vue:15
#: src/dialog/photo/files.vue:42 src/dialog/share.vue:228
#: src/dialog/photo/files.vue:42 src/dialog/share.vue:229
msgid "Delete"
msgstr "Löschen"
@ -617,7 +617,7 @@ msgstr "Duplikate werden übersprungen und erscheinen nur einmal."
msgid "Dutch"
msgstr "Niederländisch"
#: src/pages/about/feedback.vue:164
#: src/pages/about/feedback.vue:166
msgid "E-Mail"
msgstr "E-Mail"
@ -824,9 +824,9 @@ msgstr "Privates ausblenden"
#: src/options/options.js:108
msgid "Hindi"
msgstr ""
msgstr "Hindi"
#: src/pages/about/feedback.vue:123
#: src/pages/about/feedback.vue:125
msgid "How can we help?"
msgstr "Wie können wir helfen?"
@ -930,7 +930,7 @@ msgstr "Suchbegriffe"
msgid "Label"
msgstr "Kategorie"
#: src/dialog/photo/labels.vue:48 src/pages/labels.vue:308
#: src/dialog/photo/labels.vue:48 src/pages/labels.vue:309
msgid "Label Name"
msgstr "Name"
@ -1082,7 +1082,7 @@ msgstr "Monochrom"
msgid "Month"
msgstr "Monat"
#: src/options/options.js:127 src/options/options.js:180
#: src/options/options.js:127
msgid "Moonlight"
msgstr "Moonlight"
@ -1129,7 +1129,7 @@ msgstr[1] ""
#: src/component/photo/list.vue:33 src/dialog/account/edit.vue:359
#: src/dialog/album/edit.vue:105 src/dialog/photo/files.vue:72
#: src/dialog/photo/files.vue:29 src/dialog/photo/info.vue:30
#: src/pages/about/feedback.vue:141 src/pages/login.vue:67
#: src/pages/about/feedback.vue:143 src/pages/login.vue:67
#: src/share/photo/list.vue:28
msgid "Name"
msgstr "Name"
@ -1313,6 +1313,10 @@ msgstr "Originale"
msgid "Other"
msgstr "Sonstiges"
#: src/options/options.js:180
msgid "Outdoor"
msgstr "Outdoor"
#: src/dialog/photo/info.vue:101
msgid "Panorama"
msgstr "Panorama"
@ -1514,8 +1518,8 @@ msgstr "Fehler melden"
msgid "Request failed - invalid response"
msgstr "Anfrage fehlgeschlagen - ungültige Antwort"
#: src/pages/about/feedback.vue:102 src/pages/about/feedback.vue:122
#: src/pages/about/feedback.vue:162
#: src/pages/about/feedback.vue:104 src/pages/about/feedback.vue:124
#: src/pages/about/feedback.vue:164
msgid "Required"
msgstr "Erforderlich"
@ -1586,10 +1590,8 @@ msgid "Select albums or create a new one"
msgstr "Alben auswählen oder neue erstellen"
#: src/component/photo/clipboard.vue:33
#, fuzzy
#| msgid "Selection archived"
msgid "Selection approved"
msgstr "Auswahl archiviert"
msgstr "Auswahl übernommen"
#: src/component/photo/clipboard.vue:42
msgid "Selection archived"
@ -1747,8 +1749,8 @@ msgid "Sync"
msgstr "Sync"
#: src/dialog/account/edit.vue:335
msgid "Sync raw images"
msgstr "RAW-Dateien sichern"
msgid "Sync raw and video files"
msgstr "RAWs und Videos kopieren"
#: src/component/photo/list.vue:30 src/dialog/photo/info.vue:50
#: src/share/photo/list.vue:25
@ -1995,7 +1997,7 @@ msgstr ""
#: src/pages/about/feedback.vue:4
msgid "Your message has been sent"
msgstr "Nachricht versendet, vielen Dank!"
msgstr "Ihre Nachricht wurde gesendet"
#: src/component/photo/viewer.vue:135
msgid "Zoom in/out"

2
frontend/src/locales/translations.json
View file

File diff suppressed because one or more lines are too long

7
frontend/src/locales/translations.pot
View file

@ -1147,7 +1147,6 @@ msgid "Month"
msgstr ""
#: src/options/options.js:127
#: src/options/options.js:180
msgid "Moonlight"
msgstr ""
@ -1389,6 +1388,10 @@ msgstr ""
msgid "Other"
msgstr ""
#: src/options/options.js:180
msgid "Outdoor"
msgstr ""
#: src/dialog/photo/info.vue:101
msgid "Panorama"
msgstr ""
@ -1851,7 +1854,7 @@ msgid "Sync"
msgstr ""
#: src/dialog/account/edit.vue:335
msgid "Sync raw images"
msgid "Sync raw and video files"
msgstr ""
#: src/component/photo/list.vue:30

4
internal/api/account.go
View file

@ -274,6 +274,10 @@ func UpdateAccount(router *gin.RouterGroup) {
return
}
if m.AccSync {
workers.StartSync(service.Config())
}
c.JSON(http.StatusOK, m)
})
}

8
internal/workers/sync_refresh.go
View file

@ -51,11 +51,9 @@ func (worker *Sync) refresh(a entity.Account) (complete bool, err error) {
// Select supported types for download
mediaType := fs.GetMediaType(file.Name)
switch mediaType {
case fs.MediaImage:
case fs.MediaImage, fs.MediaSidecar:
f.Status = entity.FileSyncNew
case fs.MediaSidecar:
f.Status = entity.FileSyncNew
case fs.MediaRaw:
case fs.MediaRaw, fs.MediaVideo:
if a.SyncRaw {
f.Status = entity.FileSyncNew
}
@ -68,7 +66,7 @@ func (worker *Sync) refresh(a entity.Account) (complete bool, err error) {
continue
}
if f.Status == entity.FileSyncIgnore && mediaType == fs.MediaRaw && a.SyncRaw {
if f.Status == entity.FileSyncIgnore && a.SyncRaw && (mediaType == fs.MediaRaw || mediaType == fs.MediaVideo) {
worker.logError(f.Update("Status", entity.FileSyncNew))
}

4
internal/workers/sync_upload.go
View file

@ -5,6 +5,8 @@ import (
"path/filepath"
"time"
"github.com/photoprism/photoprism/pkg/txt"
"github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/event"
"github.com/photoprism/photoprism/internal/mutex"
@ -54,7 +56,7 @@ func (worker *Sync) upload(a entity.Account) (complete bool, err error) {
continue // try again next time
}
log.Infof("sync: uploaded %s to %s on %s", fileName, remoteName, a.AccName)
log.Infof("sync: uploaded %s to %s (%s)", txt.Quote(file.FileName), txt.Quote(remoteName), a.AccName)
fileSync := entity.NewFileSync(a.ID, remoteName)
fileSync.Status = entity.FileSyncUploaded

4
pkg/fs/mediatype.go
View file

@ -3,10 +3,10 @@ package fs
type MediaType string
const (
MediaRaw MediaType = "raw"
MediaImage MediaType = "image"
MediaVideo MediaType = "video"
MediaSidecar MediaType = "sidecar"
MediaRaw MediaType = "raw"
MediaVideo MediaType = "video"
MediaOther MediaType = "other"
)