Merge pull request #7 from kdancybot/dev

Major update: built-in gosumemory and systray manager

Author: AndrefHub

README.md

@@ -0,0 +1,17 @@
+# NPClient for kdancybot
+
+<img src="icon.ico" width="256">
+
+## Usage
+     
+1. [Download the latest Release](https://github.com/kdancybot/np-client/releases/latest)
+    * Unzip files anywhere
+
+2. Get config.txt file with credentials
+3. Run NPClient & osu! and enjoy!
+    * Hint: You can also add NPClient to autostart via systray icon!
+
+## Special Thanks to:
+
+* [l3lackShark](https://github.com/l3lackShark) for his [gosumemory](https://github.com/l3lackShark/gosumemory) for providing osu!'s state data
+* [Piotrekol](https://github.com/Piotrekol/) and his [ProcessMemoryDataFinder](https://github.com/Piotrekol/ProcessMemoryDataFinder) for most of the memory signatures

build-script.sh

@@ -1,8 +1,15 @@
 #!/usr/bin/env bash
 
-target=kdancybot-np-client
-	
-platforms=("windows/amd64" "windows/386" "linux/amd64" "linux/386")
+target=np-manager
+
+# # Since go doesn't support cross-compiling of C code (for obvious reasons)
+# # you can just comment out all unsupported platforms for yourself
+# # (I may or may not write better script later)	
+# ^ With removal of Cgo parts of project this comment is obsolete 
+platforms=(
+	"linux/amd64" "linux/386"
+	"windows/amd64" "windows/386"
+)
 
 mkdir -p build
 
@@ -18,9 +25,9 @@ do
 		flags+="-ldflags -H=windowsgui"
 	fi	
 
-	env GOOS=$GOOS GOARCH=$GOARCH go build $flags -o build/$output_name
+	GOOS=$GOOS GOARCH=$GOARCH go build $flags -o build/$output_name
 	if [ $? -ne 0 ]; then
    		echo 'An error has occurred! Aborting the script execution...'
 		exit 1
 	fi
-done
+done

config/config.go

@@ -0,0 +1,76 @@
+package config
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/l3lackShark/config"
+)
+
+// Config file
+var Config map[string]string
+
+// Init the config file
+func Init() {
+	ex, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+	exPath := filepath.Dir(ex)
+
+	cfg, err := config.SetFile(filepath.Join(exPath, "config.ini"))
+	if err == config.ErrDoesNotExist {
+		d := []byte(`[Main]
+update = 100
+path = auto
+cgodisable = false
+memdebug = false
+memcycletest = false
+wine = false
+		
+[Web]
+serverip = 127.0.0.1:24050
+cors = false
+		
+[GameOverlay] ; https://github.com/kdancybot/np-client/wiki/GameOverlay
+enabled = false
+gameWidth = 1920
+gameHeight = 1080
+overlayURL = http://localhost:24050/InGame2
+overlayWidth = 380
+overlayHeight = 110
+overlayOffsetX = 0
+overlayOffsetY = 0
+overlayScale = 10
+		
+`)
+		if err := ioutil.WriteFile(filepath.Join(exPath, "config.ini"), d, 0644); err != nil {
+			panic(err)
+		}
+		cfg, err = config.SetFile(filepath.Join(exPath, "config.ini"))
+		if err != nil {
+			panic(err)
+		}
+	} else if err != nil {
+		log.Fatalln(err)
+	}
+	Config, err = cfg.Parse()
+	if err != nil {
+		panic(err)
+	}
+	if Config["overlayURL"] == "" { //Quck hack to append GameOverlay stuff to existing config, whole system needs revamp
+		file, err := os.OpenFile(filepath.Join(exPath, "config.ini"), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		if err != nil {
+			panic(err)
+		}
+		_, err = file.WriteString(fmt.Sprintf("\n[GameOverlay]; https://github.com/kdancybot/np-client/wiki/GameOverlay\nenabled = false\ngameWidth = 1920\ngameHeight = 1080\noverlayURL = http://localhost:24050/InGame2\noverlayWidth = 380\noverlayHeight = 110\noverlayOffsetX = 0\noverlayOffsetY = 0\noverlayScale = 10"))
+		if err != nil {
+			panic(err)
+		}
+
+		Init()
+	}
+}