Compare commits
18 Commits
v1.0.0
...
218280caa2
| Author | SHA1 | Date | |
|---|---|---|---|
| 218280caa2 | |||
| 06a919cfd5 | |||
| 5f7c977f77 | |||
| 91d28b844d | |||
| 2566f356b2 | |||
| 24331ac3d4 | |||
| 6fd7fc0300 | |||
| 3ec3ccf1ef | |||
| ef5beeff94 | |||
| d34e919f40 | |||
| e6b806d2c1 | |||
| 33c26ec310 | |||
| f27a5830ea | |||
| eb87e74720 | |||
| 93ad8c9321 | |||
| 715c4eccb6 | |||
| a812d4ac35 | |||
| 9b25229073 |
@@ -49,17 +49,17 @@ jobs:
|
||||
cp build/bin/GoExplore-amd64-installer.exe dist/goexplore-windows-installer.exe
|
||||
"
|
||||
|
||||
# - name: Generate Changelog
|
||||
# id: changelog
|
||||
# uses: https://github.com/metcalfc/changelog-generator@v4.6.2
|
||||
# with:
|
||||
# myToken: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Generate Changelog
|
||||
id: changelog
|
||||
uses: https://github.com/metcalfc/changelog-generator@v4.6.2
|
||||
with:
|
||||
myToken: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Create Gitea Release
|
||||
uses: https://gitea.com/actions/gitea-release-action@v1
|
||||
with:
|
||||
tag_name: ${{ steps.get_version.outputs.VERSION }}
|
||||
name: GoExplore ${{ steps.get_version.outputs.VERSION }}
|
||||
name: ${{ steps.get_version.outputs.VERSION }}
|
||||
body: ${{ steps.changelog.outputs.changelog }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
|
||||
@@ -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
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"goexplore/internal/config"
|
||||
"goexplore/internal/explorer"
|
||||
"goexplore/internal/keychain"
|
||||
"goexplore/internal/protocols/ftp"
|
||||
"goexplore/internal/protocols/local"
|
||||
"goexplore/internal/protocols/nfs"
|
||||
"goexplore/internal/protocols/s3"
|
||||
@@ -15,6 +16,7 @@ import (
|
||||
"goexplore/internal/transfer"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
@@ -24,6 +26,8 @@ type App struct {
|
||||
ctx context.Context
|
||||
cfg *config.Config
|
||||
transferManager *transfer.Manager
|
||||
explorers map[string]explorer.Explorer
|
||||
explorersMu sync.Mutex
|
||||
}
|
||||
|
||||
func NewApp() *App {
|
||||
@@ -37,6 +41,7 @@ func NewApp() *App {
|
||||
return &App{
|
||||
cfg: cfg,
|
||||
transferManager: transfer.NewManager(3),
|
||||
explorers: make(map[string]explorer.Explorer),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,6 +99,69 @@ func (a *App) DeleteConnection(id string) error {
|
||||
return config.SaveConfig(a.cfg)
|
||||
}
|
||||
|
||||
func (a *App) ReorderConnections(ids []string) error {
|
||||
var newConns []config.ConnectionConfig
|
||||
connMap := make(map[string]config.ConnectionConfig)
|
||||
for _, c := range a.cfg.Connections {
|
||||
connMap[c.ID] = c
|
||||
}
|
||||
|
||||
for _, id := range ids {
|
||||
if c, ok := connMap[id]; ok {
|
||||
newConns = append(newConns, c)
|
||||
}
|
||||
}
|
||||
|
||||
// Add any connections that might have been missed
|
||||
added := make(map[string]bool)
|
||||
for _, c := range newConns {
|
||||
added[c.ID] = true
|
||||
}
|
||||
for _, c := range a.cfg.Connections {
|
||||
if !added[c.ID] {
|
||||
newConns = append(newConns, c)
|
||||
}
|
||||
}
|
||||
|
||||
a.cfg.Connections = newConns
|
||||
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) {
|
||||
if id == "local" {
|
||||
return local.New(), nil
|
||||
@@ -123,48 +191,38 @@ func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
|
||||
return webdav.New(conn, secret), nil
|
||||
case "nfs":
|
||||
return nfs.New(conn, secret)
|
||||
case "ftp":
|
||||
return ftp.New(conn, secret), nil
|
||||
default:
|
||||
return nil, fmt.Errorf("protocol %s not fully implemented", conn.Protocol)
|
||||
}
|
||||
}
|
||||
|
||||
func (a *App) ListDir(connId, path string) ([]explorer.FileEntry, error) {
|
||||
exp, err := a.getExplorerForConnection(connId)
|
||||
exp, err := a.getConnection(connId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := exp.Connect(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer exp.Disconnect()
|
||||
return exp.ListDir(path)
|
||||
}
|
||||
|
||||
func (a *App) MkDir(connId, path string) error {
|
||||
exp, err := a.getExplorerForConnection(connId)
|
||||
exp, err := a.getConnection(connId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := exp.Connect(); err != nil {
|
||||
return err
|
||||
}
|
||||
defer exp.Disconnect()
|
||||
return exp.MkDir(path)
|
||||
}
|
||||
|
||||
func (a *App) Delete(connId, path string) error {
|
||||
exp, err := a.getExplorerForConnection(connId)
|
||||
exp, err := a.getConnection(connId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := exp.Connect(); err != nil {
|
||||
return err
|
||||
}
|
||||
defer exp.Disconnect()
|
||||
return exp.Delete(path)
|
||||
}
|
||||
|
||||
func (a *App) QueueTransfer(id string, srcConnId, dstConnId, srcPath, dstPath, filename string, size int64) error {
|
||||
func (a *App) QueueTransfer(id string, srcConnId, dstConnId, srcPath, dstPath, filename string, size int64, verify bool, limitMBps int) error {
|
||||
srcExp, err := a.getExplorerForConnection(srcConnId)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -182,7 +240,7 @@ func (a *App) QueueTransfer(id string, srcConnId, dstConnId, srcPath, dstPath, f
|
||||
return err
|
||||
}
|
||||
|
||||
return a.transferManager.QueueTransfer(id, srcPath, dstPath, filename, size, srcExp, dstExp)
|
||||
return a.transferManager.QueueTransfer(id, srcPath, dstPath, filename, size, srcExp, dstExp, verify, limitMBps)
|
||||
}
|
||||
|
||||
func (a *App) GetTransfers() []*transfer.Transfer {
|
||||
@@ -194,14 +252,10 @@ func (a *App) ClearTransfers() {
|
||||
}
|
||||
|
||||
func (a *App) Rename(connId, src, dst string) error {
|
||||
exp, err := a.getExplorerForConnection(connId)
|
||||
exp, err := a.getConnection(connId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := exp.Connect(); err != nil {
|
||||
return err
|
||||
}
|
||||
defer exp.Disconnect()
|
||||
return exp.Rename(src, dst)
|
||||
}
|
||||
|
||||
@@ -229,7 +283,7 @@ func (a *App) PromptUploadFiles(connId, destPath string) error {
|
||||
remotePath = destPath + fileName
|
||||
}
|
||||
|
||||
a.QueueTransfer(id, "local", connId, localPath, remotePath, fileName, stat.Size())
|
||||
a.QueueTransfer(id, "local", connId, localPath, remotePath, fileName, stat.Size(), false, 0)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -269,7 +323,7 @@ func (a *App) PromptUploadDirectory(connId, destPath string) error {
|
||||
}
|
||||
|
||||
id := uuid.New().String()
|
||||
a.QueueTransfer(id, "local", connId, path, remotePath, info.Name(), info.Size())
|
||||
a.QueueTransfer(id, "local", connId, path, remotePath, info.Name(), info.Size(), false, 0)
|
||||
return nil
|
||||
})
|
||||
}
|
||||
@@ -301,7 +355,7 @@ func (a *App) PromptDownload(connId, remotePath string) error {
|
||||
size = stat.Size
|
||||
}
|
||||
|
||||
return a.QueueTransfer(id, connId, "local", remotePath, localPath, fileName, size)
|
||||
return a.QueueTransfer(id, connId, "local", remotePath, localPath, fileName, size, false, 0)
|
||||
}
|
||||
|
||||
type TransferItem struct {
|
||||
@@ -311,7 +365,7 @@ type TransferItem struct {
|
||||
Size int64 `json:"size"`
|
||||
}
|
||||
|
||||
func (a *App) TransferItems(srcConnId, dstConnId, dstPath string, items []TransferItem) error {
|
||||
func (a *App) TransferItems(srcConnId, dstConnId, dstPath string, items []TransferItem, verify bool, limitMBps int) error {
|
||||
for _, item := range items {
|
||||
if !item.IsDir {
|
||||
id := uuid.New().String()
|
||||
@@ -325,18 +379,18 @@ func (a *App) TransferItems(srcConnId, dstConnId, dstPath string, items []Transf
|
||||
remotePath = dstPath + item.Name
|
||||
}
|
||||
|
||||
if err := a.QueueTransfer(id, srcConnId, dstConnId, item.Path, remotePath, item.Name, item.Size); err != nil {
|
||||
if err := a.QueueTransfer(id, srcConnId, dstConnId, item.Path, remotePath, item.Name, item.Size, verify, limitMBps); err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
// Run remote walk in goroutine to not block UI
|
||||
go a.transferRemoteDirectory(srcConnId, dstConnId, item.Path, dstPath)
|
||||
go a.transferRemoteDirectory(srcConnId, dstConnId, item.Path, dstPath, verify, limitMBps)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) transferRemoteDirectory(srcConnId, dstConnId, srcDirPath, dstBasePath string) {
|
||||
func (a *App) transferRemoteDirectory(srcConnId, dstConnId, srcDirPath, dstBasePath string, verify bool, limitMBps int) {
|
||||
baseName := filepath.Base(srcDirPath)
|
||||
|
||||
newDstPath := dstBasePath
|
||||
@@ -357,11 +411,11 @@ func (a *App) transferRemoteDirectory(srcConnId, dstConnId, srcDirPath, dstBaseP
|
||||
|
||||
for _, entry := range entries {
|
||||
if entry.IsDir {
|
||||
a.transferRemoteDirectory(srcConnId, dstConnId, entry.Path, newDstPath)
|
||||
a.transferRemoteDirectory(srcConnId, dstConnId, entry.Path, newDstPath, verify, limitMBps)
|
||||
} else {
|
||||
id := uuid.New().String()
|
||||
itemDstPath := newDstPath + "/" + entry.Name
|
||||
a.QueueTransfer(id, srcConnId, dstConnId, entry.Path, itemDstPath, entry.Name, entry.Size)
|
||||
a.QueueTransfer(id, srcConnId, dstConnId, entry.Path, itemDstPath, entry.Name, entry.Size, verify, limitMBps)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+32
-4
@@ -83,6 +83,7 @@
|
||||
<select id="conn-protocol" onchange="updateProtocolFields()">
|
||||
<option value="s3">S3 / S3-Compatible</option>
|
||||
<option value="sftp">SFTP</option>
|
||||
<option value="ftp">FTP</option>
|
||||
<option value="webdav">WebDAV</option>
|
||||
<option value="smb">SMB</option>
|
||||
<option value="nfs">NFS</option>
|
||||
@@ -94,7 +95,7 @@
|
||||
<label>Host</label>
|
||||
<input type="text" id="conn-host" placeholder="example.com">
|
||||
</div>
|
||||
<div class="form-group" style="flex: 1;">
|
||||
<div class="form-group" style="flex: 1;" id="port-group">
|
||||
<label>Port</label>
|
||||
<input type="number" id="conn-port" placeholder="22">
|
||||
</div>
|
||||
@@ -103,7 +104,7 @@
|
||||
<div id="bucket-fields" style="display: none;">
|
||||
<div class="form-row">
|
||||
<div class="form-group" style="flex: 1;">
|
||||
<label>Bucket / Share</label>
|
||||
<label id="bucket-label">Bucket / Share</label>
|
||||
<input type="text" id="conn-bucket" placeholder="my-bucket-or-share">
|
||||
</div>
|
||||
<div class="form-group" style="flex: 1;" id="region-group">
|
||||
@@ -117,14 +118,26 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group" id="ftp-secure-group" style="display: none; align-items: center; gap: 0.5rem; flex-direction: row; margin-bottom: 1rem;">
|
||||
<input type="checkbox" id="conn-secure" style="width: auto;">
|
||||
<label style="margin: 0;">Use FTPS (Secure Explicit TLS)</label>
|
||||
</div>
|
||||
|
||||
<div class="form-row" id="auth-row">
|
||||
<div class="form-group" style="flex: 1;">
|
||||
<label>Username / Access Key</label>
|
||||
<input type="text" id="conn-username" placeholder="user">
|
||||
</div>
|
||||
<div class="form-group" style="flex: 1;">
|
||||
<label>Password / Secret Key</label>
|
||||
<div style="display: flex; justify-content: space-between; align-items: center;">
|
||||
<label id="secret-label">Password / Secret Key</label>
|
||||
<select id="conn-sftp-auth-type" style="display: none; width: auto; font-size: 0.75rem; padding: 0.1rem 0.3rem;" onchange="updateProtocolFields()">
|
||||
<option value="password">Password</option>
|
||||
<option value="key">Private Key</option>
|
||||
</select>
|
||||
</div>
|
||||
<input type="password" id="conn-secret" placeholder="Stored in OS Keychain">
|
||||
<textarea id="conn-secret-key" style="display: none; width: 100%; box-sizing: border-box; background: var(--bg-alt); color: var(--text-primary); border: 1px solid var(--border); border-radius: 4px; padding: 0.5rem; font-family: monospace;" rows="4" placeholder="-----BEGIN OPENSSH PRIVATE KEY-----..."></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -163,6 +176,21 @@
|
||||
<tbody id="transfer-dest-list"></tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="display: flex; align-items: center; gap: 0.5rem; flex-direction: row; margin-bottom: 1rem;">
|
||||
<input type="checkbox" id="transfer-verify" style="width: auto;">
|
||||
<label style="margin: 0; display: flex; flex-direction: column;">
|
||||
Verify Checksum (MD5)
|
||||
<span style="font-size: 0.75rem; color: var(--text-secondary); font-weight: normal;">Slower for non-S3 destinations as it requires re-reading the file over the network.</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="display: flex; align-items: center; gap: 0.5rem; flex-direction: row; margin-bottom: 1.5rem;">
|
||||
<label style="margin: 0; width: 120px;">Max Speed (MB/s)</label>
|
||||
<input type="number" id="transfer-limit" value="0" min="0" style="width: 80px;">
|
||||
<span style="font-size: 0.75rem; color: var(--text-secondary);">(0 = Unlimited)</span>
|
||||
</div>
|
||||
|
||||
<div style="display: flex; justify-content: flex-end; gap: 1rem;">
|
||||
<button class="btn" style="background: transparent; color: var(--text-primary); border-color: var(--border);" onclick="closeTransferModal()">Cancel</button>
|
||||
<button class="btn btn-primary" onclick="executeTransfer()">Transfer Here</button>
|
||||
|
||||
+139
-8
@@ -1,4 +1,4 @@
|
||||
import { GetVersion, ListDir, GetConnections, SaveConnection, DeleteConnection, Delete, Rename, PromptUploadFiles, PromptUploadDirectory, PromptDownload, TransferItems, GetTransfers, ClearTransfers } from '../wailsjs/go/main/App.js';
|
||||
import { GetVersion, ListDir, GetConnections, SaveConnection, DeleteConnection, Delete, Rename, PromptUploadFiles, PromptUploadDirectory, PromptDownload, TransferItems, GetTransfers, ClearTransfers, ReorderConnections } from '../wailsjs/go/main/App.js';
|
||||
|
||||
let currentConn = 'local';
|
||||
let currentPath = '';
|
||||
@@ -8,6 +8,7 @@ let lastSelectedPath = null;
|
||||
let showHiddenFiles = false;
|
||||
let sortField = 'name';
|
||||
let sortAsc = true;
|
||||
let draggedConnId = null;
|
||||
|
||||
function uuidv4() {
|
||||
return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, c =>
|
||||
@@ -46,9 +47,13 @@ async function init() {
|
||||
bucket: document.getElementById('conn-bucket').value,
|
||||
region: document.getElementById('conn-region').value,
|
||||
path_style: document.getElementById('conn-pathstyle').checked,
|
||||
secure: document.getElementById('conn-secure').checked,
|
||||
username: document.getElementById('conn-username').value
|
||||
};
|
||||
const secret = document.getElementById('conn-secret').value;
|
||||
let secret = document.getElementById('conn-secret').value;
|
||||
if (conn.protocol === 'sftp' && document.getElementById('conn-sftp-auth-type').value === 'key') {
|
||||
secret = document.getElementById('conn-secret-key').value;
|
||||
}
|
||||
|
||||
try {
|
||||
await SaveConnection(conn, secret);
|
||||
@@ -75,6 +80,53 @@ async function loadConnections() {
|
||||
el.className = `conn-item ${currentConn === c.id ? 'active' : ''}`;
|
||||
el.innerHTML = `<span class="badge">${c.protocol}</span> <span style="flex:1">${c.name}</span> <svg class="edit-btn" viewBox="0 0 24 24" width="16" height="16" fill="var(--accent)" style="cursor: pointer;" onclick="event.stopPropagation(); editConnection('${c.id}')"><path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.06-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.73,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.06,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.43-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.49-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"/></svg>`;
|
||||
el.onclick = () => switchConn(c.id);
|
||||
|
||||
el.draggable = true;
|
||||
el.addEventListener('dragstart', (e) => {
|
||||
draggedConnId = c.id;
|
||||
e.dataTransfer.effectAllowed = 'move';
|
||||
e.dataTransfer.setData('text/plain', c.id);
|
||||
el.style.opacity = '0.5';
|
||||
});
|
||||
el.addEventListener('dragend', () => {
|
||||
draggedConnId = null;
|
||||
el.style.opacity = '1';
|
||||
});
|
||||
el.addEventListener('dragenter', (e) => {
|
||||
e.preventDefault();
|
||||
if (draggedConnId && draggedConnId !== c.id) {
|
||||
el.style.boxShadow = 'inset 0 2px 0 var(--accent)';
|
||||
}
|
||||
});
|
||||
el.addEventListener('dragleave', (e) => {
|
||||
el.style.boxShadow = '';
|
||||
});
|
||||
el.addEventListener('dragover', (e) => {
|
||||
e.preventDefault();
|
||||
e.dataTransfer.dropEffect = 'move';
|
||||
});
|
||||
el.addEventListener('drop', async (e) => {
|
||||
e.preventDefault();
|
||||
el.style.boxShadow = '';
|
||||
if (!draggedConnId || draggedConnId === c.id) return;
|
||||
|
||||
const ids = connectionsCache.map(conn => conn.id);
|
||||
const draggedIdx = ids.indexOf(draggedConnId);
|
||||
const targetIdx = ids.indexOf(c.id);
|
||||
|
||||
if (draggedIdx !== -1 && targetIdx !== -1) {
|
||||
ids.splice(draggedIdx, 1);
|
||||
ids.splice(targetIdx, 0, draggedConnId);
|
||||
|
||||
try {
|
||||
await ReorderConnections(ids);
|
||||
} catch (err) {
|
||||
console.error("Failed to reorder connections:", err);
|
||||
}
|
||||
await loadConnections();
|
||||
}
|
||||
});
|
||||
|
||||
list.appendChild(el);
|
||||
});
|
||||
}
|
||||
@@ -102,8 +154,11 @@ window.editConnection = (id) => {
|
||||
document.getElementById('conn-bucket').value = c.bucket || '';
|
||||
document.getElementById('conn-region').value = c.region || '';
|
||||
document.getElementById('conn-pathstyle').checked = c.path_style || false;
|
||||
document.getElementById('conn-secure').checked = c.secure || false;
|
||||
document.getElementById('conn-username').value = c.username || '';
|
||||
document.getElementById('conn-secret').value = '';
|
||||
document.getElementById('conn-secret-key').value = '';
|
||||
document.getElementById('conn-sftp-auth-type').value = 'password';
|
||||
document.getElementById('conn-delete-btn').style.display = 'block';
|
||||
|
||||
updateProtocolFields();
|
||||
@@ -114,6 +169,10 @@ window.openConnModal = () => {
|
||||
document.getElementById('modal-title').innerText = "Add Connection";
|
||||
document.getElementById('conn-form').reset();
|
||||
document.getElementById('conn-id').value = uuidv4();
|
||||
document.getElementById('conn-secure').checked = false;
|
||||
document.getElementById('conn-secret').value = '';
|
||||
document.getElementById('conn-secret-key').value = '';
|
||||
document.getElementById('conn-sftp-auth-type').value = 'password';
|
||||
document.getElementById('conn-delete-btn').style.display = 'none';
|
||||
updateProtocolFields();
|
||||
document.getElementById('conn-modal').style.display = 'flex';
|
||||
@@ -126,13 +185,59 @@ window.closeConnModal = () => {
|
||||
window.updateProtocolFields = () => {
|
||||
const protocol = document.getElementById('conn-protocol').value;
|
||||
|
||||
const showBucket = protocol === 's3' || protocol === 'smb';
|
||||
const showBucket = protocol === 's3' || protocol === 'smb' || protocol === 'nfs';
|
||||
document.getElementById('bucket-fields').style.display = showBucket ? 'block' : 'none';
|
||||
|
||||
const bucketLabel = document.getElementById('bucket-label');
|
||||
if (bucketLabel) {
|
||||
if (protocol === 'nfs') {
|
||||
bucketLabel.innerText = 'Export Path';
|
||||
} else if (protocol === 'smb') {
|
||||
bucketLabel.innerText = 'Share';
|
||||
} else {
|
||||
bucketLabel.innerText = 'Bucket';
|
||||
}
|
||||
}
|
||||
|
||||
const isNFS = protocol === 'nfs';
|
||||
const portGroup = document.getElementById('port-group');
|
||||
if (portGroup) portGroup.style.display = isNFS ? 'none' : 'block';
|
||||
|
||||
const authRow = document.getElementById('auth-row');
|
||||
if (authRow) authRow.style.display = isNFS ? 'none' : 'flex';
|
||||
|
||||
// Only show S3 specific fields when S3 is selected
|
||||
const showS3Specific = protocol === 's3';
|
||||
document.getElementById('region-group').style.display = showS3Specific ? 'flex' : 'none';
|
||||
document.getElementById('pathstyle-group').style.display = showS3Specific ? 'flex' : 'none';
|
||||
|
||||
// FTP specific fields
|
||||
const showFTP = protocol === 'ftp';
|
||||
document.getElementById('ftp-secure-group').style.display = showFTP ? 'flex' : 'none';
|
||||
|
||||
// SFTP Auth Type toggle
|
||||
const authTypeSelect = document.getElementById('conn-sftp-auth-type');
|
||||
const secretInput = document.getElementById('conn-secret');
|
||||
const secretKeyArea = document.getElementById('conn-secret-key');
|
||||
const secretLabel = document.getElementById('secret-label');
|
||||
|
||||
if (protocol === 'sftp') {
|
||||
authTypeSelect.style.display = 'block';
|
||||
if (authTypeSelect.value === 'key') {
|
||||
secretInput.style.display = 'none';
|
||||
secretKeyArea.style.display = 'block';
|
||||
secretLabel.innerText = 'SSH Private Key';
|
||||
} else {
|
||||
secretInput.style.display = 'block';
|
||||
secretKeyArea.style.display = 'none';
|
||||
secretLabel.innerText = 'Password';
|
||||
}
|
||||
} else {
|
||||
authTypeSelect.style.display = 'none';
|
||||
secretInput.style.display = 'block';
|
||||
secretKeyArea.style.display = 'none';
|
||||
secretLabel.innerText = 'Password / Secret Key';
|
||||
}
|
||||
};
|
||||
|
||||
window.deleteConnection = async () => {
|
||||
@@ -388,8 +493,19 @@ document.addEventListener('contextmenu', (e) => {
|
||||
document.getElementById('ctx-divider').style.display = 'block';
|
||||
|
||||
menu.style.display = 'block';
|
||||
menu.style.left = `${e.pageX}px`;
|
||||
menu.style.top = `${e.pageY}px`;
|
||||
|
||||
let left = e.pageX;
|
||||
let top = e.pageY;
|
||||
|
||||
if (left + menu.offsetWidth > window.innerWidth) {
|
||||
left = window.innerWidth - menu.offsetWidth;
|
||||
}
|
||||
if (top + menu.offsetHeight > window.innerHeight) {
|
||||
top = window.innerHeight - menu.offsetHeight;
|
||||
}
|
||||
|
||||
menu.style.left = `${left}px`;
|
||||
menu.style.top = `${top}px`;
|
||||
} else if (isBrowserPane && !e.target.closest('#transfer-dest-list')) {
|
||||
e.preventDefault();
|
||||
|
||||
@@ -400,8 +516,19 @@ document.addEventListener('contextmenu', (e) => {
|
||||
document.getElementById('ctx-divider').style.display = 'none';
|
||||
|
||||
menu.style.display = 'block';
|
||||
menu.style.left = `${e.pageX}px`;
|
||||
menu.style.top = `${e.pageY}px`;
|
||||
|
||||
let left = e.pageX;
|
||||
let top = e.pageY;
|
||||
|
||||
if (left + menu.offsetWidth > window.innerWidth) {
|
||||
left = window.innerWidth - menu.offsetWidth;
|
||||
}
|
||||
if (top + menu.offsetHeight > window.innerHeight) {
|
||||
top = window.innerHeight - menu.offsetHeight;
|
||||
}
|
||||
|
||||
menu.style.left = `${left}px`;
|
||||
menu.style.top = `${top}px`;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -489,6 +616,8 @@ window.openTransferModal = () => {
|
||||
|
||||
window.closeTransferModal = () => {
|
||||
document.getElementById('transfer-modal').style.display = 'none';
|
||||
document.getElementById('transfer-verify').checked = false;
|
||||
document.getElementById('transfer-limit').value = "0";
|
||||
};
|
||||
|
||||
window.loadTransferDestRoot = () => {
|
||||
@@ -543,7 +672,9 @@ window.loadTransferDestDirectory = async (connId, path) => {
|
||||
window.executeTransfer = async () => {
|
||||
if (selectedItems.length === 0) return;
|
||||
try {
|
||||
await TransferItems(currentConn, transferDestConn, transferDestPath, selectedItems);
|
||||
const verify = document.getElementById('transfer-verify').checked;
|
||||
const limit = parseInt(document.getElementById('transfer-limit').value, 10) || 0;
|
||||
await TransferItems(currentConn, transferDestConn, transferDestPath, selectedItems, verify, limit);
|
||||
closeTransferModal();
|
||||
showTransfers();
|
||||
selectedItems = [];
|
||||
|
||||
@@ -57,6 +57,14 @@ body {
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.conn-item * {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.conn-item .edit-btn {
|
||||
pointer-events: auto;
|
||||
}
|
||||
|
||||
.conn-item:hover {
|
||||
background: var(--surface-hover);
|
||||
}
|
||||
|
||||
Vendored
+6
-2
@@ -11,6 +11,8 @@ export function Delete(arg1:string,arg2: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 GetTransfers():Promise<Array<transfer.Transfer>>;
|
||||
@@ -27,10 +29,12 @@ export function PromptUploadDirectory(arg1:string,arg2:string):Promise<void>;
|
||||
|
||||
export function PromptUploadFiles(arg1:string,arg2:string):Promise<void>;
|
||||
|
||||
export function QueueTransfer(arg1:string,arg2:string,arg3:string,arg4:string,arg5:string,arg6:string,arg7:number):Promise<void>;
|
||||
export function QueueTransfer(arg1:string,arg2:string,arg3:string,arg4:string,arg5:string,arg6:string,arg7:number,arg8:boolean,arg9:number):Promise<void>;
|
||||
|
||||
export function Rename(arg1:string,arg2:string,arg3:string):Promise<void>;
|
||||
|
||||
export function ReorderConnections(arg1:Array<string>):Promise<void>;
|
||||
|
||||
export function SaveConnection(arg1:config.ConnectionConfig,arg2:string):Promise<void>;
|
||||
|
||||
export function TransferItems(arg1:string,arg2:string,arg3:string,arg4:Array<main.TransferItem>):Promise<void>;
|
||||
export function TransferItems(arg1:string,arg2:string,arg3:string,arg4:Array<main.TransferItem>,arg5:boolean,arg6:number):Promise<void>;
|
||||
|
||||
@@ -14,6 +14,10 @@ export function DeleteConnection(arg1) {
|
||||
return window['go']['main']['App']['DeleteConnection'](arg1);
|
||||
}
|
||||
|
||||
export function DisconnectConnection(arg1) {
|
||||
return window['go']['main']['App']['DisconnectConnection'](arg1);
|
||||
}
|
||||
|
||||
export function GetConnections() {
|
||||
return window['go']['main']['App']['GetConnections']();
|
||||
}
|
||||
@@ -46,18 +50,22 @@ export function PromptUploadFiles(arg1, arg2) {
|
||||
return window['go']['main']['App']['PromptUploadFiles'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function QueueTransfer(arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
|
||||
return window['go']['main']['App']['QueueTransfer'](arg1, arg2, arg3, arg4, arg5, arg6, arg7);
|
||||
export function QueueTransfer(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
|
||||
return window['go']['main']['App']['QueueTransfer'](arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
|
||||
}
|
||||
|
||||
export function Rename(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['Rename'](arg1, arg2, arg3);
|
||||
}
|
||||
|
||||
export function ReorderConnections(arg1) {
|
||||
return window['go']['main']['App']['ReorderConnections'](arg1);
|
||||
}
|
||||
|
||||
export function SaveConnection(arg1, arg2) {
|
||||
return window['go']['main']['App']['SaveConnection'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function TransferItems(arg1, arg2, arg3, arg4) {
|
||||
return window['go']['main']['App']['TransferItems'](arg1, arg2, arg3, arg4);
|
||||
export function TransferItems(arg1, arg2, arg3, arg4, arg5, arg6) {
|
||||
return window['go']['main']['App']['TransferItems'](arg1, arg2, arg3, arg4, arg5, arg6);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ export namespace config {
|
||||
bucket?: string;
|
||||
region?: string;
|
||||
path_style?: boolean;
|
||||
secure?: boolean;
|
||||
username?: string;
|
||||
keychain_key?: string;
|
||||
|
||||
@@ -26,6 +27,7 @@ export namespace config {
|
||||
this.bucket = source["bucket"];
|
||||
this.region = source["region"];
|
||||
this.path_style = source["path_style"];
|
||||
this.secure = source["secure"];
|
||||
this.username = source["username"];
|
||||
this.keychain_key = source["keychain_key"];
|
||||
}
|
||||
@@ -96,6 +98,8 @@ export namespace transfer {
|
||||
eta_seconds: number;
|
||||
status: string;
|
||||
error?: string;
|
||||
verify: boolean;
|
||||
limit_mbps: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Transfer(source);
|
||||
@@ -113,6 +117,8 @@ export namespace transfer {
|
||||
this.eta_seconds = source["eta_seconds"];
|
||||
this.status = source["status"];
|
||||
this.error = source["error"];
|
||||
this.verify = source["verify"];
|
||||
this.limit_mbps = source["limit_mbps"];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,12 +9,14 @@ require (
|
||||
github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3
|
||||
github.com/google/uuid v1.6.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/studio-b12/gowebdav v0.12.0
|
||||
github.com/vmware/go-nfs-client v0.0.0-20190605212624-d43b92724c1b
|
||||
github.com/wailsapp/wails/v2 v2.12.0
|
||||
github.com/zalando/go-keyring v0.2.8
|
||||
golang.org/x/crypto v0.53.0
|
||||
golang.org/x/time v0.15.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
|
||||
|
||||
@@ -56,6 +56,8 @@ github.com/hirochachacha/go-smb2 v1.1.0 h1:b6hs9qKIql9eVXAiN0M2wSFY5xnhbHAQoCwRK
|
||||
github.com/hirochachacha/go-smb2 v1.1.0/go.mod h1:8F1A4d5EZzrGu5R7PU163UcMRDJQl4FtcxjBfsY8TZE=
|
||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
|
||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
|
||||
github.com/jlaffaye/ftp v0.2.1 h1:AICcTYPMkaXlmjLMm9I+lB36f6jXCsCvBqVQc6EfC1Y=
|
||||
github.com/jlaffaye/ftp v0.2.1/go.mod h1:gXSIr1pA9NhynDNigiFHs4+yL7o7I6bGF9Za9wi9tcE=
|
||||
github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
|
||||
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
@@ -146,6 +148,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
|
||||
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
|
||||
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
|
||||
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
|
||||
|
||||
@@ -16,6 +16,7 @@ type ConnectionConfig struct {
|
||||
Bucket string `yaml:"bucket,omitempty" json:"bucket,omitempty"`
|
||||
Region string `yaml:"region,omitempty" json:"region,omitempty"`
|
||||
PathStyle bool `yaml:"path_style,omitempty" json:"path_style,omitempty"`
|
||||
Secure bool `yaml:"secure,omitempty" json:"secure,omitempty"`
|
||||
Username string `yaml:"username,omitempty" json:"username,omitempty"`
|
||||
KeychainKey string `yaml:"keychain_key,omitempty" json:"keychain_key,omitempty"`
|
||||
}
|
||||
|
||||
@@ -21,4 +21,5 @@ type Explorer interface {
|
||||
Rename(src, dst string) error
|
||||
ReadFile(path string) (io.ReadCloser, error)
|
||||
WriteFile(path string, r io.Reader, size int64) error
|
||||
Checksum(path string) (string, error)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,194 @@
|
||||
package ftp
|
||||
|
||||
import (
|
||||
"crypto/md5"
|
||||
"crypto/tls"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"io"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"github.com/jlaffaye/ftp"
|
||||
"goexplore/internal/config"
|
||||
"goexplore/internal/explorer"
|
||||
)
|
||||
|
||||
type FTPExplorer struct {
|
||||
cfg *config.ConnectionConfig
|
||||
secret string
|
||||
client *ftp.ServerConn
|
||||
}
|
||||
|
||||
func New(c *config.ConnectionConfig, secret string) *FTPExplorer {
|
||||
return &FTPExplorer{cfg: c, secret: secret}
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) Connect() error {
|
||||
port := e.cfg.Port
|
||||
if port == 0 {
|
||||
port = 21
|
||||
}
|
||||
|
||||
addr := fmt.Sprintf("%s:%d", e.cfg.Host, port)
|
||||
var c *ftp.ServerConn
|
||||
var err error
|
||||
|
||||
if e.cfg.Secure {
|
||||
c, err = ftp.Dial(addr, ftp.DialWithExplicitTLS(&tls.Config{
|
||||
InsecureSkipVerify: true,
|
||||
}))
|
||||
} else {
|
||||
c, err = ftp.Dial(addr)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := c.Login(e.cfg.Username, e.secret); err != nil {
|
||||
c.Quit()
|
||||
return err
|
||||
}
|
||||
|
||||
e.client = c
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) Disconnect() error {
|
||||
if e.client != nil {
|
||||
return e.client.Quit()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) {
|
||||
if path == "" {
|
||||
path = "."
|
||||
}
|
||||
|
||||
entries, err := e.client.List(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var res []explorer.FileEntry
|
||||
for _, f := range entries {
|
||||
if f.Name == "." || f.Name == ".." {
|
||||
continue
|
||||
}
|
||||
|
||||
isDir := f.Type == ftp.EntryTypeFolder
|
||||
res = append(res, explorer.FileEntry{
|
||||
Name: f.Name,
|
||||
Path: filepath.ToSlash(filepath.Join(path, f.Name)),
|
||||
Size: int64(f.Size),
|
||||
Modified: f.Time.Format(time.RFC3339),
|
||||
IsDir: isDir,
|
||||
Permissions: "",
|
||||
})
|
||||
}
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) Stat(path string) (explorer.FileEntry, error) {
|
||||
if path == "" {
|
||||
path = "."
|
||||
}
|
||||
|
||||
dir := filepath.Dir(path)
|
||||
base := filepath.Base(path)
|
||||
|
||||
entries, err := e.client.List(dir)
|
||||
if err != nil {
|
||||
return explorer.FileEntry{}, err
|
||||
}
|
||||
|
||||
for _, f := range entries {
|
||||
if f.Name == base {
|
||||
return explorer.FileEntry{
|
||||
Name: f.Name,
|
||||
Path: filepath.ToSlash(path),
|
||||
Size: int64(f.Size),
|
||||
Modified: f.Time.Format(time.RFC3339),
|
||||
IsDir: f.Type == ftp.EntryTypeFolder,
|
||||
Permissions: "",
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
|
||||
return explorer.FileEntry{}, fmt.Errorf("file not found: %s", path)
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) MkDir(path string) error {
|
||||
return e.client.MakeDir(path)
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) removeAll(path string) error {
|
||||
entries, err := e.client.List(path)
|
||||
if err != nil {
|
||||
// If it fails to list, it might be a file
|
||||
return e.client.Delete(path)
|
||||
}
|
||||
|
||||
// Try treating it as a directory to remove contents
|
||||
isDir := false
|
||||
for _, f := range entries {
|
||||
if f.Name == filepath.Base(path) && f.Type == ftp.EntryTypeFolder {
|
||||
isDir = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if !isDir && len(entries) == 1 && entries[0].Name == filepath.Base(path) {
|
||||
return e.client.Delete(path)
|
||||
}
|
||||
|
||||
// Remove contents
|
||||
for _, f := range entries {
|
||||
if f.Name == "." || f.Name == ".." {
|
||||
continue
|
||||
}
|
||||
subPath := filepath.ToSlash(filepath.Join(path, f.Name))
|
||||
if f.Type == ftp.EntryTypeFolder {
|
||||
if err := e.removeAll(subPath); err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
if err := e.client.Delete(subPath); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return e.client.RemoveDir(path)
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) Delete(path string) error {
|
||||
return e.removeAll(path)
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) Rename(src, dst string) error {
|
||||
return e.client.Rename(src, dst)
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) ReadFile(path string) (io.ReadCloser, error) {
|
||||
return e.client.Retr(path)
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) WriteFile(path string, r io.Reader, size int64) error {
|
||||
return e.client.Stor(path, r)
|
||||
}
|
||||
|
||||
func (e *FTPExplorer) Checksum(path string) (string, error) {
|
||||
r, err := e.ReadFile(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer r.Close()
|
||||
h := md5.New()
|
||||
if _, err := io.Copy(h, r); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package local
|
||||
|
||||
import (
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -82,6 +84,19 @@ func (e *LocalExplorer) Rename(src, dst string) error {
|
||||
return os.Rename(src, dst)
|
||||
}
|
||||
|
||||
func (e *LocalExplorer) Checksum(path string) (string, error) {
|
||||
r, err := e.ReadFile(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer r.Close()
|
||||
h := md5.New()
|
||||
if _, err := io.Copy(h, r); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
|
||||
func (e *LocalExplorer) ReadFile(path string) (io.ReadCloser, error) {
|
||||
return os.Open(path)
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
package nfs
|
||||
|
||||
import (
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"io"
|
||||
"path/filepath"
|
||||
@@ -125,3 +127,16 @@ func (e *NFSExplorer) WriteFile(path string, r io.Reader, size int64) error {
|
||||
_, err = io.Copy(f, r)
|
||||
return err
|
||||
}
|
||||
|
||||
func (e *NFSExplorer) Checksum(path string) (string, error) {
|
||||
r, err := e.ReadFile(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer r.Close()
|
||||
h := md5.New()
|
||||
if _, err := io.Copy(h, r); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
|
||||
@@ -25,3 +25,4 @@ func (e *NFSExplorer) Delete(path string) error { return nil }
|
||||
func (e *NFSExplorer) Rename(src, dst string) error { return nil }
|
||||
func (e *NFSExplorer) ReadFile(path string) (io.ReadCloser, error) { return nil, nil }
|
||||
func (e *NFSExplorer) WriteFile(path string, r io.Reader, size int64) error { return nil }
|
||||
func (e *NFSExplorer) Checksum(path string) (string, error) { return "", nil }
|
||||
|
||||
@@ -307,3 +307,28 @@ func (e *S3Explorer) WriteFile(path string, r io.Reader, size int64) error {
|
||||
})
|
||||
return err
|
||||
}
|
||||
|
||||
func (e *S3Explorer) Checksum(path string) (string, error) {
|
||||
bucket, subpath, _, err := e.getBucketAndPath(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
if subpath == "" {
|
||||
return "", fmt.Errorf("cannot calculate checksum of bucket")
|
||||
}
|
||||
|
||||
input := &s3.HeadObjectInput{
|
||||
Bucket: aws.String(bucket),
|
||||
Key: aws.String(subpath),
|
||||
}
|
||||
head, err := e.client.HeadObject(context.TODO(), input)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
if head.ETag != nil {
|
||||
return strings.Trim(*head.ETag, "\""), nil
|
||||
}
|
||||
return "", fmt.Errorf("no etag found")
|
||||
}
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
package sftp
|
||||
|
||||
import (
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"io"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"goexplore/internal/config"
|
||||
"goexplore/internal/explorer"
|
||||
|
||||
"github.com/pkg/sftp"
|
||||
"golang.org/x/crypto/ssh"
|
||||
"goexplore/internal/config"
|
||||
"goexplore/internal/explorer"
|
||||
)
|
||||
|
||||
type SFTPExplorer struct {
|
||||
@@ -29,19 +33,46 @@ func (e *SFTPExplorer) Connect() error {
|
||||
port = 22
|
||||
}
|
||||
|
||||
var authMethod ssh.AuthMethod
|
||||
signer, err := ssh.ParsePrivateKey([]byte(e.secret))
|
||||
if err == nil {
|
||||
authMethod = ssh.PublicKeys(signer)
|
||||
var authMethods []ssh.AuthMethod
|
||||
|
||||
secretStr := strings.TrimSpace(e.secret)
|
||||
// Handle case where newlines might be escaped by mistake
|
||||
secretStr = strings.ReplaceAll(secretStr, "\\n", "\n")
|
||||
|
||||
if strings.Contains(secretStr, "-----BEGIN") {
|
||||
signer, err := ssh.ParsePrivateKey([]byte(secretStr))
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to parse private key: %w", err)
|
||||
}
|
||||
authMethods = append(authMethods, ssh.PublicKeys(signer))
|
||||
} else {
|
||||
authMethod = ssh.Password(e.secret)
|
||||
authMethods = append(authMethods, ssh.Password(e.secret))
|
||||
}
|
||||
|
||||
// Always add KeyboardInteractive to support Duo MFA and servers that require interactive auth.
|
||||
authMethods = append(authMethods, ssh.KeyboardInteractive(func(user, instruction string, questions []string, echos []bool) (answers []string, err error) {
|
||||
answers = make([]string, len(questions))
|
||||
for i, q := range questions {
|
||||
qLower := strings.ToLower(q)
|
||||
if strings.Contains(secretStr, "-----BEGIN") {
|
||||
// If using a private key, we don't have a password.
|
||||
// If it's a Duo prompt asking for an option, "1" is typically Duo Push.
|
||||
if strings.Contains(qLower, "duo push") || strings.Contains(qLower, "passcode or option") {
|
||||
answers[i] = "1"
|
||||
} else {
|
||||
answers[i] = ""
|
||||
}
|
||||
} else {
|
||||
// Otherwise, respond with the password to keyboard interactive prompts
|
||||
answers[i] = e.secret
|
||||
}
|
||||
}
|
||||
return answers, nil
|
||||
}))
|
||||
|
||||
config := &ssh.ClientConfig{
|
||||
User: e.cfg.Username,
|
||||
Auth: []ssh.AuthMethod{
|
||||
authMethod,
|
||||
},
|
||||
User: e.cfg.Username,
|
||||
Auth: authMethods,
|
||||
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
|
||||
}
|
||||
|
||||
@@ -72,9 +103,17 @@ func (e *SFTPExplorer) Disconnect() error {
|
||||
|
||||
func (e *SFTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) {
|
||||
if path == "" {
|
||||
path = "."
|
||||
if e.cfg.Bucket != "" {
|
||||
path = e.cfg.Bucket
|
||||
} else {
|
||||
path = "/"
|
||||
}
|
||||
} else if path == "." {
|
||||
path = "/"
|
||||
}
|
||||
|
||||
files, err := e.client.ReadDir(path)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -162,3 +201,16 @@ func (e *SFTPExplorer) WriteFile(path string, r io.Reader, size int64) error {
|
||||
_, err = io.Copy(f, r)
|
||||
return err
|
||||
}
|
||||
|
||||
func (e *SFTPExplorer) Checksum(path string) (string, error) {
|
||||
r, err := e.ReadFile(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer r.Close()
|
||||
h := md5.New()
|
||||
if _, err := io.Copy(h, r); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package smb
|
||||
|
||||
import (
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
@@ -243,3 +245,16 @@ func (e *SMBExplorer) WriteFile(path string, r io.Reader, size int64) error {
|
||||
_, err = io.Copy(f, r)
|
||||
return err
|
||||
}
|
||||
|
||||
func (e *SMBExplorer) Checksum(path string) (string, error) {
|
||||
r, err := e.ReadFile(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer r.Close()
|
||||
h := md5.New()
|
||||
if _, err := io.Copy(h, r); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package webdav
|
||||
|
||||
import (
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
@@ -102,3 +104,16 @@ func (e *WebDAVExplorer) ReadFile(path string) (io.ReadCloser, error) {
|
||||
func (e *WebDAVExplorer) WriteFile(path string, r io.Reader, size int64) error {
|
||||
return e.client.WriteStream(path, r, 0644)
|
||||
}
|
||||
|
||||
func (e *WebDAVExplorer) Checksum(path string) (string, error) {
|
||||
r, err := e.ReadFile(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer r.Close()
|
||||
h := md5.New()
|
||||
if _, err := io.Copy(h, r); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
|
||||
@@ -1,11 +1,18 @@
|
||||
package transfer
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"golang.org/x/time/rate"
|
||||
|
||||
"goexplore/internal/explorer"
|
||||
)
|
||||
|
||||
@@ -29,6 +36,8 @@ type Transfer struct {
|
||||
ETA int `json:"eta_seconds"`
|
||||
Status Status `json:"status"`
|
||||
Error string `json:"error,omitempty"`
|
||||
Verify bool `json:"verify"`
|
||||
LimitMBps int `json:"limit_mbps"`
|
||||
|
||||
srcExp explorer.Explorer
|
||||
dstExp explorer.Explorer
|
||||
@@ -81,12 +90,62 @@ func (m *Manager) doTransfer(t *Transfer) error {
|
||||
}
|
||||
defer r.Close()
|
||||
|
||||
hash := md5.New()
|
||||
tr := io.TeeReader(r, hash)
|
||||
|
||||
var streamReader io.Reader = tr
|
||||
if t.LimitMBps > 0 {
|
||||
limitBytes := t.LimitMBps * 1024 * 1024
|
||||
// Set burst to limitBytes to allow typical io.Copy chunk sizes without erroring
|
||||
limiter := rate.NewLimiter(rate.Limit(limitBytes), limitBytes)
|
||||
streamReader = &throttledReader{
|
||||
r: tr,
|
||||
limiter: limiter,
|
||||
}
|
||||
}
|
||||
|
||||
pr := &progressReader{
|
||||
r: r,
|
||||
r: streamReader,
|
||||
t: t,
|
||||
}
|
||||
|
||||
return t.dstExp.WriteFile(t.Destination, pr, t.BytesTotal)
|
||||
if err := t.dstExp.WriteFile(t.Destination, pr, t.BytesTotal); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if t.Verify {
|
||||
expectedHash := hex.EncodeToString(hash.Sum(nil))
|
||||
t.Status = StatusActive // Still active during verification
|
||||
|
||||
actualHash, err := t.dstExp.Checksum(t.Destination)
|
||||
if err != nil {
|
||||
return fmt.Errorf("verification failed: could not calculate destination checksum: %w", err)
|
||||
}
|
||||
|
||||
if expectedHash != actualHash {
|
||||
// S3 Multi-part ETags end with -N, we can't easily verify them with local md5
|
||||
if !strings.Contains(actualHash, "-") {
|
||||
return fmt.Errorf("verification failed: checksum mismatch (expected %s, got %s)", expectedHash, actualHash)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type throttledReader struct {
|
||||
r io.Reader
|
||||
limiter *rate.Limiter
|
||||
}
|
||||
|
||||
func (tr *throttledReader) Read(p []byte) (int, error) {
|
||||
n, err := tr.r.Read(p)
|
||||
if n > 0 && tr.limiter != nil {
|
||||
if errWait := tr.limiter.WaitN(context.Background(), n); errWait != nil {
|
||||
return n, errWait
|
||||
}
|
||||
}
|
||||
return n, err
|
||||
}
|
||||
|
||||
type progressReader struct {
|
||||
@@ -109,7 +168,7 @@ func (pr *progressReader) Read(p []byte) (int, error) {
|
||||
return n, err
|
||||
}
|
||||
|
||||
func (m *Manager) QueueTransfer(id, srcPath, dstPath, filename string, size int64, srcExp, dstExp explorer.Explorer) error {
|
||||
func (m *Manager) QueueTransfer(id, srcPath, dstPath, filename string, size int64, srcExp, dstExp explorer.Explorer, verify bool, limitMBps int) error {
|
||||
if srcExp == nil || dstExp == nil {
|
||||
return errors.New("invalid explorers")
|
||||
}
|
||||
@@ -121,6 +180,8 @@ func (m *Manager) QueueTransfer(id, srcPath, dstPath, filename string, size int6
|
||||
Filename: filename,
|
||||
BytesTotal: size,
|
||||
Status: StatusQueued,
|
||||
Verify: verify,
|
||||
LimitMBps: limitMBps,
|
||||
srcExp: srcExp,
|
||||
dstExp: dstExp,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user