EVEN MORE TESTING

Mainly just messing around

.gitignore

@@ -0,0 +1 @@
+testing/

README.md

@@ -1,39 +1,51 @@
 # LinuxPA
+
 LinuxPA is a try to bring a [PortableApps.com](http://portableapps.com) type launcher to Linux.  
 
-# How to use
+## How to use
+
 Just double click on an app to launch it! If there are multiple executables, you can either select the specific executable, or if you just double click the app it'll launch the first linux executable it finds. .sh script files have priority over other executable files.
 
-# Apps:
+## Apps
+
 The below place provides linux executables that don't need libs installed on the host system:  
-[AppImage](https://bintray.com/probono/AppImages)  
+[https://appimage.github.io/](https://appimage.github.io/)  
+
+## PortableApps.com Compatibility
 
-# PortableApps.com Compatibility
 LinuxPA works will with the PortableApps.com launcher, as it looks for apps in the PortableApps folder and grabs the app's name and icon from where it should be in the PortableApps.com format.  
 My forum at PortableApps.com can be found [here](http://portableapps.com/node/54998).  
 
-# common.sh
+## common.sh
-common.sh is found in the PortableApps/LinuxPACom folder and is executed before the app. I mainly use it to set environment variables (such as HOME). You can create and edit the common.sh from settings  
+
+common.sh is found in the PortableApps/LinuxPACom folder and is executed before the app. I mainly use it to set environment variables (such as HOME). You can create and edit the common.sh from settings.
+
+## Simple App Setup
 
-# Simple App Setup
 Because apps aren't natively formated in the PortableApps.com format, LinuxPA will look in the root directory for a AppInfo.ini (for basic info such as category and name) and appicon.png. If they aren't found, it looks where the appicon_\*.png and AppInfo.ini is in PortableApps format. You can set what the AppInfo.ini and appicon.png are from LinuxPA.  
 
-# AppImage Support
+## AppImage Support
+
 [AppImage Website](http://appimage.org)
-Right now AppImages are simply supported via the native linux executable support, and you can download AppImages. (Woo)
+I'm looking into improving AppImage support. As of 2.1.5.0 IF `unsquashfs` is in $PATH then some advanced AppImage support is available and it will automagically get the name and possibly the icon of it. I'm looking into better support, but it might be a while.
+
+## USB mount
 
-# USB mount
 Unfortunately Linux, by default, doesn't support running executables off of FAT formated flash drives, requiring you to mount your drive with special mount arguments or format in a linux friendly format (such as EXT4). I personally use the arguments `exec,noauto,nodev,nosuid,umask=0000`  
 
-# Screenshots
+## Screenshots
+
 Photos are found [Here](https://goo.gl/photos/VtBUL6DyZTMidj5n6). The screenshots are with the adapta gtk theme
 
-# TODO (Might be in order)
+## TODO (Might be in order)
-1. MAKE IT BETTER  
+
-1. Manual update check   
+1. MAKE IT BETTER
-1. Better AppImage integrations (Specifically updating, getting information from the appimage, and better appimage downloading)
+1. Integrate [goappimage](https://github.com/probonod/go-appimage) library for better AppImage integration.
-1. Automagic appimage updating (It will of course ask you beforehand)
+1. Try to `chmod +x` executables if they don't have the permission
+1. Manual update check
+1. Better AppImage integrations (Specifically updating and better appimage downloading)
 1. Get information (such as name and icon) directly from an appimage
 1. Better appimage downloading (probably based around [AppImageHub](https://appimage.github.io/apps/))
 1. Sandboxing support
+   1. Might be possible by packaging as an AppImage and providing Firejail, or simply just downloading it (like with Wine)
 1. Check if all apps are closed when it closes and ask if you want to force stop the apps

app.go

@@ -1,313 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/gotk3/gotk3/gdk"
-	"github.com/gotk3/gotk3/gtk"
-)
-
-type app struct {
-	name   string
-	cat    string
-	appimg []string
-	lin    []string
-	ex     []string
-	icon   *gdk.Pixbuf
-	dir    string
-	ini    *os.File
-}
-
-func (a *app) getTreeIter(store *gtk.TreeStore) *gtk.TreeIter {
-	it := store.Append(nil)
-	store.SetValue(it, 0, a.icon)
-	if portableHide {
-		store.SetValue(it, 1, strings.TrimSuffix(a.name, "Portable"))
-	} else {
-		store.SetValue(it, 1, a.name)
-	}
-	if len(a.ex) > 1 {
-		if wine {
-			for _, v := range a.ex {
-				i := store.Append(it)
-				store.SetValue(i, 1, v)
-			}
-		} else {
-			for _, v := range a.lin {
-				i := store.Append(it)
-				store.SetValue(i, 1, v)
-			}
-		}
-	}
-	return it
-}
-
-func (a *app) launch() {
-	if len(a.ex) == 1 {
-		if wine {
-			var cmd *exec.Cmd
-			if !contains(a.lin, a.ex[0]) {
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-				}
-			} else {
-				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[0]), ".appimage") {
-					os.Mkdir(a.dir+"/"+a.ex[0]+".home", 0777)
-					os.Mkdir(a.dir+"/"+a.ex[0]+".config", 0777)
-				}
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
-				}
-			}
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			cmd.Start()
-		} else {
-			var cmd *exec.Cmd
-			if paDirs && strings.HasSuffix(strings.ToLower(a.ex[0]), ".appimage") {
-				os.Mkdir(a.dir+"/"+a.ex[0]+".home", 0777)
-				os.Mkdir(a.dir+"/"+a.ex[0]+".config", 0777)
-			}
-			if comEnbld {
-				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
-			} else {
-				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
-			}
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			cmd.Start()
-		}
-	} else {
-		if wine {
-			var cmd *exec.Cmd
-			if len(a.lin) == 0 {
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-				}
-			} else {
-				var ind int
-				for i, v := range a.lin {
-					if strings.HasSuffix(v, ".sh") {
-						ind = i
-						break
-					}
-				}
-				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[ind]), ".appimage") {
-					os.Mkdir(a.dir+"/"+a.ex[ind]+".home", 0777)
-					os.Mkdir(a.dir+"/"+a.ex[ind]+".config", 0777)
-				}
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[ind]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
-				}
-			}
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			cmd.Start()
-		} else {
-			if len(a.lin) != 0 {
-				var ind int
-				for i, v := range a.lin {
-					if strings.HasSuffix(v, ".sh") {
-						ind = i
-						break
-					}
-				}
-				var cmd *exec.Cmd
-				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[ind]), ".appimage") {
-					os.Mkdir(a.dir+"/"+a.ex[ind]+".home", 0777)
-					os.Mkdir(a.dir+"/"+a.ex[ind]+".config", 0777)
-				}
-				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[ind]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
-				} else {
-					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
-				}
-				cmd.Stdout = os.Stdout
-				cmd.Stderr = os.Stderr
-				cmd.Start()
-			}
-		}
-	}
-}
-
-func (a *app) launchSub(sub int) {
-	if wine {
-		var cmd *exec.Cmd
-		if !contains(a.lin, a.ex[sub]) {
-			if comEnbld {
-				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[sub]+"\"")
-			} else {
-				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[sub]+"\"")
-			}
-		} else {
-			if paDirs && strings.HasSuffix(strings.ToLower(a.ex[sub]), ".appimage") {
-				os.Mkdir(a.dir+"/"+a.ex[sub]+".home", 0777)
-				os.Mkdir(a.dir+"/"+a.ex[sub]+".config", 0777)
-			}
-			if comEnbld {
-				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[sub]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
-			} else {
-				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
-			}
-		}
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Start()
-	} else {
-		var cmd *exec.Cmd
-		if paDirs && strings.HasSuffix(strings.ToLower(a.ex[sub]), ".appimage") {
-			os.Mkdir(a.dir+"/"+a.ex[sub]+".home", 0777)
-			os.Mkdir(a.dir+"/"+a.ex[sub]+".config", 0777)
-		}
-		if comEnbld {
-			cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[sub]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
-		} else {
-			cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
-		}
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Start()
-	}
-}
-
-func (a *app) edit(parent *gtk.Window, reload func()) {
-	tmp := *a
-	parent.SetSensitive(false)
-	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	win.Connect("destroy", func() {
-		master = make(map[string][]app)
-		linmaster = make(map[string][]app)
-		cats = make([]string, 0)
-		lin = make([]string, 0)
-		setup()
-		reload()
-		parent.SetSensitive(true)
-	})
-	win.SetDefaultSize(400, 135)
-	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	topLvl.SetMarginStart(10)
-	topLvl.SetMarginEnd(10)
-	topLvl.SetMarginTop(10)
-	topLvl.SetMarginBottom(10)
-	top, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-	img, _ := gtk.ImageNewFromPixbuf(a.icon)
-	imgBut, _ := gtk.ButtonNew()
-	imgBut.SetImage(img)
-	imgBut.SetSizeRequest(100, 100)
-	imgBut.Connect("clicked", func() {
-		fil, _ := gtk.FileChooserDialogNewWith1Button("Select Icon", win, gtk.FILE_CHOOSER_ACTION_OPEN, "Open", gtk.RESPONSE_ACCEPT)
-		filter, _ := gtk.FileFilterNew()
-		filter.AddPixbufFormats()
-		filter.SetName("Supported Pictures")
-		fil.AddFilter(filter)
-		but, _ := fil.AddButton("Cancel", gtk.RESPONSE_CANCEL)
-		but.Connect("clicked", func() {
-			fil.Close()
-		})
-		resp := fil.Run()
-		if resp == int(gtk.RESPONSE_ACCEPT) {
-			filename := fil.GetFilename()
-			_, err := os.Open(filename)
-			if err != nil {
-				fmt.Println(err)
-				return
-			}
-			pix, _ := gdk.PixbufNewFromFileAtSize(filename, 32, 32)
-			tmp.icon = pix
-			img.SetFromPixbuf(pix)
-			fil.Close()
-		}
-	})
-	topRt, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	nameLbl, _ := gtk.LabelNew("Name:")
-	nameLbl.SetHAlign(gtk.ALIGN_START)
-	txtgtbl, _ := gtk.TextTagTableNew()
-	txtBuf, _ := gtk.TextBufferNew(txtgtbl)
-	nameTxt, _ := gtk.TextViewNewWithBuffer(txtBuf)
-	nameTxt.SetAcceptsTab(false)
-	nameTxt.SetWrapMode(gtk.WRAP_CHAR)
-	nameTxt.SetPixelsBelowLines(5)
-	nameTxt.SetHExpand(true)
-	nameTxt.SetVExpand(false)
-	nameTxt.SetBorderWindowSize(gtk.TEXT_WINDOW_BOTTOM, 5)
-	txtBuf.SetText(tmp.name)
-	vScrollName, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollName, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	nameScr, _ := gtk.ScrolledWindowNew(hScrollName, vScrollName)
-	nameScr.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
-	nameScr.SetSizeRequest(300, 25)
-	nameScr.SetVExpand(false)
-	nameScr.Add(nameTxt)
-	catLbl, _ := gtk.LabelNew("Category:")
-	catLbl.SetHAlign(gtk.ALIGN_START)
-	catTbl, _ := gtk.TextTagTableNew()
-	catBuf, _ := gtk.TextBufferNew(catTbl)
-	catTxt, _ := gtk.TextViewNewWithBuffer(catBuf)
-	catBuf.SetText(tmp.cat)
-	catTxt.SetAcceptsTab(false)
-	catTxt.SetWrapMode(gtk.WRAP_CHAR)
-	catTxt.SetPixelsBelowLines(5)
-	catTxt.SetHExpand(true)
-	catTxt.SetVExpand(false)
-	catTxt.SetBorderWindowSize(gtk.TEXT_WINDOW_BOTTOM, 5)
-	vScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	catScr, _ := gtk.ScrolledWindowNew(hScrollCat, vScrollCat)
-	catScr.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
-	catScr.SetSizeRequest(300, 25)
-	catScr.SetVExpand(false)
-	catScr.Add(catTxt)
-	topRt.Add(nameLbl)
-	topRt.Add(nameScr)
-	topRt.Add(catLbl)
-	topRt.Add(catScr)
-	top.Add(imgBut)
-	top.Add(topRt)
-	bot, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-	sv, _ := gtk.ButtonNewWithLabel("Save")
-	sv.Connect("clicked", func() {
-		tmp.name, _ = txtBuf.GetText(txtBuf.GetStartIter(), txtBuf.GetEndIter(), true)
-		tmp.cat, _ = catBuf.GetText(catBuf.GetStartIter(), catBuf.GetEndIter(), true)
-		tmp.makeIni()
-		os.Remove(a.dir + "/appicon.png")
-		tmp.icon.SavePNG(a.dir+"/appicon.png", 0)
-		win.Close()
-	})
-	cnl, _ := gtk.ButtonNewWithLabel("Cancel")
-	cnl.Connect("clicked", func() {
-		win.Close()
-	})
-	bot.PackEnd(sv, false, false, 0)
-	bot.PackEnd(cnl, false, false, 0)
-	topLvl.Add(top)
-	topLvl.Add(bot)
-	win.Add(topLvl)
-	win.ShowAll()
-	win.Show()
-}
-
-func (a *app) makeIni() {
-	os.Remove(a.dir + "/appinfo.ini")
-	fil, err := os.Create(a.dir + "/appinfo.ini")
-	if err != nil {
-		return
-	}
-	ini := "[General]\n"
-	ini += "Category=" + a.cat + "\n"
-	ini += "Name=" + a.name + "\n"
-	wrt := bufio.NewWriter(fil)
-	wrt.WriteString(ini)
-	wrt.Flush()
-}

appimg/CTesting.go

@@ -1,78 +0,0 @@
-package appimg
-
-// Thanks to probono for the majority of this C code: https://discourse.appimage.org/t/accessing-appimage-desktop-file/173/4?u=calebq42
-
-/*
-#cgo CFLAGS: -I/usr/lib
-#cgo LDFLAGS: -L/usr/lib/libappimage.so -lappimage
-#cgo pkg-config: glib-2.0
-
-#include <appimage/appimage.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <strings.h>
-
-bool extract_desktop(char* appimageLoc,char* extractLoc){
-  char** files = appimage_list_files(appimageLoc);
-  g_autofree gchar *desktop_file = NULL;
-  gchar *extracted_desktop_file = extractLoc;
-  int i = 0;
-  for (; files[i] != NULL ; i++) {
-      // g_debug("AppImage file: %s", files[i]);
-      if (g_str_has_suffix (files[i],".desktop")) {
-          desktop_file = files[i];
-          g_debug("AppImage desktop file: %s", desktop_file);
-          break;
-      }
-  }
-  if(desktop_file == NULL) {
-      g_debug("AppImage desktop file not found");
-      appimage_string_list_free(files);
-      return FALSE;
-  }
-  appimage_extract_file_following_symlinks(appimageLoc, desktop_file,extracted_desktop_file);
-  appimage_string_list_free(files);
-	return TRUE;
-}
-
-bool extract_file(char* appimageLoc,char* filename,char* extractLoc){
-  char** files = appimage_list_files(appimageLoc);
-  g_autofree gchar *found_file = NULL;
-  gchar *extracted_file = extractLoc;
-  int i = 0;
-  for (; files[i] != NULL ; i++) {
-      g_debug("AppImage file: %s", files[i]);
-      if (strcmp(files[i],filename)==0) {
-          found_file = files[i];
-          g_debug("FileFound: %s", found_file);
-      }
-  }
-  if(found_file == NULL) {
-      g_debug("filenotfound");
-      appimage_string_list_free(files);
-      return FALSE;
-  }
-  appimage_extract_file_following_symlinks(appimageLoc, found_file,extracted_file);
-  appimage_string_list_free(files);
-	return TRUE;
-}
-*/
-import "C"
-import (
-	"errors"
-	"os"
-	"unsafe"
-)
-
-func GetDesktopFile(loc string) (*os.File, error) {
-	os.Remove("/tmp/my.desktop")
-	var locTmp *C.char = C.CString(loc)
-	defer C.free(unsafe.Pointer(locTmp))
-	var extractLoc *C.char = C.CString("/tmp/my.desktop")
-	defer C.free(unsafe.Pointer(extractLoc))
-	var out C.bool = C.extract_desktop(locTmp, extractLoc)
-	if out == false {
-		return nil, errors.New("Desktop File Not Found!")
-	}
-	return os.Open("/tmp/my.desktop")
-}

appimg/Proc.go

@@ -1,60 +0,0 @@
-package appimg
-
-import "reflect"
-
-func convert(in string) (out []tag) {
-	for i := 0; i < len(in); i++ {
-		v := in[i]
-		if v == '<' {
-			for j := i; j < len(in); j++ {
-				val := in[j]
-				if val == '>' {
-					var tmp tag
-					tmp.process(in[i+1 : j+1])
-					if !tmp.end && tmp.typ == "a" {
-						tmp.index[0] = i
-						tmp.index[1] = j
-						nd := fndend(tmp, in[j+1:])
-						if !reflect.DeepEqual(nd, tag{}) {
-							tmp.Meat = in[j+1 : nd.index[0]]
-							out = append(out, tmp)
-							str := in[tmp.index[1]:nd.index[0]]
-							in = in[:i] + str + in[nd.index[1]+1:]
-						}
-					}
-					break
-				}
-			}
-		}
-	}
-	return
-}
-
-func fndend(fnt tag, area string) tag {
-	var count int
-	for i, v := range area {
-		if v == '<' {
-			for j, val := range area[i:] {
-				if val == '>' {
-					var tmp tag
-					tmp.process(area[i+1 : i+j+1])
-					if tmp.typ == fnt.typ {
-						if tmp.end {
-							if count == 0 {
-								tmp.index[0] = fnt.index[1] + 1 + i
-								tmp.index[1] = fnt.index[1] + j + i + 1
-								return tmp
-							}
-							count--
-							break
-						} else {
-							count++
-							break
-						}
-					}
-				}
-			}
-		}
-	}
-	return tag{}
-}

appimg/Tag.go

@@ -1,115 +0,0 @@
-package appimg
-
-import "strings"
-
-type tag struct {
-	typ    string
-	end    bool
-	params map[string]string
-	index  [2]int
-	Meat   string
-}
-
-func (t *tag) value(param string) string {
-	return t.params[param]
-}
-
-func (t *tag) setValue(param, value string) {
-	if t.params == nil {
-		t.params = make(map[string]string)
-	}
-	t.params[strings.TrimSpace(strings.ToLower(param))] = strings.TrimSpace(value)
-}
-
-func (t *tag) process(bbtag string) {
-	if strings.HasPrefix(bbtag, "/") {
-		t.end = true
-		t.typ = strings.ToLower(strings.TrimPrefix(bbtag[:len(bbtag)-1], "/"))
-		return
-	}
-	for i, v := range bbtag {
-		if v == '=' || v == ' ' || v == '>' {
-			t.typ = strings.ToLower(bbtag[:i])
-			switch v {
-			case '=':
-				if qt := bbtag[i+1]; qt == '\'' || qt == '"' {
-					for j := i + 2; j < len(bbtag); j++ {
-						if bbtag[j] == qt {
-							t.setValue("starting", bbtag[i+2:j])
-							bbtag = bbtag[j+1:]
-							break
-						} else if bbtag[j] == '>' {
-							t.setValue("starting", bbtag[i+2:j])
-							return
-						}
-					}
-				} else {
-					for j := i + 1; j < len(bbtag); j++ {
-						if bbtag[j] == '>' {
-							t.setValue("starting", bbtag[i+1:j])
-							return
-						} else if bbtag[j] == ' ' {
-							t.setValue("starting", bbtag[i+1:j])
-							bbtag = bbtag[j+1:]
-							break
-						}
-					}
-				}
-			case '>':
-				return
-			case ' ':
-				bbtag = bbtag[i:]
-			}
-			break
-		}
-	}
-	t.processFurther(bbtag)
-}
-
-func (t *tag) processFurther(further string) {
-	further = strings.TrimSpace(further)
-	for i := 0; i < len(further); i++ {
-		switch further[i] {
-		case ' ':
-			t.setValue(strings.ToLower(further[:i]), further[:i])
-			further = strings.TrimSpace(further[i:])
-			i = -1
-		case '=':
-			if qt := further[i+1]; qt == '\'' || qt == '"' {
-			outloopqt:
-				for j := i + 2; j < len(further); j++ {
-					switch further[j] {
-					case '>':
-						t.setValue(strings.ToLower(further[:i]), further[i+2:j])
-						return
-					case qt:
-						t.setValue(strings.ToLower(further[:i]), further[i+2:j])
-						further = strings.TrimSpace(further[j+1:])
-						i = -1
-						break outloopqt
-					}
-				}
-			} else {
-			outloop:
-				for j := i + 1; j < len(further); j++ {
-					switch further[j] {
-					case '>':
-						t.setValue(strings.ToLower(further[:i]), further[i+1:j])
-						return
-					case ' ':
-						t.setValue(strings.ToLower(further[:i]), further[i+1:j])
-						further = strings.TrimSpace(further[j:])
-						i = -1
-						break outloop
-					}
-				}
-			}
-		case '>':
-			if i != 0 {
-				t.setValue(strings.ToLower(further[:i]), further[:i])
-				return
-			}
-			return
-		}
-	}
-}

appimg/appimg.go

@@ -1,13 +0,0 @@
-package appimg
-
-type appimg struct {
-	full    string
-	name    string
-	version string
-}
-
-func newApp(name string) appimg {
-	var out appimg
-	out.full = name
-	return out
-}

appimg/download.go

@@ -1,67 +0,0 @@
-package appimg
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"strings"
-
-	"github.com/gotk3/gotk3/gtk"
-)
-
-func downloadApp(parent *gtk.Window, ap appimg) {
-	parent.SetSensitive(false)
-	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	win.SetTransientFor(parent)
-	win.Connect("destroy", func() {
-		parent.SetSensitive(true)
-	})
-	spn, _ := gtk.SpinnerNew()
-	spn.Start()
-	lbl, _ := gtk.LabelNew("Downloading " + ap.full + "...")
-	box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	box.SetMarginStart(10)
-	box.SetMarginEnd(10)
-	box.SetMarginTop(10)
-	box.SetMarginBottom(10)
-	box.Add(spn)
-	box.Add(lbl)
-	win.Add(box)
-	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	win.ShowAll()
-	win.Show()
-	go func(win *gtk.Window, ap appimg) {
-		defer win.Close()
-		check := http.Client{
-			CheckRedirect: func(r *http.Request, via []*http.Request) error {
-				r.URL.Opaque = r.URL.Path
-				return nil
-			},
-		}
-		resp, err := check.Get(urlBase + ap.full)
-		if err != nil {
-			fmt.Println(err)
-			return
-		}
-		defer resp.Body.Close()
-		name := strings.Split(ap.full, "-")[0]
-		var foldName string
-		if _, err = os.Open("PortableApps/" + name + "Portable"); err == nil {
-			foldName = "PortableApps/" + name + "Portable"
-		} else if _, err = os.Open("PortableApps/" + name); err == nil {
-			foldName = "PortableApps/" + name
-		} else {
-			os.Mkdir("PortableApps/"+name+"Portable", 0777)
-			foldName = "PortableApps/" + name + "Portable"
-		}
-		os.Remove(foldName + "/" + ap.full)
-		fil, err := os.Create(foldName + "/" + ap.full)
-		if err != nil {
-			fmt.Println(err)
-			return
-		}
-		io.Copy(fil, resp.Body)
-		fil.Chmod(0777)
-	}(win, ap)
-}

appimg/installui.go

@@ -1,144 +0,0 @@
-//Package appimg is for downloading new AppImages for LinuxPA
-package appimg
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"sort"
-	"strings"
-
-	"github.com/gotk3/gotk3/glib"
-	"github.com/gotk3/gotk3/gtk"
-)
-
-const (
-	urlBase = "https://dl.bintray.com/probono/AppImages/"
-)
-
-//ShowUI shows the list of possible AppImages to be downloaded in a gtk.Window
-func ShowUI(newestVersionOnly bool, clsFunc func()) {
-	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	win.Connect("destroy", func() {
-		clsFunc()
-	})
-	apps := make([]appimg, 0)
-	win.SetSizeRequest(400, 400)
-	box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	appList, _ := gtk.ListBoxNew()
-	apch := make(chan appimg)
-	appList.SetHExpand(true)
-	appList.SetVExpand(true)
-	vScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	lst, _ := gtk.ScrolledWindowNew(hScrollCat, vScrollCat)
-	lst.SetSizeRequest(170, 500)
-	lst.Add(appList)
-	box.Add(lst)
-	win.Add(box)
-	appList.Connect("row-activated", func() {
-		if appList.GetSelectedRow().GetIndex() >= 0 {
-			downloadApp(win, apps[appList.GetSelectedRow().GetIndex()])
-		}
-	})
-	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	win.ShowAll()
-	win.Show()
-	getList(win, apch)
-	go func(win *gtk.Window, apch chan appimg, list *gtk.ListBox) {
-		if newestVersionOnly {
-			imgs := make([]appimg, 0)
-			a := make(map[string][]appimg)
-			names := make([]string, 0)
-			for i := range apch {
-				imgs = append(imgs, i)
-			}
-			for i, v := range imgs {
-				sp := strings.Split(v.full, "-")
-				if len(sp) >= 2 {
-					vers := sp[1]
-					removeLetters(vers)
-					imgs[i].version = vers
-					imgs[i].name = sp[0]
-					if _, ok := a[imgs[i].name]; !ok {
-						names = append(names, imgs[i].name)
-					}
-					a[imgs[i].name] = append(a[imgs[i].name], imgs[i])
-				}
-			}
-			sort.Strings(names)
-			for _, name := range names {
-				glib.IdleAdd(func(name string, list *gtk.ListBox, i appimg) {
-					lbl, _ := gtk.LabelNew(name)
-					list.Add(lbl)
-					apps = append(apps, i)
-					lbl.Show()
-				}, name, list, a[name][compareVersions(a[name])])
-			}
-		} else {
-			for i := range apch {
-				glib.IdleAdd(func(list *gtk.ListBox, i appimg) {
-					lbl, _ := gtk.LabelNew(i.full)
-					list.Add(lbl)
-					apps = append(apps, i)
-					lbl.Show()
-				}, list, i)
-			}
-		}
-	}(win, apch, appList)
-}
-
-func getList(parent *gtk.Window, apch chan appimg) {
-	win, _ := gtk.WindowNew(gtk.WINDOW_POPUP)
-	win.SetTransientFor(parent)
-	win.SetDestroyWithParent(true)
-	win.Connect("destroy", func() {
-		parent.SetSensitive(true)
-	})
-	parent.SetSensitive(false)
-	spin, _ := gtk.SpinnerNew()
-	spin.Start()
-	txt, _ := gtk.LabelNew("Getting List...")
-	box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	box.SetMarginBottom(10)
-	box.SetMarginEnd(10)
-	box.SetMarginStart(10)
-	box.SetMarginTop(10)
-	box.Add(spin)
-	box.Add(txt)
-	win.Add(box)
-	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	win.ShowAll()
-	win.Show()
-	go func(win *gtk.Window, apch chan appimg) {
-		check := http.Client{
-			CheckRedirect: func(r *http.Request, via []*http.Request) error {
-				r.URL.Opaque = r.URL.Path
-				return nil
-			},
-		}
-		resp, err := check.Get(urlBase)
-		if err != nil {
-			fmt.Println(err)
-			close(apch)
-			win.Close()
-			return
-		}
-		defer resp.Body.Close()
-		btys, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			fmt.Println(err)
-			close(apch)
-			win.Close()
-			return
-		}
-		tgs := convert(string(btys))
-		for _, v := range tgs {
-			if strings.HasSuffix(strings.ToLower(v.Meat), ".appimage") {
-				apch <- newApp(v.Meat)
-			}
-		}
-		close(apch)
-		win.Close()
-	}(win, apch)
-}

appimg/removeLetters.go

@@ -1,12 +0,0 @@
-package appimg
-
-import "strings"
-
-func removeLetters(vers string) string {
-	vers = strings.ToLower(vers)
-	letters := []string{"abcdefghijklmnopqrstuvwxyz"}
-	for _, v := range letters {
-		vers = strings.Replace(vers, v, "", -1)
-	}
-	return vers
-}

appimg/version.go

@@ -1,33 +0,0 @@
-package appimg
-
-import (
-	"strconv"
-	"strings"
-)
-
-func compareVersions(imgs []appimg) int {
-	for i := range imgs {
-		imgs[i].version = removeLetters(imgs[i].version)
-	}
-	highest := 0
-	higharr := strings.Split(imgs[0].version, ".")
-	for i := 0; i < len(imgs); i++ {
-		if i != highest {
-			varr := strings.Split(imgs[i].version, ".")
-			if len(higharr) < len(varr) {
-				for j := 0; j < len(higharr); j++ {
-					h, _ := strconv.Atoi(higharr[j])
-					c, _ := strconv.Atoi(varr[j])
-					if h > c {
-						break
-					} else if c > h {
-						highest = i
-						higharr = varr
-						break
-					}
-				}
-			}
-		}
-	}
-	return highest
-}

go.mod

@@ -0,0 +1,11 @@
+module github.com/CalebQ42/LinuxPA
+
+go 1.23.1
+
+require github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b
+
+require (
+	github.com/ebitengine/purego v0.8.2 // indirect
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+)

go.sum

@@ -0,0 +1,8 @@
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b h1:JJfspevP3YOXcSKVABizYOv++yMpTJIdPUtoDzF/RWw=
+github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b/go.mod h1:BaY76bZk7nw1/kVOSQObPY1v1iwVE1KHAGMfvI6oK1Q=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

internal/ui/round_rect.go

@@ -0,0 +1,260 @@
+package ui
+
+import (
+	"image/color"
+	"time"
+
+	rl "github.com/gen2brain/raylib-go/raylib"
+)
+
+// A rectangle with borders.
+// Default only has black borders.
+type Rect struct {
+	x         int32
+	y         int32
+	h         int32
+	w         int32
+	radius    int32
+	reload    bool
+	shown     bool
+	rendering bool
+
+	borderWidth int32
+	borderColor color.RGBA
+	fillColor   color.RGBA
+
+	curTweens map[string]*Tween
+	tex       rl.RenderTexture2D
+}
+
+func NewRect(x, y, height, width int32) *Rect {
+	r := &Rect{
+		x:           x,
+		y:           y,
+		h:           height,
+		w:           width,
+		radius:      0,
+		borderWidth: 2,
+		borderColor: rl.Black,
+		fillColor:   rl.Blank,
+		reload:      true,
+		curTweens:   make(map[string]*Tween),
+	}
+	r.tex = rl.LoadRenderTexture(width, height)
+	rl.SetTextureFilter(r.tex.Texture, rl.FilterAnisotropic8x|rl.FilterBilinear)
+	return r
+}
+
+func (r *Rect) Copy() *Rect {
+	return &Rect{
+		x:           r.x,
+		y:           r.y,
+		h:           r.h,
+		w:           r.w,
+		radius:      r.radius,
+		borderWidth: r.borderWidth,
+		borderColor: r.borderColor,
+		fillColor:   r.fillColor,
+	}
+}
+
+func (r *Rect) addTween(key string, old, new int32) {
+	r.curTweens[key] = NewTween(old, new, 1000*time.Millisecond)
+}
+
+func (r *Rect) SetPosition(x, y int32) {
+	if !r.shown {
+		r.x, r.y = x, y
+		return
+	}
+	if r.x != x {
+		r.addTween("x", r.x, x)
+	}
+	if r.y != y {
+		r.addTween("y", r.y, y)
+	}
+}
+
+func (r *Rect) SetSize(h, w int32) {
+	if !r.shown {
+		r.h, r.w = h, w
+		return
+	}
+	if r.h != h {
+		r.addTween("h", r.h, h)
+		r.reload = true
+	}
+	if r.w != w {
+		r.addTween("w", r.w, w)
+		r.reload = true
+	}
+}
+
+func (r *Rect) SetBorderRadius(radius int32) {
+	if !r.shown {
+		r.radius = radius
+		return
+	}
+	if r.radius != radius {
+		r.addTween("radius", r.radius, radius)
+		r.reload = true
+	}
+}
+
+func (r *Rect) SetBorderWidth(w int32) {
+	if !r.shown {
+		r.borderWidth = w
+		return
+	}
+	if r.borderWidth != w {
+		r.addTween("borderWidth", r.borderWidth, w)
+		r.reload = true
+	}
+}
+
+func (r *Rect) SetBorderColor(c color.RGBA) {
+	if r.borderColor != c {
+		r.reload = true
+	}
+	r.borderColor = c
+}
+
+func (r *Rect) SetFillColor(c color.RGBA) {
+	if r.fillColor != c {
+		r.reload = true
+	}
+	r.fillColor = c
+}
+
+func (r *Rect) Draw() {
+	r.shown = true
+	if !r.reload && len(r.curTweens) == 0 {
+		rl.DrawTextureEx(r.tex.Texture, rl.NewVector2(float32(r.x), float32(r.y)), 0, 1, rl.White)
+		return
+	}
+	var curRect *Rect
+	updateTex := false
+	if len(r.curTweens) != 0 {
+		curRect = r.Copy()
+		tween, ok := r.curTweens["x"]
+		if ok {
+			curRect.x = tween.CurVal()
+			if tween.Ended() {
+				r.x = curRect.x
+				delete(r.curTweens, "x")
+			}
+		}
+		tween, ok = r.curTweens["y"]
+		if ok {
+			curRect.y = tween.CurVal()
+			if tween.Ended() {
+				r.y = curRect.y
+				delete(r.curTweens, "y")
+			}
+		}
+		tween, ok = r.curTweens["h"]
+		if ok {
+			curRect.h = tween.CurVal()
+			if curRect.h != r.h {
+				updateTex = true
+			}
+			if tween.Ended() {
+				r.h = curRect.h
+				delete(r.curTweens, "h")
+			}
+		}
+		tween, ok = r.curTweens["w"]
+		if ok {
+			curRect.w = tween.CurVal()
+			if curRect.w != r.w {
+				updateTex = true
+			}
+			if tween.Ended() {
+				r.w = curRect.w
+				delete(r.curTweens, "w")
+			}
+		}
+		tween, ok = r.curTweens["radius"]
+		if ok {
+			curRect.radius = tween.CurVal()
+			if curRect.radius != r.radius {
+				updateTex = true
+			}
+			if tween.Ended() {
+				r.radius = curRect.radius
+				delete(r.curTweens, "radius")
+			}
+		}
+		tween, ok = r.curTweens["borderWidth"]
+		if ok {
+			curRect.borderWidth = tween.CurVal()
+			if curRect.borderWidth != r.borderWidth {
+				updateTex = true
+			}
+			if tween.Ended() {
+				r.borderWidth = curRect.borderWidth
+				delete(r.curTweens, "borderWidth")
+			}
+		}
+	} else {
+		curRect = r
+	}
+	if r.reload || updateTex {
+		// rl.UnloadTexture(r.tex)
+		// r.tex = rl.LoadTextureFromImage(curRect.buildImage())
+		// rl.UpdateTexture(r.tex, rl.LoadImageColors(curRect.buildImage()))
+		rl.BeginTextureMode(r.tex)
+		curRect.drawTexture()
+		rl.EndTextureMode()
+	}
+	rl.DrawTexturePro(r.tex.Texture, rl.NewRectangle(0, 0, float32(curRect.w), float32(curRect.h)), rl.NewRectangle(float32(curRect.x), float32(curRect.y), float32(curRect.w), float32(curRect.h)), rl.NewVector2(0, 0), 0, rl.White)
+	// rl.DrawTextureEx(r.tex.Texture, rl.NewVector2(float32(curRect.x), float32(curRect.y)), 0, 1, rl.White)
+	r.reload = false
+}
+
+func (r Rect) drawTexture() {
+	rl.ClearBackground(rl.Blank)
+	// Filled areas
+	if r.fillColor != rl.Blank {
+		rl.DrawRectangle(r.radius, 0, (r.w - (2 * r.radius)), r.h, r.fillColor)
+		if r.radius > 0 {
+			rl.DrawRectangle((r.w - r.radius), r.radius, r.radius, (r.h - (2 * r.radius)), r.fillColor)
+			rl.DrawRectangle(0, r.radius, r.radius, (r.h - (2 * r.radius)), r.fillColor)
+		}
+	}
+
+	if r.borderColor != rl.Blank {
+		// Horizontal lines
+		rl.DrawRectangle(r.radius, 0, (r.w - (2 * r.radius)), r.borderWidth, r.borderColor)
+		rl.DrawRectangle(r.radius, (r.h)-(r.borderWidth), (r.w - (2 * r.radius)), r.borderWidth, r.borderColor)
+		// Vertical lines
+		rl.DrawRectangle(0, r.radius, r.borderWidth, (r.h - (2 * r.radius)), r.borderColor)
+		rl.DrawRectangle((r.w)-(r.borderWidth), r.radius, r.borderWidth, (r.h - (2 * r.radius)), r.borderColor)
+	}
+	if r.radius > 0 {
+		r.placeCorners()
+	}
+}
+
+func (r Rect) placeCorners() {
+	//bl
+	if r.borderWidth > 0 {
+		rl.DrawRing(rl.NewVector2(float32(r.radius), float32(r.radius)), float32(r.radius-r.borderWidth), float32(r.radius), 180, 270, 20, r.borderColor)
+	}
+	rl.DrawCircleSector(rl.NewVector2(float32(r.radius), float32(r.radius)), float32(r.radius-r.borderWidth), 180, 270, 20, r.fillColor)
+	//tl
+	if r.borderWidth > 0 {
+		rl.DrawRing(rl.NewVector2(float32(r.radius), float32(r.h-r.radius)), float32(r.radius-r.borderWidth), float32(r.radius), 90, 180, 20, r.borderColor)
+	}
+	rl.DrawCircleSector(rl.NewVector2(float32(r.radius), float32(r.h-r.radius)), float32(r.radius-r.borderWidth), 90, 180, 20, r.fillColor)
+	//tr
+	if r.borderWidth > 0 {
+		rl.DrawRing(rl.NewVector2(float32(r.w-r.radius), float32(r.h-r.radius)), float32(r.radius-r.borderWidth), float32(r.radius), 0, 90, 20, r.borderColor)
+	}
+	rl.DrawCircleSector(rl.NewVector2(float32(r.w-r.radius), float32(r.h-r.radius)), float32(r.radius-r.borderWidth), 0, 90, 20, r.fillColor)
+	//br
+	if r.borderWidth > 0 {
+		rl.DrawRing(rl.NewVector2(float32(r.w-r.radius), float32(r.radius)), float32(r.radius-r.borderWidth), float32(r.radius), 270, 360, 20, r.borderColor)
+	}
+	rl.DrawCircleSector(rl.NewVector2(float32(r.w-r.radius), float32(r.radius)), float32(r.radius-r.borderWidth), 270, 360, 20, r.fillColor)
+}

internal/ui/stuff.go

@@ -0,0 +1,48 @@
+package ui
+
+import (
+	"time"
+
+	rl "github.com/gen2brain/raylib-go/raylib"
+)
+
+type Window struct{}
+
+func Test() {
+	rl.SetConfigFlags(rl.FlagWindowResizable | rl.FlagWindowHighdpi | rl.FlagVsyncHint | rl.FlagMsaa4xHint)
+	rl.InitWindow(800, 450, "raylib [core] example - basic window")
+	defer rl.CloseWindow()
+	rl.SetTargetFPS(60)
+
+	noto := rl.LoadFont("./noto-sans.ttf")
+	txtImg := rl.ImageTextEx(noto, "Hello World!", 50, 0, rl.Black)
+	txt := rl.LoadTextureFromImage(txtImg)
+
+	tmpRect := NewRect(10, 10, 250, 500)
+	tmpRect.SetBorderRadius(25)
+
+	go func() {
+		for {
+			time.Sleep(5 * time.Second)
+			// tmpRect.SetBorderRadius(0)
+			// tmpRect.SetPosition(100, 100)
+			tmpRect.SetSize(400, 700)
+			time.Sleep(5 * time.Second)
+			// tmpRect.SetBorderRadius(25)
+			// tmpRect.SetPosition(10, 10)
+			tmpRect.SetSize(250, 500)
+		}
+	}()
+	// tmpRect.SetFillColor(rl.Green)
+	for !rl.WindowShouldClose() {
+		rl.BeginDrawing()
+		rl.DrawFPS(0, 0)
+
+		rl.ClearBackground(rl.DarkGray)
+		// rl.DrawText("Congrats! You created your first window!", 190, 100, 20, rl.LightGray)
+		// // rl.DrawTextEx(noto, "Congrats! You created your first window!", rl.NewVector2(190, 200), 48, 0, rl.Black)
+		tmpRect.Draw()
+		rl.DrawTexture(txt, 50, 50, rl.Black)
+		rl.EndDrawing()
+	}
+}

internal/ui/tween.go

@@ -0,0 +1,39 @@
+package ui
+
+import (
+	"math"
+	"time"
+)
+
+type Tween struct {
+	startVal  int32
+	startTime time.Time
+	dif       int32
+	dur       time.Duration
+}
+
+func NewTween(startVal, endVal int32, duration time.Duration) *Tween {
+	return &Tween{
+		startVal:  startVal,
+		dif:       endVal - startVal,
+		dur:       duration,
+		startTime: time.Now().Round(time.Millisecond),
+	}
+}
+
+func (t *Tween) CurVal() int32 {
+	since := time.Now().Round(time.Millisecond).Sub(t.startTime)
+	if since <= 0 {
+		return t.startVal
+	}
+	if since >= t.dur {
+		return t.startVal + t.dif
+	}
+	m := float32(since.Milliseconds()) / float32(t.dur.Milliseconds())
+	m = -1 * float32(math.Log10(-.9*float64(m)+1))
+	return t.startVal + int32(math.Round(float64(float32(t.dif)*m)))
+}
+
+func (t *Tween) Ended() bool {
+	return time.Now().Round(time.Millisecond).Sub(t.startTime) >= t.dur
+}

main.go

@@ -1,124 +1,7 @@
 package main
 
-import (
+import "github.com/CalebQ42/LinuxPA/internal/ui"
-	"encoding/gob"
-	"flag"
-	"fmt"
-	"os"
-
-	"github.com/gotk3/gotk3/gtk"
-)
-
-const (
-	version = "2.1.4.0"
-)
-
-var (
-	master        map[string][]app
-	linmaster     map[string][]app
-	cats          []string
-	lin           []string
-	wine          bool
-	comEnbld      bool
-	wineAvail     bool
-	portableHide  bool
-	betaUpdate    bool
-	versionNewest = true
-	paDirs        = true
-)
 
 func main() {
-	forced := flag.Bool("force-update", false, "Force the update dialog to be shown")
+	ui.Test()
-	flag.Parse()
-	os.MkdirAll("PortableApps/LinuxPACom", 0777)
-	master = make(map[string][]app)
-	linmaster = make(map[string][]app)
-	uiStart(*forced)
-}
-
-func uiStart(forced bool) {
-	gtk.Init(nil)
-	setup()
-	win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	if err != nil {
-		fmt.Println("Window not created", err)
-	}
-	win.SetTitle("LinuxPA")
-	win.Connect("destroy", func() {
-		savePrefs()
-		gtk.MainQuit()
-	})
-	win.SetDefaultSize(500, 500)
-	win.SetPosition(gtk.WIN_POS_CENTER)
-	ui(win)
-	win.ShowAll()
-	win.Show()
-	update(win, forced)
-	gtk.Main()
-}
-
-func savePrefs() {
-	os.Remove("PortableApps/LinuxPACom/Prefs.gob")
-	fil, err := os.Create("PortableApps/LinuxPACom/Prefs.gob")
-	if err != nil {
-		return
-	}
-	enc := gob.NewEncoder(fil)
-	err = enc.Encode(wine)
-	if err != nil {
-		return
-	}
-	err = enc.Encode(portableHide)
-	if err != nil {
-		return
-	}
-	err = enc.Encode(versionNewest)
-	if err != nil {
-		return
-	}
-	err = enc.Encode(paDirs)
-	if err != nil {
-		return
-	}
-	err = enc.Encode(betaUpdate)
-	if err != nil {
-		return
-	}
-}
-
-func loadPrefs() {
-	fil, err := os.Open("PortableApps/LinuxPACom/Prefs.gob")
-	if err != nil {
-		return
-	}
-	dec := gob.NewDecoder(fil)
-	err = dec.Decode(&wine)
-	if err != nil {
-		return
-	}
-	err = dec.Decode(&portableHide)
-	if err != nil {
-		return
-	}
-	err = dec.Decode(&versionNewest)
-	if err != nil {
-		return
-	}
-	err = dec.Decode(&paDirs)
-	if err != nil {
-		return
-	}
-	err = dec.Decode(&betaUpdate)
-	if err != nil {
-		return
-	}
-}
-
-func contains(arr []string, str string) bool {
-	for _, v := range arr {
-		if v == str {
-			return true
-		}
-	}
-	return false
 }

settings.go

@@ -1,205 +0,0 @@
-package main
-
-import (
-	"io/ioutil"
-	"os"
-	"os/exec"
-
-	"github.com/gotk3/gotk3/glib"
-	"github.com/gotk3/gotk3/gtk"
-)
-
-const (
-	commonHelp = "The common.sh is run before every app is launched and allows you to set variables such as $HOME. For directories, ALWAYS start the directory with $PWD which points to the directory where LinuxPA is. To allow for greater customization and isolation, you can use the $FILENAME variable which is the filename of the executable you're using and the $APPNAME variable which is the name of the app being lanched."
-)
-
-func settingsUI(parent *gtk.Window, onExit func()) {
-	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	win.SetTransientFor(parent)
-	parent.SetSensitive(false)
-	win.SetDefaultSize(600, 300)
-	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	win.Connect("destroy", func() {
-		parent.SetSensitive(true)
-		onExit()
-	})
-	comTagTbl, _ := gtk.TextTagTableNew()
-	comBuf, _ := gtk.TextBufferNew(comTagTbl)
-	ntbk, _ := gtk.NotebookNew()
-	gnrl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	gnrl.SetMarginStart(10)
-	gnrl.SetMarginEnd(10)
-	gnrl.SetMarginTop(10)
-	gnrl.SetMarginBottom(10)
-	dlWine, _ := gtk.ButtonNewWithLabel("Download Wine")
-	wineCheck, _ := gtk.CheckButtonNewWithLabel("Show Windows apps (Wine)")
-	wineLbl, _ := gtk.LabelNew("PortableApps/LinuxPACom/Wine present")
-	dlWine.Connect("clicked", func() {
-		cb := make(chan bool)
-		downloadWine(win, cb)
-		go func() {
-			v := <-cb
-			if v {
-				setupTxt(comBuf)
-				wineLbl.Show()
-			}
-			if _, err := os.Open("PortableApps/LinuxPACom/Wine"); os.IsNotExist(err) {
-				if _, errd := exec.LookPath("wine"); errd == nil {
-					wineAvail = true
-				}
-			} else if err == nil {
-				wineAvail = true
-			}
-			glib.IdleAdd(func() {
-				if !wineAvail {
-					wineCheck.SetSensitive(false)
-					wineCheck.SetTooltipText("Download wine to run windows apps")
-				} else {
-					wineCheck.SetSensitive(true)
-					wineCheck.SetTooltipText("")
-				}
-			})
-		}()
-	})
-	if !comEnbld {
-		dlWine.SetSensitive(false)
-		dlWine.SetTooltipText("common.sh needed")
-	}
-	pthdCheck, _ := gtk.CheckButtonNewWithLabel("Hide \"Portable\" from app name")
-	pthdCheck.Connect("toggled", func() {
-		portableHide = pthdCheck.GetActive()
-		master = make(map[string][]app)
-		linmaster = make(map[string][]app)
-		cats = make([]string, 0)
-		lin = make([]string, 0)
-		setup()
-	})
-	pthdCheck.SetActive(portableHide)
-	if !wineAvail {
-		wineCheck.SetSensitive(false)
-		wineCheck.SetTooltipText("Download wine to run windows apps")
-	}
-	wineCheck.SetActive(wine)
-	wineCheck.Connect("toggled", func() {
-		wine = wineCheck.GetActive()
-	})
-	versCheck, _ := gtk.CheckButtonNewWithLabel("Only show newest app version in downloads (A bit iffy ATM)")
-	versCheck.SetActive(versionNewest)
-	versCheck.Connect("toggled", func() {
-		versionNewest = versCheck.GetActive()
-	})
-	paDirsCheck, _ := gtk.CheckButtonNewWithLabel("Create .home and .config directories for AppImages")
-	paDirsCheck.SetActive(paDirs)
-	paDirsCheck.Connect("toggled", func() {
-		paDirs = paDirsCheck.GetActive()
-	})
-	betaCheck, _ := gtk.CheckButtonNewWithLabel("Update to beta releases")
-	gnrl.Add(wineLbl)
-	gnrl.Add(dlWine)
-	gnrl.Add(pthdCheck)
-	gnrl.Add(wineCheck)
-	gnrl.Add(versCheck)
-	gnrl.Add(paDirsCheck)
-	gnrl.Add(betaCheck)
-	ntbk.AppendPage(gnrl, getLabel("General"))
-	com, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	com.SetMarginStart(10)
-	com.SetMarginEnd(10)
-	com.SetMarginTop(10)
-	com.SetMarginBottom(10)
-	comEdit, _ := gtk.TextViewNewWithBuffer(comBuf)
-	comEdit.SetVExpand(true)
-	comEdit.SetHExpand(true)
-	vScroll, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScroll, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	comScrl, _ := gtk.ScrolledWindowNew(hScroll, vScroll)
-	comScrl.Add(comEdit)
-	svBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-	sv, _ := gtk.ButtonNewWithLabel("Save")
-	sv.Connect("clicked", func() {
-		beg, end := comBuf.GetBounds()
-		txt, _ := comBuf.GetText(beg, end, true)
-		ioutil.WriteFile("PortableApps/LinuxPACom/common.sh", []byte(txt), 0777)
-	})
-	cnl, _ := gtk.ButtonNewWithLabel("Cancel")
-	cnl.Connect("clicked", func() {
-		setupTxt(comBuf)
-	})
-	info, _ := gtk.ButtonNewWithLabel("Info")
-	info.Connect("clicked", func() {
-		infoBox, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-		infoBox.SetTransientFor(parent)
-		infoBox.SetDefaultSize(300, 80)
-		infoBox.SetName("common.sh info")
-		infoBox.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-		box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-		infolbl, _ := gtk.LabelNew(commonHelp)
-		infolbl.SetLineWrap(true)
-		infolbl.SetSizeRequest(200, 50)
-		box.Add(infolbl)
-		infoBox.Add(box)
-		infoBox.ShowAll()
-		infoBox.Show()
-	})
-	svBox.Add(sv)
-	svBox.Add(cnl)
-	svBox.Add(info)
-	com.Add(comScrl)
-	com.Add(svBox)
-	ntbk.AppendPage(com, getLabel("common.sh"))
-	win.Add(ntbk)
-	win.ShowAll()
-	if !comEnbld {
-		comScrl.Hide()
-		svBox.Hide()
-		mkCom, _ := gtk.ButtonNewWithLabel("Create common.sh")
-		mkCom.Connect("clicked", func() {
-			err := ioutil.WriteFile("PortableApps/LinuxPACom/common.sh", []byte("export HOME=$PWD/PortableApps/LinuxPACom/Home"), 0777)
-			if err == nil {
-				mkCom.Hide()
-				comScrl.Show()
-				svBox.Show()
-				setupTxt(comBuf)
-				comEnbld = true
-				dlWine.SetSensitive(true)
-				dlWine.SetTooltipText("")
-			}
-		})
-		in, _ := gtk.ButtonNewWithLabel("Info")
-		in.Connect("clicked", func() {
-			infoBox, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-			infoBox.SetTransientFor(parent)
-			infoBox.SetDefaultSize(300, 80)
-			infoBox.SetName("common.sh info")
-			infoBox.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-			box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-			infolbl, _ := gtk.LabelNew(commonHelp)
-			infolbl.SetLineWrap(true)
-			infolbl.SetSizeRequest(200, 50)
-			box.Add(infolbl)
-			infoBox.Add(box)
-			infoBox.ShowAll()
-			infoBox.Show()
-		})
-		mkCom.Show()
-		com.Add(mkCom)
-		com.Add(in)
-	} else {
-		setupTxt(comBuf)
-	}
-	if _, err := os.Open("PortableApps/LinuxPACom/Wine"); err != nil && os.IsNotExist(err) {
-		wineLbl.Hide()
-	}
-	win.Show()
-}
-
-func setupTxt(buf *gtk.TextBuffer) {
-	fil, _ := os.Open("PortableApps/LinuxPACom/common.sh")
-	btys, _ := ioutil.ReadAll(fil)
-	buf.SetText(string(btys))
-}
-
-func getLabel(name string) *gtk.Label {
-	lbl, _ := gtk.LabelNew(name)
-	return lbl
-}

setup.go

@@ -1,199 +0,0 @@
-package main
-
-import (
-	"bufio"
-	_ "image/png"
-	"os"
-	"os/exec"
-	"reflect"
-	"sort"
-	"strings"
-
-	"github.com/gotk3/gotk3/gdk"
-	"github.com/gotk3/gotk3/gtk"
-)
-
-func setup() {
-	loadPrefs()
-	if _, err := os.Open("PortableApps/LinuxPACom/Wine"); os.IsNotExist(err) {
-		if _, errd := exec.LookPath("wine"); errd == nil {
-			wineAvail = true
-		}
-	} else if err == nil {
-		wineAvail = true
-	}
-	if !wineAvail {
-		wine = false
-	}
-	PortableAppsFold, err := os.Open("PortableApps")
-	if PAStat, _ := PortableAppsFold.Stat(); err != nil || !PAStat.IsDir() {
-		os.Mkdir("PortableApps", 0777)
-		PortableAppsFold, err = os.Open("PortableApps")
-		if err != nil {
-			panic("Can't find PortableApps folder and can't create one!")
-		}
-	}
-	if _, err = os.Open("PortableApps/LinuxPACom"); err != nil {
-		os.Mkdir("PortableApps/LinuxPACom", 0777)
-	}
-	_, err = os.Open("PortableApps/LinuxPACom/common.sh")
-	if err == nil {
-		comEnbld = true
-	}
-	PAFolds, _ := PortableAppsFold.Readdirnames(-1)
-	sort.Strings(PAFolds)
-	for _, v := range PAFolds {
-		fold, _ := os.Open("PortableApps/" + v)
-		if stat, _ := fold.Stat(); stat.IsDir() && stat.Name() != "PortableApps.com" && stat.Name() != "LinuxPACom" {
-			ap := processApp("PortableApps/" + v)
-			if !reflect.DeepEqual(ap, app{}) {
-				if _, ok := master[ap.cat]; !ok {
-					cats = append(cats, ap.cat)
-					sort.Strings(cats)
-				}
-				if len(ap.lin) != 0 {
-					if _, ok := linmaster[ap.cat]; !ok {
-						lin = append(lin, ap.cat)
-						sort.Strings(lin)
-					}
-				}
-				master[ap.cat] = append(master[ap.cat], ap)
-				if len(ap.lin) != 0 {
-					linmaster[ap.cat] = append(linmaster[ap.cat], ap)
-				}
-			}
-		}
-	}
-}
-
-func processApp(fold string) (out app) {
-	wd, _ := os.Getwd()
-	out.dir = wd + "/" + fold
-	out.ini = findInfo(fold)
-	if out.ini != nil {
-		out.name = getName(out.ini)
-		out.ini = findInfo(fold)
-		out.cat = getCat(out.ini)
-		out.ini = findInfo(fold)
-	}
-	if out.name == "" {
-		out.name = strings.TrimPrefix(fold, "PortableApps/")
-	}
-	if out.cat == "" {
-		out.cat = "Other"
-	}
-	if portableHide {
-		out.name = strings.TrimSuffix(out.name, "Portable")
-	}
-	out.icon = getIcon(fold)
-	folder, _ := os.Open(fold)
-	fis, _ := folder.Readdirnames(-1)
-	for _, v := range fis {
-		tmp, _ := os.Open(fold + "/" + v)
-		if stat, _ := tmp.Stat(); stat.IsDir() {
-			continue
-		}
-		if strings.HasSuffix(strings.ToLower(v), ".appimage") {
-			out.appimg = append(out.appimg, v)
-			out.ex = append(out.ex, v)
-			out.lin = append(out.lin, v)
-		} else if strings.HasSuffix(strings.ToLower(v), ".exe") {
-			out.ex = append(out.ex, v)
-		} else {
-			btys := make([]byte, 4)
-			rdr := bufio.NewReader(tmp)
-			rdr.Read(btys)
-			if (strings.Contains(strings.ToLower(string(btys)), "elf") && !strings.HasSuffix(strings.ToLower(v), ".so") && !strings.Contains(v, ".so.")) || strings.HasPrefix(strings.ToLower(string(btys)), "#!") {
-				out.ex = append(out.ex, v)
-				out.lin = append(out.lin, v)
-			}
-		}
-	}
-	if len(out.ex) == 0 {
-		return app{}
-	}
-	if len(out.lin) == 0 {
-		out.name += " (Wine)"
-	}
-	return
-}
-
-func getCat(ini *os.File) string {
-	rdr := bufio.NewReader(ini)
-	var ret string
-	for line, _, err := rdr.ReadLine(); err == nil; line, _, err = rdr.ReadLine() {
-		if strings.HasPrefix(string(line), "Category=") {
-			ret = strings.TrimPrefix(string(line), "Category=")
-			break
-		} else if strings.HasPrefix(string(line), "category=") {
-			ret = strings.TrimPrefix(string(line), "category=")
-		}
-	}
-	rdr.Reset(ini)
-	return ret
-}
-
-func getName(ini *os.File) string {
-	rdr := bufio.NewReader(ini)
-	var ret string
-	for line, _, err := rdr.ReadLine(); err == nil; line, _, err = rdr.ReadLine() {
-		if strings.HasPrefix(string(line), "Name=") {
-			ret = strings.TrimPrefix(string(line), "Name=")
-			break
-		} else if strings.HasPrefix(string(line), "name=") {
-			ret = strings.TrimPrefix(string(line), "name=")
-			break
-		}
-	}
-	rdr.Reset(ini)
-	return ret
-}
-
-func getIcon(fold string) *gdk.Pixbuf {
-	var pic string
-	if _, err := os.Open(fold + "/appicon.png"); err == nil {
-		pic = fold + "/appicon.png"
-	} else if folder, err := os.Open(fold + "/App/AppInfo"); err == nil {
-		fis, _ := folder.Readdir(-1)
-		var pics []string
-		for _, v := range fis {
-			if !v.IsDir() && strings.HasSuffix(strings.ToLower(v.Name()), ".png") && strings.HasPrefix(strings.ToLower(v.Name()), "appicon_") {
-				pics = append(pics, v.Name())
-			}
-		}
-		sort.Strings(pics)
-		if len(pics) > 1 {
-			var ind int
-			if !contains(pics, "appicon_32.png") {
-				ind = len(pics) - 1
-			} else {
-				ind = sort.SearchStrings(pics, "appicon_32.png")
-			}
-			pic = fold + "/App/AppInfo/" + pics[ind]
-		}
-	} else {
-		img, _ := gtk.ImageNewFromIconName("application-x-executable", gtk.ICON_SIZE_BUTTON)
-		buf := img.GetPixbuf()
-		return buf
-	}
-	img, _ := gtk.ImageNewFromFile(pic)
-	buf, _ := img.GetPixbuf().ScaleSimple(32, 32, gdk.INTERP_BILINEAR)
-	return buf
-}
-
-func findInfo(fold string) *os.File {
-	if fi, err := os.Open(fold + "/appinfo.ini"); err == nil {
-		return fi
-	}
-	tmp, err := os.Open(fold + "/App/AppInfo")
-	if err == nil {
-		fis, _ := tmp.Readdirnames(-1)
-		for _, v := range fis {
-			if strings.ToLower(v) == "appinfo.ini" {
-				tmp, _ := os.Open(fold + "/App/AppInfo/" + v)
-				return tmp
-			}
-		}
-	}
-	return nil
-}

ui.go

@@ -1,188 +0,0 @@
-package main
-
-import (
-	"github.com/CalebQ42/LinuxPA/appimg"
-	"github.com/gotk3/gotk3/glib"
-	"github.com/gotk3/gotk3/gtk"
-)
-
-func ui(win *gtk.Window) {
-	ls := getCatRows()
-	var treeApps []*gtk.TreeIter
-	header, _ := gtk.HeaderBarNew()
-	header.SetShowCloseButton(true)
-	header.SetTitle("LinuxPA")
-	header.SetSubtitle("PortableApps.com type launcher")
-	settings, _ := gtk.ButtonNewFromIconName("applications-system", gtk.ICON_SIZE_SMALL_TOOLBAR)
-	settings.SetTooltipText("Settings")
-	dnl, _ := gtk.ButtonNewFromIconName("emblem-downloads", gtk.ICON_SIZE_SMALL_TOOLBAR)
-	dnl.SetTooltipText("Download Apps")
-	header.PackStart(settings)
-	header.PackEnd(dnl)
-	win.SetTitlebar(header)
-	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
-	lrBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-	catList, _ := gtk.ListBoxNew()
-	catList.SetActivateOnSingleClick(true)
-	store, _ := gtk.TreeStoreNew(glib.TYPE_OBJECT, glib.TYPE_STRING)
-	appsList, _ := gtk.TreeViewNewWithModel(store)
-	render, _ := gtk.CellRendererPixbufNew()
-	pixColumn, _ := gtk.TreeViewColumnNewWithAttribute("", render, "pixbuf", 0)
-	txtRender, _ := gtk.CellRendererTextNew()
-	txtColumn, _ := gtk.TreeViewColumnNewWithAttribute("", txtRender, "text", 1)
-	appsList.AppendColumn(pixColumn)
-	appsList.AppendColumn(txtColumn)
-	appsList.SetHeadersVisible(false)
-	catList.SetHExpand(true)
-	catList.SetVExpand(true)
-	appsList.SetHExpand(true)
-	appsList.SetVExpand(true)
-	vScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	vScrollApp, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	hScrollApp, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
-	catScrl, _ := gtk.ScrolledWindowNew(hScrollCat, vScrollCat)
-	catScrl.Add(catList)
-	catScrl.SetSizeRequest(170, 500)
-	appScrl, _ := gtk.ScrolledWindowNew(hScrollApp, vScrollApp)
-	appScrl.Add(appsList)
-	appScrl.SetSizeRequest(300, 500)
-	lrBox.Add(catScrl)
-	lrBox.Add(appScrl)
-	botBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 2)
-	botBox.SetMarginStart(10)
-	botBox.SetMarginEnd(10)
-	botBox.SetMarginTop(10)
-	botBox.SetMarginBottom(10)
-	edit, _ := gtk.ButtonNewWithLabel("Edit App..")
-	edit.Connect("clicked", func() {
-		selec, _ := appsList.GetSelection()
-		_, it, ok := selec.GetSelected()
-		if ok {
-			pth, _ := store.GetPath(it)
-			ind := pth.GetIndices()
-			if wine {
-				appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
-				appLnch.edit(win, func() {
-					store.Clear()
-					for i := range ls {
-						catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
-					}
-					ls = getCatRows()
-					for i, v := range ls {
-						catList.Insert(v, i)
-					}
-					catList.ShowAll()
-				})
-			} else {
-				appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
-				appLnch.edit(win, func() {
-					store.Clear()
-					for i := range ls {
-						catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
-					}
-					ls = getCatRows()
-					for i, v := range ls {
-						catList.Insert(v, i)
-					}
-					catList.ShowAll()
-				})
-			}
-		}
-	})
-	botBox.PackEnd(edit, false, false, 0)
-	topLvl.Add(lrBox)
-	topLvl.PackEnd(botBox, false, true, 0)
-	win.Add(topLvl)
-	for _, v := range ls {
-		catList.Add(v)
-	}
-	catList.Connect("row-selected", func() {
-		store.Clear()
-		if catList.GetSelectedRow().GetIndex() >= 0 {
-			treeApps = make([]*gtk.TreeIter, 0)
-			if wine {
-				apps := master[cats[catList.GetSelectedRow().GetIndex()]]
-				for _, v := range apps {
-					treeApps = append(treeApps, v.getTreeIter(store))
-				}
-			} else {
-				apps := linmaster[lin[catList.GetSelectedRow().GetIndex()]]
-				for _, v := range apps {
-					treeApps = append(treeApps, v.getTreeIter(store))
-				}
-			}
-		}
-	})
-	appsList.Connect("row-activated", func() {
-		selec, _ := appsList.GetSelection()
-		_, it, ok := selec.GetSelected()
-		if ok {
-			pth, _ := store.GetPath(it)
-			ind := pth.GetIndices()
-			if len(ind) == 1 {
-				if wine {
-					appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					appLnch.launch()
-				} else {
-					appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					appLnch.launch()
-				}
-			} else if len(ind) == 2 {
-				if wine {
-					appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					appLnch.launchSub(ind[1])
-				} else {
-					appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					appLnch.launchSub(ind[1])
-				}
-			}
-		}
-	})
-	dnl.Connect("clicked", func() {
-		appimg.ShowUI(versionNewest, func() {
-			master = make(map[string][]app)
-			linmaster = make(map[string][]app)
-			cats = make([]string, 0)
-			lin = make([]string, 0)
-			setup()
-			store.Clear()
-			for i := range ls {
-				catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
-			}
-			ls = getCatRows()
-			for i, v := range ls {
-				catList.Insert(v, i)
-			}
-			catList.ShowAll()
-		})
-	})
-	settings.Connect("clicked", func() {
-		settingsUI(win, func() {
-			store.Clear()
-			for i := range ls {
-				catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
-			}
-			ls = getCatRows()
-			for i, v := range ls {
-				catList.Insert(v, i)
-			}
-			catList.ShowAll()
-		})
-	})
-}
-
-func getCatRows() (out []*gtk.Label) {
-	if wine {
-		for _, v := range cats {
-			txt, _ := gtk.LabelNew(v)
-			out = append(out, txt)
-		}
-	} else {
-		for _, v := range lin {
-			txt, _ := gtk.LabelNew(v)
-			out = append(out, txt)
-		}
-	}
-	return
-}

update.go

@@ -1,262 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/gotk3/gotk3/gtk"
-)
-
-const (
-	versionURL       = "https://www.dropbox.com/s/a0xizzo0a4vsfqt/Version?dl=1"
-	downloadURL      = "https://github.com/CalebQ42/LinuxPA/releases/download/vXXX/LinuxPA"
-	changelogURL     = "https://www.dropbox.com/s/nmbk318er5kej5h/Changelog?dl=1"
-	changelogBetaURL = "https://www.dropbox.com/s/m8mo2o3nsvfqbfx/ChangelogBeta?dl=1"
-)
-
-//Thanks to https://www.socketloop.com/tutorials/golang-download-file-example
-//For some of the code
-
-//Returns if success
-func versionDL() (bool, error) {
-	versionFile, err := os.Create("PortableApps/LinuxPACom/Version")
-	if err != nil {
-		return false, err
-	}
-	versionFile.Chmod(0777)
-	check := http.Client{
-		CheckRedirect: func(r *http.Request, via []*http.Request) error {
-			r.URL.Opaque = r.URL.Path
-			return nil
-		},
-	}
-	response, err := check.Get(versionURL)
-	if err != nil {
-		return false, err
-	}
-	_, err = io.Copy(versionFile, response.Body)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
-func getVersionFileInfo() (stable string, beta string) {
-	fil, err := os.Open("PortableApps/LinuxPACom/Version")
-	if err != nil {
-		return "Error!", ""
-	}
-	rdr := bufio.NewReader(fil)
-	out, _, _ := rdr.ReadLine()
-	stable = string(out)
-	out, _, _ = rdr.ReadLine()
-	beta = string(out)
-	return
-}
-
-func changelogDL() (bool, error) {
-	changelogFile, err := os.Create("PortableApps/LinuxPACom/Changelog")
-	if err != nil {
-		return false, err
-	}
-	changelogFile.Chmod(0777)
-	check := http.Client{
-		CheckRedirect: func(r *http.Request, via []*http.Request) error {
-			r.URL.Opaque = r.URL.Path
-			return nil
-		},
-	}
-	var response *http.Response
-	if betaUpdate {
-		response, err = check.Get(changelogBetaURL)
-	} else {
-		response, err = check.Get(changelogURL)
-	}
-	if err != nil {
-		return false, err
-	}
-	_, err = io.Copy(changelogFile, response.Body)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
-func getChangelog() string {
-	fil, err := os.Open("PortableApps/LinuxPACom/Changelog")
-	if err != nil {
-		return "Error!"
-	}
-	out, _ := ioutil.ReadAll(fil)
-	return string(out)
-}
-
-func checkForUpdate(stable, beta string) (bool, error) {
-	new := stable
-	if betaUpdate {
-		new = beta
-	}
-	curSlice := strings.Split(version, ".")
-	newSlice := strings.Split(new, ".")
-	curNums := make([]int, 4)
-	newNums := make([]int, 4)
-	for i, v := range curSlice {
-		num, err := strconv.Atoi(v)
-		if err == nil {
-			curNums[i] = num
-		}
-		num, err = strconv.Atoi(newSlice[i])
-		if err == nil {
-			newNums[i] = num
-		} else {
-			return false, err
-		}
-		if newNums[i] > curNums[i] {
-			return true, nil
-		} else if curNums[i] > newNums[i] {
-			return false, nil
-		}
-	}
-	return false, nil
-}
-
-func downloadUpdate(newVersion string) (bool, error) {
-	url := strings.Replace(downloadURL, "XXX", newVersion, -1)
-	err := os.Rename("LinuxPA", ".LinuxPA.old")
-	if err != nil {
-		return false, err
-	}
-	fil, err := os.Create("LinuxPA")
-	fil.Chmod(0777)
-	defer fil.Close()
-	if err != nil {
-		os.Rename(".LinuxPA.old", "LinuxPA")
-		return false, err
-	}
-	check := http.Client{
-		CheckRedirect: func(r *http.Request, via []*http.Request) error {
-			r.URL.Opaque = r.URL.Path
-			return nil
-		},
-	}
-	re, err := check.Get(url)
-	if err != nil {
-		return false, err
-	}
-	defer re.Body.Close()
-	_, err = io.Copy(fil, re.Body)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
-func update(win *gtk.Window, forced bool) {
-	stat, err := versionDL()
-	if stat {
-		stable, beta := getVersionFileInfo()
-		if stable != "Error!" {
-			stat, err = checkForUpdate(stable, beta)
-			if stat || forced {
-				stat, err = changelogDL()
-				if stat {
-					updateWin, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-					updateWin.SetTransientFor(win)
-					updateWin.SetPosition(gtk.WIN_POS_CENTER)
-					topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-					lbl, _ := gtk.LabelNew("There's a new update! Here's the changelog:")
-					tagTbl, _ := gtk.TextTagTableNew()
-					buf, _ := gtk.TextBufferNew(tagTbl)
-					tv, _ := gtk.TextViewNewWithBuffer(buf)
-					tv.SetEditable(false)
-					buf.SetText(getChangelog())
-					butBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
-					upBut, _ := gtk.ButtonNewWithLabel("Update")
-					upBut.Connect("clicked", func() {
-						updateWin.Close()
-						actuallyUpdate(win, forced)
-					})
-					cnlBut, _ := gtk.ButtonNewWithLabel("Cancel")
-					cnlBut.Connect("clicked", func() {
-						updateWin.Close()
-					})
-					butBox.Add(upBut)
-					butBox.Add(cnlBut)
-					topLvl.Add(lbl)
-					topLvl.Add(tv)
-					topLvl.Add(butBox)
-					topLvl.SetMarginBottom(10)
-					topLvl.SetMarginEnd(10)
-					topLvl.SetMarginStart(10)
-					topLvl.SetMarginTop(10)
-					updateWin.Add(topLvl)
-					updateWin.ShowAll()
-					updateWin.Show()
-				} else {
-					fmt.Println(err)
-				}
-			} else {
-				fmt.Println(err)
-			}
-		} else {
-			fmt.Println("Failed Version File Info")
-		}
-	} else {
-		fmt.Println(err)
-	}
-}
-
-func actuallyUpdate(win *gtk.Window, forced bool) {
-	updateWin, _ := gtk.WindowNew(gtk.WINDOW_POPUP)
-	updateWin.SetTransientFor(win)
-	updateWin.SetSizeRequest(150, 50)
-	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	spin, _ := gtk.SpinnerNew()
-	spin.Start()
-	lbl, _ := gtk.LabelNew("Updating")
-	topLvl.Add(spin)
-	topLvl.Add(lbl)
-	topLvl.SetMarginBottom(10)
-	topLvl.SetMarginEnd(10)
-	topLvl.SetMarginStart(10)
-	topLvl.SetMarginTop(10)
-	updateWin.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	updateWin.Add(topLvl)
-	updateWin.ShowAll()
-	updateWin.Show()
-	go func(win, updateWin *gtk.Window) {
-		defer updateWin.Close()
-		stat, err := versionDL()
-		if stat {
-			stable, beta := getVersionFileInfo()
-			if stable != "Error!" {
-				stat, err = checkForUpdate(stable, beta)
-				if stat || forced {
-					if betaUpdate {
-						downloadUpdate(beta)
-					} else {
-						downloadUpdate(stable)
-					}
-					win.Close()
-					cmd := exec.Command("./LinuxPA")
-					cmd.Stdin = os.Stdin
-					cmd.Stdout = os.Stdout
-					cmd.Start()
-				} else {
-					fmt.Println(err)
-				}
-			} else {
-				fmt.Println("Failed Version File Info")
-			}
-		} else {
-			fmt.Println(err)
-		}
-	}(win, updateWin)
-}

wine.go

@@ -1,101 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"strings"
-
-	"github.com/gotk3/gotk3/gtk"
-	"github.com/mholt/archiver"
-)
-
-const (
-	wineURL = "https://www.playonlinux.com/wine/binaries/linux-amd64/PlayOnLinux-wine-2.5-linux-amd64.pol"
-)
-
-func downloadWine(parent *gtk.Window, cb chan bool) {
-	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	win.SetTransientFor(parent)
-	win.SetDestroyWithParent(true)
-	win.Connect("destroy", func() {
-		parent.SetSensitive(true)
-	})
-	parent.SetSensitive(false)
-	spin, _ := gtk.SpinnerNew()
-	spin.Start()
-	txt, _ := gtk.LabelNew("Downloading Wine")
-	box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
-	box.SetMarginBottom(10)
-	box.SetMarginEnd(10)
-	box.SetMarginStart(10)
-	box.SetMarginTop(10)
-	box.Add(spin)
-	box.Add(txt)
-	win.Add(box)
-	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
-	win.ShowAll()
-	win.Show()
-	go func(win *gtk.Window, txt *gtk.Label) {
-		defer win.Close()
-		wineTar, err := os.Create("PortableApps/LinuxPACom/wine2.5.tar.bz2")
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		defer wineTar.Close()
-		check := http.Client{
-			CheckRedirect: func(r *http.Request, via []*http.Request) error {
-				r.URL.Opaque = r.URL.Path
-				return nil
-			},
-		}
-		resp, err := check.Get(wineURL)
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		os.RemoveAll("PortableApps/LinuxPACom/Wine")
-		defer resp.Body.Close()
-		_, err = io.Copy(wineTar, resp.Body)
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		txt.SetText("Extracting Wine")
-		err = archiver.TarBz2.Open("PortableApps/LinuxPACom/wine2.5.tar.bz2", "PortableApps/LinuxPACom/Wine")
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		fil, err := os.Open("PortableApps/LinuxPACom/common.sh")
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		tmp, err := ioutil.ReadAll(fil)
-		if err != nil {
-			fmt.Println(err)
-			cb <- false
-			return
-		}
-		if !strings.Contains(string(tmp), "export PATH=$PWD/PortableApps/LinuxPACom/Wine/wineversion/2.5/bin:$PATH") {
-			tmp = append(tmp, []byte("\nexport PATH=$PWD/PortableApps/LinuxPACom/Wine/wineversion/2.5/bin:$PATH")...)
-			ioutil.WriteFile("PortableApps/LinuxPACom/common.sh", tmp, 0777)
-			if err != nil {
-				fmt.Println(err)
-				cb <- false
-				return
-			}
-		}
-		cb <- true
-		return
-	}(win, txt)
-}