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

Backend: Add settings to public / share client config #363

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-06-23 12:37:37 +02:00
parent 12cfe6efec
commit cd3a2afdbc
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/config/client.go
View file

@ -121,8 +121,8 @@ func (c *Config) PublicConfig() ClientConfig {
Settings: Settings{ Settings: Settings{
Language: settings.Language, Language: settings.Language,
Theme: settings.Theme, Theme: settings.Theme,
Maps: MapsSettings{Animate: settings.Maps.Animate, Style: settings.Maps.Style}, Maps: settings.Maps,
Features: FeatureSettings{Download: settings.Features.Download}, Features: settings.Features,
}, },
Flags: strings.Join(c.Flags(), " "), Flags: strings.Join(c.Flags(), " "),
Name: c.Name(), Name: c.Name(),
@ -159,8 +159,8 @@ func (c *Config) ShareConfig() ClientConfig {
Settings: Settings{ Settings: Settings{
Language: settings.Language, Language: settings.Language,
Theme: settings.Theme, Theme: settings.Theme,
Maps: MapsSettings{Animate: settings.Maps.Animate, Style: settings.Maps.Style}, Maps: settings.Maps,
Features: FeatureSettings{Download: settings.Features.Download}, Features: settings.Features,
}, },
Flags: "readonly public shared", Flags: "readonly public shared",
Name: c.Name(), Name: c.Name(),

18
pkg/txt/capitalization_test.go
View file

@ -113,16 +113,16 @@ func TestTitleFromFileName(t *testing.T) {
assert.Equal(t, "Changing of the Guard / Buckingham Palace", TitleFromFileName("changing-of-the-guard--buckingham-palace_7925318070_o.jpg")) assert.Equal(t, "Changing of the Guard / Buckingham Palace", TitleFromFileName("changing-of-the-guard--buckingham-palace_7925318070_o.jpg"))
}) })
/* /*
Additional tests for https://github.com/photoprism/photoprism/issues/361 Additional tests for https://github.com/photoprism/photoprism/issues/361
-rw-r--r-- 1 root root 813009 Jun 8 23:42 えく - スカイフレア (82063926) .png -rw-r--r-- 1 root root 813009 Jun 8 23:42 えく - スカイフレア (82063926) .png
-rw-r--r-- 1 root root 161749 Jun 6 15:48 紅シャケ＠お仕事募集中 - モスティマ (81974640) .jpg -rw-r--r-- 1 root root 161749 Jun 6 15:48 紅シャケ＠お仕事募集中 - モスティマ (81974640) .jpg
[root@docker Pictures]# ls -l Originals/al [root@docker Pictures]# ls -l Originals/al
total 1276 total 1276
-rw-r--r-- 1 root root 451062 Jun 18 19:00 Cyka - swappable mag (82405706) .jpg -rw-r--r-- 1 root root 451062 Jun 18 19:00 Cyka - swappable mag (82405706) .jpg
-rw-r--r-- 1 root root 662922 Jun 15 21:18 dishwasher1910 - Friedrich the smol (82201574) 1ページ.jpg -rw-r--r-- 1 root root 662922 Jun 15 21:18 dishwasher1910 - Friedrich the smol (82201574) 1ページ.jpg
-rw-r--r-- 1 root root 185971 Jun 19 21:07 EaycddvU0AAfuUR.jpg -rw-r--r-- 1 root root 185971 Jun 19 21:07 EaycddvU0AAfuUR.jpg
*/ */
t.Run("issue_361_a", func(t *testing.T) { t.Run("issue_361_a", func(t *testing.T) {
assert.Equal(t, "えく スカイフレア", TitleFromFileName("えく - スカイフレア (82063926) .png")) assert.Equal(t, "えく スカイフレア", TitleFromFileName("えく - スカイフレア (82063926) .png"))
}) })