Compare commits
9 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 10574773c6 | |||
| bae8699674 | |||
| 8f0578c0d3 | |||
| f01365031c | |||
| d1bdefdeff | |||
| 9aac91ccb1 | |||
| 063770749e | |||
| 605248a969 | |||
| 195bd2554f |
9 changed files with 696 additions and 131 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -9,3 +9,4 @@
|
|||
/dist/*.tar.gz.part-*
|
||||
/dist/*.tar.gz.parts.sha256
|
||||
/dist/*-install.sh
|
||||
/.release-credentials
|
||||
|
|
|
|||
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -182,7 +182,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
|
|||
|
||||
[[package]]
|
||||
name = "comicviewer"
|
||||
version = "0.2.12"
|
||||
version = "0.2.20"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "comicviewer"
|
||||
version = "0.2.12"
|
||||
version = "0.2.20"
|
||||
edition = "2024"
|
||||
description = "A comic archive viewer for local and remote locations"
|
||||
license = "GPL-3.0-or-later"
|
||||
|
|
@ -8,7 +8,7 @@ license = "GPL-3.0-or-later"
|
|||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
chrono = { version = "0.4", default-features = false, features = ["clock"] }
|
||||
gtk = { package = "gtk4", version = "0.10", features = ["v4_10"] }
|
||||
gtk = { package = "gtk4", version = "0.10", features = ["v4_12"] }
|
||||
image = { version = "0.25", default-features = false, features = ["avif-native", "bmp", "gif", "jpeg", "png", "webp"] }
|
||||
filetime = "0.2"
|
||||
flate2 = "1.0"
|
||||
|
|
|
|||
|
|
@ -26,6 +26,14 @@
|
|||
</provides>
|
||||
<content_rating type="oars-1.1" />
|
||||
<releases>
|
||||
<release version="0.2.20" date="2026-08-21" />
|
||||
<release version="0.2.19" date="2026-08-21" />
|
||||
<release version="0.2.18" date="2026-08-21" />
|
||||
<release version="0.2.17" date="2026-08-21" />
|
||||
<release version="0.2.16" date="2026-08-21" />
|
||||
<release version="0.2.15" date="2026-08-21" />
|
||||
<release version="0.2.14" date="2026-08-21" />
|
||||
<release version="0.2.13" date="2026-08-21" />
|
||||
<release version="0.2.12" date="2026-07-29" />
|
||||
<release version="0.2.11" date="2026-07-24" />
|
||||
<release version="0.2.10" date="2026-07-24" />
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ sudo pacman -S fuse2 gtk4 dav1d gvfs gvfs-smb gstreamer curl \
|
|||
```
|
||||
|
||||
- `fuse2`: AppImage 마운트 및 실행
|
||||
- `gtk4`, `dav1d`: 화면 표시와 이미지 디코딩
|
||||
- `gtk4` 4.12 이상, `dav1d`: 화면 표시와 이미지 디코딩
|
||||
- `gvfs`: FTP와 SFTP 접근
|
||||
- `gvfs-smb`: SMB 공유 접근
|
||||
- `gstreamer`, `gst-plugins-*`, `gst-libav`: MP4 등 동영상 재생
|
||||
|
|
@ -84,6 +84,8 @@ Comicviewer는 XDG 표준 경로를 사용합니다.
|
|||
- 메인 창의 `캐시 비우기` 버튼으로 현재 열려 있지 않은 ZIP 캐시를 직접 삭제할 수 있습니다.
|
||||
- 캐시 한도는 설정 파일의 `cache_quota_gb`로 변경하며, 0은 영구 캐시를 사용하지 않는 값입니다.
|
||||
- 메인 창 검색은 현재 표시 중인 폴더의 파일명을 필터링하며, 입력을 지우면 전체 목록을 복원합니다.
|
||||
- 위치 목록의 `최근 열어본 파일`은 성공적으로 연 ZIP·이미지·동영상을 최신순으로 최대 100개 보관합니다.
|
||||
- 최근 파일 기록에는 원격 위치 재접속 정보가 함께 저장되며 `최근 기록 비우기`로 전체 기록만 삭제할 수 있습니다.
|
||||
|
||||
## 뷰어 조작
|
||||
|
||||
|
|
@ -91,10 +93,12 @@ Comicviewer는 XDG 표준 경로를 사용합니다.
|
|||
- `Home`과 `End`: 폴더의 첫 번째/마지막 파일 열기
|
||||
- 동영상에서 `←`와 `→`: 5초 뒤/앞으로 이동
|
||||
- 동영상에서 `↑`와 `↓`: 음량을 5%씩 조절
|
||||
- 이미지에서 `1`, `2`, `3`, `4`: 폭 맞춤, 높이 맞춤, 2페이지, 100%로 전환 (`3`은 ZIP 뷰어에서 사용)
|
||||
- 창보다 크게 표시된 이미지에서 `←`, `→`, `↑`, `↓`: 해당 방향으로 최대 100px 이동
|
||||
- `L`: 우측 파일 목록 표시 또는 숨기기
|
||||
- 파일 목록 상단 검색: 현재 재생 목록을 임시로 필터링하며, 입력을 지우면 전체 목록 복원
|
||||
- About 창의 `업데이트`: Cafe24에서 최신 번들을 내려받아 검증 후 사용자 영역에 설치
|
||||
- 이미지에서 `+`와 `-`: 현재 화면의 이미지를 임시로 10%씩 확대 또는 축소
|
||||
- 이미지에서 `+`/`=`와 `-`: 현재 화면의 이미지를 임시로 10%씩 확대 또는 축소
|
||||
- 이미지에서 `Ctrl` + 마우스 휠: 현재 화면의 이미지를 임시로 10%씩 확대 또는 축소
|
||||
- 2페이지의 `좌→우`/`우→좌` 방향은 마지막 선택을 저장해 다음 뷰어에서 복원
|
||||
- 전체 화면에서 마우스 클릭: 숨겨진 컨트롤을 5초 동안 표시
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ AppImage 빌드가 끝나면 다음 스크립트로 체크섬과 통합 `tar.gz`
|
|||
|
||||
스크립트는 `Cargo.toml`에서 버전을 읽고 다음 파일을 생성합니다.
|
||||
|
||||
- `dist/Comicviewer-0.2.12-x86_64.AppImage.sha256`
|
||||
- `dist/Comicviewer-0.2.20-x86_64.AppImage.sha256`
|
||||
- `dist/Comicviewer-latest-x86_64.tar.gz`
|
||||
- `dist/Comicviewer-latest-x86_64.tar.gz.sha256`
|
||||
|
||||
|
|
@ -78,10 +78,10 @@ sha256sum -c Comicviewer-latest-x86_64.tar.gz.sha256
|
|||
|
||||
```sh
|
||||
git add Cargo.toml Cargo.lock data packaging README.md docs
|
||||
git commit -m "Release v0.2.12"
|
||||
git tag -a v0.2.12 -m "Comicviewer v0.2.12"
|
||||
git commit -m "Release v0.2.20"
|
||||
git tag -a v0.2.20 -m "Comicviewer v0.2.20"
|
||||
git push origin main
|
||||
git push origin v0.2.12
|
||||
git push origin v0.2.20
|
||||
```
|
||||
|
||||
이미 원격에 공개한 태그는 이동하거나 덮어쓰지 않습니다. 수정이 필요하면 새
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ pub struct AppConfig {
|
|||
pub two_page_right_to_left: bool,
|
||||
pub locations: Vec<LocationProfile>,
|
||||
pub favorites: Vec<FavoriteEntry>,
|
||||
pub recent_files: Vec<RecentFileEntry>,
|
||||
}
|
||||
|
||||
impl Default for AppConfig {
|
||||
|
|
@ -27,6 +28,7 @@ impl Default for AppConfig {
|
|||
two_page_right_to_left: true,
|
||||
locations: Vec::new(),
|
||||
favorites: Vec::new(),
|
||||
recent_files: Vec::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -52,6 +54,13 @@ pub struct FavoriteEntry {
|
|||
pub profile: LocationProfile,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct RecentFileEntry {
|
||||
pub name: String,
|
||||
pub uri: String,
|
||||
pub profile: LocationProfile,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum LocationKind {
|
||||
|
|
@ -203,6 +212,18 @@ mod tests {
|
|||
domain: String::new(),
|
||||
},
|
||||
}],
|
||||
recent_files: vec![RecentFileEntry {
|
||||
name: "최근 영상.mp4".into(),
|
||||
uri: "sftp://example.invalid/comics/recent.mp4".into(),
|
||||
profile: LocationProfile {
|
||||
name: "최근 서버".into(),
|
||||
kind: LocationKind::Sftp,
|
||||
address: "sftp://example.invalid/comics".into(),
|
||||
username: "recent-reader".into(),
|
||||
password: "recent-password".into(),
|
||||
domain: String::new(),
|
||||
},
|
||||
}],
|
||||
};
|
||||
|
||||
let encoded = toml::to_string(&config).unwrap();
|
||||
|
|
@ -210,6 +231,8 @@ mod tests {
|
|||
assert_eq!(decoded.locations[0].password, "plain-password");
|
||||
assert_eq!(decoded.favorites[0].profile.username, "favorite-reader");
|
||||
assert_eq!(decoded.favorites[0].profile.password, "favorite-password");
|
||||
assert_eq!(decoded.recent_files[0].profile.username, "recent-reader");
|
||||
assert_eq!(decoded.recent_files[0].profile.password, "recent-password");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -220,6 +243,7 @@ mod tests {
|
|||
assert_eq!(decoded.viewer_mode, ViewerMode::FitWidth);
|
||||
assert!(decoded.two_page_right_to_left);
|
||||
assert!(decoded.favorites.is_empty());
|
||||
assert!(decoded.recent_files.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
364
src/viewer.rs
364
src/viewer.rs
|
|
@ -23,10 +23,12 @@ const VIDEO_VOLUME_STEP: f64 = 0.05;
|
|||
const IMAGE_ZOOM_STEP: f64 = 0.1;
|
||||
const IMAGE_ZOOM_MIN: f64 = 0.1;
|
||||
const IMAGE_ZOOM_MAX: f64 = 4.0;
|
||||
const IMAGE_PAN_STEP: f64 = 100.0;
|
||||
const VIEWER_CONTROLLER_KEY: &str = "comicviewer-viewer-controller";
|
||||
const MEDIA_VIEWER_CONTROLLER_KEY: &str = "comicviewer-media-viewer-controller";
|
||||
const VIEWER_FILE_SEARCH_KEY: &str = "comicviewer-file-search";
|
||||
const VIEWER_FILE_SCROLL_KEY: &str = "comicviewer-file-scroll";
|
||||
const VIEWER_VIDEO_LOOP_KEY: &str = "comicviewer-video-loop";
|
||||
const PRESERVE_SEEK_CLASS: &str = "viewer-preserve-seek";
|
||||
|
||||
fn clear_viewer_controller(window: >k::ApplicationWindow) {
|
||||
|
|
@ -285,7 +287,11 @@ impl ViewerWindow {
|
|||
} = controls;
|
||||
let direction_control = two_page_direction_control
|
||||
.expect("archive viewer requires a two-page direction control");
|
||||
let title = source.display_name.clone();
|
||||
let title_files = sibling_navigator
|
||||
.as_ref()
|
||||
.map(SiblingNavigator::files)
|
||||
.unwrap_or_default();
|
||||
let title = viewer_file_title(&source.display_name, &source.source_uri, &title_files);
|
||||
let file_list_query = reuse_window
|
||||
.as_ref()
|
||||
.map(viewer_file_search_query)
|
||||
|
|
@ -974,22 +980,16 @@ impl ViewerController {
|
|||
controller.seek_edge(true);
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
gdk::Key::Up | gdk::Key::KP_Up
|
||||
if matches!(
|
||||
controller.view_mode(),
|
||||
ViewMode::ActualSize | ViewMode::FitWidth | ViewMode::Continuous
|
||||
) =>
|
||||
{
|
||||
controller.scroll_vertically(false);
|
||||
gdk::Key::Up | gdk::Key::KP_Up if controller.pan_image(false, false) => {
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
gdk::Key::Down | gdk::Key::KP_Down
|
||||
if matches!(
|
||||
controller.view_mode(),
|
||||
ViewMode::ActualSize | ViewMode::FitWidth | ViewMode::Continuous
|
||||
) =>
|
||||
{
|
||||
controller.scroll_vertically(true);
|
||||
gdk::Key::Down | gdk::Key::KP_Down if controller.pan_image(false, true) => {
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
gdk::Key::Left | gdk::Key::KP_Left if controller.pan_image(true, false) => {
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
gdk::Key::Right | gdk::Key::KP_Right if controller.pan_image(true, true) => {
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
gdk::Key::Left | gdk::Key::KP_Left | gdk::Key::Page_Up => {
|
||||
|
|
@ -1008,7 +1008,7 @@ impl ViewerController {
|
|||
controller.open_sibling(true);
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
gdk::Key::plus | gdk::Key::KP_Add => {
|
||||
gdk::Key::plus | gdk::Key::equal | gdk::Key::KP_Add => {
|
||||
controller.adjust_image_zoom(true);
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
|
|
@ -1016,6 +1016,22 @@ impl ViewerController {
|
|||
controller.adjust_image_zoom(false);
|
||||
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)
|
||||
&& key
|
||||
.to_unicode()
|
||||
|
|
@ -1548,6 +1564,15 @@ impl ViewerController {
|
|||
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>) {
|
||||
let generation = self.view_layout_generation.get().wrapping_add(1);
|
||||
self.view_layout_generation.set(generation);
|
||||
|
|
@ -1615,16 +1640,18 @@ impl ViewerController {
|
|||
self.seek_page(if end { count - 1 } else { 0 });
|
||||
}
|
||||
|
||||
fn scroll_vertically(&self, down: bool) {
|
||||
let adjustment = if self.view_mode() == ViewMode::Continuous {
|
||||
self.continuous_scrolled.vadjustment()
|
||||
} else {
|
||||
self.single_scrolled.vadjustment()
|
||||
fn pan_image(&self, horizontal: bool, forward: bool) -> bool {
|
||||
let scrolled = match self.view_mode() {
|
||||
ViewMode::TwoPage => &self.spread_scrolled,
|
||||
ViewMode::Continuous => &self.continuous_scrolled,
|
||||
_ => &self.single_scrolled,
|
||||
};
|
||||
let step = adjustment.step_increment().max(64.0);
|
||||
let delta = if down { step } else { -step };
|
||||
let maximum = (adjustment.upper() - adjustment.page_size()).max(adjustment.lower());
|
||||
adjustment.set_value((adjustment.value() + delta).clamp(adjustment.lower(), maximum));
|
||||
let adjustment = if horizontal {
|
||||
scrolled.hadjustment()
|
||||
} else {
|
||||
scrolled.vadjustment()
|
||||
};
|
||||
pan_adjustment(&adjustment, forward)
|
||||
}
|
||||
|
||||
fn shift_pairing(self: &Rc<Self>, offset: isize) {
|
||||
|
|
@ -1845,8 +1872,8 @@ impl ViewerController {
|
|||
if (zoom - 1.0).abs() >= f64::EPSILON {
|
||||
let (width, height) = zoomed_picture_request(
|
||||
self.view_mode(),
|
||||
self.single_scrolled.allocated_width().max(1),
|
||||
self.single_scrolled.allocated_height().max(1),
|
||||
self.single_scrolled.width().max(1),
|
||||
self.single_scrolled.height().max(1),
|
||||
texture_width,
|
||||
texture_height,
|
||||
zoom,
|
||||
|
|
@ -1864,7 +1891,7 @@ impl ViewerController {
|
|||
self.single_picture.set_size_request(width, height);
|
||||
} else if let Some((width, height)) = single_picture_request(
|
||||
self.view_mode(),
|
||||
self.stack.allocated_width().max(1),
|
||||
self.stack.width().max(1),
|
||||
texture_width,
|
||||
texture_height,
|
||||
) {
|
||||
|
|
@ -1908,8 +1935,8 @@ impl ViewerController {
|
|||
};
|
||||
drop(state);
|
||||
let count = visible.len().max(1) as i32;
|
||||
let viewport_width = (self.spread_scrolled.allocated_width().max(1) - 8) / count;
|
||||
let viewport_height = self.spread_scrolled.allocated_height().max(1);
|
||||
let viewport_width = (self.spread_scrolled.width().max(1) - 8) / count;
|
||||
let viewport_height = self.spread_scrolled.height().max(1);
|
||||
self.spread_box.set_homogeneous(false);
|
||||
self.spread_box.set_halign(gtk::Align::Center);
|
||||
self.spread_box.set_valign(gtk::Align::Center);
|
||||
|
|
@ -2150,7 +2177,7 @@ impl ViewerController {
|
|||
}
|
||||
|
||||
fn continuous_content_width(&self) -> i32 {
|
||||
continuous_content_width(self.stack.allocated_width())
|
||||
continuous_content_width(self.stack.width())
|
||||
}
|
||||
|
||||
fn evict_cache(&self) {
|
||||
|
|
@ -2238,7 +2265,11 @@ impl MediaViewerWindow {
|
|||
view_mode_control,
|
||||
two_page_direction_control: _,
|
||||
} = controls;
|
||||
let title = source.display_name.clone();
|
||||
let title_files = sibling_navigator
|
||||
.as_ref()
|
||||
.map(SiblingNavigator::files)
|
||||
.unwrap_or_default();
|
||||
let title = viewer_file_title(&source.display_name, &source.source_uri, &title_files);
|
||||
let file_list_query = reuse_window
|
||||
.as_ref()
|
||||
.map(viewer_file_search_query)
|
||||
|
|
@ -2247,6 +2278,7 @@ impl MediaViewerWindow {
|
|||
.as_ref()
|
||||
.map(viewer_file_scroll_position)
|
||||
.unwrap_or_default();
|
||||
let video_loop_active = reuse_window.as_ref().is_some_and(viewer_video_loop_enabled);
|
||||
if let Some(window) = reuse_window.as_ref() {
|
||||
clear_viewer_controller(window);
|
||||
}
|
||||
|
|
@ -2270,6 +2302,7 @@ impl MediaViewerWindow {
|
|||
file_list_button.set_sensitive(sibling_navigator.is_some());
|
||||
file_list_button.set_active(window.has_css_class("viewer-file-list-visible"));
|
||||
let loop_check = gtk::CheckButton::with_label("반복 재생");
|
||||
loop_check.set_active(video_loop_active);
|
||||
loop_check.set_visible(kind == EntryKind::Video);
|
||||
let image_mode_dropdown = gtk::DropDown::from_strings(&["100%", "폭 맞춤", "높이 맞춤"]);
|
||||
let (image_mode_selected, image_mode_change) =
|
||||
|
|
@ -2306,14 +2339,13 @@ impl MediaViewerWindow {
|
|||
} else {
|
||||
gtk::Video::new()
|
||||
};
|
||||
video.set_autoplay(true);
|
||||
video.set_autoplay(false);
|
||||
video.set_loop(false);
|
||||
video.set_hexpand(true);
|
||||
video.set_vexpand(true);
|
||||
let video_for_loop = video.clone();
|
||||
loop_check.connect_toggled(move |check| video_for_loop.set_loop(check.is_active()));
|
||||
stack.add_named(&video, Some("video"));
|
||||
let status_label = gtk::Label::builder()
|
||||
.label(&title)
|
||||
.label(&source.display_name)
|
||||
.xalign(0.0)
|
||||
.margin_top(6)
|
||||
.margin_bottom(6)
|
||||
|
|
@ -2399,12 +2431,36 @@ impl MediaViewerWindow {
|
|||
navigation_message_generation: Rc::new(Cell::new(0)),
|
||||
});
|
||||
if let Some(stream) = controller.video.media_stream() {
|
||||
stream.set_loop(false);
|
||||
let status_label = controller.status_label.clone();
|
||||
stream.connect_error_notify(move |stream| {
|
||||
if let Some(error) = stream.error() {
|
||||
status_label.set_text(&format!("동영상을 재생할 수 없습니다: {error}"));
|
||||
}
|
||||
});
|
||||
let restart_pending = Rc::new(Cell::new(false));
|
||||
let loop_check_for_end = loop_check.downgrade();
|
||||
let restart_pending_for_end = Rc::clone(&restart_pending);
|
||||
stream.connect_ended_notify(move |stream| {
|
||||
let Some(check) = loop_check_for_end.upgrade() else {
|
||||
return;
|
||||
};
|
||||
schedule_video_loop_restart(stream, &check, &restart_pending_for_end);
|
||||
});
|
||||
let loop_check_for_timestamp = loop_check.downgrade();
|
||||
let restart_pending_for_timestamp = Rc::clone(&restart_pending);
|
||||
stream.connect_timestamp_notify(move |stream| {
|
||||
let Some(check) = loop_check_for_timestamp.upgrade() else {
|
||||
return;
|
||||
};
|
||||
schedule_video_loop_restart(stream, &check, &restart_pending_for_timestamp);
|
||||
});
|
||||
let stream_for_loop_check = stream.clone();
|
||||
let window_for_loop_check = controller.window.clone();
|
||||
loop_check.connect_toggled(move |check| {
|
||||
store_viewer_video_loop(&window_for_loop_check, check.is_active());
|
||||
schedule_video_loop_restart(&stream_for_loop_check, check, &restart_pending);
|
||||
});
|
||||
}
|
||||
controller.connect_signals();
|
||||
controller.fullscreen_changed();
|
||||
|
|
@ -2431,6 +2487,7 @@ impl MediaViewerWindow {
|
|||
EntryKind::Video => {
|
||||
controller.stack.set_visible_child_name("video");
|
||||
if let Some(stream) = controller.video.media_stream() {
|
||||
initialize_video_volume(&stream);
|
||||
stream.play();
|
||||
}
|
||||
}
|
||||
|
|
@ -2580,22 +2637,23 @@ impl MediaViewerController {
|
|||
}
|
||||
gdk::Key::Up | gdk::Key::KP_Up
|
||||
if controller.kind == EntryKind::Image
|
||||
&& matches!(
|
||||
controller.image_view_mode(),
|
||||
ViewMode::ActualSize | ViewMode::FitWidth
|
||||
) =>
|
||||
&& controller.pan_image(false, false) =>
|
||||
{
|
||||
controller.scroll_image(false);
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
gdk::Key::Down | gdk::Key::KP_Down
|
||||
if controller.kind == EntryKind::Image
|
||||
&& matches!(
|
||||
controller.image_view_mode(),
|
||||
ViewMode::ActualSize | ViewMode::FitWidth
|
||||
) =>
|
||||
if controller.kind == EntryKind::Image && controller.pan_image(false, true) =>
|
||||
{
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
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
|
||||
}
|
||||
_ if key.to_unicode() == Some('[') => {
|
||||
|
|
@ -2606,7 +2664,9 @@ impl MediaViewerController {
|
|||
controller.open_sibling(true);
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
gdk::Key::plus | gdk::Key::KP_Add if controller.kind == EntryKind::Image => {
|
||||
gdk::Key::plus | gdk::Key::equal | gdk::Key::KP_Add
|
||||
if controller.kind == EntryKind::Image =>
|
||||
{
|
||||
controller.adjust_image_zoom(true);
|
||||
glib::Propagation::Stop
|
||||
}
|
||||
|
|
@ -2614,6 +2674,18 @@ impl MediaViewerController {
|
|||
controller.adjust_image_zoom(false);
|
||||
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
|
||||
.to_unicode()
|
||||
.is_some_and(|character| character.eq_ignore_ascii_case(&'l')) =>
|
||||
|
|
@ -2982,6 +3054,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) {
|
||||
let Some((texture_width, texture_height)) = self.image_dimensions.get() else {
|
||||
return;
|
||||
|
|
@ -2990,8 +3071,8 @@ impl MediaViewerController {
|
|||
if (zoom - 1.0).abs() >= f64::EPSILON {
|
||||
let (width, height) = zoomed_picture_request(
|
||||
self.image_view_mode(),
|
||||
self.image_scrolled.allocated_width().max(1),
|
||||
self.image_scrolled.allocated_height().max(1),
|
||||
self.image_scrolled.width().max(1),
|
||||
self.image_scrolled.height().max(1),
|
||||
texture_width,
|
||||
texture_height,
|
||||
zoom,
|
||||
|
|
@ -3009,7 +3090,7 @@ impl MediaViewerController {
|
|||
self.picture.set_size_request(width, height);
|
||||
} else if let Some((width, height)) = single_picture_request(
|
||||
self.image_view_mode(),
|
||||
self.stack.allocated_width().max(1),
|
||||
self.stack.width().max(1),
|
||||
texture_width,
|
||||
texture_height,
|
||||
) {
|
||||
|
|
@ -3017,12 +3098,13 @@ impl MediaViewerController {
|
|||
}
|
||||
}
|
||||
|
||||
fn scroll_image(&self, down: bool) {
|
||||
let adjustment = self.image_scrolled.vadjustment();
|
||||
let step = adjustment.step_increment().max(64.0);
|
||||
let delta = if down { step } else { -step };
|
||||
let maximum = (adjustment.upper() - adjustment.page_size()).max(adjustment.lower());
|
||||
adjustment.set_value((adjustment.value() + delta).clamp(adjustment.lower(), maximum));
|
||||
fn pan_image(&self, horizontal: bool, forward: bool) -> bool {
|
||||
let adjustment = if horizontal {
|
||||
self.image_scrolled.hadjustment()
|
||||
} else {
|
||||
self.image_scrolled.vadjustment()
|
||||
};
|
||||
pan_adjustment(&adjustment, forward)
|
||||
}
|
||||
|
||||
fn open_sibling(&self, forward: bool) {
|
||||
|
|
@ -3371,6 +3453,13 @@ fn viewer_title_label(title: &str) -> gtk::Label {
|
|||
.build()
|
||||
}
|
||||
|
||||
fn viewer_file_title(display_name: &str, current_uri: &str, files: &[SiblingFile]) -> String {
|
||||
seek_position(files, current_uri).map_or_else(
|
||||
|| display_name.to_owned(),
|
||||
|index| format!("{display_name} ({}/{})", index + 1, files.len()),
|
||||
)
|
||||
}
|
||||
|
||||
struct ViewerFileList {
|
||||
panel: gtk::Box,
|
||||
search: gtk::SearchEntry,
|
||||
|
|
@ -3542,6 +3631,20 @@ fn store_viewer_file_scroll_position(window: >k::ApplicationWindow, position:
|
|||
}
|
||||
}
|
||||
|
||||
fn viewer_video_loop_enabled(window: >k::ApplicationWindow) -> bool {
|
||||
unsafe {
|
||||
window
|
||||
.data::<bool>(VIEWER_VIDEO_LOOP_KEY)
|
||||
.is_some_and(|active| *active.as_ref())
|
||||
}
|
||||
}
|
||||
|
||||
fn store_viewer_video_loop(window: >k::ApplicationWindow, active: bool) {
|
||||
unsafe {
|
||||
window.set_data(VIEWER_VIDEO_LOOP_KEY, active);
|
||||
}
|
||||
}
|
||||
|
||||
fn restore_viewer_file_scroll(scrolled: >k::ScrolledWindow, position: f64) {
|
||||
let scrolled = scrolled.clone();
|
||||
glib::idle_add_local_once(move || {
|
||||
|
|
@ -3995,6 +4098,99 @@ fn video_volume_target(volume: f64, delta: f64) -> f64 {
|
|||
(volume + delta).clamp(0.0, 1.0)
|
||||
}
|
||||
|
||||
fn video_loop_restart_needed(
|
||||
ended: bool,
|
||||
timestamp: i64,
|
||||
duration: i64,
|
||||
loop_active: bool,
|
||||
) -> bool {
|
||||
loop_active && (ended || (duration > 0 && timestamp >= duration))
|
||||
}
|
||||
|
||||
fn schedule_video_loop_restart(
|
||||
stream: >k::MediaStream,
|
||||
check: >k::CheckButton,
|
||||
pending: &Rc<Cell<bool>>,
|
||||
) {
|
||||
let restart_needed = video_loop_restart_needed(
|
||||
stream.is_ended(),
|
||||
stream.timestamp(),
|
||||
stream.duration(),
|
||||
check.is_active(),
|
||||
);
|
||||
if !begin_video_loop_restart(pending, restart_needed) {
|
||||
return;
|
||||
}
|
||||
let stream = stream.clone();
|
||||
let check = check.downgrade();
|
||||
let pending = Rc::clone(pending);
|
||||
glib::timeout_add_local_once(Duration::from_millis(50), move || {
|
||||
let Some(check) = check.upgrade() else {
|
||||
pending.set(false);
|
||||
return;
|
||||
};
|
||||
if video_loop_restart_needed(
|
||||
stream.is_ended(),
|
||||
stream.timestamp(),
|
||||
stream.duration(),
|
||||
check.is_active(),
|
||||
) {
|
||||
stream.pause();
|
||||
stream.seek(0);
|
||||
stream.play();
|
||||
}
|
||||
pending.set(false);
|
||||
});
|
||||
}
|
||||
|
||||
fn begin_video_loop_restart(pending: &Cell<bool>, restart_needed: bool) -> bool {
|
||||
if !restart_needed {
|
||||
pending.set(false);
|
||||
return false;
|
||||
}
|
||||
!pending.replace(true)
|
||||
}
|
||||
|
||||
fn initialize_video_volume(stream: >k::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: >k::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)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
|
@ -4111,6 +4307,38 @@ mod tests {
|
|||
assert_eq!(video_volume_target(0.5, 0.05), 0.55);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn video_loop_restarts_only_after_ending_when_enabled() {
|
||||
assert!(video_loop_restart_needed(true, 0, 10, true));
|
||||
assert!(video_loop_restart_needed(false, 11, 10, true));
|
||||
assert!(!video_loop_restart_needed(false, 9, 10, true));
|
||||
assert!(!video_loop_restart_needed(false, 11, 0, true));
|
||||
assert!(!video_loop_restart_needed(true, 10, 10, false));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn video_loop_can_restart_more_than_once() {
|
||||
let pending = Cell::new(false);
|
||||
assert!(begin_video_loop_restart(&pending, true));
|
||||
assert!(!begin_video_loop_restart(&pending, true));
|
||||
pending.set(false);
|
||||
assert!(begin_video_loop_restart(&pending, true));
|
||||
assert!(!begin_video_loop_restart(&pending, false));
|
||||
}
|
||||
|
||||
#[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]
|
||||
fn viewer_file_typeahead_wraps_by_display_name() {
|
||||
let files = ["Alpha.zip", "beta.jpg", "Bravo.mp4"].map(|name| SiblingFile {
|
||||
|
|
@ -4185,6 +4413,28 @@ mod tests {
|
|||
assert_eq!(seek_sibling_files(files, EntryKind::Image, true).len(), 3);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn viewer_title_includes_current_file_index() {
|
||||
let files = ["first.zip", "second.jpg", "third.mp4"].map(|name| SiblingFile {
|
||||
uri: format!("file:///{name}"),
|
||||
name: name.into(),
|
||||
kind: EntryKind::Image,
|
||||
});
|
||||
|
||||
assert_eq!(
|
||||
viewer_file_title("second.jpg", "file:///second.jpg", &files),
|
||||
"second.jpg (2/3)"
|
||||
);
|
||||
assert_eq!(
|
||||
viewer_file_title("missing.jpg", "file:///missing.jpg", &files),
|
||||
"missing.jpg"
|
||||
);
|
||||
assert_eq!(
|
||||
viewer_file_title("only.jpg", "file:///only.jpg", &[]),
|
||||
"only.jpg"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn playlist_search_filters_and_empty_query_restores_files() {
|
||||
let files = ["Alpha.zip", "beta.jpg", "Bravo.mp4"].map(|name| SiblingFile {
|
||||
|
|
|
|||
408
src/window.rs
408
src/window.rs
|
|
@ -21,7 +21,9 @@ use tar::Archive;
|
|||
use crate::browser::{
|
||||
BrowserEntry, EntryKind, SortDirection, SortField, classify_file, sort_entries,
|
||||
};
|
||||
use crate::config::{AppConfig, FavoriteEntry, LocationKind, LocationProfile, ViewerMode};
|
||||
use crate::config::{
|
||||
AppConfig, FavoriteEntry, LocationKind, LocationProfile, RecentFileEntry, ViewerMode,
|
||||
};
|
||||
use crate::database::Database;
|
||||
use crate::source::{
|
||||
display_remote_uri, ensure_mounted, enumerate_directory, enumerate_tree_entries,
|
||||
|
|
@ -36,6 +38,7 @@ use crate::viewer::{
|
|||
use crate::zip_cache::ZipCache;
|
||||
|
||||
const MOUSE_BACK_BUTTON: u32 = 8;
|
||||
const RECENT_FILE_LIMIT: usize = 100;
|
||||
const UPDATE_BUNDLE_URL: &str =
|
||||
"https://burningtuna.cafe24.com/www/Downloads/Comicviewer/Comicviewer-latest-x86_64.tar.gz";
|
||||
const UPDATE_CHECKSUM_URL: &str = "https://burningtuna.cafe24.com/www/Downloads/Comicviewer/Comicviewer-latest-x86_64.tar.gz.sha256";
|
||||
|
|
@ -83,11 +86,14 @@ impl ComicWindow {
|
|||
edit_location_button.set_sensitive(false);
|
||||
let delete_location_button = gtk::Button::with_label("삭제");
|
||||
delete_location_button.set_sensitive(false);
|
||||
let clear_recent_button = gtk::Button::with_label("최근 기록 비우기");
|
||||
clear_recent_button.set_visible(false);
|
||||
locations.append(>k::Label::new(Some("위치")));
|
||||
locations.append(&location_dropdown);
|
||||
locations.append(&add_location_button);
|
||||
locations.append(&edit_location_button);
|
||||
locations.append(&delete_location_button);
|
||||
locations.append(&clear_recent_button);
|
||||
|
||||
let navigation = gtk::Box::new(gtk::Orientation::Horizontal, 6);
|
||||
let up_button = gtk::Button::builder()
|
||||
|
|
@ -149,6 +155,7 @@ impl ComicWindow {
|
|||
location_dropdown,
|
||||
edit_location_button,
|
||||
delete_location_button,
|
||||
clear_recent_button: clear_recent_button.clone(),
|
||||
path_entry,
|
||||
search_entry,
|
||||
sort_dropdown,
|
||||
|
|
@ -159,7 +166,7 @@ impl ComicWindow {
|
|||
state: RefCell::new(BrowserState {
|
||||
profile_index: 0,
|
||||
favorite_profile: None,
|
||||
browsing_favorites: false,
|
||||
mode: BrowserMode::Directory,
|
||||
root_uri: root_uri.clone(),
|
||||
current_uri: root_uri,
|
||||
entries: Vec::new(),
|
||||
|
|
@ -206,7 +213,7 @@ impl ComicWindow {
|
|||
struct BrowserState {
|
||||
profile_index: usize,
|
||||
favorite_profile: Option<LocationProfile>,
|
||||
browsing_favorites: bool,
|
||||
mode: BrowserMode,
|
||||
root_uri: String,
|
||||
current_uri: String,
|
||||
entries: Vec<BrowserEntry>,
|
||||
|
|
@ -218,6 +225,13 @@ struct BrowserState {
|
|||
typeahead_last_input: Option<Instant>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
enum BrowserMode {
|
||||
Directory,
|
||||
Favorites,
|
||||
Recent,
|
||||
}
|
||||
|
||||
struct BrowserController {
|
||||
window: gtk::ApplicationWindow,
|
||||
about_button: gtk::Button,
|
||||
|
|
@ -225,6 +239,7 @@ struct BrowserController {
|
|||
location_dropdown: gtk::DropDown,
|
||||
edit_location_button: gtk::Button,
|
||||
delete_location_button: gtk::Button,
|
||||
clear_recent_button: gtk::Button,
|
||||
path_entry: gtk::Entry,
|
||||
search_entry: gtk::SearchEntry,
|
||||
sort_dropdown: gtk::DropDown,
|
||||
|
|
@ -298,8 +313,10 @@ impl BrowserController {
|
|||
let Some(controller) = controller.upgrade() else {
|
||||
return;
|
||||
};
|
||||
if is_favorites_selection(item.position(), controller.profiles().len()) {
|
||||
controller.show_favorites();
|
||||
match special_browser_mode(item.position(), controller.profiles().len()) {
|
||||
Some(BrowserMode::Favorites) => controller.show_favorites(),
|
||||
Some(BrowserMode::Recent) => controller.show_recent(),
|
||||
_ => {}
|
||||
}
|
||||
});
|
||||
label.add_controller(click);
|
||||
|
|
@ -406,6 +423,9 @@ impl BrowserController {
|
|||
let controller = Rc::clone(self);
|
||||
self.clear_cache_button
|
||||
.connect_clicked(move |_| controller.show_clear_cache_dialog());
|
||||
let controller = Rc::clone(self);
|
||||
self.clear_recent_button
|
||||
.connect_clicked(move |_| controller.show_clear_recent_dialog());
|
||||
}
|
||||
|
||||
fn profiles(&self) -> Vec<LocationProfile> {
|
||||
|
|
@ -431,6 +451,7 @@ impl BrowserController {
|
|||
.map(|profile| profile.name.clone())
|
||||
.collect();
|
||||
names.push("즐겨찾기".into());
|
||||
names.push("최근 열어본 파일".into());
|
||||
let names: Vec<_> = names.iter().map(String::as_str).collect();
|
||||
self.location_dropdown
|
||||
.set_model(Some(>k::StringList::new(&names)));
|
||||
|
|
@ -439,9 +460,16 @@ impl BrowserController {
|
|||
fn select_profile(self: &Rc<Self>) {
|
||||
let profile_index = self.location_dropdown.selected() as usize;
|
||||
let profiles = self.profiles();
|
||||
if is_favorites_selection(self.location_dropdown.selected(), profiles.len()) {
|
||||
self.show_favorites();
|
||||
return;
|
||||
match special_browser_mode(self.location_dropdown.selected(), profiles.len()) {
|
||||
Some(BrowserMode::Favorites) => {
|
||||
self.show_favorites();
|
||||
return;
|
||||
}
|
||||
Some(BrowserMode::Recent) => {
|
||||
self.show_recent();
|
||||
return;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
let editable = profile_index > 0 && profile_index < profiles.len();
|
||||
self.edit_location_button.set_sensitive(editable);
|
||||
|
|
@ -455,10 +483,11 @@ impl BrowserController {
|
|||
let mut state = self.state.borrow_mut();
|
||||
state.profile_index = profile_index;
|
||||
state.favorite_profile = None;
|
||||
state.browsing_favorites = false;
|
||||
state.mode = BrowserMode::Directory;
|
||||
state.root_uri = root_uri.clone();
|
||||
state.current_uri = root_uri;
|
||||
drop(state);
|
||||
self.update_mode_controls(BrowserMode::Directory);
|
||||
self.path_entry.set_editable(true);
|
||||
self.search_entry.set_text("");
|
||||
self.refresh();
|
||||
|
|
@ -484,24 +513,58 @@ impl BrowserController {
|
|||
state.generation = state.generation.wrapping_add(1);
|
||||
state.typeahead_query.clear();
|
||||
state.typeahead_last_input = None;
|
||||
state.browsing_favorites = true;
|
||||
state.mode = BrowserMode::Favorites;
|
||||
state.favorite_profile = None;
|
||||
state.entries = entries;
|
||||
drop(state);
|
||||
self.update_mode_controls(BrowserMode::Favorites);
|
||||
self.search_entry.set_text("");
|
||||
self.render();
|
||||
}
|
||||
|
||||
fn show_recent(&self) {
|
||||
self.cancel_listing();
|
||||
self.edit_location_button.set_sensitive(false);
|
||||
self.delete_location_button.set_sensitive(false);
|
||||
self.path_entry.set_text("최근 열어본 파일");
|
||||
self.path_entry.set_editable(false);
|
||||
let entries = self
|
||||
.config
|
||||
.borrow()
|
||||
.recent_files
|
||||
.iter()
|
||||
.map(recent_file_browser_entry)
|
||||
.collect();
|
||||
let mut state = self.state.borrow_mut();
|
||||
state.generation = state.generation.wrapping_add(1);
|
||||
state.typeahead_query.clear();
|
||||
state.typeahead_last_input = None;
|
||||
state.mode = BrowserMode::Recent;
|
||||
state.favorite_profile = None;
|
||||
state.entries = entries;
|
||||
drop(state);
|
||||
self.update_mode_controls(BrowserMode::Recent);
|
||||
self.search_entry.set_text("");
|
||||
self.render();
|
||||
}
|
||||
|
||||
fn update_mode_controls(&self, mode: BrowserMode) {
|
||||
let recent = mode == BrowserMode::Recent;
|
||||
self.clear_recent_button.set_visible(recent);
|
||||
self.sort_dropdown.set_sensitive(!recent);
|
||||
self.direction_button.set_sensitive(!recent);
|
||||
}
|
||||
|
||||
fn open_favorite(self: &Rc<Self>, favorite: FavoriteEntry) {
|
||||
let Ok(root) = root_file(&favorite.profile) else {
|
||||
self.status_label
|
||||
.set_text("즐겨찾기의 저장된 위치가 올바르지 않습니다.");
|
||||
.set_text("저장된 파일의 위치 정보가 올바르지 않습니다.");
|
||||
return;
|
||||
};
|
||||
let favorite_file = gio::File::for_uri(&favorite.uri);
|
||||
if !is_within_root(&favorite_file, &root) {
|
||||
self.status_label
|
||||
.set_text("즐겨찾기가 저장된 위치의 루트 밖을 가리킵니다.");
|
||||
.set_text("저장된 파일이 위치의 루트 밖을 가리킵니다.");
|
||||
return;
|
||||
}
|
||||
if favorite.is_directory {
|
||||
|
|
@ -511,17 +574,18 @@ impl BrowserController {
|
|||
self.delete_location_button.set_sensitive(false);
|
||||
let mut state = self.state.borrow_mut();
|
||||
state.favorite_profile = Some(favorite.profile.clone());
|
||||
state.browsing_favorites = false;
|
||||
state.mode = BrowserMode::Directory;
|
||||
state.root_uri = root.uri().into();
|
||||
state.current_uri = favorite.uri;
|
||||
drop(state);
|
||||
self.update_mode_controls(BrowserMode::Directory);
|
||||
self.search_entry.set_text("");
|
||||
self.refresh();
|
||||
return;
|
||||
}
|
||||
|
||||
self.cancel_listing();
|
||||
self.status_label.set_text("즐겨찾기에 연결하는 중...");
|
||||
self.status_label.set_text("저장된 파일에 연결하는 중...");
|
||||
let operation = mount_operation(&favorite.profile, &self.window);
|
||||
let controller = Rc::downgrade(self);
|
||||
let task = glib::MainContext::default().spawn_local(async move {
|
||||
|
|
@ -554,7 +618,7 @@ impl BrowserController {
|
|||
if !kind.is_viewable() {
|
||||
controller
|
||||
.status_label
|
||||
.set_text("이 즐겨찾기 파일 형식은 열 수 없습니다.");
|
||||
.set_text("이 파일 형식은 열 수 없습니다.");
|
||||
return;
|
||||
}
|
||||
let entry = folder_entries
|
||||
|
|
@ -591,8 +655,7 @@ impl BrowserController {
|
|||
}
|
||||
|
||||
fn open_entered_path(self: &Rc<Self>) {
|
||||
let browsing_favorites = self.state.borrow().browsing_favorites;
|
||||
if browsing_favorites {
|
||||
if self.state.borrow().mode != BrowserMode::Directory {
|
||||
return;
|
||||
}
|
||||
let profile = self.current_profile();
|
||||
|
|
@ -609,8 +672,7 @@ impl BrowserController {
|
|||
}
|
||||
|
||||
fn go_up(self: &Rc<Self>) {
|
||||
let browsing_favorites = self.state.borrow().browsing_favorites;
|
||||
if browsing_favorites {
|
||||
if self.state.borrow().mode != BrowserMode::Directory {
|
||||
return;
|
||||
}
|
||||
let state = self.state.borrow();
|
||||
|
|
@ -624,10 +686,17 @@ impl BrowserController {
|
|||
}
|
||||
|
||||
fn refresh(self: &Rc<Self>) {
|
||||
let browsing_favorites = self.state.borrow().browsing_favorites;
|
||||
if browsing_favorites {
|
||||
self.show_favorites();
|
||||
return;
|
||||
let mode = self.state.borrow().mode;
|
||||
match mode {
|
||||
BrowserMode::Favorites => {
|
||||
self.show_favorites();
|
||||
return;
|
||||
}
|
||||
BrowserMode::Recent => {
|
||||
self.show_recent();
|
||||
return;
|
||||
}
|
||||
BrowserMode::Directory => {}
|
||||
}
|
||||
self.cancel_listing();
|
||||
let (profile, uri, generation) = {
|
||||
|
|
@ -658,7 +727,8 @@ impl BrowserController {
|
|||
let Some(controller) = progress_controller.upgrade() else {
|
||||
return;
|
||||
};
|
||||
if controller.state.borrow().generation == generation {
|
||||
let state = controller.state.borrow();
|
||||
if state.generation == generation && state.mode == BrowserMode::Directory {
|
||||
controller.status_label.set_text(&format!(
|
||||
"폴더를 불러오는 중... ({count}개의 파일/폴더를 읽음)"
|
||||
));
|
||||
|
|
@ -669,7 +739,7 @@ impl BrowserController {
|
|||
return;
|
||||
};
|
||||
let state = controller.state.borrow();
|
||||
let stale = state.generation != generation || state.browsing_favorites;
|
||||
let stale = state.generation != generation || state.mode != BrowserMode::Directory;
|
||||
drop(state);
|
||||
if stale {
|
||||
return;
|
||||
|
|
@ -701,12 +771,14 @@ impl BrowserController {
|
|||
.filter(|entry| browser_search_match(entry, query.as_str()))
|
||||
.cloned()
|
||||
.collect();
|
||||
sort_entries(
|
||||
&mut visible_entries,
|
||||
state.sort_field,
|
||||
state.sort_direction,
|
||||
case_insensitive,
|
||||
);
|
||||
if state.mode != BrowserMode::Recent {
|
||||
sort_entries(
|
||||
&mut visible_entries,
|
||||
state.sort_field,
|
||||
state.sort_direction,
|
||||
case_insensitive,
|
||||
);
|
||||
}
|
||||
let count = visible_entries.len();
|
||||
let names = visible_entries
|
||||
.iter()
|
||||
|
|
@ -776,8 +848,11 @@ impl BrowserController {
|
|||
drop(state);
|
||||
|
||||
if let Some(index) = found {
|
||||
self.list_selection.set_selected(index as u32);
|
||||
let _ = self.list_view.grab_focus();
|
||||
self.list_view.scroll_to(
|
||||
index as u32,
|
||||
gtk::ListScrollFlags::FOCUS | gtk::ListScrollFlags::SELECT,
|
||||
None,
|
||||
);
|
||||
self.status_label.set_text(&format!(
|
||||
"'{query}'로 이동: {}",
|
||||
found_name.unwrap_or_default()
|
||||
|
|
@ -828,19 +903,40 @@ impl BrowserController {
|
|||
else {
|
||||
return;
|
||||
};
|
||||
let browsing_favorites = self.state.borrow().browsing_favorites;
|
||||
if browsing_favorites {
|
||||
let favorite = self
|
||||
.config
|
||||
.borrow()
|
||||
.favorites
|
||||
.iter()
|
||||
.find(|favorite| favorite.uri == entry.uri)
|
||||
.cloned();
|
||||
if let Some(favorite) = favorite {
|
||||
self.open_favorite(favorite);
|
||||
let mode = self.state.borrow().mode;
|
||||
match mode {
|
||||
BrowserMode::Favorites => {
|
||||
let favorite = self
|
||||
.config
|
||||
.borrow()
|
||||
.favorites
|
||||
.iter()
|
||||
.find(|favorite| favorite.uri == entry.uri)
|
||||
.cloned();
|
||||
if let Some(favorite) = favorite {
|
||||
self.open_favorite(favorite);
|
||||
}
|
||||
return;
|
||||
}
|
||||
return;
|
||||
BrowserMode::Recent => {
|
||||
let recent = self
|
||||
.config
|
||||
.borrow()
|
||||
.recent_files
|
||||
.iter()
|
||||
.find(|recent| recent.uri == entry.uri)
|
||||
.cloned();
|
||||
if let Some(recent) = recent {
|
||||
self.open_favorite(FavoriteEntry {
|
||||
name: recent.name,
|
||||
uri: recent.uri,
|
||||
is_directory: false,
|
||||
profile: recent.profile,
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
BrowserMode::Directory => {}
|
||||
}
|
||||
match entry.kind {
|
||||
EntryKind::Directory => {
|
||||
|
|
@ -985,9 +1081,9 @@ impl BrowserController {
|
|||
state.sort_direction,
|
||||
case_insensitive,
|
||||
);
|
||||
let browsing_favorites = state.browsing_favorites;
|
||||
let mode = state.mode;
|
||||
drop(state);
|
||||
if !browsing_favorites && entries.iter().any(|entry| entry.uri == current_uri) {
|
||||
if mode == BrowserMode::Directory && entries.iter().any(|entry| entry.uri == current_uri) {
|
||||
Rc::new(entries)
|
||||
} else {
|
||||
Rc::clone(fallback)
|
||||
|
|
@ -1001,6 +1097,8 @@ impl BrowserController {
|
|||
profile: LocationProfile,
|
||||
reuse_window: Option<gtk::ApplicationWindow>,
|
||||
) {
|
||||
let recent_entry = entry.clone();
|
||||
let recent_profile = profile.clone();
|
||||
self.status_label.set_text("ZIP 파일 다운로드 준비 중...");
|
||||
let progress_label = reuse_window.as_ref().map_or_else(
|
||||
|| self.status_label.clone(),
|
||||
|
|
@ -1027,6 +1125,7 @@ impl BrowserController {
|
|||
}
|
||||
match result {
|
||||
Ok(source) => {
|
||||
controller.record_recent_file(&recent_entry, &recent_profile);
|
||||
controller.status_label.set_text("다운로드 완료");
|
||||
result_label.set_text("ZIP 파일을 여는 중...");
|
||||
let Some(application) = controller.window.application() else {
|
||||
|
|
@ -1068,6 +1167,8 @@ impl BrowserController {
|
|||
profile: LocationProfile,
|
||||
reuse_window: Option<gtk::ApplicationWindow>,
|
||||
) {
|
||||
let recent_entry = entry.clone();
|
||||
let recent_profile = profile.clone();
|
||||
let kind = entry.kind;
|
||||
self.status_label
|
||||
.set_text("미디어 파일 다운로드 준비 중...");
|
||||
|
|
@ -1096,6 +1197,7 @@ impl BrowserController {
|
|||
}
|
||||
match result {
|
||||
Ok(source) => {
|
||||
controller.record_recent_file(&recent_entry, &recent_profile);
|
||||
controller.status_label.set_text("다운로드 완료");
|
||||
result_label.set_text("미디어 파일을 여는 중...");
|
||||
let Some(application) = controller.window.application() else {
|
||||
|
|
@ -1208,16 +1310,32 @@ impl BrowserController {
|
|||
}
|
||||
|
||||
fn profile_for_entry(&self, entry: &BrowserEntry) -> LocationProfile {
|
||||
if self.state.borrow().browsing_favorites
|
||||
&& let Some(profile) = self
|
||||
.config
|
||||
.borrow()
|
||||
.favorites
|
||||
.iter()
|
||||
.find(|favorite| favorite.uri == entry.uri)
|
||||
.map(|favorite| favorite.profile.clone())
|
||||
{
|
||||
return profile;
|
||||
match self.state.borrow().mode {
|
||||
BrowserMode::Favorites => {
|
||||
if let Some(profile) = self
|
||||
.config
|
||||
.borrow()
|
||||
.favorites
|
||||
.iter()
|
||||
.find(|favorite| favorite.uri == entry.uri)
|
||||
.map(|favorite| favorite.profile.clone())
|
||||
{
|
||||
return profile;
|
||||
}
|
||||
}
|
||||
BrowserMode::Recent => {
|
||||
if let Some(profile) = self
|
||||
.config
|
||||
.borrow()
|
||||
.recent_files
|
||||
.iter()
|
||||
.find(|recent| recent.uri == entry.uri)
|
||||
.map(|recent| recent.profile.clone())
|
||||
{
|
||||
return profile;
|
||||
}
|
||||
}
|
||||
BrowserMode::Directory => {}
|
||||
}
|
||||
self.current_profile()
|
||||
}
|
||||
|
|
@ -1449,13 +1567,14 @@ impl BrowserController {
|
|||
let uri: String = directory.uri().into();
|
||||
let mut state = self.state.borrow_mut();
|
||||
state.favorite_profile = Some(profile);
|
||||
state.browsing_favorites = false;
|
||||
state.mode = BrowserMode::Directory;
|
||||
state.root_uri = uri.clone();
|
||||
state.current_uri = uri.clone();
|
||||
state.entries = entries;
|
||||
state.typeahead_query.clear();
|
||||
state.typeahead_last_input = None;
|
||||
drop(state);
|
||||
self.update_mode_controls(BrowserMode::Directory);
|
||||
self.path_entry.set_text(&display_uri(&uri));
|
||||
self.search_entry.set_text("");
|
||||
self.render();
|
||||
|
|
@ -1525,8 +1644,7 @@ impl BrowserController {
|
|||
return was_active;
|
||||
}
|
||||
*self.config.borrow_mut() = updated;
|
||||
let browsing_favorites = self.state.borrow().browsing_favorites;
|
||||
if browsing_favorites {
|
||||
if self.state.borrow().mode == BrowserMode::Favorites {
|
||||
self.show_favorites();
|
||||
}
|
||||
self.status_label.set_text(if active {
|
||||
|
|
@ -1537,6 +1655,28 @@ impl BrowserController {
|
|||
active
|
||||
}
|
||||
|
||||
fn record_recent_file(&self, entry: &BrowserEntry, profile: &LocationProfile) {
|
||||
let mut updated = self.config.borrow().clone();
|
||||
record_recent_file(&mut updated, entry, profile);
|
||||
if let Err(error) = updated.save(&self.config_path) {
|
||||
self.status_label
|
||||
.set_text(&format!("최근 파일 기록을 저장할 수 없습니다: {error:#}"));
|
||||
return;
|
||||
}
|
||||
*self.config.borrow_mut() = updated;
|
||||
if self.state.borrow().mode == BrowserMode::Recent {
|
||||
let entries = self
|
||||
.config
|
||||
.borrow()
|
||||
.recent_files
|
||||
.iter()
|
||||
.map(recent_file_browser_entry)
|
||||
.collect();
|
||||
self.state.borrow_mut().entries = entries;
|
||||
self.render();
|
||||
}
|
||||
}
|
||||
|
||||
fn choose_download_destination(
|
||||
self: &Rc<Self>,
|
||||
entry: BrowserEntry,
|
||||
|
|
@ -1973,6 +2113,58 @@ impl BrowserController {
|
|||
});
|
||||
dialog.present();
|
||||
}
|
||||
|
||||
fn show_clear_recent_dialog(self: &Rc<Self>) {
|
||||
let dialog = gtk::Window::builder()
|
||||
.title("최근 기록 비우기")
|
||||
.transient_for(&self.window)
|
||||
.modal(true)
|
||||
.resizable(false)
|
||||
.default_width(420)
|
||||
.build();
|
||||
let content = gtk::Box::new(gtk::Orientation::Vertical, 16);
|
||||
content.set_margin_top(18);
|
||||
content.set_margin_bottom(12);
|
||||
content.set_margin_start(18);
|
||||
content.set_margin_end(18);
|
||||
let message = gtk::Label::new(Some(
|
||||
"최근 열어본 파일 기록을 모두 삭제하시겠습니까?\n즐겨찾기와 ZIP 읽기 진행도는 유지됩니다.",
|
||||
));
|
||||
message.set_wrap(true);
|
||||
message.set_xalign(0.0);
|
||||
let actions = gtk::Box::new(gtk::Orientation::Horizontal, 6);
|
||||
actions.set_halign(gtk::Align::End);
|
||||
let cancel_button = gtk::Button::with_label("취소");
|
||||
let clear_button = gtk::Button::with_label("모두 삭제");
|
||||
clear_button.add_css_class("destructive-action");
|
||||
actions.append(&cancel_button);
|
||||
actions.append(&clear_button);
|
||||
content.append(&message);
|
||||
content.append(&actions);
|
||||
dialog.set_child(Some(&content));
|
||||
|
||||
let dialog_to_close = dialog.clone();
|
||||
cancel_button.connect_clicked(move |_| dialog_to_close.close());
|
||||
let controller = Rc::clone(self);
|
||||
let dialog_to_close = dialog.clone();
|
||||
clear_button.connect_clicked(move |_| {
|
||||
let mut updated = controller.config.borrow().clone();
|
||||
updated.recent_files.clear();
|
||||
if let Err(error) = updated.save(&controller.config_path) {
|
||||
controller
|
||||
.status_label
|
||||
.set_text(&format!("최근 기록을 삭제할 수 없습니다: {error:#}"));
|
||||
return;
|
||||
}
|
||||
*controller.config.borrow_mut() = updated;
|
||||
controller.show_recent();
|
||||
controller
|
||||
.status_label
|
||||
.set_text("최근 기록을 삭제했습니다.");
|
||||
dialog_to_close.close();
|
||||
});
|
||||
dialog.present();
|
||||
}
|
||||
}
|
||||
|
||||
fn install_latest_update() -> Result<()> {
|
||||
|
|
@ -2258,8 +2450,15 @@ fn browser_search_match(entry: &BrowserEntry, lowercase_query: &str) -> bool {
|
|||
lowercase_query.is_empty() || entry.name.to_lowercase().contains(lowercase_query)
|
||||
}
|
||||
|
||||
fn is_favorites_selection(selected: u32, profile_count: usize) -> bool {
|
||||
selected != gtk::INVALID_LIST_POSITION && selected as usize == profile_count
|
||||
fn special_browser_mode(selected: u32, profile_count: usize) -> Option<BrowserMode> {
|
||||
if selected == gtk::INVALID_LIST_POSITION {
|
||||
return None;
|
||||
}
|
||||
match selected as usize {
|
||||
index if index == profile_count => Some(BrowserMode::Favorites),
|
||||
index if index == profile_count + 1 => Some(BrowserMode::Recent),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn sorted_navigable_entries(
|
||||
|
|
@ -2313,6 +2512,32 @@ fn favorite_browser_entry(favorite: &FavoriteEntry) -> BrowserEntry {
|
|||
}
|
||||
}
|
||||
|
||||
fn recent_file_browser_entry(recent: &RecentFileEntry) -> BrowserEntry {
|
||||
BrowserEntry {
|
||||
uri: recent.uri.clone(),
|
||||
name: recent.name.clone(),
|
||||
list_name: None,
|
||||
kind: classify_file(Path::new(&recent.name)),
|
||||
size: None,
|
||||
modified: None,
|
||||
created: None,
|
||||
etag: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn record_recent_file(config: &mut AppConfig, entry: &BrowserEntry, profile: &LocationProfile) {
|
||||
config.recent_files.retain(|recent| recent.uri != entry.uri);
|
||||
config.recent_files.insert(
|
||||
0,
|
||||
RecentFileEntry {
|
||||
name: entry.name.clone(),
|
||||
uri: entry.uri.clone(),
|
||||
profile: profile.clone(),
|
||||
},
|
||||
);
|
||||
config.recent_files.truncate(RECENT_FILE_LIMIT);
|
||||
}
|
||||
|
||||
fn show_viewer_loading(
|
||||
window: >k::ApplicationWindow,
|
||||
file_name: &str,
|
||||
|
|
@ -2603,9 +2828,62 @@ mod tests {
|
|||
|
||||
assert_eq!(folder.kind, EntryKind::Directory);
|
||||
assert_eq!(archive.kind, EntryKind::ZipArchive);
|
||||
assert!(is_favorites_selection(3, 3));
|
||||
assert!(!is_favorites_selection(2, 3));
|
||||
assert!(!is_favorites_selection(gtk::INVALID_LIST_POSITION, 3));
|
||||
assert_eq!(special_browser_mode(3, 3), Some(BrowserMode::Favorites));
|
||||
assert_eq!(special_browser_mode(4, 3), Some(BrowserMode::Recent));
|
||||
assert_eq!(special_browser_mode(2, 3), None);
|
||||
assert_eq!(special_browser_mode(gtk::INVALID_LIST_POSITION, 3), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn recent_files_move_to_front_and_keep_only_100() {
|
||||
let profile = LocationProfile {
|
||||
name: "원격".into(),
|
||||
kind: LocationKind::Sftp,
|
||||
address: "sftp://example.invalid/comics".into(),
|
||||
username: "reader".into(),
|
||||
password: "password".into(),
|
||||
domain: String::new(),
|
||||
};
|
||||
let mut config = AppConfig::default();
|
||||
for index in 0..=RECENT_FILE_LIMIT {
|
||||
let entry = media_entry(&format!("page{index}.jpg"));
|
||||
record_recent_file(&mut config, &entry, &profile);
|
||||
}
|
||||
assert_eq!(config.recent_files.len(), RECENT_FILE_LIMIT);
|
||||
assert_eq!(config.recent_files[0].name, "page100.jpg");
|
||||
assert!(
|
||||
!config
|
||||
.recent_files
|
||||
.iter()
|
||||
.any(|recent| recent.name == "page0.jpg")
|
||||
);
|
||||
|
||||
let entry = media_entry("page50.jpg");
|
||||
record_recent_file(&mut config, &entry, &profile);
|
||||
assert_eq!(config.recent_files.len(), RECENT_FILE_LIMIT);
|
||||
assert_eq!(config.recent_files[0].name, "page50.jpg");
|
||||
assert_eq!(config.recent_files[0].profile.password, "password");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn recent_files_support_all_viewer_file_types() {
|
||||
let profile = home_profile();
|
||||
let mut config = AppConfig::default();
|
||||
for name in ["book.zip", "page.jpg", "clip.mp4"] {
|
||||
let mut entry = media_entry(name);
|
||||
entry.kind = classify_file(Path::new(name));
|
||||
record_recent_file(&mut config, &entry, &profile);
|
||||
}
|
||||
let kinds = config
|
||||
.recent_files
|
||||
.iter()
|
||||
.map(recent_file_browser_entry)
|
||||
.map(|entry| entry.kind)
|
||||
.collect::<Vec<_>>();
|
||||
assert_eq!(
|
||||
kinds,
|
||||
[EntryKind::Video, EntryKind::Image, EntryKind::ZipArchive]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue