Fix non-working unit conversion

Adjust package name to golang convention
Tinyblargon · Aug 15, 2018 · 3ece023 · 3ece023
1 parent d6f3707
commit 3ece023
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/proxmox/client.go b/proxmox/client.go
@@ -346,11 +346,11 @@ func (c *Client) ResizeQemuDisk(vmr *VmRef, disk string, moreSizeGB int) (exitSt
 	return
 }
 
-func (c *Client) CreateQemuDisk(vmr *VmRef, vmId int, diskName string, diskSize int, unit sizeUnit.SizeUnit,
+func (c *Client) CreateQemuDisk(vmr *VmRef, vmId int, diskName string, diskSize int, unit sizeunit.SizeUnit,
 	format string) error {
 	reqBody := ParamsToBody(map[string]string{
 		"filename": diskName,
-		"size":     sizeUnit.FormatToShortString(diskSize, unit),
+		"size":     sizeunit.FormatToShortString(diskSize, unit),
 		"format":   format,
 		"vmid":     strconv.Itoa(vmId),
 	})

diff --git a/sizeunit/size_unit.go b/sizeunit/size_unit.go
@@ -1,11 +1,11 @@
-package sizeUnit
+package sizeunit
 
 import (
 	"fmt"
 	"strconv"
 )
 
-type SizeUnit uint64
+type SizeUnit int64
 
 const (
 	KB SizeUnit = 1 << (10 * (iota + 1))
@@ -34,11 +34,5 @@ func FormatToLongString(size int, sizeUnit SizeUnit) string {
 }
 
 func ConvertTo(size int, oldSizeUnit SizeUnit, newSizeUnit SizeUnit) (newSize int, newUnit SizeUnit) {
-	if oldSizeUnit < newSizeUnit {
-		return size / int(newSizeUnit), newSizeUnit
-	} else if newSizeUnit > oldSizeUnit {
-		return size * int(newSizeUnit), newSizeUnit
-	} else {
-		return size, newSizeUnit
-	}
+	return size * int(oldSizeUnit) / int(newSizeUnit), newSizeUnit
 }