19 Commits

Author SHA1 Message Date
mamamiyear 5aa60555b9 Release beta_v0.1.0
Release Note:

- feature:
  - capture the screenshot, and copy it in clipboard or save it to local file
  - annotate the screenshot with in many ways, e.g. Line, Arrow, Text, Mosaic...
  - upload the screenshot to remote server and copy path, e.g. OBS, SCP, FTP...
  - extract text from the screenshot (OCR), and copy to clipboard
  - describe the screenshot by AI according your requirements

- other:
  - Landing page for promo
  - README.md and AGENTS.md for AI and Humman developers
2026-07-13 20:18:11 +08:00
mamamiyear 75c9b96fbf fix: preserve annotations while resizing selection 2026-07-13 13:43:14 +08:00
mamamiyear b69ef00013 feat: add ftp root path setting 2026-07-13 13:20:31 +08:00
mamamiyear 50551de105 feat: add line and arrow annotations 2026-07-12 21:09:23 +08:00
mamamiyear b82108db38 feat: add mosaic screenshot annotations 2026-07-12 20:40:05 +08:00
mamamiyear dd12521be2 feat: add FTP and SFTP upload support 2026-07-12 10:04:21 +08:00
mamamiyear f1998fb23c feat(landing): slide showcase carousel horizontally 2026-07-10 15:50:02 +08:00
mamamiyear 8e611a11e6 chore: ignore build temp files 2026-07-10 15:44:09 +08:00
mamamiyear ba252c8576 feat(landing): add interactive showcase carousel 2026-07-10 15:26:28 +08:00
mamamiyear 1115f4532c fix(landing): add rounded favicon 2026-07-10 14:10:25 +08:00
mamamiyear 1229efaa84 fix(landing): repair mobile layout 2026-07-10 11:11:33 +08:00
mamamiyear ecbdffcea4 chore: configure landing base path 2026-07-10 09:42:25 +08:00
mamamiyear 6b7135a7c8 copy: refine landing card titles 2026-07-10 00:58:38 +08:00
mamamiyear 32945a7758 feat: update landing feature cards 2026-07-10 00:55:57 +08:00
mamamiyear 410a30666c feat: add landing page for promo 2026-07-10 00:13:15 +08:00
mamamiyear 57366ac08f fix: prefer aggregate OCR text 2026-07-09 09:05:05 +08:00
mamamiyear 273af6a429 feat: add screenshot OCR extraction 2026-07-08 16:46:27 +08:00
mamamiyear 18a9f53062 feat: add annotation tool settings menus 2026-07-08 16:20:51 +08:00
mamamiyear 7b290d9300 fix: align text annotations in captures 2026-07-08 14:46:57 +08:00
46 changed files with 9398 additions and 365 deletions
+3 -2
View File
@@ -21,6 +21,7 @@ SnapGo 是一个为“截完图马上发链接”而做的轻量截图工具。
- 全局快捷键触发:无论当前在什么应用里,都能快速发起截图
- 菜单栏常驻:随用随取,不打断主流程
- 支持 S3 兼容存储:可接入 AWS S3、MinIO、Cloudflare R2、Backblaze B2 等
- 支持 FTP / SFTP:可通过独立截图操作上传到文件服务器,并复制远端路径
- 支持自定义公开地址:可配合 CDN 或自定义域名使用
- 上传失败自动兜底:至少保住截图文件,不会白截
@@ -57,11 +58,11 @@ SnapGo 是一个为“截完图马上发链接”而做的轻量截图工具。
## 使用方式
1. 打开应用,填写你的 S3 兼容对象存储配置
1. 打开应用,填写 S3、FTP / SFTP 或 SSH 远端配置
2. 保存并测试连接
3. 按下默认快捷键 `cmd+shift+a`
4. 框选截图区域
5. 直接粘贴刚刚自动复制的图片链接
5. 点击目标上传按钮,直接粘贴自动复制的图片链接或远端路径
## 当前体验
+159 -3
View File
@@ -3,13 +3,16 @@
package main
import (
"bytes"
"context"
"encoding/json"
"fmt"
"image"
"image/png"
"log/slog"
"os"
"path/filepath"
"strings"
"sync"
"sync/atomic"
"time"
@@ -21,6 +24,7 @@ import (
"github.com/mmmy/snapgo/internal/infrastructure/clipboard"
"github.com/mmmy/snapgo/internal/infrastructure/config"
"github.com/mmmy/snapgo/internal/infrastructure/display"
ftppkg "github.com/mmmy/snapgo/internal/infrastructure/ftp"
"github.com/mmmy/snapgo/internal/infrastructure/hotkey"
llmpkg "github.com/mmmy/snapgo/internal/infrastructure/llm"
ocrpkg "github.com/mmmy/snapgo/internal/infrastructure/ocr"
@@ -33,8 +37,8 @@ import (
//
// We deliberately keep this struct small: it owns long-lived collaborators
// (config store, hotkey manager, capturer, clipboard) but delegates the
// real work to the application service constructed on demand once an OSS
// provider is configured.
// real work to application services constructed on demand for the selected
// storage destination.
type App struct {
ctx context.Context
@@ -398,6 +402,56 @@ func (a *App) runSaveRemotePipeline(pngBytes []byte) error {
return nil
}
// runFTPUploadPipeline uploads through the protocol selected in FTPConfig and
// copies the resulting remote path. FTP/SFTP remains separate from both S3
// (public URL semantics) and SSH/SCP (a distinct toolbar destination).
func (a *App) runFTPUploadPipeline(pngBytes []byte) error {
a.mu.RLock()
cfg := a.cfg
a.mu.RUnlock()
if !cfg.IsFTPConfigured() {
err := fmt.Errorf("FTP/SFTP host/user is not configured")
a.emitOperationStatus("ftp-upload", "需要配置 FTP/SFTP", err.Error(), "error")
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
return err
}
uploader, err := ftppkg.NewUploader(cfg.FTP)
if err != nil {
a.emitOperationStatus("ftp-upload", "FTP/SFTP 配置错误", err.Error(), "error")
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
return err
}
slog.Info("FTP/SFTP upload dispatch",
"protocol", cfg.FTP.Protocol,
"host", cfg.FTP.Host,
"user", cfg.FTP.User,
"port", cfg.FTP.Port,
"auth_method", cfg.FTP.AuthMethod,
"strict_host_key", cfg.FTP.StrictHostKey,
"has_password", cfg.FTP.Password != "",
"png_size", len(pngBytes))
svc := &application.CaptureAndFTPService{
Uploader: uploader,
Clipboard: a.clip,
Notifier: &runtimeNotifier{ctx: a.ctx},
Cfg: cfg.FTP,
}
protocolLabel := strings.ToUpper(cfg.FTP.Protocol)
if protocolLabel == "" {
protocolLabel = "FTP"
}
a.emitOperationStatus("ftp-upload", "上传中", "正在上传截图到 "+protocolLabel, "running")
if err := svc.ExecuteWithBytes(a.ctx, pngBytes); err != nil {
a.emitOperationStatus("ftp-upload", "上传失败", err.Error(), "error")
return err
}
a.emitOperationStatus("ftp-upload", "上传完成", "远端路径已复制到剪贴板", "success")
return nil
}
func (a *App) runSummaryPipeline(pngBytes []byte) error {
a.mu.RLock()
cfg := a.cfg
@@ -562,7 +616,8 @@ func (a *App) captureSelectedPNG(result CaptureResult, pc *pendingCapture) ([]by
return nil, err
}
if len(result.Annotations) > 0 {
cropped, err = application.ApplyAnnotations(cropped, result.Annotations, pc.Display.Scale)
scaleX, scaleY := annotationScalesForCapture(cropped, rect, pc.Display.Scale)
cropped, err = application.ApplyAnnotationsWithScale(cropped, result.Annotations, scaleX, scaleY)
if err != nil {
return nil, err
}
@@ -570,6 +625,33 @@ func (a *App) captureSelectedPNG(result CaptureResult, pc *pendingCapture) ([]by
return cropped, nil
}
func annotationScalesForCapture(pngBytes []byte, rect RegionRect, fallback float64) (float64, float64) {
if fallback <= 0 {
fallback = 1
}
scaleX := fallback
scaleY := fallback
cfg, err := png.DecodeConfig(bytes.NewReader(pngBytes))
if err != nil {
return scaleX, scaleY
}
if rect.W > 0 && cfg.Width > 0 {
scaleX = saneAnnotationScale(float64(cfg.Width)/float64(rect.W), fallback)
}
if rect.H > 0 && cfg.Height > 0 {
scaleY = saneAnnotationScale(float64(cfg.Height)/float64(rect.H), fallback)
}
return scaleX, scaleY
}
func saneAnnotationScale(scale, fallback float64) float64 {
if scale >= 0.25 && scale <= 8 {
return scale
}
return fallback
}
func (a *App) chooseSaveDirectory() (string, error) {
return wruntime.OpenDirectoryDialog(a.ctx, wruntime.OpenDialogOptions{
Title: "Save screenshot to folder",
@@ -659,6 +741,33 @@ func (a *App) TestSSHConnection(cfg domain.SSHConfig) error {
return nil
}
// TestFTPConnection performs a write/delete probe with the supplied FTP or
// SFTP configuration so Settings can verify both authentication and remote
// directory permissions before saving.
func (a *App) TestFTPConnection(cfg domain.FTPConfig) error {
slog.Info("RPC TestFTPConnection",
"protocol", cfg.Protocol,
"host", cfg.Host,
"user", cfg.User,
"port", cfg.Port,
"auth_method", cfg.AuthMethod,
"strict_host_key", cfg.StrictHostKey,
"has_password", cfg.Password != "")
uploader, err := ftppkg.NewUploader(cfg)
if err != nil {
return err
}
if err := uploader.TestConnection(a.ctx); err != nil {
slog.Error("RPC TestFTPConnection failed",
"protocol", cfg.Protocol,
"host", cfg.Host,
"user", cfg.User,
"err", err)
return err
}
return nil
}
// CaptureNow is the in-app trigger.
func (a *App) CaptureNow() {
go a.runInteractiveCapture()
@@ -890,6 +999,30 @@ func (a *App) SaveRegionToRemote(result CaptureResult) error {
return a.runSaveRemotePipeline(cropped)
}
// UploadRegionToFTP uploads the selected region through the configured FTP or
// SFTP destination. This is the non-macOS Wails overlay action.
func (a *App) UploadRegionToFTP(result CaptureResult) error {
pc, err := a.consumePendingCapture()
if err != nil {
slog.Warn("UploadRegionToFTP: no pending capture", "err", err)
return err
}
defer func() {
a.capturing.Store(false)
a.dismissOverlay()
}()
a.dismissOverlay()
flushFrame()
cropped, err := a.captureSelectedPNG(result, pc)
if err != nil {
slog.Error("UploadRegionToFTP: capture failed", "err", err)
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
return err
}
return a.runFTPUploadPipeline(cropped)
}
// SummarizeRegion uploads the selected screenshot to S3, sends the public URL
// to the configured multimodal LLM, and copies the resulting summary.
func (a *App) SummarizeRegion(result CaptureResult) error {
@@ -978,6 +1111,29 @@ func (a *App) SaveNativeRegionToRemote(result CaptureResult) error {
return a.runSaveRemotePipeline(cropped)
}
// UploadNativeRegionToFTP is the macOS AppKit overlay equivalent of
// UploadRegionToFTP. The native panel has already closed when this runs.
func (a *App) UploadNativeRegionToFTP(result CaptureResult) error {
pc, err := a.consumePendingCapture()
if err != nil {
slog.Warn("UploadNativeRegionToFTP: no pending capture", "err", err)
return err
}
defer func() {
a.capturing.Store(false)
hideDockIcon()
}()
flushFrame()
cropped, err := a.captureSelectedPNG(result, pc)
if err != nil {
slog.Error("UploadNativeRegionToFTP: capture failed", "err", err)
wruntime.EventsEmit(a.ctx, "upload:failure", err.Error())
return err
}
return a.runFTPUploadPipeline(cropped)
}
// SummarizeNativeRegion is the macOS-native overlay equivalent of
// SummarizeRegion. The AppKit panel is already closed before this runs.
func (a *App) SummarizeNativeRegion(result CaptureResult) error {
+1
View File
@@ -6,6 +6,7 @@
"scripts": {
"dev": "vite",
"build": "vue-tsc --noEmit && vite build",
"test": "node --test tests/*.test.ts",
"preview": "vite preview"
},
"dependencies": {
+1 -1
View File
@@ -1 +1 @@
bb7ffb87329c9ad4990374471d4ce9a4
e2d56b98c3c8ae5968db0bbb461b5615
+38 -78
View File
@@ -22,6 +22,7 @@ import {
CopyRegionImage,
SaveRegionImage,
SaveRegionToRemote,
UploadRegionToFTP,
SummarizeRegion,
ExtractTextRegion,
CancelRegion,
@@ -59,7 +60,7 @@ async function loadThemePreference() {
// `SettingsTab` is hoisted to the App shell so the sidebar (which lives
// here) and the inner SettingsView (which renders the matching card) can
// share a single source of truth without an event bus.
type SettingsTab = 'general' | 's3' | 'ssh' | 'llm' | 'ocr'
type SettingsTab = 'general' | 's3' | 'ftp' | 'ssh' | 'llm' | 'ocr'
const activeTab = ref<SettingsTab>('general')
// Sidebar entries are declarative so adding a destination type later is
@@ -67,6 +68,7 @@ const activeTab = ref<SettingsTab>('general')
const sidebarItems: Array<{ id: SettingsTab; label: string }> = [
{ id: 'general', label: '通用设置' },
{ id: 's3', label: '对象存储' },
{ id: 'ftp', label: '文件服务' },
{ id: 'ssh', label: '远程主机' },
{ id: 'llm', label: '智能识图' },
{ id: 'ocr', label: '文字提取' },
@@ -79,6 +81,25 @@ interface OverlayPayload {
}
const overlayPayload = ref<OverlayPayload | null>(null)
interface OverlayAnnotation {
tool: string
color: string
points: Array<{ x: number; y: number }>
text?: string
strokeWidth?: number
fontSize?: number
}
interface OverlayResult {
rect: {
x: number
y: number
w: number
h: number
}
annotations: OverlayAnnotation[]
}
const capturing = ref(false)
const toast = ref<{ kind: 'success' | 'error'; text: string } | null>(null)
@@ -123,19 +144,7 @@ async function retryHotkey() {
}
}
async function onOverlayConfirm(rect: {
rect: {
x: number
y: number
w: number
h: number
}
annotations: Array<{
tool: string
color: string
points: Array<{ x: number; y: number }>
}>
}) {
async function onOverlayConfirm(rect: OverlayResult) {
// Optimistically swap back so the window does not visually lag the
// Go-side hide. If upload fails, the toast surfaces the reason.
mode.value = 'settings'
@@ -147,19 +156,7 @@ async function onOverlayConfirm(rect: {
}
}
async function onOverlayCopy(rect: {
rect: {
x: number
y: number
w: number
h: number
}
annotations: Array<{
tool: string
color: string
points: Array<{ x: number; y: number }>
}>
}) {
async function onOverlayCopy(rect: OverlayResult) {
mode.value = 'settings'
overlayPayload.value = null
try {
@@ -169,19 +166,7 @@ async function onOverlayCopy(rect: {
}
}
async function onOverlaySave(rect: {
rect: {
x: number
y: number
w: number
h: number
}
annotations: Array<{
tool: string
color: string
points: Array<{ x: number; y: number }>
}>
}) {
async function onOverlaySave(rect: OverlayResult) {
mode.value = 'settings'
overlayPayload.value = null
try {
@@ -191,19 +176,7 @@ async function onOverlaySave(rect: {
}
}
async function onOverlaySaveRemote(rect: {
rect: {
x: number
y: number
w: number
h: number
}
annotations: Array<{
tool: string
color: string
points: Array<{ x: number; y: number }>
}>
}) {
async function onOverlaySaveRemote(rect: OverlayResult) {
mode.value = 'settings'
overlayPayload.value = null
try {
@@ -213,19 +186,17 @@ async function onOverlaySaveRemote(rect: {
}
}
async function onOverlaySummarize(rect: {
rect: {
x: number
y: number
w: number
h: number
async function onOverlayUploadFTP(rect: OverlayResult) {
mode.value = 'settings'
overlayPayload.value = null
try {
await UploadRegionToFTP(rect as any)
} catch {
/* Surfaced via upload:failure */
}
annotations: Array<{
tool: string
color: string
points: Array<{ x: number; y: number }>
}>
}) {
}
async function onOverlaySummarize(rect: OverlayResult) {
mode.value = 'settings'
overlayPayload.value = null
try {
@@ -235,19 +206,7 @@ async function onOverlaySummarize(rect: {
}
}
async function onOverlayOCR(rect: {
rect: {
x: number
y: number
w: number
h: number
}
annotations: Array<{
tool: string
color: string
points: Array<{ x: number; y: number }>
}>
}) {
async function onOverlayOCR(rect: OverlayResult) {
mode.value = 'settings'
overlayPayload.value = null
try {
@@ -328,6 +287,7 @@ onUnmounted(() => {
@copy="onOverlayCopy"
@save="onOverlaySave"
@save-remote="onOverlaySaveRemote"
@upload-ftp="onOverlayUploadFTP"
@summarize="onOverlaySummarize"
@ocr="onOverlayOCR"
@cancel="onOverlayCancel"
+1
View File
@@ -0,0 +1 @@
<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path d="M128 128h768v256H128V128zm64 64v128h640V192H192zm64 48h64v32h-64v-32zM128 448h416v64H192v192h352v64H128V448zm560-32 160 160-45.248 45.248L720 538.496V832h-64V538.496l-82.752 82.752L528 576l160-160z" fill="currentColor"></path></svg>

After

Width:  |  Height:  |  Size: 306 B

+28
View File
@@ -0,0 +1,28 @@
export interface AnnotationPoint {
x: number
y: number
}
interface PointCollection {
points: AnnotationPoint[]
}
// Annotations are stored relative to the selection origin. Resizing from the
// top or left moves that origin, so offset the local points in the opposite
// direction to keep them attached to the same screen pixels.
export function preserveAnnotationScreenPositions(
annotations: PointCollection[],
previousOrigin: AnnotationPoint,
nextOrigin: AnnotationPoint
) {
const dx = previousOrigin.x - nextOrigin.x
const dy = previousOrigin.y - nextOrigin.y
if (dx === 0 && dy === 0) return
for (const annotation of annotations) {
for (const point of annotation.points) {
point.x += dx
point.y += dy
}
}
}
File diff suppressed because it is too large Load Diff
+215 -1
View File
@@ -7,6 +7,7 @@
*
* "general" the global hotkey / capture parameters.
* "s3" S3-compatible object-storage credentials.
* "ftp" FTP/SFTP file-transfer destination.
* "ssh" SSH/SCP destination for the "save remote" button.
* "llm" multimodal screenshot summary provider settings.
* "ocr" cloud OCR provider settings for text extraction.
@@ -18,14 +19,16 @@ import {
GetConfig,
SaveConfig,
TestConnection,
TestFTPConnection,
TestSSHConnection,
CaptureNow,
} from '../../wailsjs/go/main/App'
// Tab discriminator shared with the App shell. Kept as a string union so
// the parent can pass the value without importing a type from this view.
type TabId = 'general' | 's3' | 'ssh' | 'llm' | 'ocr'
type TabId = 'general' | 's3' | 'ftp' | 'ssh' | 'llm' | 'ocr'
type ThemeMode = 'auto' | 'light' | 'dark'
type FTPProtocol = 'ftp' | 'sftp'
const props = defineProps<{
tab: TabId
@@ -59,6 +62,20 @@ interface SSHConfig {
connectTimeoutSecs: number
}
interface FTPConfig {
protocol: FTPProtocol
host: string
port: number
user: string
authMethod: 'password' | 'key'
password: string
rootDirectory: string
pathPrefix: string
strictHostKey: boolean
knownHostsPath: string
connectTimeoutSecs: number
}
interface LLMProviderConfig {
label: string
baseUrl: string
@@ -97,6 +114,7 @@ interface AppConfig {
theme: ThemeMode
s3: S3Config
ssh: SSHConfig
ftp: FTPConfig
llm: LLMConfig
ocr: OCRConfig
}
@@ -145,6 +163,19 @@ function defaultConfig(): AppConfig {
publicUrlBase: '',
usePathStyle: true,
},
ftp: {
protocol: 'ftp',
host: '',
port: 21,
user: '',
authMethod: 'password',
password: '',
rootDirectory: '/',
pathPrefix: 'snapgo/',
strictHostKey: false,
knownHostsPath: '',
connectTimeoutSecs: 10,
},
ssh: {
host: '',
port: 22,
@@ -223,6 +254,7 @@ const config = ref<AppConfig>(defaultConfig())
const saving = ref(false)
const testing = ref(false)
const testingFTP = ref(false)
const testingSSH = ref(false)
const message = ref<{ kind: 'ok' | 'err'; text: string } | null>(null)
@@ -240,6 +272,48 @@ const sshPathDisplay = computed({
},
})
// FTP and SFTP both upload relative to the authenticated login directory.
// RootDirectory is display-only: it is prepended to the uploaded relative path
// when that path is copied, without changing where the file is uploaded.
const ftpPathDisplay = computed({
get: () => config.value.ftp.pathPrefix,
set: (raw: string) => {
let cleaned = raw.trim()
cleaned = cleaned.replace(/^~/, '')
cleaned = cleaned.replace(/^\/+/, '')
config.value.ftp.pathPrefix = cleaned
},
})
const ftpCopiedPathPreview = computed(() => {
const root = config.value.ftp.rootDirectory.trim().replace(/\/+$/, '')
const remote = config.value.ftp.pathPrefix
.trim()
.replace(/^\/+|\/+$/g, '')
const remotePrefix = remote ? `${remote}/` : ''
return `${root || (config.value.ftp.protocol === 'sftp' ? '~' : '')}/${remotePrefix}2026/07/20260713-110413-18lnbx.png`
})
function changeFTPProtocol(event: Event) {
const next = (event.target as HTMLSelectElement).value as FTPProtocol
const previous = config.value.ftp.protocol
const previousDefault = previous === 'sftp' ? 22 : 21
const previousRootDefault = previous === 'sftp' ? '~/' : '/'
if (config.value.ftp.port === previousDefault) {
config.value.ftp.port = next === 'sftp' ? 22 : 21
}
if (config.value.ftp.rootDirectory === previousRootDefault) {
config.value.ftp.rootDirectory = next === 'sftp' ? '~/' : '/'
}
config.value.ftp.protocol = next
}
function changeFTPAuthMethod(event: Event) {
config.value.ftp.authMethod = (event.target as HTMLSelectElement).value as
| 'password'
| 'key'
}
const activeLLMProvider = computed(() => {
const id = config.value.llm.activeProvider || 'openai'
if (!config.value.llm.providers[id]) {
@@ -280,6 +354,7 @@ async function load() {
Object.assign(merged, cfg)
merged.s3 = { ...merged.s3, ...(cfg as any).s3 }
merged.ssh = { ...merged.ssh, ...(cfg as any).ssh }
merged.ftp = { ...merged.ftp, ...(cfg as any).ftp }
merged.llm = { ...merged.llm, ...(cfg as any).llm }
merged.llm.providers = {
...defaultConfig().llm.providers,
@@ -320,6 +395,21 @@ async function test() {
}
}
async function testFTP() {
testingFTP.value = true
try {
await TestFTPConnection(config.value.ftp as any)
flash(
'ok',
`${config.value.ftp.protocol.toUpperCase()} connection OK — remote directory is writable`
)
} catch (err: any) {
flash('err', `FTP/SFTP test failed: ${err?.message ?? err}`)
} finally {
testingFTP.value = false
}
}
async function testSSH() {
testingSSH.value = true
try {
@@ -450,6 +540,130 @@ onMounted(load)
</div>
</section>
<!-- FTP/SFTP tab file-transfer destination for its toolbar action. -->
<section v-if="props.tab === 'ftp'" class="card">
<h2>文件服务</h2>
<div class="grid">
<label class="field">
<span>Protocol</span>
<select :value="config.ftp.protocol" @change="changeFTPProtocol">
<option value="ftp">FTP</option>
<option value="sftp">SFTP (SSH File Transfer Protocol)</option>
</select>
</label>
<label class="field">
<span>Port</span>
<input
v-model.number="config.ftp.port"
type="number"
min="1"
max="65535"
:placeholder="config.ftp.protocol === 'sftp' ? '22' : '21'"
/>
</label>
<label class="field">
<span>Host (IP or domain) *</span>
<input v-model.trim="config.ftp.host" placeholder="files.example.com" />
</label>
<label class="field">
<span>User *</span>
<input v-model.trim="config.ftp.user" placeholder="snapgo" />
</label>
<label
v-if="config.ftp.protocol === 'sftp'"
key="sftp-auth-method"
class="field"
>
<span>Auth method</span>
<select
:value="config.ftp.authMethod"
@change="changeFTPAuthMethod"
>
<option value="password">Password</option>
<option value="key">SSH-Key</option>
</select>
</label>
<label
v-if="config.ftp.protocol === 'ftp' || config.ftp.authMethod === 'password'"
:key="`${config.ftp.protocol}-password`"
class="field"
>
<span>Password</span>
<input v-model="config.ftp.password" type="password" />
</label>
<label class="field full">
<span>根目录仅用于拼接复制路径</span>
<input
v-model.trim="config.ftp.rootDirectory"
:placeholder="config.ftp.protocol === 'sftp' ? '~/' : '/'"
spellcheck="false"
/>
</label>
<label class="field full">
<span>Remote directory登录目录下的上传目录</span>
<input
v-model="ftpPathDisplay"
placeholder="snapgo/"
spellcheck="false"
/>
</label>
<label class="field">
<span>Connect timeout (sec)</span>
<input
v-model.number="config.ftp.connectTimeoutSecs"
type="number"
min="1"
max="120"
placeholder="10"
/>
</label>
<label v-if="config.ftp.protocol === 'sftp'" class="field">
<span>Known hosts path</span>
<input
v-model="config.ftp.knownHostsPath"
placeholder="~/.ssh/known_hosts"
:disabled="!config.ftp.strictHostKey"
/>
</label>
<label v-if="config.ftp.protocol === 'sftp'" class="field checkbox">
<input type="checkbox" v-model="config.ftp.strictHostKey" />
<span>Strict host key checking (recommended)</span>
</label>
</div>
<p class="hint">
复制路径示例<code>{{ ftpCopiedPathPreview }}</code>
</p>
<p v-if="config.ftp.protocol === 'ftp'" class="hint warn">
FTP sends the username, password, and screenshot without encryption.
Prefer SFTP on networks you do not fully trust. SFTP is not FTPS.
</p>
<p
v-else-if="config.ftp.authMethod === 'key'"
class="hint"
>
SSH-Key mode uses your <code>ssh-agent</code> and
<code>~/.ssh/id_*</code> keys.
</p>
<p
v-else-if="!config.ftp.strictHostKey"
class="hint warn"
>
Host key checking is disabled. Enable it for production servers to
detect server impersonation.
</p>
<div class="actions">
<button class="btn" :disabled="testingFTP" @click="testFTP">
{{ testingFTP ? 'Testing…' : 'Test connection' }}
</button>
<button class="btn primary" :disabled="saving" @click="save">
{{ saving ? 'Saving…' : 'Save' }}
</button>
</div>
</section>
<!-- SSH-Conf tab destination for the save-remote action. -->
<section v-if="props.tab === 'ssh'" class="card">
<h2>SSH / SCP destination</h2>
+65
View File
@@ -0,0 +1,65 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { preserveAnnotationScreenPositions } from '../src/utils/annotationGeometry.ts'
test('keeps annotation points at the same screen position when the origin moves', () => {
const annotations = [
{ points: [{ x: 30, y: 40 }, { x: 80, y: 90 }] },
{ points: [{ x: 12, y: 18 }] },
]
preserveAnnotationScreenPositions(
annotations,
{ x: 100, y: 200 },
{ x: 125, y: 230 }
)
assert.deepEqual(annotations, [
{ points: [{ x: 5, y: 10 }, { x: 55, y: 60 }] },
{ points: [{ x: -13, y: -12 }] },
])
assert.deepEqual(
annotations[0].points.map((point) => ({
x: 125 + point.x,
y: 230 + point.y,
})),
[{ x: 130, y: 240 }, { x: 180, y: 290 }]
)
})
test('does not move annotations when only the right or bottom edge changes', () => {
const annotations = [{ points: [{ x: 30, y: 40 }] }]
preserveAnnotationScreenPositions(
annotations,
{ x: 100, y: 200 },
{ x: 100, y: 200 }
)
assert.deepEqual(annotations, [{ points: [{ x: 30, y: 40 }] }])
})
test('preserves screen positions across repeated drags and an edge crossover', () => {
const annotations = [{ points: [{ x: 50, y: 60 }] }]
preserveAnnotationScreenPositions(
annotations,
{ x: 100, y: 100 },
{ x: 140, y: 130 }
)
preserveAnnotationScreenPositions(
annotations,
{ x: 140, y: 130 },
{ x: 300, y: 150 }
)
assert.deepEqual(annotations, [{ points: [{ x: -150, y: 10 }] }])
assert.deepEqual(
{
x: 300 + annotations[0].points[0].x,
y: 150 + annotations[0].points[0].y,
},
{ x: 150, y: 160 }
)
})
+6
View File
@@ -47,4 +47,10 @@ export function SummarizeRegion(arg1:main.CaptureResult):Promise<void>;
export function TestConnection(arg1:domain.S3Config):Promise<void>;
export function TestFTPConnection(arg1:domain.FTPConfig):Promise<void>;
export function TestSSHConnection(arg1:domain.SSHConfig):Promise<void>;
export function UploadNativeRegionToFTP(arg1:main.CaptureResult):Promise<void>;
export function UploadRegionToFTP(arg1:main.CaptureResult):Promise<void>;
+12
View File
@@ -90,6 +90,18 @@ export function TestConnection(arg1) {
return window['go']['main']['App']['TestConnection'](arg1);
}
export function TestFTPConnection(arg1) {
return window['go']['main']['App']['TestFTPConnection'](arg1);
}
export function TestSSHConnection(arg1) {
return window['go']['main']['App']['TestSSHConnection'](arg1);
}
export function UploadNativeRegionToFTP(arg1) {
return window['go']['main']['App']['UploadNativeRegionToFTP'](arg1);
}
export function UploadRegionToFTP(arg1) {
return window['go']['main']['App']['UploadRegionToFTP'](arg1);
}
+76 -37
View File
@@ -1,13 +1,13 @@
export namespace application {
export class Point {
x: number;
y: number;
static createFrom(source: any = {}) {
return new Point(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.x = source["x"];
@@ -19,19 +19,23 @@ export namespace application {
color: string;
points: Point[];
text?: string;
strokeWidth?: number;
fontSize?: number;
static createFrom(source: any = {}) {
return new Annotation(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.tool = source["tool"];
this.color = source["color"];
this.points = this.convertValues(source["points"], Point);
this.text = source["text"];
this.strokeWidth = source["strokeWidth"];
this.fontSize = source["fontSize"];
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
@@ -54,7 +58,7 @@ export namespace application {
}
export namespace domain {
export class OCRProviderConfig {
label: string;
endpoint: string;
@@ -65,11 +69,11 @@ export namespace domain {
action: string;
version: string;
timeoutSecs: number;
static createFrom(source: any = {}) {
return new OCRProviderConfig(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.label = source["label"];
@@ -86,17 +90,17 @@ export namespace domain {
export class OCRConfig {
activeProvider: string;
providers: Record<string, OCRProviderConfig>;
static createFrom(source: any = {}) {
return new OCRConfig(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.activeProvider = source["activeProvider"];
this.providers = this.convertValues(source["providers"], OCRProviderConfig, true);
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
@@ -124,11 +128,11 @@ export namespace domain {
temperature: number;
timeoutSecs: number;
maxInlineBytes: number;
static createFrom(source: any = {}) {
return new LLMProviderConfig(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.label = source["label"];
@@ -145,18 +149,18 @@ export namespace domain {
activeProvider: string;
prompt: string;
providers: Record<string, LLMProviderConfig>;
static createFrom(source: any = {}) {
return new LLMConfig(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.activeProvider = source["activeProvider"];
this.prompt = source["prompt"];
this.providers = this.convertValues(source["providers"], LLMProviderConfig, true);
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
@@ -175,6 +179,38 @@ export namespace domain {
return a;
}
}
export class FTPConfig {
protocol: string;
host: string;
port: number;
user: string;
authMethod: string;
password: string;
rootDirectory: string;
pathPrefix: string;
strictHostKey: boolean;
knownHostsPath: string;
connectTimeoutSecs: number;
static createFrom(source: any = {}) {
return new FTPConfig(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.protocol = source["protocol"];
this.host = source["host"];
this.port = source["port"];
this.user = source["user"];
this.authMethod = source["authMethod"];
this.password = source["password"];
this.rootDirectory = source["rootDirectory"];
this.pathPrefix = source["pathPrefix"];
this.strictHostKey = source["strictHostKey"];
this.knownHostsPath = source["knownHostsPath"];
this.connectTimeoutSecs = source["connectTimeoutSecs"];
}
}
export class SSHConfig {
host: string;
port: number;
@@ -185,11 +221,11 @@ export namespace domain {
strictHostKey: boolean;
knownHostsPath: string;
connectTimeoutSecs: number;
static createFrom(source: any = {}) {
return new SSHConfig(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.host = source["host"];
@@ -212,11 +248,11 @@ export namespace domain {
pathPrefix: string;
publicUrlBase: string;
usePathStyle: boolean;
static createFrom(source: any = {}) {
return new S3Config(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.endpoint = source["endpoint"];
@@ -234,23 +270,25 @@ export namespace domain {
theme: string;
s3: S3Config;
ssh: SSHConfig;
ftp: FTPConfig;
llm: LLMConfig;
ocr: OCRConfig;
static createFrom(source: any = {}) {
return new AppConfig(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.hotkey = source["hotkey"];
this.theme = source["theme"];
this.s3 = this.convertValues(source["s3"], S3Config);
this.ssh = this.convertValues(source["ssh"], SSHConfig);
this.ftp = this.convertValues(source["ftp"], FTPConfig);
this.llm = this.convertValues(source["llm"], LLMConfig);
this.ocr = this.convertValues(source["ocr"], OCRConfig);
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
@@ -269,24 +307,25 @@ export namespace domain {
return a;
}
}
}
export namespace main {
export class CaptureActionResult {
completed: boolean;
path?: string;
static createFrom(source: any = {}) {
return new CaptureActionResult(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.completed = source["completed"];
@@ -298,11 +337,11 @@ export namespace main {
y: number;
w: number;
h: number;
static createFrom(source: any = {}) {
return new RegionRect(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.x = source["x"];
@@ -314,17 +353,17 @@ export namespace main {
export class CaptureResult {
rect: RegionRect;
annotations: application.Annotation[];
static createFrom(source: any = {}) {
return new CaptureResult(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.rect = this.convertValues(source["rect"], RegionRect);
this.annotations = this.convertValues(source["annotations"], application.Annotation);
}
convertValues(a: any, classs: any, asMap: boolean = false): any {
if (!a) {
return a;
+9 -4
View File
@@ -7,11 +7,13 @@ require (
github.com/aws/aws-sdk-go-v2 v1.30.3
github.com/aws/aws-sdk-go-v2/credentials v1.17.27
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2
github.com/jlaffaye/ftp v0.2.0
github.com/kbinani/screenshot v0.0.0-20230812210009-b87d31814237
github.com/pkg/sftp v1.13.10
github.com/wailsapp/wails/v2 v2.12.0
golang.design/x/clipboard v0.7.0
golang.design/x/hotkey v0.4.1
golang.org/x/crypto v0.33.0
golang.org/x/crypto v0.41.0
golang.org/x/image v0.12.0
)
@@ -32,8 +34,11 @@ require (
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
github.com/jezek/xgb v1.1.0 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/labstack/echo/v4 v4.13.3 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/leaanthony/go-ansi-parser v1.6.1 // indirect
@@ -54,7 +59,7 @@ require (
github.com/wailsapp/mimetype v1.4.1 // indirect
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect
golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/net v0.42.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/text v0.28.0 // indirect
)
+20 -10
View File
@@ -41,12 +41,20 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
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/jezek/xgb v1.1.0 h1:wnpxJzP1+rkbGclEkmwpVFQWpuE2PUGNUzP8SbfFobk=
github.com/jezek/xgb v1.1.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
github.com/jlaffaye/ftp v0.2.0 h1:lXNvW7cBu7R/68bknOX3MrRIIqZ61zELs1P2RAiA3lg=
github.com/jlaffaye/ftp v0.2.0/go.mod h1:is2Ds5qkhceAPy2xD6RLI6hmp/qysSoymZ+Z2uTnspI=
github.com/kbinani/screenshot v0.0.0-20230812210009-b87d31814237 h1:YOp8St+CM/AQ9Vp4XYm4272E77MptJDHkwypQHIRl9Q=
github.com/kbinani/screenshot v0.0.0-20230812210009-b87d31814237/go.mod h1:e7qQlOY68wOz4b82D7n+DdaptZAi+SHW0+yKiWZzEYE=
github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
@@ -75,6 +83,8 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/sftp v1.13.10 h1:+5FbKNTe5Z9aspU88DPIKJ9z2KZoaGCu6Sr6kKR/5mU=
github.com/pkg/sftp v1.13.10/go.mod h1:bJ1a7uDhrX/4OII+agvy28lzRvQrmIQuaHrcI1HbeGA=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -106,8 +116,8 @@ golang.design/x/mainthread v0.3.0/go.mod h1:vYX7cF2b3pTJMGM/hc13NmN6kblKnf4/IyvH
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 h1:estk1glOnSVeJ9tdEZZc5mAMDZk5lNJNyJ6DvrBkTEU=
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
@@ -126,8 +136,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -144,21 +154,21 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+169 -26
View File
@@ -22,10 +22,12 @@ import (
// Annotation describes a user-drawn mark relative to the selected screenshot.
// Coordinates are logical pixels in the same coordinate system as the overlay.
type Annotation struct {
Tool string `json:"tool"`
Color string `json:"color"`
Points []Point `json:"points"`
Text string `json:"text,omitempty"`
Tool string `json:"tool"`
Color string `json:"color"`
Points []Point `json:"points"`
Text string `json:"text,omitempty"`
StrokeWidth float64 `json:"strokeWidth,omitempty"`
FontSize float64 `json:"fontSize,omitempty"`
}
type Point struct {
@@ -35,12 +37,22 @@ type Point struct {
// ApplyAnnotations decodes a PNG, draws all annotations, and re-encodes it.
func ApplyAnnotations(pngBytes []byte, annotations []Annotation, scale float64) ([]byte, error) {
return ApplyAnnotationsWithScale(pngBytes, annotations, scale, scale)
}
// ApplyAnnotationsWithScale decodes a PNG, draws all annotations using the
// actual device-pixel scale of the captured image, and re-encodes it.
func ApplyAnnotationsWithScale(pngBytes []byte, annotations []Annotation, scaleX, scaleY float64) ([]byte, error) {
if len(annotations) == 0 {
return pngBytes, nil
}
if scale <= 0 {
scale = 1
if scaleX <= 0 {
scaleX = 1
}
if scaleY <= 0 {
scaleY = scaleX
}
strokeScale := math.Max(scaleX, scaleY)
src, err := png.Decode(bytes.NewReader(pngBytes))
if err != nil {
@@ -55,16 +67,28 @@ func ApplyAnnotations(pngBytes []byte, annotations []Annotation, scale float64)
if err != nil {
c = color.RGBA{R: 59, G: 130, B: 246, A: 255}
}
width := int(math.Max(2, math.Round(3*scale)))
strokeWidth := ann.StrokeWidth
if strokeWidth <= 0 {
strokeWidth = 3
}
width := int(math.Max(1, math.Round(strokeWidth*strokeScale)))
switch ann.Tool {
case "pen":
drawPolyline(dst, ann.Points, scale, width, c)
drawPolyline(dst, ann.Points, scaleX, scaleY, width, c)
case "line":
drawStraightLine(dst, ann.Points, scaleX, scaleY, width, c)
case "arrow":
drawArrow(dst, ann.Points, scaleX, scaleY, width, c)
case "rect":
drawRectOutline(dst, ann.Points, scale, width, c)
drawRectOutline(dst, ann.Points, scaleX, scaleY, width, c)
case "ellipse":
drawEllipseOutline(dst, ann.Points, scale, width, c)
drawEllipseOutline(dst, ann.Points, scaleX, scaleY, width, c)
case "text":
drawTextAnnotation(dst, ann, scale, c)
drawTextAnnotation(dst, ann, scaleX, scaleY, c)
case "mosaic-brush":
applyMosaicBrush(dst, ann.Points, scaleX, scaleY, width)
case "mosaic-rect":
applyMosaicRect(dst, ann.Points, scaleX, scaleY)
}
}
@@ -75,6 +99,121 @@ func ApplyAnnotations(pngBytes []byte, annotations []Annotation, scale float64)
return buf.Bytes(), nil
}
func drawStraightLine(img *image.RGBA, points []Point, scaleX, scaleY float64, width int, c color.RGBA) {
if len(points) < 2 {
return
}
drawLine(img, scalePoint(points[0], scaleX, scaleY), scalePoint(points[len(points)-1], scaleX, scaleY), width, c)
}
func drawArrow(img *image.RGBA, points []Point, scaleX, scaleY float64, width int, c color.RGBA) {
if len(points) < 2 {
return
}
start := scalePoint(points[0], scaleX, scaleY)
end := scalePoint(points[len(points)-1], scaleX, scaleY)
dx, dy := end.X-start.X, end.Y-start.Y
length := math.Hypot(dx, dy)
if length < 1 {
return
}
drawLine(img, start, end, width, c)
headLength := math.Min(length*0.45, math.Max(10*math.Max(scaleX, scaleY), float64(width)*4))
angle := math.Atan2(dy, dx)
spread := math.Pi / 6
left := Point{X: end.X - headLength*math.Cos(angle-spread), Y: end.Y - headLength*math.Sin(angle-spread)}
right := Point{X: end.X - headLength*math.Cos(angle+spread), Y: end.Y - headLength*math.Sin(angle+spread)}
drawLine(img, end, left, width, c)
drawLine(img, end, right, width, c)
}
const mosaicBlockSize = 10
func applyMosaicBrush(img *image.RGBA, points []Point, scaleX, scaleY float64, width int) {
if len(points) == 0 {
return
}
mask := image.NewAlpha(img.Bounds())
maskColor := color.RGBA{A: 255}
if len(points) == 1 {
drawDotMask(mask, scalePoint(points[0], scaleX, scaleY), width, maskColor)
} else {
for i := 1; i < len(points); i++ {
drawMaskLine(mask, scalePoint(points[i-1], scaleX, scaleY), scalePoint(points[i], scaleX, scaleY), width, maskColor)
}
}
applyPixelation(img, img.Bounds(), mask)
}
func applyMosaicRect(img *image.RGBA, points []Point, scaleX, scaleY float64) {
if len(points) < 2 {
return
}
a := scalePoint(points[0], scaleX, scaleY)
b := scalePoint(points[len(points)-1], scaleX, scaleY)
x1, x2 := ordered(a.X, b.X)
y1, y2 := ordered(a.Y, b.Y)
r := image.Rect(int(math.Floor(x1)), int(math.Floor(y1)), int(math.Ceil(x2)), int(math.Ceil(y2))).Intersect(img.Bounds())
applyPixelation(img, r, nil)
}
func applyPixelation(img *image.RGBA, region image.Rectangle, mask *image.Alpha) {
if region.Empty() {
return
}
for y := region.Min.Y; y < region.Max.Y; y += mosaicBlockSize {
for x := region.Min.X; x < region.Max.X; x += mosaicBlockSize {
block := image.Rect(x, y, min(x+mosaicBlockSize, region.Max.X), min(y+mosaicBlockSize, region.Max.Y))
var r, g, b, a, count uint64
for py := block.Min.Y; py < block.Max.Y; py++ {
for px := block.Min.X; px < block.Max.X; px++ {
c := img.RGBAAt(px, py)
r += uint64(c.R)
g += uint64(c.G)
b += uint64(c.B)
a += uint64(c.A)
count++
}
}
if count == 0 {
continue
}
avg := color.RGBA{uint8(r / count), uint8(g / count), uint8(b / count), uint8(a / count)}
for py := block.Min.Y; py < block.Max.Y; py++ {
for px := block.Min.X; px < block.Max.X; px++ {
if mask == nil || mask.AlphaAt(px, py).A > 0 {
img.SetRGBA(px, py, avg)
}
}
}
}
}
}
func drawMaskLine(mask *image.Alpha, a, b Point, width int, c color.RGBA) {
dx, dy := b.X-a.X, b.Y-a.Y
steps := int(math.Max(math.Abs(dx), math.Abs(dy)))
if steps == 0 {
drawDotMask(mask, a, width, c)
return
}
for i := 0; i <= steps; i++ {
t := float64(i) / float64(steps)
drawDotMask(mask, Point{X: a.X + dx*t, Y: a.Y + dy*t}, width, c)
}
}
func drawDotMask(mask *image.Alpha, p Point, width int, c color.RGBA) {
radius := float64(width) / 2
for y := int(math.Floor(p.Y - radius)); y <= int(math.Ceil(p.Y+radius)); y++ {
for x := int(math.Floor(p.X - radius)); x <= int(math.Ceil(p.X+radius)); x++ {
if image.Pt(x, y).In(mask.Bounds()) && math.Hypot(float64(x)-p.X, float64(y)-p.Y) <= radius {
mask.SetAlpha(x, y, color.Alpha{A: c.A})
}
}
}
}
func parseHexColor(hex string) (color.RGBA, error) {
value := strings.TrimPrefix(strings.TrimSpace(hex), "#")
if len(value) != 6 {
@@ -92,22 +231,22 @@ func parseHexColor(hex string) (color.RGBA, error) {
}, nil
}
func drawPolyline(img *image.RGBA, points []Point, scale float64, width int, c color.RGBA) {
func drawPolyline(img *image.RGBA, points []Point, scaleX, scaleY float64, width int, c color.RGBA) {
if len(points) == 1 {
drawDot(img, scalePoint(points[0], scale), width, c)
drawDot(img, scalePoint(points[0], scaleX, scaleY), width, c)
return
}
for i := 1; i < len(points); i++ {
drawLine(img, scalePoint(points[i-1], scale), scalePoint(points[i], scale), width, c)
drawLine(img, scalePoint(points[i-1], scaleX, scaleY), scalePoint(points[i], scaleX, scaleY), width, c)
}
}
func drawRectOutline(img *image.RGBA, points []Point, scale float64, width int, c color.RGBA) {
func drawRectOutline(img *image.RGBA, points []Point, scaleX, scaleY float64, width int, c color.RGBA) {
if len(points) < 2 {
return
}
a := scalePoint(points[0], scale)
b := scalePoint(points[len(points)-1], scale)
a := scalePoint(points[0], scaleX, scaleY)
b := scalePoint(points[len(points)-1], scaleX, scaleY)
x1, x2 := ordered(a.X, b.X)
y1, y2 := ordered(a.Y, b.Y)
drawLine(img, Point{X: x1, Y: y1}, Point{X: x2, Y: y1}, width, c)
@@ -116,12 +255,12 @@ func drawRectOutline(img *image.RGBA, points []Point, scale float64, width int,
drawLine(img, Point{X: x1, Y: y2}, Point{X: x1, Y: y1}, width, c)
}
func drawEllipseOutline(img *image.RGBA, points []Point, scale float64, width int, c color.RGBA) {
func drawEllipseOutline(img *image.RGBA, points []Point, scaleX, scaleY float64, width int, c color.RGBA) {
if len(points) < 2 {
return
}
a := scalePoint(points[0], scale)
b := scalePoint(points[len(points)-1], scale)
a := scalePoint(points[0], scaleX, scaleY)
b := scalePoint(points[len(points)-1], scaleX, scaleY)
x1, x2 := ordered(a.X, b.X)
y1, y2 := ordered(a.Y, b.Y)
rx := (x2 - x1) / 2
@@ -180,8 +319,8 @@ func drawDot(img *image.RGBA, p Point, width int, c color.RGBA) {
}
}
func scalePoint(p Point, scale float64) Point {
return Point{X: p.X * scale, Y: p.Y * scale}
func scalePoint(p Point, scaleX, scaleY float64) Point {
return Point{X: p.X * scaleX, Y: p.Y * scaleY}
}
func ordered(a, b float64) (float64, float64) {
@@ -191,7 +330,7 @@ func ordered(a, b float64) (float64, float64) {
return b, a
}
func drawTextAnnotation(img *image.RGBA, ann Annotation, scale float64, c color.RGBA) {
func drawTextAnnotation(img *image.RGBA, ann Annotation, scaleX, scaleY float64, c color.RGBA) {
if len(ann.Points) == 0 {
return
}
@@ -199,16 +338,20 @@ func drawTextAnnotation(img *image.RGBA, ann Annotation, scale float64, c color.
if text == "" {
return
}
face := annotationFontFace(20 * scale)
fontSize := ann.FontSize
if fontSize <= 0 {
fontSize = 20
}
face := annotationFontFace(fontSize * scaleY)
if face == nil {
face = basicfont.Face7x13
}
origin := scalePoint(ann.Points[0], scale)
origin := scalePoint(ann.Points[0], scaleX, scaleY)
metrics := face.Metrics()
lineHeight := metrics.Height
if lineHeight <= 0 {
lineHeight = fixed.I(int(math.Ceil(24 * scale)))
lineHeight = fixed.I(int(math.Ceil(fontSize * 1.2 * scaleY)))
}
d := &xfont.Drawer{
Dst: img,
+185
View File
@@ -93,3 +93,188 @@ func TestApplyAnnotationsDrawsTextIntoPNG(t *testing.T) {
t.Fatalf("expected red text pixels near annotation point")
}
}
func TestApplyAnnotationsWithScaleDrawsTextAtDevicePosition(t *testing.T) {
src := image.NewRGBA(image.Rect(0, 0, 220, 120))
draw.Draw(src, src.Bounds(), &image.Uniform{C: color.White}, image.Point{}, draw.Src)
var buf bytes.Buffer
if err := png.Encode(&buf, src); err != nil {
t.Fatalf("encode source: %v", err)
}
out, err := ApplyAnnotationsWithScale(buf.Bytes(), []Annotation{
{
Tool: "text",
Color: "#ef4444",
Points: []Point{{X: 50, Y: 20}},
Text: "T",
FontSize: 20,
},
}, 2, 2)
if err != nil {
t.Fatalf("apply annotations: %v", err)
}
img, err := png.Decode(bytes.NewReader(out))
if err != nil {
t.Fatalf("decode output: %v", err)
}
minX := 999
found := false
for y := 0; y < img.Bounds().Dy(); y++ {
for x := 0; x < img.Bounds().Dx(); x++ {
got := color.RGBAModel.Convert(img.At(x, y)).(color.RGBA)
if got.R > 180 && got.G < 180 && got.B < 180 {
found = true
if x < minX {
minX = x
}
}
}
}
if !found {
t.Fatalf("expected red text pixels")
}
if minX < 90 {
t.Fatalf("expected text to be drawn near scaled x=100, min red x=%d", minX)
}
}
func TestApplyAnnotationsUsesStrokeWidth(t *testing.T) {
src := image.NewRGBA(image.Rect(0, 0, 80, 80))
draw.Draw(src, src.Bounds(), &image.Uniform{C: color.White}, image.Point{}, draw.Src)
var buf bytes.Buffer
if err := png.Encode(&buf, src); err != nil {
t.Fatalf("encode source: %v", err)
}
out, err := ApplyAnnotations(buf.Bytes(), []Annotation{
{
Tool: "rect",
Color: "#ef4444",
Points: []Point{{X: 20, Y: 20}, {X: 60, Y: 60}},
StrokeWidth: 8,
},
}, 1)
if err != nil {
t.Fatalf("apply annotations: %v", err)
}
img, err := png.Decode(bytes.NewReader(out))
if err != nil {
t.Fatalf("decode output: %v", err)
}
got := color.RGBAModel.Convert(img.At(20, 24)).(color.RGBA)
if got.R < 180 || got.G > 180 || got.B > 180 {
t.Fatalf("expected thick rectangle stroke to cover y=24, got %#v", got)
}
}
func TestApplyAnnotationsPixelatesMosaicRectangle(t *testing.T) {
src := image.NewRGBA(image.Rect(0, 0, 40, 30))
for y := 0; y < 30; y++ {
for x := 0; x < 40; x++ {
src.SetRGBA(x, y, color.RGBA{R: uint8(x * 6), G: uint8(y * 8), B: uint8((x + y) * 3), A: 255})
}
}
var buf bytes.Buffer
if err := png.Encode(&buf, src); err != nil {
t.Fatalf("encode source: %v", err)
}
out, err := ApplyAnnotations(buf.Bytes(), []Annotation{{
Tool: "mosaic-rect", Points: []Point{{X: 10, Y: 5}, {X: 30, Y: 25}},
}}, 1)
if err != nil {
t.Fatalf("apply annotations: %v", err)
}
img, err := png.Decode(bytes.NewReader(out))
if err != nil {
t.Fatalf("decode output: %v", err)
}
if img.At(12, 7) != img.At(18, 13) {
t.Fatalf("expected pixels in one mosaic block to share a color")
}
if img.At(5, 5) != src.At(5, 5) {
t.Fatalf("expected pixels outside mosaic rectangle to remain unchanged")
}
}
func TestApplyAnnotationsPixelatesOnlyMosaicBrushStroke(t *testing.T) {
src := image.NewRGBA(image.Rect(0, 0, 50, 30))
for y := 0; y < 30; y++ {
for x := 0; x < 50; x++ {
src.SetRGBA(x, y, color.RGBA{R: uint8(x * 5), G: uint8(y * 8), A: 255})
}
}
var buf bytes.Buffer
if err := png.Encode(&buf, src); err != nil {
t.Fatalf("encode source: %v", err)
}
out, err := ApplyAnnotations(buf.Bytes(), []Annotation{{
Tool: "mosaic-brush", StrokeWidth: 12, Points: []Point{{X: 5, Y: 15}, {X: 45, Y: 15}},
}}, 1)
if err != nil {
t.Fatalf("apply annotations: %v", err)
}
img, err := png.Decode(bytes.NewReader(out))
if err != nil {
t.Fatalf("decode output: %v", err)
}
if img.At(12, 15) == src.At(12, 15) {
t.Fatalf("expected brush path to be pixelated")
}
if img.At(12, 2) != src.At(12, 2) {
t.Fatalf("expected pixels outside brush path to remain unchanged")
}
}
func TestApplyAnnotationsDrawsStraightLine(t *testing.T) {
src := image.NewRGBA(image.Rect(0, 0, 60, 40))
draw.Draw(src, src.Bounds(), &image.Uniform{C: color.White}, image.Point{}, draw.Src)
var buf bytes.Buffer
if err := png.Encode(&buf, src); err != nil {
t.Fatalf("encode source: %v", err)
}
out, err := ApplyAnnotations(buf.Bytes(), []Annotation{{
Tool: "line", Color: "#ef4444", StrokeWidth: 4,
Points: []Point{{X: 5, Y: 20}, {X: 50, Y: 20}},
}}, 1)
if err != nil {
t.Fatalf("apply annotations: %v", err)
}
img, err := png.Decode(bytes.NewReader(out))
if err != nil {
t.Fatalf("decode output: %v", err)
}
got := color.RGBAModel.Convert(img.At(30, 20)).(color.RGBA)
if got.R < 180 || got.G > 180 || got.B > 180 {
t.Fatalf("expected red line at center, got %#v", got)
}
}
func TestApplyAnnotationsDrawsArrowHead(t *testing.T) {
src := image.NewRGBA(image.Rect(0, 0, 80, 60))
draw.Draw(src, src.Bounds(), &image.Uniform{C: color.White}, image.Point{}, draw.Src)
var buf bytes.Buffer
if err := png.Encode(&buf, src); err != nil {
t.Fatalf("encode source: %v", err)
}
out, err := ApplyAnnotations(buf.Bytes(), []Annotation{{
Tool: "arrow", Color: "#3b82f6", StrokeWidth: 3,
Points: []Point{{X: 10, Y: 30}, {X: 60, Y: 30}},
}}, 1)
if err != nil {
t.Fatalf("apply annotations: %v", err)
}
img, err := png.Decode(bytes.NewReader(out))
if err != nil {
t.Fatalf("decode output: %v", err)
}
shaft := color.RGBAModel.Convert(img.At(35, 30)).(color.RGBA)
head := color.RGBAModel.Convert(img.At(52, 25)).(color.RGBA)
if shaft.B < 180 || shaft.R > 140 || head.B < 180 || head.R > 140 {
t.Fatalf("expected blue arrow shaft and head, got shaft=%#v head=%#v", shaft, head)
}
}
+150
View File
@@ -0,0 +1,150 @@
// capture_ftp.go — application-level FTP/SFTP upload orchestration.
//
// Design rationale:
// - FTP/SFTP returns a remote filesystem path, not necessarily a public URL,
// so this flow stays separate from the OSSProvider-based S3 pipeline.
// - A tiny uploader interface keeps protocol libraries out of the
// application layer and makes the upload/copy/notify sequence unit-testable.
// - The dated filename layout is shared with SSH/SCP while FTP-specific path
// validation prevents an invalid prefix from escaping the login root.
package application
import (
"context"
"fmt"
"log/slog"
"strings"
"time"
"github.com/mmmy/snapgo/internal/domain"
"github.com/mmmy/snapgo/internal/infrastructure/clipboard"
)
// ftpSvcLog returns an application-layer FTP logger bound to the current
// default slog handler.
func ftpSvcLog() *slog.Logger { return slog.Default().With("component", "application.ftp") }
// FTPUploader abstracts both FTP and SFTP adapters.
type FTPUploader interface {
// Upload stores data at remoteRelPath, relative to the authenticated
// account's login root.
Upload(ctx context.Context, remoteRelPath string, data []byte) error
}
// CaptureAndFTPService wires captured PNG bytes → FTP/SFTP → clipboard →
// notification.
type CaptureAndFTPService struct {
Uploader FTPUploader
Clipboard clipboard.Writer
Notifier Notifier
Cfg domain.FTPConfig
}
// ExecuteWithBytes uploads previously captured PNG bytes and copies a display
// path built from the configured root directory plus the uploaded relative
// path. RootDirectory deliberately does not affect the upload destination.
func (s *CaptureAndFTPService) ExecuteWithBytes(ctx context.Context, pngBytes []byte) error {
if s.Uploader == nil {
s.notifyFailure("FTP/SFTP not configured")
return fmt.Errorf("ftp uploader is nil")
}
if len(pngBytes) == 0 {
s.notifyFailure("empty screenshot")
return fmt.Errorf("empty screenshot")
}
relPath, err := buildFTPRemotePath(s.Cfg.PathPrefix)
if err != nil {
s.notifyFailure(err.Error())
return err
}
protocol := normalizedFTPProtocol(s.Cfg.Protocol)
start := time.Now()
ftpSvcLog().Info("file-transfer pipeline start",
"protocol", protocol,
"host", s.Cfg.Host,
"user", s.Cfg.User,
"port", s.Cfg.Port,
"size", len(pngBytes),
"remote_path", relPath,
"strict_host_key", s.Cfg.StrictHostKey)
if err := s.Uploader.Upload(ctx, relPath, pngBytes); err != nil {
ftpSvcLog().Error("file-transfer upload failed",
"protocol", protocol,
"remote_path", relPath,
"elapsed", time.Since(start),
"err", err)
s.notifyFailure(strings.ToUpper(protocol) + " upload failed: " + err.Error())
return err
}
clipText := ftpShareText(protocol, s.Cfg.RootDirectory, relPath)
if s.Clipboard != nil {
if err := s.Clipboard.WriteText(clipText); err != nil {
s.notifyFailure("clipboard write failed: " + err.Error())
return err
}
}
if s.Notifier != nil {
s.Notifier.NotifySuccess(clipText)
}
ftpSvcLog().Info("file-transfer pipeline done",
"protocol", protocol,
"remote_path", relPath,
"total_elapsed", time.Since(start))
return nil
}
// buildFTPRemotePath validates the user-controlled prefix before reusing the
// existing dated remote-path generator shared with SSH/SCP.
func buildFTPRemotePath(prefix string) (string, error) {
if err := validateFTPPathPrefix(prefix); err != nil {
return "", err
}
prefix = strings.TrimSpace(prefix)
prefix = strings.TrimPrefix(prefix, "~")
prefix = strings.TrimLeft(prefix, "/")
return buildRemoteRelPath(prefix), nil
}
func validateFTPPathPrefix(prefix string) error {
if strings.ContainsAny(prefix, "\x00\r\n\\") {
return fmt.Errorf("FTP/SFTP path contains an invalid character")
}
prefix = strings.TrimSpace(prefix)
prefix = strings.TrimPrefix(prefix, "~")
prefix = strings.TrimLeft(prefix, "/")
for _, segment := range strings.Split(prefix, "/") {
if segment == ".." {
return fmt.Errorf("FTP/SFTP path must stay inside the login directory")
}
}
return nil
}
func normalizedFTPProtocol(protocol string) string {
if protocol == domain.FTPProtocolSFTP {
return domain.FTPProtocolSFTP
}
return domain.FTPProtocolFTP
}
func ftpShareText(protocol, rootDirectory, relPath string) string {
rootDirectory = strings.TrimSpace(rootDirectory)
if rootDirectory == "" {
if protocol == domain.FTPProtocolSFTP {
rootDirectory = "~/"
} else {
rootDirectory = "/"
}
}
return strings.TrimRight(rootDirectory, "/") + "/" + strings.TrimLeft(relPath, "/")
}
func (s *CaptureAndFTPService) notifyFailure(reason string) {
if s.Notifier != nil {
s.Notifier.NotifyFailure(reason)
}
}
+160
View File
@@ -0,0 +1,160 @@
package application
import (
"context"
"errors"
"strings"
"testing"
"github.com/mmmy/snapgo/internal/domain"
)
type fakeFTPUploader struct {
path string
data []byte
err error
}
func (f *fakeFTPUploader) Upload(_ context.Context, remoteRelPath string, data []byte) error {
f.path = remoteRelPath
f.data = append([]byte(nil), data...)
return f.err
}
func TestCaptureAndFTPServiceUploadsAndCopiesFTPPath(t *testing.T) {
uploader := &fakeFTPUploader{}
clip := &fakeClipboard{}
notifier := &fakeNotifier{}
svc := &CaptureAndFTPService{
Uploader: uploader,
Clipboard: clip,
Notifier: notifier,
Cfg: domain.FTPConfig{
Protocol: domain.FTPProtocolFTP,
PathPrefix: "snapgo/",
},
}
if err := svc.ExecuteWithBytes(context.Background(), []byte("png")); err != nil {
t.Fatalf("upload FTP screenshot: %v", err)
}
if string(uploader.data) != "png" {
t.Fatalf("expected PNG bytes, got %q", string(uploader.data))
}
if !strings.HasPrefix(uploader.path, "snapgo/") || !strings.HasSuffix(uploader.path, ".png") {
t.Fatalf("unexpected remote path %q", uploader.path)
}
if clip.text != "/"+uploader.path {
t.Fatalf("expected FTP root path copied, got %q", clip.text)
}
if notifier.success != clip.text {
t.Fatalf("expected success notification %q, got %q", clip.text, notifier.success)
}
}
func TestCaptureAndFTPServiceCopiesConfiguredRootPath(t *testing.T) {
uploader := &fakeFTPUploader{}
clip := &fakeClipboard{}
svc := &CaptureAndFTPService{
Uploader: uploader,
Clipboard: clip,
Cfg: domain.FTPConfig{
Protocol: domain.FTPProtocolSFTP,
RootDirectory: "~/ftp/",
PathPrefix: "images",
},
}
if err := svc.ExecuteWithBytes(context.Background(), []byte("png")); err != nil {
t.Fatalf("upload SFTP screenshot: %v", err)
}
if clip.text != "~/ftp/"+uploader.path {
t.Fatalf("expected configured SFTP root path copied, got %q", clip.text)
}
}
func TestFTPShareTextJoinsConfiguredRootAndRemoteDirectory(t *testing.T) {
const relPath = "snapgo/2026/07/20260713-110413-18lnbx.png"
const want = "~/ftp/snapgo/2026/07/20260713-110413-18lnbx.png"
if got := ftpShareText(domain.FTPProtocolSFTP, "~/ftp/", relPath); got != want {
t.Fatalf("ftpShareText() = %q, want %q", got, want)
}
}
func TestFTPShareTextUsesProtocolDefaultWhenRootDirectoryIsEmpty(t *testing.T) {
const relPath = "snapgo/2026/07/image.png"
tests := []struct {
name string
protocol string
want string
}{
{name: "FTP", protocol: domain.FTPProtocolFTP, want: "/" + relPath},
{name: "SFTP", protocol: domain.FTPProtocolSFTP, want: "~/" + relPath},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := ftpShareText(tt.protocol, "", relPath); got != tt.want {
t.Fatalf("ftpShareText() = %q, want %q", got, tt.want)
}
})
}
}
func TestCaptureAndFTPServiceRejectsTraversalBeforeUpload(t *testing.T) {
uploader := &fakeFTPUploader{}
notifier := &fakeNotifier{}
svc := &CaptureAndFTPService{
Uploader: uploader,
Notifier: notifier,
Cfg: domain.FTPConfig{
Protocol: domain.FTPProtocolSFTP,
PathPrefix: "../../outside",
},
}
err := svc.ExecuteWithBytes(context.Background(), []byte("png"))
if err == nil {
t.Fatal("expected traversal prefix to fail")
}
if uploader.path != "" {
t.Fatalf("uploader should not run, got path %q", uploader.path)
}
if notifier.failure == "" {
t.Fatal("expected failure notification")
}
}
func TestCaptureAndFTPServiceSurfacesUploadFailure(t *testing.T) {
want := errors.New("server unavailable")
uploader := &fakeFTPUploader{err: want}
clip := &fakeClipboard{}
notifier := &fakeNotifier{}
svc := &CaptureAndFTPService{
Uploader: uploader,
Clipboard: clip,
Notifier: notifier,
Cfg: domain.FTPConfig{Protocol: domain.FTPProtocolFTP},
}
err := svc.ExecuteWithBytes(context.Background(), []byte("png"))
if !errors.Is(err, want) {
t.Fatalf("expected %v, got %v", want, err)
}
if clip.text != "" {
t.Fatalf("clipboard should remain empty, got %q", clip.text)
}
if !strings.Contains(notifier.failure, "server unavailable") {
t.Fatalf("unexpected failure notification %q", notifier.failure)
}
}
func TestBuildFTPRemotePathNormalizesLoginRootMarkers(t *testing.T) {
remotePath, err := buildFTPRemotePath(" ~////snapgo/ ")
if err != nil {
t.Fatalf("build remote path: %v", err)
}
if strings.HasPrefix(remotePath, "/") || !strings.HasPrefix(remotePath, "snapgo/") {
t.Fatalf("expected relative snapgo path, got %q", remotePath)
}
}
+88 -5
View File
@@ -1,8 +1,8 @@
// Package domain — configuration types.
//
// S3Config and SSHConfig are intentionally split into their own structs so
// that future providers can introduce their own configuration types side-
// by-side without polluting the core domain types file.
// S3Config, SSHConfig, and FTPConfig are intentionally split into their own
// structs so future providers can introduce configuration types side-by-side
// without polluting the core domain types file.
package domain
// S3Config describes the connection parameters for any S3-compatible
@@ -72,6 +72,37 @@ type SSHConfig struct {
ConnectTimeoutSecs int `json:"connectTimeoutSecs"`
}
// FTPConfig describes a file-transfer destination reached through FTP or
// SFTP. It is intentionally separate from SSHConfig: SFTP uses the SSH
// transport, but it is a different file-transfer protocol from the existing
// SCP action and has its own remote-root semantics.
//
// Field design notes:
// - Protocol is either "ftp" or "sftp". Their default ports are 21 and 22.
// - AuthMethod is used only by SFTP. "password" uses Password, while "key"
// reuses the local ssh-agent and ~/.ssh/id_* discovery used by SSH/SCP.
// - PathPrefix is relative to the account's login root. The application
// rejects absolute paths and traversal segments before uploading.
// - RootDirectory is only used to build the path copied to the clipboard.
// Keeping it separate from PathPrefix lets the server expose a login root
// such as "~/ftp/" while uploads still target a relative directory such
// as "snapgo/".
// - StrictHostKey and KnownHostsPath apply only to SFTP. Plain FTP has no
// host-key mechanism and sends credentials and data without encryption.
type FTPConfig struct {
Protocol string `json:"protocol"`
Host string `json:"host"`
Port int `json:"port"`
User string `json:"user"`
AuthMethod string `json:"authMethod"`
Password string `json:"password"`
RootDirectory string `json:"rootDirectory"`
PathPrefix string `json:"pathPrefix"`
StrictHostKey bool `json:"strictHostKey"`
KnownHostsPath string `json:"knownHostsPath"`
ConnectTimeoutSecs int `json:"connectTimeoutSecs"`
}
// LLMProviderConfig stores one OpenAI-compatible multimodal chat endpoint.
//
// The three built-in providers (Qwen, Doubao/Ark, OpenAI-compatible) all use
@@ -145,6 +176,12 @@ const (
SSHAuthKerberos = "kerberos"
)
// File-transfer protocol identifiers stored in FTPConfig.Protocol.
const (
FTPProtocolFTP = "ftp"
FTPProtocolSFTP = "sftp"
)
// Built-in LLM provider identifiers.
const (
LLMProviderQwen = "qwen"
@@ -181,8 +218,8 @@ func (c SSHConfig) IsKerberos() bool {
// AppConfig is the top-level on-disk configuration document.
//
// We keep S3 / SSH nested so that adding more providers later (e.g. AliyunOSS,
// COS, FTP) only requires a new sibling field rather than a schema rewrite.
// We keep S3 / SSH / FTP nested so adding another provider later only requires
// a new sibling field rather than a schema rewrite.
type AppConfig struct {
// Hotkey describes the global shortcut that triggers a capture.
// Stored as a human-readable string like "cmd+shift+a"; parsing happens
@@ -199,6 +236,9 @@ type AppConfig struct {
// destination triggered by the save-remote toolbar button.
SSH SSHConfig `json:"ssh"`
// FTP holds the destination used by the dedicated FTP/SFTP toolbar action.
FTP FTPConfig `json:"ftp"`
// LLM holds provider settings for the "copy summary" screenshot action.
LLM LLMConfig `json:"llm"`
@@ -221,6 +261,15 @@ func DefaultAppConfig() AppConfig {
ConnectTimeoutSecs: 10,
StrictHostKey: false,
},
FTP: FTPConfig{
Protocol: FTPProtocolFTP,
Port: 21,
AuthMethod: SSHAuthPassword,
RootDirectory: "/",
PathPrefix: "snapgo/",
ConnectTimeoutSecs: 10,
StrictHostKey: false,
},
LLM: DefaultLLMConfig(),
OCR: DefaultOCRConfig(),
}
@@ -315,6 +364,32 @@ func (c *AppConfig) Normalize() {
if c.SSH.ConnectTimeoutSecs == 0 {
c.SSH.ConnectTimeoutSecs = 10
}
if c.FTP.Protocol != FTPProtocolFTP && c.FTP.Protocol != FTPProtocolSFTP {
c.FTP.Protocol = FTPProtocolFTP
}
if c.FTP.Port == 0 {
if c.FTP.Protocol == FTPProtocolSFTP {
c.FTP.Port = 22
} else {
c.FTP.Port = 21
}
}
if c.FTP.AuthMethod != SSHAuthPassword && c.FTP.AuthMethod != SSHAuthKey {
c.FTP.AuthMethod = SSHAuthPassword
}
if c.FTP.RootDirectory == "" {
if c.FTP.Protocol == FTPProtocolSFTP {
c.FTP.RootDirectory = "~/"
} else {
c.FTP.RootDirectory = "/"
}
}
if c.FTP.PathPrefix == "" {
c.FTP.PathPrefix = "snapgo/"
}
if c.FTP.ConnectTimeoutSecs == 0 {
c.FTP.ConnectTimeoutSecs = 10
}
defaultLLM := DefaultLLMConfig()
if c.LLM.ActiveProvider == "" {
@@ -409,6 +484,14 @@ func (c AppConfig) IsSSHConfigured() bool {
return c.SSH.Host != "" && c.SSH.User != ""
}
// IsFTPConfigured reports whether the FTP/SFTP destination has the minimum
// fields required to attempt a connection. Password is not required because
// SFTP key authentication and password-less FTP accounts are both valid.
func (c AppConfig) IsFTPConfigured() bool {
return (c.FTP.Protocol == FTPProtocolFTP || c.FTP.Protocol == FTPProtocolSFTP) &&
c.FTP.Host != "" && c.FTP.User != ""
}
// ActiveLLMProvider returns the selected provider config plus a boolean
// indicating whether the selection exists.
func (c AppConfig) ActiveLLMProvider() (string, LLMProviderConfig, bool) {
+56
View File
@@ -0,0 +1,56 @@
package domain
import "testing"
func TestDefaultAppConfigIncludesFTPDefaults(t *testing.T) {
cfg := DefaultAppConfig()
if cfg.FTP.Protocol != FTPProtocolFTP {
t.Fatalf("expected default FTP protocol, got %q", cfg.FTP.Protocol)
}
if cfg.FTP.Port != 21 {
t.Fatalf("expected default FTP port 21, got %d", cfg.FTP.Port)
}
if cfg.FTP.PathPrefix != "snapgo/" {
t.Fatalf("expected default path prefix, got %q", cfg.FTP.PathPrefix)
}
if cfg.FTP.RootDirectory != "/" {
t.Fatalf("expected default root directory, got %q", cfg.FTP.RootDirectory)
}
if cfg.FTP.ConnectTimeoutSecs != 10 {
t.Fatalf("expected 10 second timeout, got %d", cfg.FTP.ConnectTimeoutSecs)
}
}
func TestNormalizeUsesSFTPDefaultPort(t *testing.T) {
cfg := AppConfig{
FTP: FTPConfig{
Protocol: FTPProtocolSFTP,
},
}
cfg.Normalize()
if cfg.FTP.Port != 22 {
t.Fatalf("expected SFTP port 22, got %d", cfg.FTP.Port)
}
if cfg.FTP.AuthMethod != SSHAuthPassword {
t.Fatalf("expected password auth default, got %q", cfg.FTP.AuthMethod)
}
if cfg.FTP.RootDirectory != "~/" {
t.Fatalf("expected SFTP home root directory, got %q", cfg.FTP.RootDirectory)
}
}
func TestIsFTPConfiguredRequiresProtocolHostAndUser(t *testing.T) {
cfg := DefaultAppConfig()
if cfg.IsFTPConfigured() {
t.Fatal("empty FTP destination should not be configured")
}
cfg.FTP.Host = "files.example.com"
cfg.FTP.User = "snapgo"
if !cfg.IsFTPConfigured() {
t.Fatal("host and user should be enough for a normalized FTP config")
}
cfg.FTP.Protocol = "invalid"
if cfg.IsFTPConfigured() {
t.Fatal("invalid protocol should not be configured")
}
}
+288
View File
@@ -0,0 +1,288 @@
// Package ftp provides the FTP side of SnapGo's FTP/SFTP destination.
//
// Design rationale:
// - Plain FTP needs a real protocol client for PASV/EPSV handling; hand-
// rolling those details would be fragile across common servers.
// - SFTP is delegated to the sibling SSH adapter so authentication, agent,
// key discovery, and known_hosts behaviour stay consistent with SCP.
// - Both implementations upload to a temporary name and rename only after
// the payload is complete, preventing a failed transfer from exposing a
// partially written screenshot at the final path.
package ftp
import (
"bytes"
"context"
"fmt"
"io"
"log/slog"
"net"
"path"
"strings"
"sync"
"time"
ftpclient "github.com/jlaffaye/ftp"
"github.com/mmmy/snapgo/internal/domain"
sshpkg "github.com/mmmy/snapgo/internal/infrastructure/ssh"
)
// RemoteUploader is the common capability exposed to app.go for FTP and
// SFTP. The application service only needs Upload; TestConnection remains an
// infrastructure concern used by the Settings probe RPC.
type RemoteUploader interface {
Upload(ctx context.Context, remoteRelPath string, data []byte) error
TestConnection(ctx context.Context) error
}
// NewUploader validates cfg and returns the adapter for its selected protocol.
func NewUploader(cfg domain.FTPConfig) (RemoteUploader, error) {
normalized, err := normalizeConfig(cfg)
if err != nil {
return nil, err
}
if normalized.Protocol == domain.FTPProtocolSFTP {
return sshpkg.NewSFTPUploader(normalized), nil
}
return &plainUploader{cfg: normalized}, nil
}
type plainUploader struct {
cfg domain.FTPConfig
}
func ftpLog() *slog.Logger { return slog.Default().With("component", "ftp") }
func normalizeConfig(cfg domain.FTPConfig) (domain.FTPConfig, error) {
cfg.Protocol = strings.ToLower(strings.TrimSpace(cfg.Protocol))
if cfg.Protocol == "" {
cfg.Protocol = domain.FTPProtocolFTP
}
if cfg.Protocol != domain.FTPProtocolFTP && cfg.Protocol != domain.FTPProtocolSFTP {
return domain.FTPConfig{}, fmt.Errorf("file transfer: protocol must be ftp or sftp")
}
cfg.Host = strings.TrimSpace(cfg.Host)
cfg.User = strings.TrimSpace(cfg.User)
if cfg.Host == "" || cfg.User == "" {
return domain.FTPConfig{}, fmt.Errorf("file transfer: host and user are required")
}
if cfg.Port <= 0 {
if cfg.Protocol == domain.FTPProtocolSFTP {
cfg.Port = 22
} else {
cfg.Port = 21
}
}
if cfg.Port > 65535 {
return domain.FTPConfig{}, fmt.Errorf("file transfer: port must be between 1 and 65535")
}
if cfg.ConnectTimeoutSecs <= 0 {
cfg.ConnectTimeoutSecs = 10
}
if cfg.AuthMethod == "" {
cfg.AuthMethod = domain.SSHAuthPassword
}
if cfg.Protocol == domain.FTPProtocolSFTP &&
cfg.AuthMethod != domain.SSHAuthPassword && cfg.AuthMethod != domain.SSHAuthKey {
return domain.FTPConfig{}, fmt.Errorf("sftp: auth method must be password or key")
}
return cfg, nil
}
func (u *plainUploader) dial(ctx context.Context) (*ftpclient.ServerConn, error) {
timeout := time.Duration(u.cfg.ConnectTimeoutSecs) * time.Second
addr := net.JoinHostPort(u.cfg.Host, fmt.Sprintf("%d", u.cfg.Port))
ftpLog().Info("FTP dial start",
"addr", addr,
"user", u.cfg.User,
"timeout", timeout,
"has_password", u.cfg.Password != "")
conn, err := ftpclient.Dial(
addr,
ftpclient.DialWithDialFunc(contextDialFunc(ctx, timeout)),
ftpclient.DialWithShutTimeout(timeout),
)
if err != nil {
return nil, fmt.Errorf("ftp: dial %s: %w", addr, err)
}
if err := conn.Login(u.cfg.User, u.cfg.Password); err != nil {
_ = conn.Quit()
return nil, fmt.Errorf("ftp: login: %w", err)
}
return conn, nil
}
// Upload stores one screenshot through plain FTP.
func (u *plainUploader) Upload(ctx context.Context, remoteRelPath string, data []byte) error {
cleaned, err := validateRemoteRelativePath(remoteRelPath)
if err != nil {
return err
}
conn, err := u.dial(ctx)
if err != nil {
return err
}
defer func() { _ = conn.Quit() }()
if err := enterFTPDirectory(conn, path.Dir(cleaned)); err != nil {
return err
}
base := path.Base(cleaned)
tempName := temporaryRemoteName(base)
removeTemp := true
defer func() {
if removeTemp {
_ = conn.Delete(tempName)
}
}()
if err := conn.Stor(tempName, &contextReader{ctx: ctx, reader: bytes.NewReader(data)}); err != nil {
if ctx.Err() != nil {
return ctx.Err()
}
return fmt.Errorf("ftp: store %s: %w", cleaned, err)
}
if err := conn.Rename(tempName, base); err != nil {
return fmt.Errorf("ftp: commit %s: %w", cleaned, err)
}
removeTemp = false
ftpLog().Info("FTP upload ok", "remote_path", cleaned, "size", len(data))
return nil
}
// TestConnection writes and removes a small probe under the configured path,
// proving that credentials and directory permissions are both usable.
func (u *plainUploader) TestConnection(ctx context.Context) error {
probe, err := probeRemotePath(u.cfg.PathPrefix)
if err != nil {
return err
}
conn, err := u.dial(ctx)
if err != nil {
return err
}
defer func() { _ = conn.Quit() }()
if err := enterFTPDirectory(conn, path.Dir(probe)); err != nil {
return err
}
base := path.Base(probe)
if err := conn.Stor(base, strings.NewReader("snapgo")); err != nil {
return fmt.Errorf("ftp probe: write: %w", err)
}
if err := conn.Delete(base); err != nil {
return fmt.Errorf("ftp probe: delete: %w", err)
}
return nil
}
// enterFTPDirectory walks to dir relative to the login root, creating missing
// segments.
func enterFTPDirectory(conn *ftpclient.ServerConn, dir string) error {
dir = strings.Trim(dir, "/")
if dir == "" || dir == "." {
return nil
}
for _, segment := range strings.Split(dir, "/") {
if err := conn.ChangeDir(segment); err == nil {
continue
}
if err := conn.MakeDir(segment); err != nil {
// A concurrent uploader may have created the directory after our
// failed CWD. Retrying CWD distinguishes that race from a real error.
if retryErr := conn.ChangeDir(segment); retryErr == nil {
continue
}
return fmt.Errorf("ftp: create directory %q: %w", segment, err)
}
if err := conn.ChangeDir(segment); err != nil {
return fmt.Errorf("ftp: enter directory %q: %w", segment, err)
}
}
return nil
}
func validateRemoteRelativePath(value string) (string, error) {
value = strings.TrimSpace(value)
if value == "" || strings.HasPrefix(value, "/") || strings.HasPrefix(value, "~") {
return "", fmt.Errorf("file transfer: remote path must be relative to the login directory")
}
if strings.ContainsAny(value, "\x00\r\n\\") {
return "", fmt.Errorf("file transfer: remote path contains an invalid character")
}
for _, segment := range strings.Split(value, "/") {
if segment == ".." {
return "", fmt.Errorf("file transfer: remote path must not contain '..'")
}
}
cleaned := path.Clean(value)
if cleaned == "." || path.Base(cleaned) == "." || path.Base(cleaned) == ".." {
return "", fmt.Errorf("file transfer: remote filename is empty")
}
return cleaned, nil
}
func probeRemotePath(prefix string) (string, error) {
prefix = strings.TrimSpace(prefix)
prefix = strings.TrimPrefix(prefix, "~")
prefix = strings.TrimLeft(prefix, "/")
probe := fmt.Sprintf(".snapgo-probe-%d", time.Now().UnixNano())
return validateRemoteRelativePath(path.Join(prefix, probe))
}
func temporaryRemoteName(base string) string {
return fmt.Sprintf(".%s.snapgo-upload-%d", base, time.Now().UnixNano())
}
type contextReader struct {
ctx context.Context
reader io.Reader
}
func contextDialFunc(ctx context.Context, timeout time.Duration) func(string, string) (net.Conn, error) {
dialer := &net.Dialer{Timeout: timeout}
return func(network, address string) (net.Conn, error) {
conn, err := dialer.DialContext(ctx, network, address)
if err != nil {
return nil, err
}
wrapped := &cancelableConn{
Conn: conn,
done: make(chan struct{}),
}
go func() {
select {
case <-ctx.Done():
_ = wrapped.Close()
case <-wrapped.done:
}
}()
return wrapped, nil
}
}
type cancelableConn struct {
net.Conn
done chan struct{}
once sync.Once
}
func (c *cancelableConn) Close() error {
var err error
c.once.Do(func() {
close(c.done)
err = c.Conn.Close()
})
return err
}
func (r *contextReader) Read(p []byte) (int, error) {
select {
case <-r.ctx.Done():
return 0, r.ctx.Err()
default:
return r.reader.Read(p)
}
}
@@ -0,0 +1,34 @@
package ftp
import "testing"
func TestValidateRemoteRelativePath(t *testing.T) {
valid, err := validateRemoteRelativePath("snapgo/2026/07/image.png")
if err != nil {
t.Fatalf("valid path rejected: %v", err)
}
if valid != "snapgo/2026/07/image.png" {
t.Fatalf("unexpected normalized path %q", valid)
}
invalid := []string{
"",
"/absolute/image.png",
"~/image.png",
"../image.png",
"snapgo/../../image.png",
"snapgo\\image.png",
"snapgo/image.png\nnext",
}
for _, value := range invalid {
if _, err := validateRemoteRelativePath(value); err == nil {
t.Errorf("expected %q to be rejected", value)
}
}
}
func TestProbeRemotePathRejectsTraversalPrefix(t *testing.T) {
if _, err := probeRemotePath("../../outside"); err == nil {
t.Fatal("expected traversal prefix to fail")
}
}
+133
View File
@@ -264,6 +264,9 @@ func parseOCRText(data []byte) (string, error) {
if msg := responseError(root); msg != "" {
return "", errors.New(msg)
}
if text := normalizeOCRText(extractOverallOCRText(root, "")); text != "" {
return text, nil
}
parts := collectOCRParts(root, "")
if len(parts) == 0 {
return "", fmt.Errorf("no text found")
@@ -312,6 +315,62 @@ func responseError(v any) string {
return ""
}
func extractOverallOCRText(v any, parentKey string) string {
switch value := v.(type) {
case string:
text := strings.TrimSpace(value)
if text == "" {
return ""
}
if looksLikeJSON(text) {
var nested any
if err := json.Unmarshal([]byte(text), &nested); err == nil {
if nestedText := extractOverallOCRText(nested, parentKey); nestedText != "" {
return nestedText
}
}
}
if isAggregateContainerKey(parentKey) {
return text
}
return ""
case map[string]any:
for _, key := range aggregateTextKeys() {
if child, ok := value[key]; ok {
if text := extractOverallOCRText(child, key); text != "" {
return text
}
}
}
for _, key := range responseContainerKeys() {
if child, ok := value[key]; ok {
if text := extractOverallOCRText(child, key); text != "" {
return text
}
}
}
keys := make([]string, 0, len(value))
for key := range value {
keys = append(keys, key)
}
sort.Strings(keys)
for _, key := range keys {
if isAggregateTextKey(key) ||
isResponseContainerKey(key) ||
isBlockContainerKey(key) ||
isMetadataKey(key) {
continue
}
if text := extractOverallOCRText(value[key], key); text != "" {
return text
}
}
return ""
default:
return ""
}
}
func collectOCRParts(v any, parentKey string) []string {
switch value := v.(type) {
case string:
@@ -359,6 +418,36 @@ func collectOCRParts(v any, parentKey string) []string {
}
}
func aggregateTextKeys() []string {
return []string{
"content",
"Content",
"text",
"Text",
"full_text",
"FullText",
"fullText",
"plain_text",
"PlainText",
"plainText",
"recognized_text",
"RecognizedText",
"recognizedText",
"ocr_text",
"OCRText",
"ocrText",
}
}
func responseContainerKeys() []string {
return []string{
"Data",
"data",
"Result",
"result",
}
}
func priorityOCRKeys() []string {
return []string{
"Data",
@@ -394,6 +483,38 @@ func priorityOCRKeys() []string {
}
}
func isAggregateTextKey(key string) bool {
for _, item := range aggregateTextKeys() {
if item == key {
return true
}
}
return false
}
func isAggregateContainerKey(key string) bool {
return isAggregateTextKey(key) || isResponseContainerKey(key)
}
func isResponseContainerKey(key string) bool {
for _, item := range responseContainerKeys() {
if item == key {
return true
}
}
return false
}
func isBlockContainerKey(key string) bool {
switch normalizeKey(key) {
case "wordsresult", "prismwordsinfo", "prismwords", "ocrinfos", "items",
"blocks", "regions", "words", "linetexts", "lines", "cells":
return true
default:
return false
}
}
func isPriorityOCRKey(key string) bool {
for _, item := range priorityOCRKeys() {
if item == key {
@@ -459,6 +580,18 @@ func dedupeNonEmpty(parts []string) []string {
return out
}
func normalizeOCRText(text string) string {
lines := strings.Split(strings.TrimSpace(text), "\n")
out := make([]string, 0, len(lines))
for _, line := range lines {
line = strings.TrimSpace(line)
if line != "" {
out = append(out, line)
}
}
return strings.Join(out, "\n")
}
func looksLikeJSON(text string) bool {
return strings.HasPrefix(text, "{") || strings.HasPrefix(text, "[")
}
@@ -142,6 +142,33 @@ func TestParseOCRTextSupportsWordsResult(t *testing.T) {
}
}
func TestParseOCRTextPrefersOverallContentOverBlocks(t *testing.T) {
text, err := parseOCRText([]byte(`{
"Data": "{\"content\":\"整体识别文本\",\"prism_wordsInfo\":[{\"word\":\"整体\"},{\"word\":\"识别\"},{\"word\":\"文本\"}]}"
}`))
if err != nil {
t.Fatalf("parse ocr text: %v", err)
}
if text != "整体识别文本" {
t.Fatalf("expected overall content only, got %q", text)
}
}
func TestParseOCRTextPrefersResultTextOverWordsResult(t *testing.T) {
text, err := parseOCRText([]byte(`{
"Result": {
"text": "hello world",
"words_result": [{"words":"hello"},{"words":"world"}]
}
}`))
if err != nil {
t.Fatalf("parse ocr text: %v", err)
}
if text != "hello world" {
t.Fatalf("expected result text only, got %q", text)
}
}
func TestParseOCRTextReturnsProviderError(t *testing.T) {
_, err := parseOCRText([]byte(`{"ResponseMetadata":{"Error":{"Code":"BadRequest","Message":"bad image"}}}`))
if err == nil || !strings.Contains(err.Error(), "bad image") {
@@ -0,0 +1,213 @@
package ssh
import (
"bytes"
"context"
"fmt"
"io"
"os"
"path"
"strings"
"time"
"github.com/pkg/sftp"
"github.com/mmmy/snapgo/internal/domain"
)
// SFTPUploader transfers screenshots through the SSH File Transfer Protocol.
// It lives beside the SCP client so both protocols share the same SSH
// authentication and host-key implementation without duplicating credential
// discovery code.
type SFTPUploader struct {
cfg domain.FTPConfig
}
// NewSFTPUploader returns a short-lived SFTP adapter. A fresh SSH/SFTP
// connection is opened for every upload or connection probe.
func NewSFTPUploader(cfg domain.FTPConfig) *SFTPUploader {
return &SFTPUploader{cfg: cfg}
}
func (u *SFTPUploader) sshConfig() domain.SSHConfig {
return domain.SSHConfig{
Host: u.cfg.Host,
Port: u.cfg.Port,
User: u.cfg.User,
AuthMethod: u.cfg.AuthMethod,
Password: u.cfg.Password,
StrictHostKey: u.cfg.StrictHostKey,
KnownHostsPath: u.cfg.KnownHostsPath,
ConnectTimeoutSecs: u.cfg.ConnectTimeoutSecs,
}
}
func (u *SFTPUploader) dial(ctx context.Context) (*Client, *sftp.Client, error) {
sshClient, err := Dial(ctx, u.sshConfig())
if err != nil {
return nil, nil, fmt.Errorf("sftp: %w", err)
}
sftpClient, err := sftp.NewClient(sshClient.client)
if err != nil {
_ = sshClient.Close()
return nil, nil, fmt.Errorf("sftp: start subsystem: %w", err)
}
return sshClient, sftpClient, nil
}
// Upload writes data to a temporary file and atomically exposes it at the
// final relative path after the transfer completes.
func (u *SFTPUploader) Upload(ctx context.Context, remoteRelPath string, data []byte) error {
cleaned, err := validateSFTPRemotePath(remoteRelPath)
if err != nil {
return err
}
sshClient, sftpClient, err := u.dial(ctx)
if err != nil {
return err
}
done := closeSFTPOnCancel(ctx, sshClient, sftpClient)
defer sshClient.Close()
defer sftpClient.Close()
defer close(done)
dir := path.Dir(cleaned)
if dir != "." {
if err := sftpClient.MkdirAll(dir); err != nil {
return fmt.Errorf("sftp: create directory %s: %w", dir, err)
}
}
tempPath := path.Join(dir, temporarySFTPName(path.Base(cleaned)))
removeTemp := true
defer func() {
if removeTemp {
_ = sftpClient.Remove(tempPath)
}
}()
file, err := sftpClient.OpenFile(tempPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC)
if err != nil {
return fmt.Errorf("sftp: create temporary file: %w", err)
}
reader := &sftpContextReader{ctx: ctx, reader: bytes.NewReader(data)}
_, copyErr := io.Copy(file, reader)
if copyErr == nil {
copyErr = file.Chmod(0o644)
}
closeErr := file.Close()
if copyErr != nil {
if ctx.Err() != nil {
return ctx.Err()
}
return fmt.Errorf("sftp: write %s: %w", cleaned, copyErr)
}
if closeErr != nil {
return fmt.Errorf("sftp: close %s: %w", cleaned, closeErr)
}
if err := sftpClient.Rename(tempPath, cleaned); err != nil {
return fmt.Errorf("sftp: commit %s: %w", cleaned, err)
}
removeTemp = false
sshLog().Info("SFTP upload ok", "remote_path", cleaned, "size", len(data))
return nil
}
// TestConnection verifies SFTP write/delete permissions with a small probe.
func (u *SFTPUploader) TestConnection(ctx context.Context) error {
probe, err := sftpProbePath(u.cfg.PathPrefix)
if err != nil {
return err
}
sshClient, sftpClient, err := u.dial(ctx)
if err != nil {
return err
}
done := closeSFTPOnCancel(ctx, sshClient, sftpClient)
defer sshClient.Close()
defer sftpClient.Close()
defer close(done)
dir := path.Dir(probe)
if dir != "." {
if err := sftpClient.MkdirAll(dir); err != nil {
return fmt.Errorf("sftp probe: create directory: %w", err)
}
}
file, err := sftpClient.OpenFile(probe, os.O_WRONLY|os.O_CREATE|os.O_TRUNC)
if err != nil {
return fmt.Errorf("sftp probe: create: %w", err)
}
_, writeErr := file.Write([]byte("snapgo"))
closeErr := file.Close()
if writeErr != nil {
_ = sftpClient.Remove(probe)
return fmt.Errorf("sftp probe: write: %w", writeErr)
}
if closeErr != nil {
_ = sftpClient.Remove(probe)
return fmt.Errorf("sftp probe: close: %w", closeErr)
}
if err := sftpClient.Remove(probe); err != nil {
return fmt.Errorf("sftp probe: delete: %w", err)
}
return nil
}
func closeSFTPOnCancel(ctx context.Context, sshClient *Client, sftpClient *sftp.Client) chan struct{} {
done := make(chan struct{})
go func() {
select {
case <-ctx.Done():
_ = sftpClient.Close()
_ = sshClient.Close()
case <-done:
}
}()
return done
}
func validateSFTPRemotePath(value string) (string, error) {
value = strings.TrimSpace(value)
if value == "" || strings.HasPrefix(value, "/") || strings.HasPrefix(value, "~") {
return "", fmt.Errorf("sftp: remote path must be relative to the login directory")
}
if strings.ContainsAny(value, "\x00\r\n\\") {
return "", fmt.Errorf("sftp: remote path contains an invalid character")
}
for _, segment := range strings.Split(value, "/") {
if segment == ".." {
return "", fmt.Errorf("sftp: remote path must not contain '..'")
}
}
cleaned := path.Clean(value)
if cleaned == "." || path.Base(cleaned) == "." || path.Base(cleaned) == ".." {
return "", fmt.Errorf("sftp: remote filename is empty")
}
return cleaned, nil
}
func sftpProbePath(prefix string) (string, error) {
prefix = strings.TrimSpace(prefix)
prefix = strings.TrimPrefix(prefix, "~")
prefix = strings.TrimLeft(prefix, "/")
return validateSFTPRemotePath(path.Join(prefix, fmt.Sprintf(".snapgo-probe-%d", time.Now().UnixNano())))
}
func temporarySFTPName(base string) string {
return fmt.Sprintf(".%s.snapgo-upload-%d", base, time.Now().UnixNano())
}
type sftpContextReader struct {
ctx context.Context
reader io.Reader
}
func (r *sftpContextReader) Read(p []byte) (int, error) {
select {
case <-r.ctx.Done():
return 0, r.ctx.Err()
default:
return r.reader.Read(p)
}
}
@@ -0,0 +1,28 @@
package ssh
import "testing"
func TestValidateSFTPRemotePathRejectsTraversal(t *testing.T) {
if got, err := validateSFTPRemotePath("snapgo/2026/image.png"); err != nil || got != "snapgo/2026/image.png" {
t.Fatalf("valid path: got %q err=%v", got, err)
}
for _, value := range []string{
"",
"/absolute/image.png",
"~/image.png",
"../image.png",
"snapgo/../../image.png",
"snapgo\\image.png",
} {
if _, err := validateSFTPRemotePath(value); err == nil {
t.Errorf("expected %q to be rejected", value)
}
}
}
func TestSFTPProbePathRejectsTraversalPrefix(t *testing.T) {
if _, err := sftpProbePath("../../outside"); err == nil {
t.Fatal("expected traversal prefix to fail")
}
}
+1 -1
View File
@@ -74,7 +74,7 @@ func main() {
WindowIsTranslucent: true,
About: &mac.AboutInfo{
Title: "SnapGo",
Message: "Cross-platform screenshot tool with one-click upload to S3.",
Message: "Cross-platform screenshot tool with one-click upload to S3, FTP, SFTP, or SSH.",
},
},
})
+12
View File
@@ -74,6 +74,18 @@ func nativeOverlaySaveRemote(x, y, w, h C.int, annotationsJSON *C.char) {
}()
}
//export nativeOverlayUploadFTP
func nativeOverlayUploadFTP(x, y, w, h C.int, annotationsJSON *C.char) {
app := consumeNativeOverlayApp()
if app == nil {
return
}
result := nativeCaptureResult(x, y, w, h, annotationsJSON)
go func() {
_ = app.UploadNativeRegionToFTP(result)
}()
}
//export nativeOverlaySummarize
func nativeOverlaySummarize(x, y, w, h C.int, annotationsJSON *C.char) {
app := consumeNativeOverlayApp()
+806 -104
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
VITE_BASE_PATH=/
+10
View File
@@ -0,0 +1,10 @@
node_modules
dist
dist-ssr
.vite
.DS_Store
*.log
tsconfig.node.tsbuildinfo
tsconfig.app.tsbuildinfo
upload_koodo.py
+22
View File
@@ -0,0 +1,22 @@
<!doctype html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/png" sizes="64x64" href="%BASE_URL%favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta
name="description"
content="SnapGo — 截完图,链接已经在你剪贴板里。常驻菜单栏的轻量截图工具,一键上传到你自己的 S3 兼容对象存储。"
/>
<meta property="og:title" content="SnapGo — 截完图,链接已经在剪贴板里" />
<meta
property="og:description"
content="常驻菜单栏的轻量截图工具,一键上传到你自己的 S3 兼容对象存储。"
/>
<title>SnapGo — 截完图,链接已经在剪贴板里</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
+2239
View File
File diff suppressed because it is too large Load Diff
+25
View File
@@ -0,0 +1,25 @@
{
"name": "snapgo-landing",
"private": true,
"version": "0.1.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc -b && vite build",
"preview": "vite preview",
"typecheck": "tsc -b --noEmit"
},
"dependencies": {
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@tailwindcss/vite": "^4.0.0",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.4",
"tailwindcss": "^4.0.0",
"typescript": "^5.6.3",
"vite": "^5.4.11"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

+268
View File
@@ -0,0 +1,268 @@
import { useMemo, useRef, useState, type AnimationEvent } from "react";
import logoUrl from "./assets/logo-universal.png";
import ShowcaseVisual from "./ShowcaseVisual";
const slides = [
{
eyebrow: "UPLOAD",
title: "直达云端",
body: "截图可直接保存至对象存储、远端服务器等,并将地址直接复制到剪切板。",
metric: "OBS / SSH / FTP",
feature: "支持多种远端存储配置",
},
{
eyebrow: "IDENTIFICATION",
title: "智能识别",
body: "截图可按你配置进行 AI 识别与总结,直接将你所需要的答案复制到剪切板。",
metric: "AI",
feature: "支持自定义 prompt 与多 provider",
},
{
eyebrow: "OCR",
title: "文字提取",
body: "截图可自动识别其中的文本文字,并将文字直接复制到剪切板。",
metric: "TEXT",
feature: "兼容多个主流的 OCR 服务",
},
{
eyebrow: "CAPTURE",
title: "功能完备",
body: "完善的截图功能,支持各类标注、打码,直接复制与本机保存。",
metric: "⌘⇧S",
feature: "全局快捷键唤起",
},
];
type SlideDirection = -1 | 1;
type SlideTransition = {
from: number;
direction: SlideDirection;
};
function Logo() {
return (
<div className="brand" aria-label="SnapGo logo">
<div className="brand-main">
<span className="logo-mark">
<img src={logoUrl} alt="SnapGo" />
</span>
<span className="brand-name">SnapGo</span>
</div>
<p className="brand-overline">AI SCREENSHOT UTILITY</p>
</div>
);
}
export default function App() {
const [activeSlide, setActiveSlide] = useState(0);
const [slideTransition, setSlideTransition] = useState<SlideTransition | null>(null);
const dragStartX = useRef<number | null>(null);
const active = slides[activeSlide];
function getTransitionClass(role: "entering" | "exiting") {
if (!slideTransition) {
return "";
}
const edge = slideTransition.direction === 1 ? "right" : "left";
return `is-${role}-from-${edge}`;
}
function finishSlideTransition(event: AnimationEvent<HTMLElement>) {
if (event.target === event.currentTarget) {
setSlideTransition(null);
}
}
function selectSlide(nextSlide: number, direction: SlideDirection) {
if (slideTransition || nextSlide === activeSlide) {
return;
}
setSlideTransition({ from: activeSlide, direction });
setActiveSlide(nextSlide);
}
function selectDotSlide(nextSlide: number) {
const forwardDistance = (nextSlide - activeSlide + slides.length) % slides.length;
const backwardDistance = (activeSlide - nextSlide + slides.length) % slides.length;
selectSlide(nextSlide, forwardDistance <= backwardDistance ? 1 : -1);
}
const accentDots = useMemo(
() =>
slides.map((slide, index) => (
<button
key={slide.eyebrow}
className={`dot ${index === activeSlide ? "is-active" : ""}`}
type="button"
aria-label={`查看 ${slide.title}`}
onClick={() => selectDotSlide(index)}
/>
)),
[activeSlide, slideTransition],
);
function moveSlide(direction: SlideDirection) {
const nextSlide = (activeSlide + direction + slides.length) % slides.length;
selectSlide(nextSlide, direction);
}
function handlePointerEnd(clientX: number) {
if (dragStartX.current === null) {
return;
}
const delta = clientX - dragStartX.current;
dragStartX.current = null;
if (Math.abs(delta) < 42) {
return;
}
moveSlide(delta > 0 ? -1 : 1);
}
return (
<main className="landing-shell">
<div className="ambient ambient-one" aria-hidden="true" />
<div className="ambient ambient-two" aria-hidden="true" />
<Logo />
<section className="hero-copy" aria-labelledby="landing-title">
<h1 id="landing-title">AI </h1>
<p className="subtitle">便 AI </p>
<p className="intro">
..
<br />
</p>
<div className="cta-row" aria-label="下载与项目链接">
<div className="download-cta-group">
<a className="primary-cta" href="https://gitea.mamamiyear.site/mamamiyear/SnapGo">
<span className="apple-logo" aria-hidden="true"></span>
Mac
<svg viewBox="0 0 20 20" aria-hidden="true">
<path d="M5 10h9M10.5 6.5 14 10l-3.5 3.5" />
</svg>
</a>
<span className="platform-note">Windows/Linux </span>
</div>
<a
className="github-cta"
href="https://gitea.mamamiyear.site/mamamiyear/SnapGo"
aria-label="查看源码"
title="查看源码"
>
<svg viewBox="0 0 24 24" aria-hidden="true">
<path
fillRule="evenodd"
clipRule="evenodd"
d="M12 2C6.48 2 2 6.58 2 12.23c0 4.52 2.87 8.35 6.84 9.7.5.09.68-.22.68-.49 0-.24-.01-.88-.01-1.73-2.78.62-3.37-1.37-3.37-1.37-.45-1.18-1.11-1.5-1.11-1.5-.91-.64.07-.63.07-.63 1 .07 1.53 1.06 1.53 1.06.9 1.57 2.34 1.12 2.91.86.09-.67.35-1.12.64-1.38-2.22-.26-4.56-1.14-4.56-5.06 0-1.12.39-2.03 1.03-2.74-.1-.26-.45-1.3.1-2.7 0 0 .84-.28 2.75 1.05A9.32 9.32 0 0 1 12 6.96c.85 0 1.7.12 2.5.34 1.91-1.33 2.75-1.05 2.75-1.05.55 1.4.2 2.44.1 2.7.64.71 1.03 1.62 1.03 2.74 0 3.93-2.34 4.8-4.57 5.05.36.32.68.94.68 1.9 0 1.38-.01 2.49-.01 2.83 0 .27.18.59.69.49A10.1 10.1 0 0 0 22 12.23C22 6.58 17.52 2 12 2Z"
/>
</svg>
</a>
</div>
</section>
<section className="product-showcase" aria-label="SnapGo 功能效果展示">
<div
className="device-card"
onPointerDown={(event) => {
dragStartX.current = event.clientX;
}}
onPointerUp={(event) => handlePointerEnd(event.clientX)}
onPointerCancel={() => {
dragStartX.current = null;
}}
onPointerLeave={() => {
dragStartX.current = null;
}}
>
<div className="window-chrome" aria-hidden="true">
<span />
<span />
<span />
</div>
<div className="preview-stage">
{slideTransition && (
<div
key={`visual-${slideTransition.from}`}
className={`carousel-slide is-exiting ${getTransitionClass("exiting")}`}
aria-hidden="true"
>
<ShowcaseVisual activeIndex={slideTransition.from} />
</div>
)}
<div
key={`visual-${activeSlide}`}
className={`carousel-slide ${slideTransition ? `is-entering ${getTransitionClass("entering")}` : ""}`}
onAnimationEnd={finishSlideTransition}
>
<ShowcaseVisual activeIndex={activeSlide} />
</div>
</div>
<div className="slide-panel-viewport">
{slideTransition && (
<div
key={`copy-${slideTransition.from}`}
className={`slide-panel is-exiting ${getTransitionClass("exiting")}`}
aria-hidden="true"
>
<p>{slides[slideTransition.from].eyebrow}</p>
<h2>{slides[slideTransition.from].title}</h2>
<span>{slides[slideTransition.from].body}</span>
</div>
)}
<div
key={`copy-${activeSlide}`}
className={`slide-panel ${slideTransition ? `is-entering ${getTransitionClass("entering")}` : ""}`}
>
<p>{active.eyebrow}</p>
<h2>{active.title}</h2>
<span>{active.body}</span>
</div>
</div>
</div>
<div className="carousel-bar">
<button type="button" className="nav-btn" aria-label="上一项" onClick={() => moveSlide(-1)}>
<svg viewBox="0 0 20 20" aria-hidden="true">
<path d="m12 5-5 5 5 5" />
</svg>
</button>
<div className="slide-meta-viewport" aria-live="polite">
{slideTransition && (
<div
key={`meta-${slideTransition.from}`}
className={`slide-meta is-exiting ${getTransitionClass("exiting")}`}
aria-hidden="true"
>
<strong>{slides[slideTransition.from].metric}</strong>
<span>{slides[slideTransition.from].feature}</span>
</div>
)}
<div
key={`meta-${activeSlide}`}
className={`slide-meta ${slideTransition ? `is-entering ${getTransitionClass("entering")}` : ""}`}
>
<strong>{active.metric}</strong>
<span>{active.feature}</span>
</div>
</div>
<div className="dots" aria-label="轮播分页">
{accentDots}
</div>
<button type="button" className="nav-btn" aria-label="下一项" onClick={() => moveSlide(1)}>
<svg viewBox="0 0 20 20" aria-hidden="true">
<path d="m8 5 5 5-5 5" />
</svg>
</button>
</div>
</section>
</main>
);
}
+435
View File
@@ -0,0 +1,435 @@
import { useState, type PointerEvent } from "react";
type ShowcaseVisualProps = {
activeIndex: number;
};
type CaptureTool = "rect" | "arrow" | "pen" | "mosaic";
type OcrLanguage = "zh" | "en" | "auto";
type UploadDestination = {
id: "obs" | "ssh" | "ftp";
label: string;
detail: string;
};
const destinations: UploadDestination[] = [
{ id: "obs", label: "OBS", detail: "Bucket" },
{ id: "ssh", label: "SSH", detail: "Server" },
{ id: "ftp", label: "FTP", detail: "Remote" },
];
const uploadRoutes: Record<UploadDestination["id"], string> = {
obs: "M 50 30 C 59 30 61 17 71 17",
ssh: "M 50 30 C 58 30 63 30 71 30",
ftp: "M 50 30 C 59 30 61 43 71 43",
};
const ocrModes: Array<{
id: OcrLanguage;
label: string;
name: string;
lines: string[];
characters: number;
confidence: string;
}> = [
{
id: "zh",
label: "中",
name: "中文",
lines: ["让每一次截图直接进入下一步。"],
characters: 15,
confidence: "99.5%",
},
{
id: "en",
label: "EN",
name: "English",
lines: ["Capture, understand, share."],
characters: 27,
confidence: "99.1%",
},
{
id: "auto",
label: "AUTO",
name: "中英混排",
lines: ["Capture, understand, share.", "让每一次截图直接进入下一步。"],
characters: 42,
confidence: "99.2%",
},
];
const aiModes = [
{
id: "vision",
label: "识图",
result: "检测到系统权限弹窗,截图权限尚未开启。",
score: "96%",
},
{
id: "summary",
label: "总结",
result: "当前页面包含 3 个设置项,建议先开启屏幕录制权限。",
score: "93%",
},
{
id: "question",
label: "问答",
result: "前往系统设置中的隐私与安全性即可完成授权。",
score: "98%",
},
];
const captureTools: Array<{ id: CaptureTool; label: string }> = [
{ id: "rect", label: "矩形" },
{ id: "arrow", label: "箭头" },
{ id: "pen", label: "画笔" },
{ id: "mosaic", label: "马赛克" },
];
function stopSceneDrag(event: PointerEvent<HTMLElement>) {
event.stopPropagation();
}
function UploadScene() {
const [selected, setSelected] = useState<UploadDestination>(destinations[0]);
const routePath = uploadRoutes[selected.id];
return (
<div className={`visual-scene upload-scene target-${selected.id}`}>
<div className="upload-file-card">
<div className="upload-file-preview" aria-hidden="true">
<div className="screenshot-window-bar">
<span><i /><i /><i /></span>
<b className="screenshot-address-bar" />
</div>
<div className="screenshot-window-body">
<div className="screenshot-sidebar"><i /><i /><i /><i /></div>
<div className="screenshot-main">
<span className="screenshot-heading" />
<span className="screenshot-row row-long" />
<span className="screenshot-row row-medium" />
<div className="screenshot-card-grid">
<i /><i /><i />
</div>
<div className="screenshot-copy-lines">
<i /><i /><i />
</div>
</div>
</div>
<div className="upload-capture-frame">
<i className="upload-capture-corner corner-nw" />
<i className="upload-capture-corner corner-ne" />
<i className="upload-capture-corner corner-sw" />
<i className="upload-capture-corner corner-se" />
</div>
</div>
<div className="upload-file-copy">
<span>SCREENSHOT-1428.PNG</span>
</div>
</div>
<svg
className="upload-route"
viewBox="0 0 100 60"
preserveAspectRatio="none"
aria-hidden="true"
>
<path
key={`route-${selected.id}`}
className="upload-route-line"
d={routePath}
vectorEffect="non-scaling-stroke"
/>
<path
key={`shimmer-${selected.id}`}
className="upload-route-shimmer"
d={routePath}
pathLength="100"
strokeDasharray="16 84"
vectorEffect="non-scaling-stroke"
/>
</svg>
<span key={`packet-${selected.id}`} className={`upload-packet packet-${selected.id}`} aria-hidden="true">
<svg viewBox="0 0 20 20">
<path d="M 5 10 H 14 M 10.5 6.5 L 14 10 L 10.5 13.5" />
</svg>
</span>
<div className="upload-destinations" role="group" aria-label="上传目标">
{destinations.map((destination) => (
<button
key={destination.id}
type="button"
className={destination.id === selected.id ? "is-selected" : ""}
aria-pressed={destination.id === selected.id}
aria-label={`选择 ${destination.label} 上传目标`}
onPointerDown={stopSceneDrag}
onClick={() => setSelected(destination)}
>
<span className="destination-status" />
<strong>{destination.label}</strong>
<small>{destination.detail}</small>
</button>
))}
</div>
<div className="upload-result scene-float-delayed" aria-live="polite">
<span className="result-check" aria-hidden="true"></span>
<div>
<small>LINK COPIED</small>
<strong>cdn.snapgo.dev/{selected.id}/...</strong>
</div>
</div>
</div>
);
}
function IdentificationScene() {
const [mode, setMode] = useState(aiModes[0]);
return (
<div className="visual-scene identification-scene">
<div className="ai-source-card">
<div className="mini-window-bar" aria-hidden="true">
<span />
<span />
<span />
</div>
<div className="ai-source-content">
<span className="source-sidebar" />
<div className="source-settings">
<i />
<i />
<i />
</div>
<div className="source-dialog">
<span className="dialog-icon">!</span>
<div>
<strong>Permission required</strong>
<small>Screen Recording</small>
</div>
</div>
</div>
<span className="ai-scan-line" aria-hidden="true" />
</div>
<div className="ai-core" aria-hidden="true">
<span>AI</span>
<i className="ai-orbit orbit-one" />
<i className="ai-orbit orbit-two" />
</div>
<div className="ai-result-card scene-float-soft" aria-live="polite">
<div className="ai-result-heading">
<span className="ai-spark" aria-hidden="true"></span>
<strong>SnapGo Vision</strong>
<i />
</div>
<p>{mode.result}</p>
<div className="confidence-row">
<span><i /></span>
<small>{mode.score} confidence</small>
</div>
</div>
<div className="ai-mode-switch" role="group" aria-label="AI 处理模式">
{aiModes.map((item) => (
<button
key={item.id}
type="button"
className={item.id === mode.id ? "is-selected" : ""}
aria-pressed={item.id === mode.id}
onPointerDown={stopSceneDrag}
onClick={() => setMode(item)}
>
{item.label}
</button>
))}
</div>
</div>
);
}
function OcrScene() {
const [copied, setCopied] = useState(false);
const [language, setLanguage] = useState<OcrLanguage>("auto");
const activeMode = ocrModes.find((mode) => mode.id === language) ?? ocrModes[2];
function selectLanguage(mode: OcrLanguage) {
setLanguage(mode);
setCopied(false);
}
return (
<div className="visual-scene ocr-scene">
<div className="ocr-document">
<div className="document-header">
<span />
<div><i /><i /><i /></div>
</div>
<div className="document-copy">
<strong>Release notes</strong>
<span className="text-line line-long" />
<span className="text-line line-medium" />
<span className="text-line line-highlight"><i>Capture, understand, share.</i></span>
<span className="text-line line-long" />
<span className="text-line line-short" />
<span className="text-line line-highlight secondary"><i></i></span>
</div>
<span className="ocr-scan-bar" aria-hidden="true" />
</div>
<div className="ocr-selection-card scene-float-delayed">
<div className="selection-heading">
<span>OCR</span>
<small>{activeMode.name}</small>
</div>
<p>
{activeMode.lines.map((line) => <span key={line}>{line}</span>)}
</p>
<div className="selection-meta">
<span>{activeMode.characters} characters</span>
<strong>{activeMode.confidence}</strong>
</div>
<button
type="button"
className={copied ? "is-copied" : ""}
aria-pressed={copied}
onPointerDown={stopSceneDrag}
onClick={() => setCopied((current) => !current)}
>
<span aria-hidden="true">{copied ? "✓" : "⌘C"}</span>
{copied ? "已复制" : "复制文本"}
</button>
</div>
<div className="ocr-language-pills" role="group" aria-label="OCR 识别语言">
{ocrModes.map((mode) => (
<button
key={mode.id}
type="button"
className={mode.id === language ? "is-selected" : ""}
aria-pressed={mode.id === language}
onPointerDown={stopSceneDrag}
onClick={() => selectLanguage(mode.id)}
>
{mode.label}
</button>
))}
</div>
</div>
);
}
function ToolGlyph({ tool }: { tool: CaptureTool }) {
if (tool === "rect") {
return <svg viewBox="0 0 20 20" aria-hidden="true"><rect x="4" y="4" width="12" height="12" rx="2" /></svg>;
}
if (tool === "arrow") {
return <svg viewBox="0 0 20 20" aria-hidden="true"><path d="M4 15 15 4M9 4h6v6" /></svg>;
}
if (tool === "pen") {
return <svg viewBox="0 0 20 20" aria-hidden="true"><path d="m5 15 2.2-4.7L13.8 3.7l2.5 2.5-6.6 6.6L5 15Z" /><path d="m11.8 5.7 2.5 2.5" /></svg>;
}
return (
<svg viewBox="0 0 20 20" aria-hidden="true">
<rect x="3" y="3" width="5" height="5" />
<rect x="12" y="3" width="5" height="5" />
<rect x="3" y="12" width="5" height="5" />
<rect x="12" y="12" width="5" height="5" />
</svg>
);
}
function AnnotationPreview({ tool }: { tool: CaptureTool }) {
if (tool === "arrow") {
return (
<svg className="annotation-arrow" viewBox="0 0 180 110" aria-hidden="true">
<path d="M28 84C66 78 91 56 139 31" />
<path d="m121 27 20 3-8 18" />
</svg>
);
}
if (tool === "pen") {
return (
<svg className="annotation-pen" viewBox="0 0 180 110" aria-hidden="true">
<path d="M24 76c20-42 36 25 57-6s33-33 48-4c9 18 21 13 29-7" />
</svg>
);
}
if (tool === "mosaic") {
return <div className="annotation-mosaic" aria-hidden="true">{Array.from({ length: 20 }, (_, index) => <span key={index} />)}</div>;
}
return <div className="annotation-rect" aria-hidden="true"><span /><span /><span /><span /></div>;
}
function CaptureScene() {
const [tool, setTool] = useState<CaptureTool>("rect");
return (
<div className="visual-scene capture-scene">
<div className="capture-canvas">
<div className="canvas-app-bar">
<span />
<strong>Project overview</strong>
<i />
</div>
<div className="canvas-layout" aria-hidden="true">
<span className="canvas-sidebar" />
<div className="canvas-content">
<i className="canvas-heading" />
<i className="canvas-line" />
<i className="canvas-line short" />
<div className="canvas-chart"><span /><span /><span /><span /><span /></div>
</div>
</div>
<div className="capture-selection">
<span className="selection-size">1280 × 720</span>
<i className="selection-handle handle-nw" />
<i className="selection-handle handle-ne" />
<i className="selection-handle handle-sw" />
<i className="selection-handle handle-se" />
<AnnotationPreview tool={tool} />
</div>
</div>
<div className="capture-toolbar" role="toolbar" aria-label="截图标注工具">
{captureTools.map((item) => (
<button
key={item.id}
type="button"
className={item.id === tool ? "is-selected" : ""}
aria-label={item.label}
aria-pressed={item.id === tool}
title={item.label}
onPointerDown={stopSceneDrag}
onClick={() => setTool(item.id)}
>
<ToolGlyph tool={item.id} />
</button>
))}
<span className="toolbar-divider" />
<span className="toolbar-color" aria-hidden="true" />
</div>
</div>
);
}
const scenes = [UploadScene, IdentificationScene, OcrScene, CaptureScene];
export default function ShowcaseVisual({ activeIndex }: ShowcaseVisualProps) {
const Scene = scenes[activeIndex] ?? UploadScene;
return (
<div className="scene-parallax" data-testid="showcase-visual">
<Scene />
</div>
);
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

File diff suppressed because it is too large Load Diff
+10
View File
@@ -0,0 +1,10 @@
import React from "react";
import ReactDOM from "react-dom/client";
import App from "./App";
import "./index.css";
ReactDOM.createRoot(document.getElementById("root")!).render(
<React.StrictMode>
<App />
</React.StrictMode>,
);
+1
View File
@@ -0,0 +1 @@
/// <reference types="vite/client" />
+22
View File
@@ -0,0 +1,22 @@
{
"compilerOptions": {
"target": "ES2022",
"lib": ["ES2022", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "bundler",
"jsx": "react-jsx",
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"resolveJsonModule": true,
"isolatedModules": true,
"useDefineForClassFields": true,
"allowImportingTsExtensions": false,
"noEmit": true
},
"include": ["src"]
}
+7
View File
@@ -0,0 +1,7 @@
{
"files": [],
"references": [
{ "path": "./tsconfig.app.json" },
{ "path": "./tsconfig.node.json" }
]
}
+15
View File
@@ -0,0 +1,15 @@
{
"compilerOptions": {
"target": "ES2022",
"lib": ["ES2023"],
"module": "ESNext",
"moduleResolution": "bundler",
"strict": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"isolatedModules": true,
"noEmit": true
},
"include": ["vite.config.ts"]
}
+17
View File
@@ -0,0 +1,17 @@
import { defineConfig, loadEnv } from "vite";
import react from "@vitejs/plugin-react";
import tailwindcss from "@tailwindcss/vite";
// https://vitejs.dev/config/
export default defineConfig(({ mode }) => {
const env = loadEnv(mode, ".", "");
return {
base: env.VITE_BASE_PATH || "/",
plugins: [react(), tailwindcss()],
server: {
port: 5273,
open: true,
},
};
});