Repository avatars #6986

sergey-dryabzhinsky · 2019-05-19T02:44:01Z

first variant of code from old work for gogs
add migration 87
add new option in app.ini
add en-US locale string
add new class in repository.less

For issue #694 and #5625

- first variant of code from old work for gogs - add migration 87 - add new option in app.ini - add en-US locale string - add new class in repository.less

sergey-dryabzhinsky · 2019-05-19T02:46:09Z

Should I commit also index.css?

lunny · 2019-05-19T03:15:06Z

@sergey-dryabzhinsky yes, please.

lunny · 2019-05-19T03:15:31Z

add new option in app.ini.sample and docs

codecov-io · 2019-05-19T06:06:08Z

Codecov Report

Merging #6986 into master will decrease coverage by <.01%.
The diff coverage is 37.19%.

@@            Coverage Diff             @@
##           master    #6986      +/-   ##
==========================================
- Coverage   41.43%   41.42%   -0.01%     
==========================================
  Files         442      443       +1     
  Lines       59701    59865     +164     
==========================================
+ Hits        24735    24797      +62     
- Misses      31729    31819      +90     
- Partials     3237     3249      +12

Impacted Files	Coverage Δ
models/migrations/migrations.go	`1.52% <ø> (ø)`	⬆️
routers/repo/setting.go	`9.34% <0%> (-0.73%)`	⬇️
routers/user/setting/profile.go	`40% <0%> (-0.82%)`	⬇️
models/migrations/v87.go	`0% <0%> (ø)`
modules/setting/setting.go	`48.15% <100%> (+0.55%)`	⬆️
routers/routes/routes.go	`82.91% <100%> (+0.23%)`	⬆️
models/repo.go	`47.21% <47.31%> (ø)`	⬆️
modules/log/colors_router.go	`83.33% <0%> (-4.17%)`	⬇️
models/repo_list.go	`73.09% <0%> (+1.01%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d749404...141d542. Read the comment docs.

- remove old avatar file on upload - use ID in name of avatar file - users may upload same files - add simple tests

sergey-dryabzhinsky · 2019-05-19T09:18:18Z

Ready for review

models/migrations/v87.go

zeripath · 2019-05-19T09:18:59Z

models/migrations/v87.go

+	}
+
+	if err != nil {
+		return fmt.Errorf("Error changing mirror interval column type: %v", err)


If we do need this migration you need to change this line.

routers/repo/setting.go

zeripath · 2019-05-19T10:00:06Z

routers/repo/setting.go

@@ -727,3 +730,53 @@ func init() {
 		panic(err)
 	}
 }
+
+// UpdateAvatarSetting update repo's avatar
+// FIXME: limit size.


You must limit size before we merge - just stick a config in it doesn't need a great UI.

- add file size check - add new option - update config docs - add new string to en-us locale

- use FileHEader field for check file size - add new test - upload big image

techknowlogick · 2019-05-28T20:47:10Z

models/repo.go

@@ -166,6 +172,9 @@ type Repository struct {
 	CloseIssuesViaCommitInAnyBranch bool               `xorm:"NOT NULL DEFAULT false"`
 	Topics                          []string           `xorm:"TEXT JSON"`

+	// Avatar
+	Avatar string `xorm:"VARCHAR(2048)"`


Does the full URL need to be stored in DB? For user avatars this makes sense due to gravatar (and other external avatar services), but for repo avatars it follows the following patter setting.AppSubURL + "/repo-avatars/" + repo.Avatar

You mean that it easily fits into 250 symbols?
ID+MD5 ~ (10-20) + 32.
64 symbols must be enough I think.

Yes, rather than storing the full URL, just the filename could be stored.

Done in 4ae9383

lunny · 2019-05-29T00:52:29Z

models/repo.go

+	// Users can upload the same image to other repo - prefix it with ID
+	// Then repo will be removed - only it avatar file will be removed
+	repo.Avatar = fmt.Sprintf("%d-%x", repo.ID, md5.Sum(data))
+	if _, err := x.ID(repo.ID).Cols("avatar").Update(repo); err != nil {


sess. not x.

Done in c007a9a

… too

sergey-dryabzhinsky · 2019-05-29T06:11:19Z

Also rewrite models.repo.DeleteAvatar - now it uses Session too.

lafriks

Two code readability issues but otherwise LG-TM

lafriks · 2019-05-29T08:08:01Z

models/repo.go

+func (repo *Repository) DeleteAvatar() error {
+
+	// Avatar exists
+	if len(repo.Avatar) > 0 {


Please return as soon as possible for code readability:

Suggested change

if len(repo.Avatar) > 0 {

if len(repo.Avatar) == 0 {

return nil

}

Point taken.
Done in f53758a

lafriks · 2019-05-29T08:09:20Z

routers/repo/setting.go

+// UpdateAvatarSetting update repo's avatar
+func UpdateAvatarSetting(ctx *context.Context, form auth.AvatarForm) error {
+	ctxRepo := ctx.Repo.Repository
+	if form.Avatar != nil {


Same here (do not use else):

Suggested change

if form.Avatar != nil {

if form.Avatar == nil {

// No avatar is uploaded but setting has been changed to enable

// No random avatar here.

if !com.IsFile(ctxRepo.CustomAvatarPath()) {

log.Trace("No avatar was uploaded for repo: %d. Default icon will appear instead.", ctxRepo.ID)

}

return nil

}

Done in f53758a

lunny · 2019-05-29T09:35:05Z

@sergey-dryabzhinsky Thanks for your good job!!!

richmahn · 2019-05-29T12:33:25Z

Yes, this looks great! Was going to review but looks like you have reviewers, and a few minor details to fix. This is definitely something my organization will find useful!

sergey-dryabzhinsky · 2019-05-29T19:01:59Z

@richmahn same here.
I've tired to make war with bloated GitLab in my company.
So I decided to take an action.

Love to use gitea at home to manage my pet projects.
Now it will be even better.

saitho · 2019-05-30T09:05:31Z

When no repository avatar was assigned it will render an empty img tag in repository list.
<img class="ui avatar image" src="">

EDIT: Fixed in #7087

sergey-dryabzhinsky · 2019-05-30T20:25:02Z

ohh... missed that then merge code changes from gogs.

maznu · 2019-07-06T15:43:41Z

Really hyped for 1.9! Thanks, everyone! 👍

saitho · 2019-07-07T13:24:35Z

Really hyped for 1.9!

Definitely! To me 1.9 seems to be much larger than previous feature releases. 👍

@lafriks

* Repository avatars - first variant of code from old work for gogs - add migration 87 - add new option in app.ini - add en-US locale string - add new class in repository.less * Add changed index.css, remove unused template name * Update en-us doc about configuration options * Add comments to new functions, add new option to docker app.ini * Add comment for lint * Remove variable, not needed * Fix formatting * Update swagger api template * Check if avatar exists * Fix avatar link/path checks * Typo * TEXT column can't have a default value * Fixes: - remove old avatar file on upload - use ID in name of avatar file - users may upload same files - add simple tests * Fix fmt check * Generate PNG instead of "static" GIF * More informative comment * Fix error message * Update avatar upload checks: - add file size check - add new option - update config docs - add new string to en-us locale * Fixes: - use FileHEader field for check file size - add new test - upload big image * Fix formatting * Update comments * Update log message * Removed wrong style - not needed * Use Sync2 to migrate * Update repos list view - bigger avatar - fix html blocks alignment * A little adjust avatar size * Use small icons for explore/repo list * Use new cool avatar preparation func by @lafriks * Missing changes for new function * Remove unused import, move imports * Missed new option definition in app.ini Add file size check in user/profile avatar upload * Use smaller field length for Avatar * Use session to update repo DB data, update DeleteAvatar - use session too * Fix err variable definition * As suggested @lafriks - return as soon as possible, code readability

Repository avatars

a2b9436

- first variant of code from old work for gogs - add migration 87 - add new option in app.ini - add en-US locale string - add new class in repository.less

sergey-dryabzhinsky mentioned this pull request May 19, 2019

Repository logo #694

Closed

6 tasks

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 19, 2019

sergey-dryabzhinsky added 7 commits May 19, 2019 06:16

Add changed index.css, remove unused template name

c94c201

Update en-us doc about configuration options

259c995

Add comments to new functions, add new option to docker app.ini

8ad6526

Add comment for lint

903c8ec

Remove variable, not needed

a16f49e

Fix formatting

e8367ac

Update swagger api template

822e33f

lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label May 19, 2019

sergey-dryabzhinsky added 4 commits May 19, 2019 08:11

Check if avatar exists

984199a

Fix avatar link/path checks

253e7d1

Typo

53379c6

TEXT column can't have a default value

ef07e9b

sergey-dryabzhinsky added 4 commits May 19, 2019 09:58

Fixes:

3ccee72

- remove old avatar file on upload - use ID in name of avatar file - users may upload same files - add simple tests

Fix fmt check

52f877b

Generate PNG instead of "static" GIF

0a84f5c

More informative comment

a280eeb

zeripath reviewed May 19, 2019

View reviewed changes

sergey-dryabzhinsky added 5 commits May 19, 2019 13:34

Fix error message

b9e3514

Update avatar upload checks:

32cc0f9

- add file size check - add new option - update config docs - add new string to en-us locale

Fixes:

b660e55

- use FileHEader field for check file size - add new test - upload big image

Fix formatting

82b1333

Update comments

d71e535

techknowlogick reviewed May 28, 2019

View reviewed changes

Use smaller field length for Avatar

4ae9383

lunny requested changes May 29, 2019

View reviewed changes

sergey-dryabzhinsky added 2 commits May 29, 2019 09:05

Use session to update repo DB data, update DeleteAvatar - use session…

c007a9a

… too

Fix err variable definition

01c3ef8

lafriks requested changes May 29, 2019

View reviewed changes

lunny approved these changes May 29, 2019

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 29, 2019

lunny added this to the 1.9.0 milestone May 29, 2019

lunny added the type/changelog Adds the changelog for a new Gitea version label May 29, 2019

As suggested @lafriks - return as soon as possible, code readability

f53758a

lafriks approved these changes May 29, 2019

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 29, 2019

Merge branch 'master' into issue-694-repository-avatars

141d542

techknowlogick merged commit 3fd1883 into go-gitea:master May 30, 2019

saitho mentioned this pull request May 30, 2019

Repository avatar fallback configuration #7087

Merged

lunny mentioned this pull request Jul 6, 2019

Per-Project Logo to use as og:image (for social posts) #3825

Closed

go-gitea locked and limited conversation to collaborators Nov 24, 2020

delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Repository avatars #6986

Repository avatars #6986

sergey-dryabzhinsky commented May 19, 2019

sergey-dryabzhinsky commented May 19, 2019

lunny commented May 19, 2019

lunny commented May 19, 2019

codecov-io commented May 19, 2019 •

edited

Loading

sergey-dryabzhinsky commented May 19, 2019

zeripath May 19, 2019

sergey-dryabzhinsky May 19, 2019

zeripath May 19, 2019

sergey-dryabzhinsky May 19, 2019

techknowlogick May 28, 2019

sergey-dryabzhinsky May 28, 2019 •

edited

Loading

techknowlogick May 28, 2019

sergey-dryabzhinsky May 28, 2019

lunny May 29, 2019

sergey-dryabzhinsky May 29, 2019

sergey-dryabzhinsky commented May 29, 2019

lafriks left a comment •

edited

Loading

lafriks May 29, 2019

sergey-dryabzhinsky May 29, 2019

lafriks May 29, 2019

sergey-dryabzhinsky May 29, 2019

lunny commented May 29, 2019

richmahn commented May 29, 2019

sergey-dryabzhinsky commented May 29, 2019

saitho commented May 30, 2019 •

edited

Loading

sergey-dryabzhinsky commented May 30, 2019

maznu commented Jul 6, 2019

saitho commented Jul 7, 2019

-	if len(repo.Avatar) > 0 {
+	if len(repo.Avatar) == 0 {
+		return nil
+	}

-	if form.Avatar != nil {
+	if form.Avatar == nil {
+		// No avatar is uploaded but setting has been changed to enable
+		// No random avatar here.
+		if !com.IsFile(ctxRepo.CustomAvatarPath()) {
+			log.Trace("No avatar was uploaded for repo: %d. Default icon will appear instead.", ctxRepo.ID)
+		}
+		return nil
+	}

Repository avatars #6986

Repository avatars #6986

Conversation

sergey-dryabzhinsky commented May 19, 2019

sergey-dryabzhinsky commented May 19, 2019

lunny commented May 19, 2019

lunny commented May 19, 2019

codecov-io commented May 19, 2019 • edited Loading

Codecov Report

sergey-dryabzhinsky commented May 19, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sergey-dryabzhinsky May 28, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sergey-dryabzhinsky commented May 29, 2019

lafriks left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lunny commented May 29, 2019

richmahn commented May 29, 2019

sergey-dryabzhinsky commented May 29, 2019

saitho commented May 30, 2019 • edited Loading

sergey-dryabzhinsky commented May 30, 2019

maznu commented Jul 6, 2019

saitho commented Jul 7, 2019

codecov-io commented May 19, 2019 •

edited

Loading

sergey-dryabzhinsky May 28, 2019 •

edited

Loading

lafriks left a comment •

edited

Loading

saitho commented May 30, 2019 •

edited

Loading