Release v0.2.13

This commit is contained in:
burnintuna 2026-08-21 21:29:25 +09:00
parent 195bd2554f
commit 605248a969
6 changed files with 156 additions and 48 deletions

2
Cargo.lock generated
View file

@ -182,7 +182,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]] [[package]]
name = "comicviewer" name = "comicviewer"
version = "0.2.12" version = "0.2.13"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",

View file

@ -1,6 +1,6 @@
[package] [package]
name = "comicviewer" name = "comicviewer"
version = "0.2.12" version = "0.2.13"
edition = "2024" edition = "2024"
description = "A comic archive viewer for local and remote locations" description = "A comic archive viewer for local and remote locations"
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"

View file

@ -26,6 +26,7 @@
</provides> </provides>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="0.2.13" date="2026-08-21" />
<release version="0.2.12" date="2026-07-29" /> <release version="0.2.12" date="2026-07-29" />
<release version="0.2.11" date="2026-07-24" /> <release version="0.2.11" date="2026-07-24" />
<release version="0.2.10" date="2026-07-24" /> <release version="0.2.10" date="2026-07-24" />

View file

@ -91,6 +91,8 @@ Comicviewer는 XDG 표준 경로를 사용합니다.
- `Home`과 `End`: 폴더의 첫 번째/마지막 파일 열기 - `Home`과 `End`: 폴더의 첫 번째/마지막 파일 열기
- 동영상에서 `←`와 `→`: 5초 뒤/앞으로 이동 - 동영상에서 `←`와 `→`: 5초 뒤/앞으로 이동
- 동영상에서 `↑`와 `↓`: 음량을 5%씩 조절 - 동영상에서 `↑`와 `↓`: 음량을 5%씩 조절
- 이미지에서 `1`, `2`, `3`, `4`: 폭 맞춤, 높이 맞춤, 2페이지, 100%로 전환 (`3`은 ZIP 뷰어에서 사용)
- 창보다 크게 표시된 이미지에서 `←`, `→`, `↑`, `↓`: 해당 방향으로 최대 100px 이동
- `L`: 우측 파일 목록 표시 또는 숨기기 - `L`: 우측 파일 목록 표시 또는 숨기기
- 파일 목록 상단 검색: 현재 재생 목록을 임시로 필터링하며, 입력을 지우면 전체 목록 복원 - 파일 목록 상단 검색: 현재 재생 목록을 임시로 필터링하며, 입력을 지우면 전체 목록 복원
- About 창의 `업데이트`: Cafe24에서 최신 번들을 내려받아 검증 후 사용자 영역에 설치 - About 창의 `업데이트`: Cafe24에서 최신 번들을 내려받아 검증 후 사용자 영역에 설치

View file

@ -55,7 +55,7 @@ AppImage 빌드가 끝나면 다음 스크립트로 체크섬과 통합 `tar.gz`
스크립트는 `Cargo.toml`에서 버전을 읽고 다음 파일을 생성합니다. 스크립트는 `Cargo.toml`에서 버전을 읽고 다음 파일을 생성합니다.
- `dist/Comicviewer-0.2.12-x86_64.AppImage.sha256` - `dist/Comicviewer-0.2.13-x86_64.AppImage.sha256`
- `dist/Comicviewer-latest-x86_64.tar.gz` - `dist/Comicviewer-latest-x86_64.tar.gz`
- `dist/Comicviewer-latest-x86_64.tar.gz.sha256` - `dist/Comicviewer-latest-x86_64.tar.gz.sha256`
@ -78,10 +78,10 @@ sha256sum -c Comicviewer-latest-x86_64.tar.gz.sha256
```sh ```sh
git add Cargo.toml Cargo.lock data packaging README.md docs git add Cargo.toml Cargo.lock data packaging README.md docs
git commit -m "Release v0.2.12" git commit -m "Release v0.2.13"
git tag -a v0.2.12 -m "Comicviewer v0.2.12" git tag -a v0.2.13 -m "Comicviewer v0.2.13"
git push origin main git push origin main
git push origin v0.2.12 git push origin v0.2.13
``` ```
이미 원격에 공개한 태그는 이동하거나 덮어쓰지 않습니다. 수정이 필요하면 새 이미 원격에 공개한 태그는 이동하거나 덮어쓰지 않습니다. 수정이 필요하면 새

View file

@ -23,6 +23,7 @@ const VIDEO_VOLUME_STEP: f64 = 0.05;
const IMAGE_ZOOM_STEP: f64 = 0.1; const IMAGE_ZOOM_STEP: f64 = 0.1;
const IMAGE_ZOOM_MIN: f64 = 0.1; const IMAGE_ZOOM_MIN: f64 = 0.1;
const IMAGE_ZOOM_MAX: f64 = 4.0; const IMAGE_ZOOM_MAX: f64 = 4.0;
const IMAGE_PAN_STEP: f64 = 100.0;
const VIEWER_CONTROLLER_KEY: &str = "comicviewer-viewer-controller"; const VIEWER_CONTROLLER_KEY: &str = "comicviewer-viewer-controller";
const MEDIA_VIEWER_CONTROLLER_KEY: &str = "comicviewer-media-viewer-controller"; const MEDIA_VIEWER_CONTROLLER_KEY: &str = "comicviewer-media-viewer-controller";
const VIEWER_FILE_SEARCH_KEY: &str = "comicviewer-file-search"; const VIEWER_FILE_SEARCH_KEY: &str = "comicviewer-file-search";
@ -974,22 +975,16 @@ impl ViewerController {
controller.seek_edge(true); controller.seek_edge(true);
glib::Propagation::Stop glib::Propagation::Stop
} }
gdk::Key::Up | gdk::Key::KP_Up gdk::Key::Up | gdk::Key::KP_Up if controller.pan_image(false, false) => {
if matches!(
controller.view_mode(),
ViewMode::ActualSize | ViewMode::FitWidth | ViewMode::Continuous
) =>
{
controller.scroll_vertically(false);
glib::Propagation::Stop glib::Propagation::Stop
} }
gdk::Key::Down | gdk::Key::KP_Down gdk::Key::Down | gdk::Key::KP_Down if controller.pan_image(false, true) => {
if matches!( glib::Propagation::Stop
controller.view_mode(), }
ViewMode::ActualSize | ViewMode::FitWidth | ViewMode::Continuous gdk::Key::Left | gdk::Key::KP_Left if controller.pan_image(true, false) => {
) => glib::Propagation::Stop
{ }
controller.scroll_vertically(true); gdk::Key::Right | gdk::Key::KP_Right if controller.pan_image(true, true) => {
glib::Propagation::Stop glib::Propagation::Stop
} }
gdk::Key::Left | gdk::Key::KP_Left | gdk::Key::Page_Up => { gdk::Key::Left | gdk::Key::KP_Left | gdk::Key::Page_Up => {
@ -1016,6 +1011,22 @@ impl ViewerController {
controller.adjust_image_zoom(false); controller.adjust_image_zoom(false);
glib::Propagation::Stop glib::Propagation::Stop
} }
gdk::Key::_1 | gdk::Key::KP_1 => {
controller.select_view_mode(1);
glib::Propagation::Stop
}
gdk::Key::_2 | gdk::Key::KP_2 => {
controller.select_view_mode(2);
glib::Propagation::Stop
}
gdk::Key::_3 | gdk::Key::KP_3 => {
controller.select_view_mode(3);
glib::Propagation::Stop
}
gdk::Key::_4 | gdk::Key::KP_4 => {
controller.select_view_mode(0);
glib::Propagation::Stop
}
_ if !shortcut_modifiers_blocked(modifiers) _ if !shortcut_modifiers_blocked(modifiers)
&& key && key
.to_unicode() .to_unicode()
@ -1548,6 +1559,15 @@ impl ViewerController {
self.stack.queue_allocate(); self.stack.queue_allocate();
} }
fn select_view_mode(self: &Rc<Self>, index: u32) {
if self.mode_dropdown.selected() != index {
self.mode_dropdown.set_selected(index);
} else {
self.image_zoom.set(1.0);
self.apply_view_mode();
}
}
fn schedule_view_mode_refresh(self: &Rc<Self>) { fn schedule_view_mode_refresh(self: &Rc<Self>) {
let generation = self.view_layout_generation.get().wrapping_add(1); let generation = self.view_layout_generation.get().wrapping_add(1);
self.view_layout_generation.set(generation); self.view_layout_generation.set(generation);
@ -1615,16 +1635,18 @@ impl ViewerController {
self.seek_page(if end { count - 1 } else { 0 }); self.seek_page(if end { count - 1 } else { 0 });
} }
fn scroll_vertically(&self, down: bool) { fn pan_image(&self, horizontal: bool, forward: bool) -> bool {
let adjustment = if self.view_mode() == ViewMode::Continuous { let scrolled = match self.view_mode() {
self.continuous_scrolled.vadjustment() ViewMode::TwoPage => &self.spread_scrolled,
} else { ViewMode::Continuous => &self.continuous_scrolled,
self.single_scrolled.vadjustment() _ => &self.single_scrolled,
}; };
let step = adjustment.step_increment().max(64.0); let adjustment = if horizontal {
let delta = if down { step } else { -step }; scrolled.hadjustment()
let maximum = (adjustment.upper() - adjustment.page_size()).max(adjustment.lower()); } else {
adjustment.set_value((adjustment.value() + delta).clamp(adjustment.lower(), maximum)); scrolled.vadjustment()
};
pan_adjustment(&adjustment, forward)
} }
fn shift_pairing(self: &Rc<Self>, offset: isize) { fn shift_pairing(self: &Rc<Self>, offset: isize) {
@ -2306,11 +2328,17 @@ impl MediaViewerWindow {
} else { } else {
gtk::Video::new() gtk::Video::new()
}; };
video.set_autoplay(true); video.set_autoplay(false);
video.set_hexpand(true); video.set_hexpand(true);
video.set_vexpand(true); video.set_vexpand(true);
let video_for_loop = video.clone(); let video_for_loop = video.clone();
loop_check.connect_toggled(move |check| video_for_loop.set_loop(check.is_active())); loop_check.connect_toggled(move |check| {
let active = check.is_active();
video_for_loop.set_loop(active);
if let Some(stream) = video_for_loop.media_stream() {
stream.set_loop(active);
}
});
stack.add_named(&video, Some("video")); stack.add_named(&video, Some("video"));
let status_label = gtk::Label::builder() let status_label = gtk::Label::builder()
.label(&title) .label(&title)
@ -2431,6 +2459,7 @@ impl MediaViewerWindow {
EntryKind::Video => { EntryKind::Video => {
controller.stack.set_visible_child_name("video"); controller.stack.set_visible_child_name("video");
if let Some(stream) = controller.video.media_stream() { if let Some(stream) = controller.video.media_stream() {
initialize_video_volume(&stream);
stream.play(); stream.play();
} }
} }
@ -2580,22 +2609,23 @@ impl MediaViewerController {
} }
gdk::Key::Up | gdk::Key::KP_Up gdk::Key::Up | gdk::Key::KP_Up
if controller.kind == EntryKind::Image if controller.kind == EntryKind::Image
&& matches!( && controller.pan_image(false, false) =>
controller.image_view_mode(),
ViewMode::ActualSize | ViewMode::FitWidth
) =>
{ {
controller.scroll_image(false);
glib::Propagation::Stop glib::Propagation::Stop
} }
gdk::Key::Down | gdk::Key::KP_Down gdk::Key::Down | gdk::Key::KP_Down
if controller.kind == EntryKind::Image if controller.kind == EntryKind::Image && controller.pan_image(false, true) =>
&& matches!( {
controller.image_view_mode(), glib::Propagation::Stop
ViewMode::ActualSize | ViewMode::FitWidth }
) => gdk::Key::Left | gdk::Key::KP_Left
if controller.kind == EntryKind::Image && controller.pan_image(true, false) =>
{
glib::Propagation::Stop
}
gdk::Key::Right | gdk::Key::KP_Right
if controller.kind == EntryKind::Image && controller.pan_image(true, true) =>
{ {
controller.scroll_image(true);
glib::Propagation::Stop glib::Propagation::Stop
} }
_ if key.to_unicode() == Some('[') => { _ if key.to_unicode() == Some('[') => {
@ -2614,6 +2644,18 @@ impl MediaViewerController {
controller.adjust_image_zoom(false); controller.adjust_image_zoom(false);
glib::Propagation::Stop glib::Propagation::Stop
} }
gdk::Key::_1 | gdk::Key::KP_1 if controller.kind == EntryKind::Image => {
controller.select_image_view_mode(1);
glib::Propagation::Stop
}
gdk::Key::_2 | gdk::Key::KP_2 if controller.kind == EntryKind::Image => {
controller.select_image_view_mode(2);
glib::Propagation::Stop
}
gdk::Key::_4 | gdk::Key::KP_4 if controller.kind == EntryKind::Image => {
controller.select_image_view_mode(0);
glib::Propagation::Stop
}
_ if key _ if key
.to_unicode() .to_unicode()
.is_some_and(|character| character.eq_ignore_ascii_case(&'l')) => .is_some_and(|character| character.eq_ignore_ascii_case(&'l')) =>
@ -2982,6 +3024,15 @@ impl MediaViewerController {
} }
} }
fn select_image_view_mode(&self, index: u32) {
if self.image_mode_dropdown.selected() != index {
self.image_mode_dropdown.set_selected(index);
} else {
self.image_zoom.set(1.0);
self.apply_image_view_mode();
}
}
fn resize_image_picture(&self) { fn resize_image_picture(&self) {
let Some((texture_width, texture_height)) = self.image_dimensions.get() else { let Some((texture_width, texture_height)) = self.image_dimensions.get() else {
return; return;
@ -3017,12 +3068,13 @@ impl MediaViewerController {
} }
} }
fn scroll_image(&self, down: bool) { fn pan_image(&self, horizontal: bool, forward: bool) -> bool {
let adjustment = self.image_scrolled.vadjustment(); let adjustment = if horizontal {
let step = adjustment.step_increment().max(64.0); self.image_scrolled.hadjustment()
let delta = if down { step } else { -step }; } else {
let maximum = (adjustment.upper() - adjustment.page_size()).max(adjustment.lower()); self.image_scrolled.vadjustment()
adjustment.set_value((adjustment.value() + delta).clamp(adjustment.lower(), maximum)); };
pan_adjustment(&adjustment, forward)
} }
fn open_sibling(&self, forward: bool) { fn open_sibling(&self, forward: bool) {
@ -3995,6 +4047,46 @@ fn video_volume_target(volume: f64, delta: f64) -> f64 {
(volume + delta).clamp(0.0, 1.0) (volume + delta).clamp(0.0, 1.0)
} }
fn initialize_video_volume(stream: &gtk::MediaStream) {
let volume = stream.volume().clamp(0.0, 1.0);
// Force the realized playback backend and GTK controls to receive the same initial value.
stream.set_volume(if volume > 0.0 { 0.0 } else { 1.0 });
stream.set_volume(volume);
}
fn pan_adjustment(adjustment: &gtk::Adjustment, forward: bool) -> bool {
let Some(value) = image_pan_target(
adjustment.value(),
adjustment.lower(),
adjustment.upper(),
adjustment.page_size(),
forward,
) else {
return false;
};
adjustment.set_value(value);
true
}
fn image_pan_target(
value: f64,
lower: f64,
upper: f64,
page_size: f64,
forward: bool,
) -> Option<f64> {
let maximum = (upper - page_size).max(lower);
if maximum <= lower {
return None;
}
let delta = if forward {
IMAGE_PAN_STEP
} else {
-IMAGE_PAN_STEP
};
Some((value + delta).clamp(lower, maximum))
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@ -4111,6 +4203,19 @@ mod tests {
assert_eq!(video_volume_target(0.5, 0.05), 0.55); assert_eq!(video_volume_target(0.5, 0.05), 0.55);
} }
#[test]
fn image_pan_moves_at_most_100_pixels_and_consumes_clipped_axis() {
assert_eq!(
image_pan_target(250.0, 0.0, 1_000.0, 400.0, true),
Some(350.0)
);
assert_eq!(
image_pan_target(600.0, 0.0, 1_000.0, 400.0, true),
Some(600.0)
);
assert_eq!(image_pan_target(0.0, 0.0, 400.0, 400.0, true), None);
}
#[test] #[test]
fn viewer_file_typeahead_wraps_by_display_name() { fn viewer_file_typeahead_wraps_by_display_name() {
let files = ["Alpha.zip", "beta.jpg", "Bravo.mp4"].map(|name| SiblingFile { let files = ["Alpha.zip", "beta.jpg", "Bravo.mp4"].map(|name| SiblingFile {