1diff --git a/Makefile b/Makefile
2index 743c0fd2e391830b12b52616a9acd68b37ef9aa3..76c271a2565bfb16b476e67c6268b9c395441f5b 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -30,7 +30,7 @@
6 compress_into_oblivion: build
7 upx --best --ultra-brute $(OUT)
8
9-run: sass
10+run: sass tmpl
11 $(GO_RUN) $(SERVER) \
12 --db-type=$(DB_TYPE) \
13 --db-con="$(DB_CON)" \
14diff --git a/cmd/server/main.go b/cmd/server/main.go
15index 035d00aba84f2c6f54ce952f28c9b28b6b719e9e..daf5356263701e47f844e450c6a9d5d491bc7808 100644
16--- a/cmd/server/main.go
17+++ b/cmd/server/main.go
18@@ -109,6 +109,7 @@ view.NewAuthView(userController),
19 view.NewFileSystemView(*fileSystemController, settingsRepository),
20 view.NewSettingsView(settingsRepository, userController),
21 view.NewMediaView(mediaRepository, userRepository, settingsRepository),
22+ view.NewAlbumView(mediaRepository, userRepository, settingsRepository),
23 } {
24 v.SetMyselfIn(extRouter)
25 }
26diff --git a/pkg/database/repository/media.go b/pkg/database/repository/media.go
27index d6addbf7d2189814875083776bb38b422ed5aee3..9915c90c7f8a3ba35b115113c08ca8cdde69f29d 100644
28--- a/pkg/database/repository/media.go
29+++ b/pkg/database/repository/media.go
30@@ -35,7 +35,9 @@ GPSLongitude *float64
31 }
32
33 Album struct {
34- ID uint
35+ ID uint
36+ Name string
37+ Path string
38 }
39
40 MediaThumbnail struct {
41@@ -43,9 +45,10 @@ Path string
42 }
43
44 Pagination struct {
45- Page int
46- Size int
47- Path string
48+ Page int
49+ Size int
50+ AlbumID *uint
51+ Path string
52 }
53
54 CreateMedia struct {
55@@ -83,8 +86,10 @@ GetThumbnail(context.Context, uint) (*MediaThumbnail, error)
56 CreateThumbnail(context.Context, uint, *MediaThumbnail) error
57
58 ListEmptyAlbums(context.Context, *Pagination) ([]*Media, error)
59+ ListAlbums(context.Context, uint) ([]*Album, error)
60 ExistsAlbumByAbsolutePath(context.Context, string) (bool, error)
61 GetAlbumByAbsolutePath(context.Context, string) (*Album, error)
62+ GetAlbum(context.Context, uint) (*Album, error)
63 CreateAlbum(context.Context, *CreateAlbum) (*Album, error)
64 CreateAlbumFile(context.Context, *CreateAlbumFile) error
65 }
66diff --git a/pkg/database/sql/media.go b/pkg/database/sql/media.go
67index 59e39eebc37dd9a80b8e8f5e9a2452d827e88740..4b48608a19f623d1b6021171ce0942fd88d10fbb 100644
68--- a/pkg/database/sql/media.go
69+++ b/pkg/database/sql/media.go
70@@ -23,7 +23,7 @@ MediaEXIF struct {
71 gorm.Model
72 Width *float64
73 Height *float64
74- MediaID uint
75+ MediaID uint `gorm:"not null"`
76 Media Media
77 Description *string
78 Camera *string
79@@ -43,8 +43,8 @@ }
80
81 MediaThumbnail struct {
82 gorm.Model
83- Path string
84- MediaID uint
85+ Path string `gorm:"not null;unique"`
86+ MediaID uint `gorm:"not null"`
87 Media Media
88 }
89
90@@ -53,7 +53,7 @@ gorm.Model
91 ParentID *uint
92 Parent *MediaAlbum
93 Name string
94- Path string
95+ Path string `gorm:"not null; unique"`
96 }
97
98 MediaAlbumFile struct {
99@@ -104,7 +104,9 @@ }
100
101 func (a *MediaAlbum) ToModel() *repository.Album {
102 return &repository.Album{
103- ID: a.ID,
104+ ID: a.ID,
105+ Name: a.Name,
106+ Path: a.Path,
107 }
108 }
109
110@@ -407,6 +409,22 @@
111 return m.ToModel(), nil
112 }
113
114+func (r *MediaRepository) GetAlbum(ctx context.Context, albumID uint) (*repository.Album, error) {
115+ m := &MediaAlbum{}
116+ result := r.db.
117+ WithContext(ctx).
118+ Model(&MediaAlbum{}).
119+ Where("id = ?", albumID).
120+ Limit(1).
121+ Take(m)
122+
123+ if result.Error != nil {
124+ return nil, result.Error
125+ }
126+
127+ return m.ToModel(), nil
128+}
129+
130 func (m *MediaRepository) CreateAlbum(ctx context.Context, createAlbum *repository.CreateAlbum) (*repository.Album, error) {
131 album := &MediaAlbum{
132 ParentID: createAlbum.ParentID,
133@@ -439,3 +457,21 @@ }
134
135 return nil
136 }
137+
138+func (m *MediaRepository) ListAlbums(ctx context.Context, albumID uint) ([]*repository.Album, error) {
139+ albums := make([]*MediaAlbum, 0)
140+
141+ result := m.db.
142+ WithContext(ctx).
143+ Model(&MediaAlbum{}).
144+ Where("parent_id = ?", albumID).
145+ Find(&albums)
146+
147+ if result.Error != nil {
148+ return nil, result.Error
149+ }
150+
151+ return list.Map(albums, func(a *MediaAlbum) *repository.Album {
152+ return a.ToModel()
153+ }), nil
154+}
155diff --git a/pkg/view/album.go b/pkg/view/album.go
156new file mode 100644
157index 0000000000000000000000000000000000000000..a96b9bd89530fbb8e557a68e2c4fb2f299784748
158--- /dev/null
159+++ b/pkg/view/album.go
160@@ -0,0 +1,102 @@
161+package view
162+
163+import (
164+ "net/http"
165+
166+ "git.sr.ht/~gabrielgio/img/pkg/database/repository"
167+ "git.sr.ht/~gabrielgio/img/pkg/ext"
168+ "git.sr.ht/~gabrielgio/img/templates"
169+)
170+
171+type (
172+ AlbumView struct {
173+ mediaRepository repository.MediaRepository
174+ userRepository repository.UserRepository
175+ settingsRepository repository.SettingsRepository
176+ }
177+)
178+
179+func NewAlbumView(
180+ mediaRepository repository.MediaRepository,
181+ userRepository repository.UserRepository,
182+ settingsRepository repository.SettingsRepository,
183+) *AlbumView {
184+ return &AlbumView{
185+ mediaRepository: mediaRepository,
186+ userRepository: userRepository,
187+ settingsRepository: settingsRepository,
188+ }
189+}
190+
191+func (self *AlbumView) Index(w http.ResponseWriter, r *http.Request) error {
192+ p := getPagination(r)
193+ token := ext.GetTokenFromCtx(w, r)
194+
195+ // TODO: optmize call, GetPathFromUserID may no be necessary
196+ userPath, err := self.userRepository.GetPathFromUserID(r.Context(), token.UserID)
197+ if err != nil {
198+ return err
199+ }
200+
201+ var albums []*repository.Album
202+ var album *repository.Album
203+
204+ if p.AlbumID == nil {
205+ // use user path as default value
206+ p.Path = userPath
207+
208+ album, err = self.mediaRepository.GetAlbumByAbsolutePath(r.Context(), p.Path)
209+ if err != nil {
210+ return err
211+ }
212+
213+ albums, err = self.mediaRepository.ListAlbums(r.Context(), album.ID)
214+ if err != nil {
215+ return err
216+ }
217+ } else {
218+ album, err = self.mediaRepository.GetAlbum(r.Context(), *p.AlbumID)
219+ if err != nil {
220+ return err
221+ }
222+
223+ // TODO: User can enter a album out of its bounderies
224+ p.Path = album.Path
225+
226+ albums, err = self.mediaRepository.ListAlbums(r.Context(), *p.AlbumID)
227+ if err != nil {
228+ return err
229+ }
230+
231+ }
232+
233+ medias, err := self.mediaRepository.List(r.Context(), p)
234+ if err != nil {
235+ return err
236+ }
237+
238+ settings, err := self.settingsRepository.Load(r.Context())
239+ if err != nil {
240+ return err
241+ }
242+
243+ page := &templates.AlbumPage{
244+ Medias: medias,
245+ Albums: albums,
246+ Name: album.Name,
247+ Next: &repository.Pagination{
248+ Size: p.Size,
249+ Page: p.Page + 1,
250+ },
251+ Settings: settings,
252+ }
253+
254+ templates.WritePageTemplate(w, page)
255+
256+ return nil
257+}
258+
259+func (self *AlbumView) SetMyselfIn(r *ext.Router) {
260+ r.GET("/album/", self.Index)
261+ r.POST("/album/", self.Index)
262+}
263diff --git a/pkg/view/media.go b/pkg/view/media.go
264index c7d84ec9e8346627ef2b13fab1bc7e0ec949a2d5..3124119f901e683cddd810c4694584937b5c859f 100644
265--- a/pkg/view/media.go
266+++ b/pkg/view/media.go
267@@ -17,12 +17,14 @@ settingsRepository repository.SettingsRepository
268 }
269 )
270
271-func getPagination(w http.ResponseWriter, r *http.Request) *repository.Pagination {
272+func getPagination(r *http.Request) *repository.Pagination {
273 var (
274- size int
275- page int
276- sizeStr = r.FormValue("size")
277- pageStr = r.FormValue("page")
278+ size int
279+ page int
280+ albumID *uint
281+ sizeStr = r.FormValue("size")
282+ pageStr = r.FormValue("page")
283+ albumIDStr = r.FormValue("albumId")
284 )
285
286 if sizeStr == "" {
287@@ -41,9 +43,17 @@ } else {
288 page = p
289 }
290
291+ if albumIDStr == "" {
292+ page = 0
293+ } else if p, err := strconv.Atoi(albumIDStr); err == nil {
294+ id := uint(p)
295+ albumID = &id
296+ }
297+
298 return &repository.Pagination{
299- Page: page,
300- Size: size,
301+ Page: page,
302+ Size: size,
303+ AlbumID: albumID,
304 }
305 }
306
307@@ -60,7 +70,7 @@ }
308 }
309
310 func (self *MediaView) Index(w http.ResponseWriter, r *http.Request) error {
311- p := getPagination(w, r)
312+ p := getPagination(r)
313 token := ext.GetTokenFromCtx(w, r)
314
315 userPath, err := self.userRepository.GetPathFromUserID(r.Context(), token.UserID)
316diff --git a/pkg/worker/scanner/album_scanner.go b/pkg/worker/scanner/album_scanner.go
317index 618a184d157d6fba7abfcf3e64823107ddba0583..04af9bceac2ed534d76640f3682c558ade815986 100644
318--- a/pkg/worker/scanner/album_scanner.go
319+++ b/pkg/worker/scanner/album_scanner.go
320@@ -92,6 +92,7 @@ func FanInwards(paths []string) []string {
321 result := make([]string, 0, len(paths))
322 for i := (len(paths) - 1); i >= 0; i-- {
323 subPaths := paths[0:i]
324+ subPaths = append([]string{"/"}, subPaths...)
325 result = append(result, path.Join(subPaths...))
326 }
327 return result
328diff --git a/templates/album.qtpl b/templates/album.qtpl
329new file mode 100644
330index 0000000000000000000000000000000000000000..ce8111e926fdfff1f11d2947d5822bb7b1ef09c2
331--- /dev/null
332+++ b/templates/album.qtpl
333@@ -0,0 +1,50 @@
334+{% import "git.sr.ht/~gabrielgio/img/pkg/database/repository" %}
335+
336+{% code
337+type AlbumPage struct {
338+ Medias []*repository.Media
339+ Next *repository.Pagination
340+ Settings *repository.Settings
341+ Albums []*repository.Album
342+ Name string
343+}
344+
345+func (m *AlbumPage) PreloadAttr() string {
346+ if m.Settings.PreloadVideoMetadata {
347+ return "metadata"
348+ }
349+ return "none"
350+}
351+%}
352+
353+{% func (p *AlbumPage) Title() %}Media{% endfunc %}
354+
355+{% func (p *AlbumPage) Content() %}
356+<h1 class="title">{%s p.Name %}</h1>
357+<div class="tags are-large">
358+{% for _, a := range p.Albums %}
359+ <a href="/album/?albumId={%s FromUInttoString(&a.ID) %}" class="tag">{%s a.Name %}</a>
360+{% endfor %}
361+</div>
362+<div class="columns is-multiline">
363+{% for _, media := range p.Medias %}
364+ <div class="card-image">
365+ {% if media.IsVideo() %}
366+ <video class="image is-fit" controls muted="true" poster="/media/thumbnail/?path_hash={%s media.PathHash %}" preload="{%s p.PreloadAttr() %}">
367+ <source src="/media/image/?path_hash={%s media.PathHash %}" type="{%s media.MIMEType %}">
368+ </video>
369+ {% else %}
370+ <figure class="image is-fit">
371+ <img src="/media/thumbnail/?path_hash={%s media.PathHash %}">
372+ </figure>
373+ {% endif %}
374+ </div>
375+{% endfor %}
376+</div>
377+<div class="row">
378+ <a href="/media/?page={%d p.Next.Page %}" class="button is-pulled-right">next</a>
379+</div>
380+{% endfunc %}
381+
382+{% func (p *AlbumPage) Script() %}
383+{% endfunc %}
384diff --git a/templates/base.qtpl b/templates/base.qtpl
385index 5a7c3b769e7767d77cb6fe18985a98d41d5e39f2..772167d70fbbcb8c1374c2f10243122c33085a25 100644
386--- a/templates/base.qtpl
387+++ b/templates/base.qtpl
388@@ -11,8 +11,7 @@ }
389
390 %}
391
392-{% code
393- func FromUInttoString(u *uint) string {
394+{% code func FromUInttoString(u *uint) string {
395 if u != nil {
396 return strconv.FormatUint(uint64(*u), 10)
397 }
398@@ -39,6 +38,9 @@ files
399 </a>
400 <a href="/media/" class="navbar-item">
401 media
402+ </a>
403+ <a href="/album/" class="navbar-item">
404+ album
405 </a>
406 <a href="/settings/" class="navbar-item">
407 settings