Move cmd/gomi/main.go

main.go → cmd/gomi/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"github.com/b4b4r07/gomi"
 	"github.com/jessevdk/go-flags"
 	"os"
 	"path/filepath"
@@ -27,7 +28,7 @@ func main() {
 			path = args[0]
 		}
 
-		if err := restore(path); err != nil {
+		if err := gomi.Restore(path); err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
 			os.Exit(1)
 		}
@@ -43,11 +44,11 @@ func main() {
 	}
 
 	// Main
-	for _, gomi := range args {
+	for _, g := range args {
 		if opts.System {
-			path, err = removeTo(gomi)
+			path, err = gomi.RemoveTo(g)
 		} else {
-			path, err = remove(gomi)
+			path, err = gomi.Remove(g)
 		}
 
 		if err != nil {
@@ -59,8 +60,8 @@ func main() {
 			os.Exit(1)
 		}
 
-		gomi, _ = filepath.Abs(gomi)
-		if err := logging(gomi, path); err != nil {
+		g, _ = filepath.Abs(g)
+		if err := gomi.Logging(g, path); err != nil {
 			fmt.Fprintf(os.Stderr, "%v\n", err)
 			os.Exit(1)
 		}

config.go

@@ -1,4 +1,4 @@
-package main
+package gomi
 
 import (
 	"fmt"

gomi.go

@@ -1,4 +1,4 @@
-package main
+package gomi
 
 import (
 	"bufio"
@@ -44,7 +44,7 @@ func cleanLog() error {
 	return nil
 }
 
-func restore(path string) error {
+func Restore(path string) error {
 	var answer string
 
 	if err := cleanLog(); err != nil {
@@ -98,7 +98,7 @@ func restore(path string) error {
 	return nil
 }
 
-func logging(src, dest string) error {
+func Logging(src, dest string) error {
 	// Open or create rm_log if rm_log doesn't exist
 	f, err := os.OpenFile(rm_log, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
 	if err != nil {
@@ -123,7 +123,7 @@ func logging(src, dest string) error {
 	return nil
 }
 
-func remove(src string) (dest string, err error) {
+func Remove(src string) (dest string, err error) {
 	// Check if rm_trash exists
 	_, err = os.Stat(rm_trash)
 	if os.IsNotExist(err) {
@@ -166,7 +166,7 @@ func remove(src string) (dest string, err error) {
 	return
 }
 
-func removeTo(src string) (dest string, err error) {
+func RemoveTo(src string) (dest string, err error) {
 	// Check if src exists
 	_, err = os.Stat(src)
 	if err != nil {

gomi_others.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package main
+package gomi
 
 import "os"
 

gomi_windows.go

@@ -1,6 +1,6 @@
 // +build windows
 
-package main
+package gomi
 
 var rm_trash = `C:\ProgramData` + "/gomi"
 var rm_log = rm_trash + "/log"

quicklook.go

@@ -1,4 +1,4 @@
-package main
+package gomi
 
 import (
 	"bufio"

tty_bsd.go

@@ -1,21 +1,21 @@
 // +build darwin freebsd
 
-package main
+package gomi
 
 import (
-  "os"
-  "syscall"
-  "unsafe"
+	"os"
+	"syscall"
+	"unsafe"
 )
 
 func isTty() bool {
-  var termios syscall.Termios
-  _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, os.Stdin.Fd(), uintptr(syscall.TIOCGETA), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-  return err == 0
+	var termios syscall.Termios
+	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, os.Stdin.Fd(), uintptr(syscall.TIOCGETA), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
+	return err == 0
 }
 
 func ttyReady() error {
-  return nil
+	return nil
 }
 
 func ttyTerm() {

tty_linux.go

@@ -1,21 +1,21 @@
 // +build linux
 
-package main
+package gomi
 
 import (
-  "os"
-  "syscall"
-  "unsafe"
+	"os"
+	"syscall"
+	"unsafe"
 )
 
 func isTty() bool {
-  var termios syscall.Termios
-  _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, os.Stdin.Fd(), uintptr(syscall.TCGETS), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-  return err == 0
+	var termios syscall.Termios
+	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, os.Stdin.Fd(), uintptr(syscall.TCGETS), uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
+	return err == 0
 }
 
 func ttyReady() error {
-  return nil
+	return nil
 }
 
 func ttyTerm() {

tty_windows.go

@@ -1,4 +1,4 @@
-package main
+package gomi
 
 import (
 	"os"

ui.go

@@ -1,4 +1,4 @@
-package main
+package gomi
 
 import (
 	"fmt"

utils.go

@@ -1,4 +1,4 @@
-package main
+package gomi
 
 import (
 	"bufio"