Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
orangecat
ollama
Commits
6707768e
"src/vscode:/vscode.git/clone" did not exist on "5087ad50dc56e620f97cefca545dae8b38576139"
Unverified
Commit
6707768e
authored
May 06, 2024
by
alwqx
Committed by
GitHub
May 05, 2024
Browse files
chore: format go code (#4149)
parent
c78bb76a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
73 additions
and
73 deletions
+73
-73
app/tray/wintray/menus.go
app/tray/wintray/menus.go
+71
-71
examples/go-http-generate/main.go
examples/go-http-generate/main.go
+1
-1
types/model/name.go
types/model/name.go
+1
-1
No files found.
app/tray/wintray/menus.go
View file @
6707768e
//go:build windows
//go:build windows
package
wintray
package
wintray
import
(
import
(
"fmt"
"fmt"
"log/slog"
"log/slog"
"unsafe"
"unsafe"
"golang.org/x/sys/windows"
"golang.org/x/sys/windows"
)
)
const
(
const
(
updatAvailableMenuID
=
1
updatAvailableMenuID
=
1
updateMenuID
=
updatAvailableMenuID
+
1
updateMenuID
=
updatAvailableMenuID
+
1
separatorMenuID
=
updateMenuID
+
1
separatorMenuID
=
updateMenuID
+
1
diagLogsMenuID
=
separatorMenuID
+
1
diagLogsMenuID
=
separatorMenuID
+
1
diagSeparatorMenuID
=
diagLogsMenuID
+
1
diagSeparatorMenuID
=
diagLogsMenuID
+
1
quitMenuID
=
diagSeparatorMenuID
+
1
quitMenuID
=
diagSeparatorMenuID
+
1
)
)
func
(
t
*
winTray
)
initMenus
()
error
{
func
(
t
*
winTray
)
initMenus
()
error
{
if
err
:=
t
.
addOrUpdateMenuItem
(
diagLogsMenuID
,
0
,
diagLogsMenuTitle
,
false
);
err
!=
nil
{
if
err
:=
t
.
addOrUpdateMenuItem
(
diagLogsMenuID
,
0
,
diagLogsMenuTitle
,
false
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to create menu entries %w
\n
"
,
err
)
return
fmt
.
Errorf
(
"unable to create menu entries %w
\n
"
,
err
)
}
}
if
err
:=
t
.
addSeparatorMenuItem
(
diagSeparatorMenuID
,
0
);
err
!=
nil
{
if
err
:=
t
.
addSeparatorMenuItem
(
diagSeparatorMenuID
,
0
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to create menu entries %w"
,
err
)
return
fmt
.
Errorf
(
"unable to create menu entries %w"
,
err
)
}
}
if
err
:=
t
.
addOrUpdateMenuItem
(
quitMenuID
,
0
,
quitMenuTitle
,
false
);
err
!=
nil
{
if
err
:=
t
.
addOrUpdateMenuItem
(
quitMenuID
,
0
,
quitMenuTitle
,
false
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to create menu entries %w
\n
"
,
err
)
return
fmt
.
Errorf
(
"unable to create menu entries %w
\n
"
,
err
)
}
}
return
nil
return
nil
}
}
func
(
t
*
winTray
)
UpdateAvailable
(
ver
string
)
error
{
func
(
t
*
winTray
)
UpdateAvailable
(
ver
string
)
error
{
if
!
t
.
updateNotified
{
if
!
t
.
updateNotified
{
slog
.
Debug
(
"updating menu and sending notification for new update"
)
slog
.
Debug
(
"updating menu and sending notification for new update"
)
if
err
:=
t
.
addOrUpdateMenuItem
(
updatAvailableMenuID
,
0
,
updateAvailableMenuTitle
,
true
);
err
!=
nil
{
if
err
:=
t
.
addOrUpdateMenuItem
(
updatAvailableMenuID
,
0
,
updateAvailableMenuTitle
,
true
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to create menu entries %w"
,
err
)
return
fmt
.
Errorf
(
"unable to create menu entries %w"
,
err
)
}
}
if
err
:=
t
.
addOrUpdateMenuItem
(
updateMenuID
,
0
,
updateMenutTitle
,
false
);
err
!=
nil
{
if
err
:=
t
.
addOrUpdateMenuItem
(
updateMenuID
,
0
,
updateMenutTitle
,
false
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to create menu entries %w"
,
err
)
return
fmt
.
Errorf
(
"unable to create menu entries %w"
,
err
)
}
}
if
err
:=
t
.
addSeparatorMenuItem
(
separatorMenuID
,
0
);
err
!=
nil
{
if
err
:=
t
.
addSeparatorMenuItem
(
separatorMenuID
,
0
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to create menu entries %w"
,
err
)
return
fmt
.
Errorf
(
"unable to create menu entries %w"
,
err
)
}
}
iconFilePath
,
err
:=
iconBytesToFilePath
(
wt
.
updateIcon
)
iconFilePath
,
err
:=
iconBytesToFilePath
(
wt
.
updateIcon
)
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to write icon data to temp file: %w"
,
err
)
return
fmt
.
Errorf
(
"unable to write icon data to temp file: %w"
,
err
)
}
}
if
err
:=
wt
.
setIcon
(
iconFilePath
);
err
!=
nil
{
if
err
:=
wt
.
setIcon
(
iconFilePath
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to set icon: %w"
,
err
)
return
fmt
.
Errorf
(
"unable to set icon: %w"
,
err
)
}
}
t
.
updateNotified
=
true
t
.
updateNotified
=
true
t
.
pendingUpdate
=
true
t
.
pendingUpdate
=
true
// Now pop up the notification
// Now pop up the notification
t
.
muNID
.
Lock
()
t
.
muNID
.
Lock
()
defer
t
.
muNID
.
Unlock
()
defer
t
.
muNID
.
Unlock
()
copy
(
t
.
nid
.
InfoTitle
[
:
],
windows
.
StringToUTF16
(
updateTitle
))
copy
(
t
.
nid
.
InfoTitle
[
:
],
windows
.
StringToUTF16
(
updateTitle
))
copy
(
t
.
nid
.
Info
[
:
],
windows
.
StringToUTF16
(
fmt
.
Sprintf
(
updateMessage
,
ver
)))
copy
(
t
.
nid
.
Info
[
:
],
windows
.
StringToUTF16
(
fmt
.
Sprintf
(
updateMessage
,
ver
)))
t
.
nid
.
Flags
|=
NIF_INFO
t
.
nid
.
Flags
|=
NIF_INFO
t
.
nid
.
Timeout
=
10
t
.
nid
.
Timeout
=
10
t
.
nid
.
Size
=
uint32
(
unsafe
.
Sizeof
(
*
wt
.
nid
))
t
.
nid
.
Size
=
uint32
(
unsafe
.
Sizeof
(
*
wt
.
nid
))
err
=
t
.
nid
.
modify
()
err
=
t
.
nid
.
modify
()
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
}
}
return
nil
return
nil
}
}
examples/go-http-generate/main.go
View file @
6707768e
...
@@ -19,7 +19,7 @@ func main() {
...
@@ -19,7 +19,7 @@ func main() {
}
}
defer
resp
.
Body
.
Close
()
defer
resp
.
Body
.
Close
()
responseData
,
err
:=
io
.
ReadAll
(
resp
.
Body
)
responseData
,
err
:=
io
.
ReadAll
(
resp
.
Body
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Fatal
(
err
)
log
.
Fatal
(
err
)
...
...
types/model/name.go
View file @
6707768e
...
@@ -161,7 +161,7 @@ func ParseNameBare(s string) Name {
...
@@ -161,7 +161,7 @@ func ParseNameBare(s string) Name {
}
}
scheme
,
host
,
ok
:=
strings
.
Cut
(
s
,
"://"
)
scheme
,
host
,
ok
:=
strings
.
Cut
(
s
,
"://"
)
if
!
ok
{
if
!
ok
{
host
=
scheme
host
=
scheme
}
}
n
.
Host
=
host
n
.
Host
=
host
...
...
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