Skip to content

Commit 38252de

Browse files
authored
chore: create images folder when starting the application (#437)
1 parent 63c2272 commit 38252de

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

main.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,14 @@ func Main() {
7777

7878
initUsbGadget()
7979

80-
err = setInitialVirtualMediaState()
81-
if err != nil {
80+
if err := setInitialVirtualMediaState(); err != nil {
8281
logger.Warn().Err(err).Msg("failed to set initial virtual media state")
8382
}
8483

84+
if err := initImagesFolder(); err != nil {
85+
logger.Warn().Err(err).Msg("failed to init images folder")
86+
}
87+
8588
go func() {
8689
time.Sleep(15 * time.Minute)
8790
for {

usb_mass_storage.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,20 @@ var nbdDevice *NBDDevice
9494

9595
const imagesFolder = "/userdata/jetkvm/images"
9696

97+
func initImagesFolder() error {
98+
err := os.MkdirAll(imagesFolder, 0755)
99+
if err != nil {
100+
return fmt.Errorf("failed to create images folder: %w", err)
101+
}
102+
return nil
103+
}
104+
97105
func rpcMountBuiltInImage(filename string) error {
98106
logger.Info().Str("filename", filename).Msg("Mount Built-In Image")
99-
_ = os.MkdirAll(imagesFolder, 0755)
107+
if err := initImagesFolder(); err != nil {
108+
return err
109+
}
110+
100111
imagePath := filepath.Join(imagesFolder, filename)
101112

102113
// Check if the file exists in the imagesFolder
@@ -224,13 +235,14 @@ func getInitialVirtualMediaState() (*VirtualMediaState, error) {
224235
}
225236

226237
// TODO: check if it's WebRTC or HTTP
227-
if diskPath == "" {
238+
switch diskPath {
239+
case "":
228240
return nil, nil
229-
} else if diskPath == "/dev/nbd0" {
241+
case "/dev/nbd0":
230242
initialState.Source = HTTP
231243
initialState.URL = "/"
232244
initialState.Size = 1
233-
} else {
245+
default:
234246
initialState.Filename = filepath.Base(diskPath)
235247
// get size from file
236248
logger.Info().Str("diskPath", diskPath).Msg("getting file size")

0 commit comments

Comments
 (0)