From 3ece023b3edad6c88b5a6e72656e279610cf8efa Mon Sep 17 00:00:00 2001
From: Steven <unconfigured@null.spigotmc.org>
Date: Wed, 15 Aug 2018 22:18:32 +0200
Subject: [PATCH] Fix non-working unit conversion Adjust package name to golang
 convention

---
 proxmox/client.go     |  4 ++--
 sizeunit/size_unit.go | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/proxmox/client.go b/proxmox/client.go
index 64d65731..72f8ec76 100644
--- 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
index cd376a03..b2ebd782 100644
--- 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
 }