Fixing making a new file

Author: raguay

.gitignore

@@ -1,5 +1,5 @@
 # Wails bin directory
-build/bin
+build
 
 # Don't save the public folder. It shoud be compiled each time.
 frontend/dist

app.go

@@ -3,12 +3,6 @@ package main
 import (
 	"context"
 	"errors"
-	"fmt"
-	clip "github.com/atotto/clipboard"
-	"github.com/go-git/go-git/v5"
-	github "github.com/google/go-github/v49/github"
-	cp "github.com/otiai10/copy"
-	rt "github.com/wailsapp/wails/v2/pkg/runtime"
 	"io"
 	"io/fs"
 	"io/ioutil"
@@ -19,13 +13,18 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	clip "github.com/atotto/clipboard"
+	"github.com/go-git/go-git/v5"
+	github "github.com/google/go-github/v49/github"
+	cp "github.com/otiai10/copy"
+	rt "github.com/wailsapp/wails/v2/pkg/runtime"
 )
 
 // App application struct and other structs
 type App struct {
 	ctx           context.Context
 	err           string
-	proc          *os.Process
 	lastRightDir  string
 	lastLeftDir   string
 	Commands      []string
@@ -245,7 +244,7 @@ func (b *App) SplitFile(path string) FileParts {
 func (b *App) ReadDir(path string) []FileInfo {
 	b.err = ""
 	var result []FileInfo
-	result = make([]FileInfo, 0, 0)
+	result = make([]FileInfo, 0)
 	files, err := ioutil.ReadDir(path)
 	if err != nil {
 		b.err = err.Error()
@@ -411,13 +410,12 @@ func (b *App) GetOSName() string {
 	switch os {
 	case "windows":
 		result = "windows"
-		break
 	case "darwin":
 		result = "macos"
 	case "linux":
 		result = "linux"
 	default:
-		result = fmt.Sprintf("%s", os)
+		result = os
 	}
 	return result
 }
@@ -428,7 +426,7 @@ func (b *App) GetGitHubThemes() []GitHubRepos {
 	topics, _, err := client.Search.Repositories(context.Background(), "in:topic modalfilemanager in:topic theme", nil)
 	if err == nil {
 		total := *topics.Total
-		result = make([]GitHubRepos, total, total)
+		result = make([]GitHubRepos, total)
 		for i := 0; i < total; i++ {
 			result[i].ID = *topics.Repositories[i].ID
 			result[i].Name = *topics.Repositories[i].Name
@@ -448,7 +446,7 @@ func (b *App) GetGitHubScripts() []GitHubRepos {
 	topics, _, err := client.Search.Repositories(context.Background(), "in:topic modalfilemanager in:topic V2 in:topic extension", nil)
 	if err == nil {
 		total := *topics.Total
-		result = make([]GitHubRepos, total, total)
+		result = make([]GitHubRepos, total)
 		for i := 0; i < total; i++ {
 			result[i].ID = *topics.Repositories[i].ID
 			result[i].Name = *topics.Repositories[i].Name
@@ -463,7 +461,7 @@ func (b *App) GetGitHubScripts() []GitHubRepos {
 }
 
 func (b *App) SearchMatchingDirectories(path string, pat string, max int) []string {
-	result := make([]string, max, max)
+	result := make([]string, max)
 	count := 0
 	err := filepath.Walk(path, func(path string, info fs.FileInfo, err error) error {
 		if err == nil && info.IsDir() {

build/darwin/Info.dev.plist

@@ -1612,12 +1612,6 @@
 
   function deleteEntries() {
     let entries = getSelectedFiles();
-    if (typeof entries !== "undefined" && entries.length === 0) {
-      //
-      // Get the entry at the current cursor
-      //
-      entries.push($currentCursor.entry);
-    }
     deleteEntriesCommand(entries);
   }
 
@@ -1649,13 +1643,6 @@
   function copyEntries() {
     let entries = getSelectedFiles();
     let sel = true;
-    if (typeof entries !== "undefined" && entries.length === 0) {
-      //
-      // Get the entry at the current cursor
-      //
-      entries.push($currentCursor.entry);
-      sel = false;
-    }
     let otherPane;
     if ($currentCursor.pane === "left") {
       otherPane = { ...$currentRightFile.entry };
@@ -1791,12 +1778,6 @@
 
   function moveEntries() {
     let entries = getSelectedFiles();
-    if (typeof entries !== "undefined" && entries.length === 0) {
-      //
-      // Get the entry at the current cursor
-      //
-      entries.push($currentCursor.entry);
-    }
     let otherPane =
       $currentCursor.pane === "left"
         ? $currentRightFile.entry
@@ -2081,9 +2062,11 @@
     //
     // Create the new file.
     //
-    let nfile = { ...$currentCursor.entry };
-    nfile.name = nfname;
-    await $currentCursor.entry.fileSystem.createFile(nfile);
+    nfname = await $currentCursor.entry.fileSystem.appendPath(
+      $currentCursor.entry.dir,
+      nfname
+    );
+    await $currentCursor.entry.fileSystem.createFile(nfname);
 
     //
     // Refresh the file list.
@@ -2229,6 +2212,9 @@
       //
       selected = rightEntries.filter((item) => item.selected === true);
     }
+    if (selected.length === 0) {
+      selected.push($currentCursor.entry);
+    }
     return selected;
   }
 

build/darwin/Info.plist

@@ -2,10 +2,10 @@
 // File:      commands.js
 //
 // Description: This file contains the commands object for dealing with commands that
-//              SvelteFileManager uses. 
+//              ModalFileManager uses. 
 //
 
-var commands = {
+const commands = {
   commandList: [],
   lastError: '',
   addCommand: function(name, altname, description, command) {
@@ -45,6 +45,7 @@ var commands = {
     return commands.commandList.map(item => {
       return {
         name: item.name,
+        altname: item.altname,
         description: item.description
       };
     })

frontend/Pictures/ModalFileManager2-small.afphoto

@@ -4,7 +4,7 @@
 // Description: This object contains the extensions used and interacts with them.
 //
 
-var extensions = {
+const extensions = {
   fileSystems: null,
   commands: null,
   extCommandList: [],
@@ -34,16 +34,16 @@ var extensions = {
     //
     extensions.config = confg;
     extensions.localFS = LFS;
-    var items = await extensions.localFS.readDir(extensions.extensionDir);
-    for (var i = 0; i < items.length; i++) {
+    let items = await extensions.localFS.readDir(extensions.extensionDir);
+    for (let i = 0; i < items.length; i++) {
       const extsDir = await extensions.localFS.appendPath(extensions.extensionDir, items[i].Name);
       try {
         //
         // an extension directory. load it!
         //
         const paramfile = await extensions.localFS.appendPath(extsDir, 'package.json');
         if (await extensions.localFS.fileExists(paramfile)) {
-          var parms = await extensions.localFS.readFile(paramfile);
+          let parms = await extensions.localFS.readFile(paramfile);
           parms = JSON.parse(parms.toString());
           if (typeof parms.mfmextension !== 'undefined') {
             const extfile = await extensions.localFS.appendPath(extsDir, parms.mfmextension.main);
@@ -158,7 +158,7 @@ var extensions = {
     })
   },
   removeExtension: function(ext) {
-    var exten = extensions.extensionList.filter(item => item.name === ext)[0];
+    let exten = extensions.extensionList.filter(item => item.name === ext)[0];
     exten.unload();
     extensions.extensionList = extensions.extensionList.filter(item => item.name != ext);
   },

frontend/Pictures/ModalFileManager2-small.jpg

@@ -5,73 +5,78 @@ go 1.18
 require (
 	github.com/atotto/clipboard v0.1.4
 	github.com/gin-contrib/static v0.0.1
-	github.com/gin-gonic/gin v1.9.0
-	github.com/go-git/go-git/v5 v5.6.1
+	github.com/gin-gonic/gin v1.9.1
+	github.com/go-git/go-git/v5 v5.9.0
 	github.com/google/go-github/v49 v49.1.0
-	github.com/otiai10/copy v1.11.0
-	github.com/wailsapp/wails/v2 v2.4.1
+	github.com/otiai10/copy v1.14.0
+	github.com/wailsapp/wails/v2 v2.6.0
 )
 
 require (
+	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230426101702-58e86b294756 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
 	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/bep/debounce v1.2.1 // indirect
-	github.com/bytedance/sonic v1.8.8 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
-	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
+	github.com/cloudflare/circl v1.3.5 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-git/gcfg v1.5.0 // indirect
-	github.com/go-git/go-billy/v5 v5.4.1 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.5.0 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.13.0 // indirect
+	github.com/go-playground/validator/v10 v10.15.5 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/labstack/echo/v4 v4.10.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/labstack/echo/v4 v4.11.2 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
-	github.com/leaanthony/go-ansi-parser v1.6.0 // indirect
+	github.com/leaanthony/go-ansi-parser v1.6.1 // indirect
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.6.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/samber/lo v1.38.1 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/skeema/knownhosts v1.1.0 // indirect
+	github.com/skeema/knownhosts v1.2.1 // indirect
 	github.com/tkrajina/go-reflector v0.5.6 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
+	github.com/wailsapp/go-webview2 v1.0.9 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/tools v0.9.1 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	golang.org/x/arch v0.5.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sync v0.4.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/tools v0.14.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )