Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add Image Diff for SVG files #14867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jun 5, 2021
Merged

Add Image Diff for SVG files #14867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2980d3f
Added type sniffer.
KN4CK3R Feb 28, 2021
bc73503
Switched content detection from base to typesniffer.
KN4CK3R Feb 28, 2021
c6ecc52
Added GuessContentType to Blob.
KN4CK3R Mar 2, 2021
8c6836e
Moved image info logic to client.
KN4CK3R Mar 2, 2021
114fa62
Restore old blocked svg behaviour.
KN4CK3R Mar 2, 2021
d300009
Added missing image formats.
KN4CK3R Mar 3, 2021
79fc11f
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
KN4CK3R Mar 29, 2021
1f087a8
Execute image diff only when container is visible.
KN4CK3R Mar 29, 2021
0c88002
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
KN4CK3R Apr 13, 2021
758b477
Merge branch 'main' of https://github.com/go-gitea/gitea into feature…
KN4CK3R May 18, 2021
109b345
Merge branch 'main' of https://github.com/go-gitea/gitea into feature…
KN4CK3R May 21, 2021
af3a6ae
add margin to spinner
silverwind May 21, 2021
f2919f9
improve BIN tag on image diffs
silverwind May 21, 2021
f6eb565
Default to render view.
KN4CK3R May 22, 2021
20d9cbb
Show image diff on incomplete diff.
KN4CK3R May 25, 2021
0264265
Merge branch 'main' into feature-svg-diff
lunny Jun 4, 2021
221e7e8
Merge branch 'main' into feature-svg-diff
lafriks Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore old blocked svg behaviour.
  • Loading branch information
@KN4CK3R
KN4CK3R committed Mar 2, 2021
commit 114fa626ed80bf77726388f96d86fad71f6b18bb
2 changes: 1 addition & 1 deletion routers/repo/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func setImageCompareContext(ctx *context.Context) {
log.Error("GuessContentType failed: %v", err)
return false
}
return st.IsImage()
return st.IsImage() && (setting.UI.SVG.Enabled || !st.IsSvgImage())
}
}

Expand Down
16 changes: 8 additions & 8 deletions routers/repo/lfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,16 +280,16 @@ func LFSFileGet(ctx *context.Context) {
}
buf = buf[:n]

ct := typesniffer.DetectContentType(buf)
ctx.Data["IsTextFile"] = ct.IsText()
isRepresentableAsText := ct.IsRepresentableAsText()
st := typesniffer.DetectContentType(buf)
ctx.Data["IsTextFile"] = st.IsText()
isRepresentableAsText := st.IsRepresentableAsText()

fileSize := meta.Size
ctx.Data["FileSize"] = meta.Size
ctx.Data["RawFileLink"] = fmt.Sprintf("%s%s.git/info/lfs/objects/%s/%s", setting.AppURL, ctx.Repo.Repository.FullName(), meta.Oid, "direct")
switch {
case isRepresentableAsText:
if ct.IsSvgImage() {
if st.IsSvgImage() {
ctx.Data["IsImageFile"] = true
}

Expand Down Expand Up @@ -331,13 +331,13 @@ func LFSFileGet(ctx *context.Context) {
}
ctx.Data["LineNums"] = gotemplate.HTML(output.String())

case ct.IsPDF():
case st.IsPDF():
ctx.Data["IsPDFFile"] = true
case ct.IsVideo():
case st.IsVideo():
ctx.Data["IsVideoFile"] = true
case ct.IsAudio():
case st.IsAudio():
ctx.Data["IsAudioFile"] = true
case ct.IsImage():
case st.IsImage() && (setting.UI.SVG.Enabled || !st.IsSvgImage()):
ctx.Data["IsImageFile"] = true
}
ctx.HTML(200, tplSettingsLFSFile)
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
ctx.Data["IsVideoFile"] = true
case st.IsAudio():
ctx.Data["IsAudioFile"] = true
case st.IsImage():
case st.IsImage() && (setting.UI.SVG.Enabled || !st.IsSvgImage()):
ctx.Data["IsImageFile"] = true
default:
if fileSize >= setting.UI.MaxDisplayFileSize {
Expand Down