Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
342d1aee
Commit
342d1aee
authored
Nov 06, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: version checker
parent
363c1073
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
22 deletions
+17
-22
server.go
server/server.go
+1
-1
version_checker.go
server/service/version_checker/version_checker.go
+15
-20
version_checker_test.go
server/service/version_checker/version_checker_test.go
+1
-1
No files found.
server/server.go
View file @
342d1aee
...
@@ -110,7 +110,7 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store
...
@@ -110,7 +110,7 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store
}
}
func
(
s
*
Server
)
Start
(
ctx
context
.
Context
)
error
{
func
(
s
*
Server
)
Start
(
ctx
context
.
Context
)
error
{
go
versionchecker
.
NewVersionChecker
(
s
.
Store
)
.
Start
(
ctx
)
go
versionchecker
.
NewVersionChecker
(
s
.
Store
,
s
.
Profile
)
.
Start
(
ctx
)
go
s
.
telegramBot
.
Start
(
ctx
)
go
s
.
telegramBot
.
Start
(
ctx
)
go
s
.
backupRunner
.
Run
(
ctx
)
go
s
.
backupRunner
.
Run
(
ctx
)
...
...
server/service/version_checker/version_checker.go
View file @
342d1aee
...
@@ -11,6 +11,7 @@ import (
...
@@ -11,6 +11,7 @@ import (
"github.com/pkg/errors"
"github.com/pkg/errors"
storepb
"github.com/usememos/memos/proto/gen/store"
storepb
"github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/server/version"
"github.com/usememos/memos/server/version"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -18,11 +19,13 @@ import (
...
@@ -18,11 +19,13 @@ import (
// nolint
// nolint
type
VersionChecker
struct
{
type
VersionChecker
struct
{
Store
*
store
.
Store
Store
*
store
.
Store
Profile
*
profile
.
Profile
}
}
func
NewVersionChecker
(
store
*
store
.
Store
)
*
VersionChecker
{
func
NewVersionChecker
(
store
*
store
.
Store
,
profile
*
profile
.
Profile
)
*
VersionChecker
{
return
&
VersionChecker
{
return
&
VersionChecker
{
Store
:
store
,
Store
:
store
,
Profile
:
profile
,
}
}
}
}
...
@@ -47,20 +50,11 @@ func (*VersionChecker) GetLatestVersion() (string, error) {
...
@@ -47,20 +50,11 @@ func (*VersionChecker) GetLatestVersion() (string, error) {
}
}
func
(
c
*
VersionChecker
)
Check
(
ctx
context
.
Context
)
{
func
(
c
*
VersionChecker
)
Check
(
ctx
context
.
Context
)
{
migrationHistories
,
err
:=
c
.
Store
.
FindMigrationHistoryList
(
ctx
,
&
store
.
FindMigrationHistory
{})
if
err
!=
nil
{
return
}
if
len
(
migrationHistories
)
==
0
{
return
}
lastVersion
:=
migrationHistories
[
0
]
.
Version
latestVersion
,
err
:=
c
.
GetLatestVersion
()
latestVersion
,
err
:=
c
.
GetLatestVersion
()
if
err
!=
nil
{
if
err
!=
nil
{
return
return
}
}
if
!
version
.
IsVersionGreaterThan
(
latestVersion
,
lastVersion
)
{
if
!
version
.
IsVersionGreaterThan
(
latestVersion
,
version
.
GetCurrentVersion
(
c
.
Profile
.
Mode
)
)
{
return
return
}
}
...
@@ -71,15 +65,16 @@ func (c *VersionChecker) Check(ctx context.Context) {
...
@@ -71,15 +65,16 @@ func (c *VersionChecker) Check(ctx context.Context) {
if
err
!=
nil
{
if
err
!=
nil
{
return
return
}
}
if
len
(
list
)
==
0
{
return
}
shouldNotify
:=
true
if
len
(
list
)
>
0
{
latestVersionUpdateActivity
:=
list
[
0
]
latestVersionUpdateActivity
:=
list
[
0
]
if
latestVersionUpdateActivity
.
Payload
==
nil
{
if
latestVersionUpdateActivity
.
Payload
!=
nil
&&
version
.
IsVersionGreaterOrEqualThan
(
latestVersionUpdateActivity
.
Payload
.
VersionUpdate
.
Version
,
latestVersion
)
{
return
shouldNotify
=
false
}
}
if
version
.
IsVersionGreaterOrEqualThan
(
latestVersionUpdateActivity
.
Payload
.
VersionUpdate
.
Version
,
latestVersion
)
{
}
if
!
shouldNotify
{
return
return
}
}
...
...
server/service/version_checker/version_checker_test.go
View file @
342d1aee
...
@@ -7,6 +7,6 @@ import (
...
@@ -7,6 +7,6 @@ import (
)
)
func
TestGetLatestVersion
(
t
*
testing
.
T
)
{
func
TestGetLatestVersion
(
t
*
testing
.
T
)
{
_
,
err
:=
NewVersionChecker
(
nil
)
.
GetLatestVersion
()
_
,
err
:=
NewVersionChecker
(
nil
,
nil
)
.
GetLatestVersion
()
require
.
NoError
(
t
,
err
)
require
.
NoError
(
t
,
err
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment