Compare commits
4 Commits
v1.1.2
...
218280caa2
| Author | SHA1 | Date | |
|---|---|---|---|
| 218280caa2 | |||
| 06a919cfd5 | |||
| 5f7c977f77 | |||
| 91d28b844d |
@@ -0,0 +1,32 @@
|
|||||||
|
name: SonarQube
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sonarqube:
|
||||||
|
name: SonarQube
|
||||||
|
runs-on: build-htz-01
|
||||||
|
steps:
|
||||||
|
- name: Checkout Code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Create Valid Project Key
|
||||||
|
id: sonar_setup
|
||||||
|
run: |
|
||||||
|
CLEAN_KEY=$(echo "${{ gitea.repository }}" | tr '/' ':')
|
||||||
|
echo "key=$CLEAN_KEY" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: SonarQube Scan
|
||||||
|
uses: sonarsource/sonarqube-scan-action@master
|
||||||
|
continue-on-error: true
|
||||||
|
env:
|
||||||
|
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
||||||
|
SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
|
||||||
|
with:
|
||||||
|
args: >
|
||||||
|
-Dsonar.projectKey=${{ steps.sonar_setup.outputs.key }}
|
||||||
|
-Dsonar.projectName=${{ gitea.repository }}
|
||||||
|
-Dsonar.qualitygate.wait=true
|
||||||
@@ -16,6 +16,7 @@ import (
|
|||||||
"goexplore/internal/transfer"
|
"goexplore/internal/transfer"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
"github.com/wailsapp/wails/v2/pkg/runtime"
|
"github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
@@ -25,6 +26,8 @@ type App struct {
|
|||||||
ctx context.Context
|
ctx context.Context
|
||||||
cfg *config.Config
|
cfg *config.Config
|
||||||
transferManager *transfer.Manager
|
transferManager *transfer.Manager
|
||||||
|
explorers map[string]explorer.Explorer
|
||||||
|
explorersMu sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewApp() *App {
|
func NewApp() *App {
|
||||||
@@ -38,6 +41,7 @@ func NewApp() *App {
|
|||||||
return &App{
|
return &App{
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
transferManager: transfer.NewManager(3),
|
transferManager: transfer.NewManager(3),
|
||||||
|
explorers: make(map[string]explorer.Explorer),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,6 +127,41 @@ func (a *App) ReorderConnections(ids []string) error {
|
|||||||
return config.SaveConfig(a.cfg)
|
return config.SaveConfig(a.cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *App) getConnection(id string) (explorer.Explorer, error) {
|
||||||
|
if id == "local" {
|
||||||
|
return local.New(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
a.explorersMu.Lock()
|
||||||
|
defer a.explorersMu.Unlock()
|
||||||
|
|
||||||
|
if exp, ok := a.explorers[id]; ok {
|
||||||
|
return exp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
exp, err := a.getExplorerForConnection(id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := exp.Connect(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
a.explorers[id] = exp
|
||||||
|
return exp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) DisconnectConnection(id string) {
|
||||||
|
a.explorersMu.Lock()
|
||||||
|
defer a.explorersMu.Unlock()
|
||||||
|
|
||||||
|
if exp, ok := a.explorers[id]; ok {
|
||||||
|
exp.Disconnect()
|
||||||
|
delete(a.explorers, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
|
func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
|
||||||
if id == "local" {
|
if id == "local" {
|
||||||
return local.New(), nil
|
return local.New(), nil
|
||||||
@@ -160,38 +199,26 @@ func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) ListDir(connId, path string) ([]explorer.FileEntry, error) {
|
func (a *App) ListDir(connId, path string) ([]explorer.FileEntry, error) {
|
||||||
exp, err := a.getExplorerForConnection(connId)
|
exp, err := a.getConnection(connId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if err := exp.Connect(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer exp.Disconnect()
|
|
||||||
return exp.ListDir(path)
|
return exp.ListDir(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) MkDir(connId, path string) error {
|
func (a *App) MkDir(connId, path string) error {
|
||||||
exp, err := a.getExplorerForConnection(connId)
|
exp, err := a.getConnection(connId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := exp.Connect(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer exp.Disconnect()
|
|
||||||
return exp.MkDir(path)
|
return exp.MkDir(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) Delete(connId, path string) error {
|
func (a *App) Delete(connId, path string) error {
|
||||||
exp, err := a.getExplorerForConnection(connId)
|
exp, err := a.getConnection(connId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := exp.Connect(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer exp.Disconnect()
|
|
||||||
return exp.Delete(path)
|
return exp.Delete(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -225,14 +252,10 @@ func (a *App) ClearTransfers() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) Rename(connId, src, dst string) error {
|
func (a *App) Rename(connId, src, dst string) error {
|
||||||
exp, err := a.getExplorerForConnection(connId)
|
exp, err := a.getConnection(connId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := exp.Connect(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer exp.Disconnect()
|
|
||||||
return exp.Rename(src, dst)
|
return exp.Rename(src, dst)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -85,6 +85,7 @@ async function loadConnections() {
|
|||||||
el.addEventListener('dragstart', (e) => {
|
el.addEventListener('dragstart', (e) => {
|
||||||
draggedConnId = c.id;
|
draggedConnId = c.id;
|
||||||
e.dataTransfer.effectAllowed = 'move';
|
e.dataTransfer.effectAllowed = 'move';
|
||||||
|
e.dataTransfer.setData('text/plain', c.id);
|
||||||
el.style.opacity = '0.5';
|
el.style.opacity = '0.5';
|
||||||
});
|
});
|
||||||
el.addEventListener('dragend', () => {
|
el.addEventListener('dragend', () => {
|
||||||
@@ -94,11 +95,11 @@ async function loadConnections() {
|
|||||||
el.addEventListener('dragenter', (e) => {
|
el.addEventListener('dragenter', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (draggedConnId && draggedConnId !== c.id) {
|
if (draggedConnId && draggedConnId !== c.id) {
|
||||||
el.style.borderTop = '2px solid var(--accent)';
|
el.style.boxShadow = 'inset 0 2px 0 var(--accent)';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
el.addEventListener('dragleave', (e) => {
|
el.addEventListener('dragleave', (e) => {
|
||||||
el.style.borderTop = '';
|
el.style.boxShadow = '';
|
||||||
});
|
});
|
||||||
el.addEventListener('dragover', (e) => {
|
el.addEventListener('dragover', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -106,7 +107,7 @@ async function loadConnections() {
|
|||||||
});
|
});
|
||||||
el.addEventListener('drop', async (e) => {
|
el.addEventListener('drop', async (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
el.style.borderTop = '';
|
el.style.boxShadow = '';
|
||||||
if (!draggedConnId || draggedConnId === c.id) return;
|
if (!draggedConnId || draggedConnId === c.id) return;
|
||||||
|
|
||||||
const ids = connectionsCache.map(conn => conn.id);
|
const ids = connectionsCache.map(conn => conn.id);
|
||||||
|
|||||||
Vendored
+2
@@ -11,6 +11,8 @@ export function Delete(arg1:string,arg2:string):Promise<void>;
|
|||||||
|
|
||||||
export function DeleteConnection(arg1:string):Promise<void>;
|
export function DeleteConnection(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function DisconnectConnection(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function GetConnections():Promise<Array<config.ConnectionConfig>>;
|
export function GetConnections():Promise<Array<config.ConnectionConfig>>;
|
||||||
|
|
||||||
export function GetTransfers():Promise<Array<transfer.Transfer>>;
|
export function GetTransfers():Promise<Array<transfer.Transfer>>;
|
||||||
|
|||||||
@@ -14,6 +14,10 @@ export function DeleteConnection(arg1) {
|
|||||||
return window['go']['main']['App']['DeleteConnection'](arg1);
|
return window['go']['main']['App']['DeleteConnection'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function DisconnectConnection(arg1) {
|
||||||
|
return window['go']['main']['App']['DisconnectConnection'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function GetConnections() {
|
export function GetConnections() {
|
||||||
return window['go']['main']['App']['GetConnections']();
|
return window['go']['main']['App']['GetConnections']();
|
||||||
}
|
}
|
||||||
|
|||||||
Executable → Regular
Executable → Regular
@@ -9,12 +9,14 @@ require (
|
|||||||
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3
|
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
github.com/hirochachacha/go-smb2 v1.1.0
|
github.com/hirochachacha/go-smb2 v1.1.0
|
||||||
|
github.com/jlaffaye/ftp v0.2.1
|
||||||
github.com/pkg/sftp v1.13.10
|
github.com/pkg/sftp v1.13.10
|
||||||
github.com/studio-b12/gowebdav v0.12.0
|
github.com/studio-b12/gowebdav v0.12.0
|
||||||
github.com/vmware/go-nfs-client v0.0.0-20190605212624-d43b92724c1b
|
github.com/vmware/go-nfs-client v0.0.0-20190605212624-d43b92724c1b
|
||||||
github.com/wailsapp/wails/v2 v2.12.0
|
github.com/wailsapp/wails/v2 v2.12.0
|
||||||
github.com/zalando/go-keyring v0.2.8
|
github.com/zalando/go-keyring v0.2.8
|
||||||
golang.org/x/crypto v0.53.0
|
golang.org/x/crypto v0.53.0
|
||||||
|
golang.org/x/time v0.15.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -41,7 +43,6 @@ require (
|
|||||||
github.com/godbus/dbus/v5 v5.2.2 // indirect
|
github.com/godbus/dbus/v5 v5.2.2 // indirect
|
||||||
github.com/gorilla/websocket v1.5.3 // indirect
|
github.com/gorilla/websocket v1.5.3 // indirect
|
||||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
|
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
|
||||||
github.com/jlaffaye/ftp v0.2.1 // indirect
|
|
||||||
github.com/kr/fs v0.1.0 // indirect
|
github.com/kr/fs v0.1.0 // indirect
|
||||||
github.com/labstack/echo/v4 v4.13.3 // indirect
|
github.com/labstack/echo/v4 v4.13.3 // indirect
|
||||||
github.com/labstack/gommon v0.4.2 // indirect
|
github.com/labstack/gommon v0.4.2 // indirect
|
||||||
@@ -64,7 +65,6 @@ require (
|
|||||||
golang.org/x/net v0.55.0 // indirect
|
golang.org/x/net v0.55.0 // indirect
|
||||||
golang.org/x/sys v0.46.0 // indirect
|
golang.org/x/sys v0.46.0 // indirect
|
||||||
golang.org/x/text v0.38.0 // indirect
|
golang.org/x/text v0.38.0 // indirect
|
||||||
golang.org/x/time v0.15.0 // indirect
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// replace github.com/wailsapp/wails/v2 v2.12.0 => /home/jamie/go/pkg/mod
|
// replace github.com/wailsapp/wails/v2 v2.12.0 => /home/jamie/go/pkg/mod
|
||||||
|
|||||||
@@ -9,10 +9,11 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/pkg/sftp"
|
|
||||||
"golang.org/x/crypto/ssh"
|
|
||||||
"goexplore/internal/config"
|
"goexplore/internal/config"
|
||||||
"goexplore/internal/explorer"
|
"goexplore/internal/explorer"
|
||||||
|
|
||||||
|
"github.com/pkg/sftp"
|
||||||
|
"golang.org/x/crypto/ssh"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SFTPExplorer struct {
|
type SFTPExplorer struct {
|
||||||
@@ -31,9 +32,9 @@ func (e *SFTPExplorer) Connect() error {
|
|||||||
if port == 0 {
|
if port == 0 {
|
||||||
port = 22
|
port = 22
|
||||||
}
|
}
|
||||||
|
|
||||||
var authMethods []ssh.AuthMethod
|
var authMethods []ssh.AuthMethod
|
||||||
|
|
||||||
secretStr := strings.TrimSpace(e.secret)
|
secretStr := strings.TrimSpace(e.secret)
|
||||||
// Handle case where newlines might be escaped by mistake
|
// Handle case where newlines might be escaped by mistake
|
||||||
secretStr = strings.ReplaceAll(secretStr, "\\n", "\n")
|
secretStr = strings.ReplaceAll(secretStr, "\\n", "\n")
|
||||||
@@ -70,8 +71,8 @@ func (e *SFTPExplorer) Connect() error {
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
config := &ssh.ClientConfig{
|
config := &ssh.ClientConfig{
|
||||||
User: e.cfg.Username,
|
User: e.cfg.Username,
|
||||||
Auth: authMethods,
|
Auth: authMethods,
|
||||||
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
|
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,9 +103,17 @@ func (e *SFTPExplorer) Disconnect() error {
|
|||||||
|
|
||||||
func (e *SFTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) {
|
func (e *SFTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) {
|
||||||
if path == "" {
|
if path == "" {
|
||||||
path = "."
|
if e.cfg.Bucket != "" {
|
||||||
|
path = e.cfg.Bucket
|
||||||
|
} else {
|
||||||
|
path = "/"
|
||||||
|
}
|
||||||
|
} else if path == "." {
|
||||||
|
path = "/"
|
||||||
}
|
}
|
||||||
|
|
||||||
files, err := e.client.ReadDir(path)
|
files, err := e.client.ReadDir(path)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user