Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FinClip
ligase
提交
7a30f208
ligase
项目概览
FinClip
/
ligase
通知
36
Star
8
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ligase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7a30f208
编写于
9月 20, 2017
作者:
E
Erik Johnston
提交者:
Mark Haines
9月 20, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add goconst linter (#246)
上级
340a84cd
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
33 addition
and
18 deletion
+33
-18
linter-fast.json
linter-fast.json
+2
-1
linter.json
linter.json
+2
-1
src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer.go
...m/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer.go
+4
-4
src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer_nfnt.go
...rix-org/dendrite/mediaapi/thumbnailer/thumbnailer_nfnt.go
+1
-1
src/github.com/matrix-org/dendrite/mediaapi/types/types.go
src/github.com/matrix-org/dendrite/mediaapi/types/types.go
+6
-0
src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
...thub.com/matrix-org/dendrite/mediaapi/writers/download.go
+2
-2
src/github.com/matrix-org/dendrite/roomserver/input/membership.go
...ub.com/matrix-org/dendrite/roomserver/input/membership.go
+16
-9
未找到文件。
linter-fast.json
浏览文件 @
7a30f208
...
...
@@ -11,6 +11,7 @@
"gas"
,
"misspell"
,
"errcheck"
,
"vet"
"vet"
,
"goconst"
]
}
linter.json
浏览文件 @
7a30f208
...
...
@@ -17,6 +17,7 @@
"unparam"
,
"errcheck"
,
"vet"
,
"megacheck"
"megacheck"
,
"goconst"
]
}
src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer.go
浏览文件 @
7a30f208
...
...
@@ -63,22 +63,22 @@ func SelectThumbnail(desired types.ThumbnailSize, thumbnails []*types.ThumbnailM
bestFit
:=
newThumbnailFitness
()
for
_
,
thumbnail
:=
range
thumbnails
{
if
desired
.
ResizeMethod
==
"scale"
&&
thumbnail
.
ThumbnailSize
.
ResizeMethod
!=
"scale"
{
if
desired
.
ResizeMethod
==
types
.
Scale
&&
thumbnail
.
ThumbnailSize
.
ResizeMethod
!=
types
.
Scale
{
continue
}
fitness
:=
calcThumbnailFitness
(
thumbnail
.
ThumbnailSize
,
thumbnail
.
MediaMetadata
,
desired
)
if
isBetter
:=
fitness
.
betterThan
(
bestFit
,
desired
.
ResizeMethod
==
"crop"
);
isBetter
{
if
isBetter
:=
fitness
.
betterThan
(
bestFit
,
desired
.
ResizeMethod
==
types
.
Crop
);
isBetter
{
bestFit
=
fitness
chosenThumbnail
=
thumbnail
}
}
for
_
,
thumbnailSize
:=
range
thumbnailSizes
{
if
desired
.
ResizeMethod
==
"scale"
&&
thumbnailSize
.
ResizeMethod
!=
"scale"
{
if
desired
.
ResizeMethod
==
types
.
Scale
&&
thumbnailSize
.
ResizeMethod
!=
types
.
Scale
{
continue
}
fitness
:=
calcThumbnailFitness
(
types
.
ThumbnailSize
(
thumbnailSize
),
nil
,
desired
)
if
isBetter
:=
fitness
.
betterThan
(
bestFit
,
desired
.
ResizeMethod
==
"crop"
);
isBetter
{
if
isBetter
:=
fitness
.
betterThan
(
bestFit
,
desired
.
ResizeMethod
==
types
.
Crop
);
isBetter
{
bestFit
=
fitness
chosenThumbnailSize
=
(
*
types
.
ThumbnailSize
)(
&
thumbnailSize
)
}
...
...
src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer_nfnt.go
浏览文件 @
7a30f208
...
...
@@ -149,7 +149,7 @@ func createThumbnail(src types.Path, img image.Image, config types.ThumbnailSize
}
start
:=
time
.
Now
()
width
,
height
,
err
:=
adjustSize
(
dst
,
img
,
config
.
Width
,
config
.
Height
,
config
.
ResizeMethod
==
"crop"
,
logger
)
width
,
height
,
err
:=
adjustSize
(
dst
,
img
,
config
.
Width
,
config
.
Height
,
config
.
ResizeMethod
==
types
.
Crop
,
logger
)
if
err
!=
nil
{
return
false
,
err
}
...
...
src/github.com/matrix-org/dendrite/mediaapi/types/types.go
浏览文件 @
7a30f208
...
...
@@ -102,3 +102,9 @@ type ActiveThumbnailGeneration struct {
// The string key is a thumbnail file path
PathToResult
map
[
string
]
*
ThumbnailGenerationResult
}
// Crop indicates we should crop the thumbnail on resize
const
Crop
=
"crop"
// Scale indicates we should scale the thumbnail on resize
const
Scale
=
"scale"
src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
浏览文件 @
7a30f208
...
...
@@ -179,9 +179,9 @@ func (r *downloadRequest) Validate() *util.JSONResponse {
}
// Default method to scale if not set
if
r
.
ThumbnailSize
.
ResizeMethod
==
""
{
r
.
ThumbnailSize
.
ResizeMethod
=
"scale"
r
.
ThumbnailSize
.
ResizeMethod
=
types
.
Scale
}
if
r
.
ThumbnailSize
.
ResizeMethod
!=
"crop"
&&
r
.
ThumbnailSize
.
ResizeMethod
!=
"scale"
{
if
r
.
ThumbnailSize
.
ResizeMethod
!=
types
.
Crop
&&
r
.
ThumbnailSize
.
ResizeMethod
!=
types
.
Scale
{
return
&
util
.
JSONResponse
{
Code
:
400
,
JSON
:
jsonerror
.
Unknown
(
"method must be one of crop or scale"
),
...
...
src/github.com/matrix-org/dendrite/roomserver/input/membership.go
浏览文件 @
7a30f208
...
...
@@ -23,6 +23,13 @@ import (
"github.com/matrix-org/gomatrixserverlib"
)
// Membership values
// TODO: Factor these out somewhere sensible?
const
join
=
"join"
const
leave
=
"leave"
const
invite
=
"invite"
const
ban
=
"ban"
// updateMembership updates the current membership and the invites for each
// user affected by a change in the current state of the room.
// Returns a list of output events to write to the kafka log to inform the
...
...
@@ -83,9 +90,9 @@ func updateMembership(
updates
[]
api
.
OutputEvent
,
)
([]
api
.
OutputEvent
,
error
)
{
var
err
error
// Default the membership to
"leave"
if no event was added or removed.
old
:=
"leave"
new
:=
"leave"
// Default the membership to
Leave
if no event was added or removed.
old
:=
leave
new
:=
leave
if
remove
!=
nil
{
old
,
err
=
remove
.
Membership
()
...
...
@@ -99,9 +106,9 @@ func updateMembership(
return
nil
,
err
}
}
if
old
==
new
&&
new
!=
"join"
{
if
old
==
new
&&
new
!=
join
{
// If the membership is the same then nothing changed and we can return
// immediately, unless it's a
"join"
update (e.g. profile update).
// immediately, unless it's a
Join
update (e.g. profile update).
return
updates
,
nil
}
...
...
@@ -111,11 +118,11 @@ func updateMembership(
}
switch
new
{
case
"invite"
:
case
invite
:
return
updateToInviteMembership
(
mu
,
add
,
updates
)
case
"join"
:
case
join
:
return
updateToJoinMembership
(
mu
,
add
,
updates
)
case
"leave"
,
"ban"
:
case
leave
,
ban
:
return
updateToLeaveMembership
(
mu
,
add
,
new
,
updates
)
default
:
panic
(
fmt
.
Errorf
(
...
...
@@ -176,7 +183,7 @@ func updateToJoinMembership(
for
_
,
eventID
:=
range
retired
{
orie
:=
api
.
OutputRetireInviteEvent
{
EventID
:
eventID
,
Membership
:
"join"
,
Membership
:
join
,
}
if
add
!=
nil
{
orie
.
RetiredByEventID
=
add
.
EventID
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录