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
OpenDAS
ollama
Commits
8608eb47
Commit
8608eb47
authored
Sep 26, 2023
by
Michael Yang
Browse files
prune empty directories
parent
a2b21013
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
0 deletions
+54
-0
cmd/cmd.go
cmd/cmd.go
+9
-0
server/images.go
server/images.go
+33
-0
server/routes.go
server/routes.go
+12
-0
No files found.
cmd/cmd.go
View file @
8608eb47
...
@@ -721,6 +721,15 @@ func RunServer(cmd *cobra.Command, _ []string) error {
...
@@ -721,6 +721,15 @@ func RunServer(cmd *cobra.Command, _ []string) error {
if
err
:=
server
.
PruneLayers
();
err
!=
nil
{
if
err
:=
server
.
PruneLayers
();
err
!=
nil
{
return
err
return
err
}
}
manifestsPath
,
err
:=
server
.
GetManifestPath
()
if
err
!=
nil
{
return
err
}
if
err
:=
server
.
PruneDirectory
(
manifestsPath
);
err
!=
nil
{
return
err
}
}
}
return
server
.
Serve
(
ln
,
origins
)
return
server
.
Serve
(
ln
,
origins
)
...
...
server/images.go
View file @
8608eb47
...
@@ -1005,6 +1005,39 @@ func PruneLayers() error {
...
@@ -1005,6 +1005,39 @@ func PruneLayers() error {
return
nil
return
nil
}
}
func
PruneDirectory
(
path
string
)
error
{
info
,
err
:=
os
.
Lstat
(
path
)
if
err
!=
nil
{
return
err
}
if
info
.
IsDir
()
&&
info
.
Mode
()
&
os
.
ModeSymlink
==
0
{
entries
,
err
:=
os
.
ReadDir
(
path
)
if
err
!=
nil
{
return
err
}
for
_
,
entry
:=
range
entries
{
if
err
:=
PruneDirectory
(
filepath
.
Join
(
path
,
entry
.
Name
()));
err
!=
nil
{
return
err
}
}
entries
,
err
=
os
.
ReadDir
(
path
)
if
err
!=
nil
{
return
err
}
if
len
(
entries
)
>
0
{
return
nil
}
return
os
.
Remove
(
path
)
}
return
nil
}
func
DeleteModel
(
name
string
)
error
{
func
DeleteModel
(
name
string
)
error
{
mp
:=
ParseModelPath
(
name
)
mp
:=
ParseModelPath
(
name
)
manifest
,
_
,
err
:=
GetManifest
(
mp
)
manifest
,
_
,
err
:=
GetManifest
(
mp
)
...
...
server/routes.go
View file @
8608eb47
...
@@ -378,6 +378,18 @@ func DeleteModelHandler(c *gin.Context) {
...
@@ -378,6 +378,18 @@ func DeleteModelHandler(c *gin.Context) {
}
}
return
return
}
}
manifestsPath
,
err
:=
GetManifestPath
()
if
err
!=
nil
{
c
.
JSON
(
http
.
StatusInternalServerError
,
gin
.
H
{
"error"
:
err
.
Error
()})
return
}
if
err
:=
PruneDirectory
(
manifestsPath
);
err
!=
nil
{
c
.
JSON
(
http
.
StatusInternalServerError
,
gin
.
H
{
"error"
:
err
.
Error
()})
return
}
c
.
JSON
(
http
.
StatusOK
,
nil
)
c
.
JSON
(
http
.
StatusOK
,
nil
)
}
}
...
...
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