Add bleed-through and b/w density settings for AirScan

mzyy94 · mzyy94 · commit 0f50f3f1d440 · 2026-02-21T15:34:00.000+09:00
diff --git a/README.en.md b/README.en.md
@@ -145,8 +145,9 @@ Access the built-in management interface at `http://<host>:8080/ui/`.
 
 - **Status** &mdash; Connection state, ADF paper presence, error states (paper jam, cover open, multi-feed)
 - **Device Info** &mdash; Scanner name, serial, IP, firmware revision
-- **Scan Settings** &mdash; Color mode, resolution, duplex, output format, blank page removal, bleed-through reduction
+- **Button Scan Settings** &mdash; Color mode, resolution, paper size, output format, duplex, blank page removal, bleed-through reduction
 - **Save Destination** &mdash; Configure local folder / FTP / Paperless-ngx for button scans
+- **AirScan Settings** &mdash; Auto paper size detect, bleed-through reduction, B&W density overrides for AirScan clients
 - **eSCL Endpoint** &mdash; URL for manual eSCL client configuration
 - **i18n** &mdash; English / Japanese toggle
 
diff --git a/README.md b/README.md
@@ -145,8 +145,9 @@ AIRSCAP_PASSWORD=0700 AIRSCAP_SCANNER_IP=192.168.1.100 ./airscap
 
 - **ステータス** &mdash; 接続状態、ADF の用紙有無、エラー状態（紙詰まり・カバーオープン・重送検知）
 - **デバイス情報** &mdash; スキャナ名、シリアル番号、IP、ファームウェアリビジョン
-- **スキャン設定** &mdash; カラーモード、解像度、両面、出力形式、白紙スキップ、裏写り軽減
-- **保存先** &mdash; ローカルフォルダ / FTP / Paperless-ngx のボタンスキャン設定
+- **ボタンスキャン設定** &mdash; カラーモード、解像度、用紙サイズ、出力形式、両面、白紙スキップ、裏写り軽減
+- **保存先** &mdash; ローカルフォルダ / FTP / Paperless-ngx のボタンスキャン保存先設定
+- **AirScan 設定** &mdash; 用紙サイズ自動検出、裏写り軽減、白黒濃度の AirScan クライアント向けオーバーライド
 - **eSCL エンドポイント** &mdash; eSCL クライアント手動設定用の URL
 - **多言語対応** &mdash; 英語 / 日本語切り替え
 
diff --git a/internal/config/store.go b/internal/config/store.go
@@ -12,6 +12,7 @@ import (
 type Settings struct {
 	ColorMode        string `json:"colorMode"`
 	Resolution       int    `json:"resolution"`
+	PaperSize        string `json:"paperSize"` // "auto", "a4", "a5", "business_card", "postcard"
 	Duplex           bool   `json:"duplex"`
 	Format           string `json:"format"`
 	BlankPageRemoval *bool  `json:"blankPageRemoval"` // nil = default (true)
@@ -24,8 +25,9 @@ type Settings struct {
 	FTPPassword      string `json:"ftpPassword"`
 	PaperlessURL     string `json:"paperlessUrl"`
 	PaperlessToken   string `json:"paperlessToken"`
-	ForcePaperAuto   bool   `json:"forcePaperAuto"` // AirScan: force paper auto-detect for eSCL clients
-	PaperSize        string `json:"paperSize"`      // button scan paper size: "auto", "a4", "a5", "business_card", "postcard"
+	AirscanForcePaperAuto bool   `json:"airscanForcePaperAuto"` // AirScan: force paper auto-detect for eSCL clients
+	AirscanBleedThrough   bool   `json:"airscanBleedThrough"`   // AirScan: apply bleed-through reduction
+	AirscanBWDensity      int    `json:"airscanBwDensity"`      // AirScan: B&W density override (-5 to +5)
 }
 
 // DefaultSettings returns the default scan settings.
diff --git a/internal/scanner/escl.go b/internal/scanner/escl.go
@@ -149,18 +149,28 @@ func (a *ESCLAdapter) Scan(ctx context.Context, req abstract.ScannerRequest) (ab
 		return nil, err
 	}
 
-	forcePaperAuto := a.settings != nil && a.settings.Get().ForcePaperAuto
+	forcePaperAuto := a.settings != nil && a.settings.Get().AirscanForcePaperAuto
 	cfg := mapScanConfig(req, forcePaperAuto)
 	a.mu.Lock()
 	cfg.BlankPageRemoval = a.blankPageRemoval
 	a.mu.Unlock()
 
+	// Apply server-side AirScan overrides from settings
+	if a.settings != nil {
+		s := a.settings.Get()
+		cfg.BleedThrough = s.AirscanBleedThrough
+		if req.Threshold == nil {
+			cfg.BWDensity = s.AirscanBWDensity
+		}
+	}
+
 	slog.Info("scan requested",
 		"colorMode", req.ColorMode,
 		"resolution", req.Resolution,
 		"adfMode", req.ADFMode,
 		"duplex", cfg.Duplex,
 		"blankPageRemoval", cfg.BlankPageRemoval,
+		"bleedThrough", cfg.BleedThrough,
 		"bwDensity", cfg.BWDensity,
 		"paperWidth", cfg.PaperWidth,
 		"paperHeight", cfg.PaperHeight,
diff --git a/internal/scanner/escl_test.go b/internal/scanner/escl_test.go
@@ -240,8 +240,8 @@ func TestMapScanConfig_ZeroRegionIsAuto(t *testing.T) {
 	}
 }
 
-func TestMapScanConfig_ForcePaperAuto(t *testing.T) {
-	// Even with a specific region, forcePaperAuto skips paper override
+func TestMapScanConfig_AirscanForcePaperAuto(t *testing.T) {
+	// Even with a specific region, airscanForcePaperAuto skips paper override
 	req := abstract.ScannerRequest{
 		Region: abstract.Region{
 			Width:  210 * abstract.Millimeter,
@@ -335,7 +335,7 @@ func TestBuildCapabilities_WithScanParams(t *testing.T) {
 		t.Errorf("MaxHeight = %d, want %d", caps.ADFSimplex.MaxHeight, expectedMaxHeight)
 	}
 
-	// MinWidth/MinHeight default (non-ForcePaperAuto)
+	// MinWidth/MinHeight default (non-AirscanForcePaperAuto)
 	if caps.ADFSimplex.MinWidth != 50*abstract.Millimeter {
 		t.Errorf("MinWidth = %d, want %d", caps.ADFSimplex.MinWidth, 50*abstract.Millimeter)
 	}
diff --git a/internal/webui/static/index.html b/internal/webui/static/index.html
@@ -196,7 +196,7 @@
           <div class="field">
             <label class="label is-small" x-text="t('paperSize')"></label>
             <div class="control">
-              <div class="select is-fullwidth">
+              <div class="select is-ful lwidth">
                 <select x-model="scanConfig.paperSize" @change="debounceSaveSettings()">
                   <template x-for="ps in ['auto', 'a4', 'a5', 'business_card', 'postcard']" :key="ps">
                     <option :value="ps" x-text="t('paper_' + ps)"></option>
@@ -400,12 +400,28 @@
         </header>
         <div class="card-content">
           <div class="field">
-            <label class="label is-small" x-text="t('forcePaperAuto')"></label>
+            <label class="label is-small" x-text="t('airscanForcePaperAuto')"></label>
+            <div class="buttons has-addons">
+              <button type="button" class="button" :class="scanConfig.airscanForcePaperAuto ? 'is-primary is-selected' : ''" @click="scanConfig.airscanForcePaperAuto = true; debounceSaveSettings()">ON</button>
+              <button type="button" class="button" :class="!scanConfig.airscanForcePaperAuto ? 'is-primary is-selected' : ''" @click="scanConfig.airscanForcePaperAuto = false; debounceSaveSettings()">OFF</button>
+            </div>
+            <p class="help" x-text="t('airscanForcePaperAutoHelp')"></p>
+          </div>
+
+          <div class="field">
+            <label class="label is-small" x-text="t('airscanBleedThrough')"></label>
             <div class="buttons has-addons">
-              <button type="button" class="button" :class="scanConfig.forcePaperAuto ? 'is-primary is-selected' : ''" @click="scanConfig.forcePaperAuto = true; debounceSaveSettings()">ON</button>
-              <button type="button" class="button" :class="!scanConfig.forcePaperAuto ? 'is-primary is-selected' : ''" @click="scanConfig.forcePaperAuto = false; debounceSaveSettings()">OFF</button>
+              <button type="button" class="button" :class="scanConfig.airscanBleedThrough ? 'is-primary is-selected' : ''" @click="scanConfig.airscanBleedThrough = true; debounceSaveSettings()">ON</button>
+              <button type="button" class="button" :class="!scanConfig.airscanBleedThrough ? 'is-primary is-selected' : ''" @click="scanConfig.airscanBleedThrough = false; debounceSaveSettings()">OFF</button>
             </div>
-            <p class="help" x-text="t('forcePaperAutoHelp')"></p>
+            <p class="help" x-text="t('airscanBleedThroughHelp')"></p>
+          </div>
+
+          <div class="field">
+            <label class="label is-small"><span x-text="t('airscanBwDensity')"></span> <span class="has-text-weight-normal has-text-grey" x-text="(scanConfig.airscanBwDensity > 0 ? '+' : '') + scanConfig.airscanBwDensity"></span></label>
+            <input type="range" min="-5" max="5" step="1" x-model.number="scanConfig.airscanBwDensity" @change="debounceSaveSettings()">
+            <div class="range-labels"><span>-5</span><span>0</span><span>+5</span></div>
+            <p class="help" x-text="t('airscanBwDensityHelp')"></p>
           </div>
         </div>
       </div>
@@ -481,7 +497,7 @@
         status: null,
         tick: 0,
         lang: localStorage.getItem('lang') || (navigator.language.startsWith('ja') ? 'ja' : 'en'),
-        scanConfig: { colorMode: 'auto', resolution: '0', duplex: false, format: 'application/pdf', blankPageRemoval: true, bleedThrough: false, bwDensity: 0, paperSize: 'auto', saveType: 'none', savePath: '', ftpHost: '', ftpUser: '', ftpPassword: '', paperlessUrl: '', paperlessToken: '', forcePaperAuto: false },
+        scanConfig: { colorMode: 'auto', resolution: '0', duplex: false, format: 'application/pdf', blankPageRemoval: true, bleedThrough: false, bwDensity: 0, paperSize: 'auto', saveType: 'none', savePath: '', ftpHost: '', ftpUser: '', ftpPassword: '', paperlessUrl: '', paperlessToken: '', airscanForcePaperAuto: false, airscanBleedThrough: false, airscanBwDensity: 0 },
         scanJob: { scanning: false, lastError: '', lastScan: '', pages: 0, filePath: '' },
         scanPreview: { scanning: false, error: '', pages: [], showModal: false, currentPage: 0 },
         settingsReady: false,
@@ -536,7 +552,9 @@
               paperlessUrl: s.paperlessUrl || '',
               paperlessToken: s.paperlessToken || '',
               paperSize: s.paperSize || 'auto',
-              forcePaperAuto: s.forcePaperAuto || false,
+              airscanForcePaperAuto: s.airscanForcePaperAuto || false,
+              airscanBleedThrough: s.airscanBleedThrough || false,
+              airscanBwDensity: s.airscanBwDensity ?? 0,
             };
             this.clampToCapabilities();
             this.settingsReady = true;
@@ -588,7 +606,9 @@
               paperlessUrl: this.scanConfig.paperlessUrl,
               paperlessToken: this.scanConfig.paperlessToken,
               paperSize: this.scanConfig.paperSize,
-              forcePaperAuto: this.scanConfig.forcePaperAuto,
+              airscanForcePaperAuto: this.scanConfig.airscanForcePaperAuto,
+              airscanBleedThrough: this.scanConfig.airscanBleedThrough,
+              airscanBwDensity: Number(this.scanConfig.airscanBwDensity),
             };
             const resp = await fetch('api/settings', {
               method: 'PUT',
diff --git a/internal/webui/static/messages.js b/internal/webui/static/messages.js
@@ -3,7 +3,7 @@ const MESSAGES = {
   status:           { en: 'Status',           ja: 'ステータス' },
   deviceInfo:       { en: 'Device Info',      ja: 'デバイス情報' },
   capabilities:     { en: 'Capabilities',     ja: 'スキャン機能' },
-  scanSettings:     { en: 'Scan Settings',    ja: 'スキャン設定' },
+  scanSettings:     { en: 'Button Scan Settings', ja: 'ボタンスキャン設定' },
   saveDestination:  { en: 'Save Destination', ja: '保存先' },
   scan:             { en: 'Scan',             ja: 'スキャン' },
   esclEndpoint:     { en: 'eSCL Endpoint',    ja: 'eSCL エンドポイント' },
@@ -78,9 +78,13 @@ const MESSAGES = {
   paper_postcard:   { en: 'Postcard',      ja: 'はがき' },
 
   // AirScan settings
-  airscanSettings:  { en: 'AirScan Settings',      ja: 'AirScan 設定' },
-  forcePaperAuto:   { en: 'Auto paper size detect', ja: '用紙サイズ自動検出' },
-  forcePaperAutoHelp: { en: 'Force auto paper size detection for AirScan clients (macOS Image Capture, etc.). Takes effect on the next scan.', ja: 'AirScan クライアント (macOS Image Capture 等) で用紙サイズを自動検出に強制する。次回のスキャンから反映されます。' },
+  airscanSettings:           { en: 'AirScan Settings',        ja: 'AirScan 設定' },
+  airscanForcePaperAuto:     { en: 'Auto paper size detect',  ja: '用紙サイズ自動検出' },
+  airscanForcePaperAutoHelp: { en: 'Ignore paper size specified by AirScan clients and always use auto-detect. Takes effect on the next scan.', ja: 'AirScan クライアントが指定した用紙サイズを無視し、常に自動検出を使用する。次回のスキャンから反映されます。' },
+  airscanBleedThrough:       { en: 'Bleed-through reduction', ja: '裏写り軽減' },
+  airscanBleedThroughHelp:   { en: 'Apply bleed-through reduction to AirScan scans.', ja: 'AirScan スキャンに裏写り軽減を適用する。' },
+  airscanBwDensity:          { en: 'B&W Density',             ja: '白黒濃度' },
+  airscanBwDensityHelp:      { en: 'Default B&W density for AirScan clients that don\'t specify threshold.', ja: 'Threshold を指定しない AirScan クライアント用の白黒濃度デフォルト値。' },
 
   // Browser scan
   scanNow:          { en: 'Scan & Preview',                 ja: 'スキャンしてプレビュー' },

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,8 @@ func TestMapScanConfig_ZeroRegionIsAuto(t *testing.T) {`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`
`243`		`-func TestMapScanConfig_ForcePaperAuto(t *testing.T) {`
`244`		`- // Even with a specific region, forcePaperAuto skips paper override`
	`243`	`+func TestMapScanConfig_AirscanForcePaperAuto(t *testing.T) {`
	`244`	`+ // Even with a specific region, airscanForcePaperAuto skips paper override`
`245`	`245`	`req := abstract.ScannerRequest{`
`246`	`246`	`Region: abstract.Region{`
`247`	`247`	`Width: 210 * abstract.Millimeter,`
`@@ -335,7 +335,7 @@ func TestBuildCapabilities_WithScanParams(t *testing.T) {`
`335`	`335`	`t.Errorf("MaxHeight = %d, want %d", caps.ADFSimplex.MaxHeight, expectedMaxHeight)`
`336`	`336`	`}`
`337`	`337`
`338`		`- // MinWidth/MinHeight default (non-ForcePaperAuto)`
	`338`	`+ // MinWidth/MinHeight default (non-AirscanForcePaperAuto)`
`339`	`339`	`if caps.ADFSimplex.MinWidth != 50*abstract.Millimeter {`
`340`	`340`	`t.Errorf("MinWidth = %d, want %d", caps.ADFSimplex.MinWidth, 50*abstract.Millimeter)`
`341`	`341`	`}`