Release v0.2.17
This commit is contained in:
parent
d1bdefdeff
commit
f01365031c
5 changed files with 76 additions and 35 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -182,7 +182,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "comicviewer"
|
name = "comicviewer"
|
||||||
version = "0.2.16"
|
version = "0.2.17"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "comicviewer"
|
name = "comicviewer"
|
||||||
version = "0.2.16"
|
version = "0.2.17"
|
||||||
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"
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
</provides>
|
</provides>
|
||||||
<content_rating type="oars-1.1" />
|
<content_rating type="oars-1.1" />
|
||||||
<releases>
|
<releases>
|
||||||
|
<release version="0.2.17" date="2026-08-21" />
|
||||||
<release version="0.2.16" 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.15" date="2026-08-21" />
|
||||||
<release version="0.2.14" date="2026-08-21" />
|
<release version="0.2.14" date="2026-08-21" />
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ AppImage 빌드가 끝나면 다음 스크립트로 체크섬과 통합 `tar.gz`
|
||||||
|
|
||||||
스크립트는 `Cargo.toml`에서 버전을 읽고 다음 파일을 생성합니다.
|
스크립트는 `Cargo.toml`에서 버전을 읽고 다음 파일을 생성합니다.
|
||||||
|
|
||||||
- `dist/Comicviewer-0.2.16-x86_64.AppImage.sha256`
|
- `dist/Comicviewer-0.2.17-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.16"
|
git commit -m "Release v0.2.17"
|
||||||
git tag -a v0.2.16 -m "Comicviewer v0.2.16"
|
git tag -a v0.2.17 -m "Comicviewer v0.2.17"
|
||||||
git push origin main
|
git push origin main
|
||||||
git push origin v0.2.16
|
git push origin v0.2.17
|
||||||
```
|
```
|
||||||
|
|
||||||
이미 원격에 공개한 태그는 이동하거나 덮어쓰지 않습니다. 수정이 필요하면 새
|
이미 원격에 공개한 태그는 이동하거나 덮어쓰지 않습니다. 수정이 필요하면 새
|
||||||
|
|
|
||||||
|
|
@ -2337,16 +2337,9 @@ impl MediaViewerWindow {
|
||||||
gtk::Video::new()
|
gtk::Video::new()
|
||||||
};
|
};
|
||||||
video.set_autoplay(false);
|
video.set_autoplay(false);
|
||||||
|
video.set_loop(false);
|
||||||
video.set_hexpand(true);
|
video.set_hexpand(true);
|
||||||
video.set_vexpand(true);
|
video.set_vexpand(true);
|
||||||
let video_for_loop = video.clone();
|
|
||||||
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(&source.display_name)
|
.label(&source.display_name)
|
||||||
|
|
@ -2435,31 +2428,33 @@ impl MediaViewerWindow {
|
||||||
navigation_message_generation: Rc::new(Cell::new(0)),
|
navigation_message_generation: Rc::new(Cell::new(0)),
|
||||||
});
|
});
|
||||||
if let Some(stream) = controller.video.media_stream() {
|
if let Some(stream) = controller.video.media_stream() {
|
||||||
|
stream.set_loop(false);
|
||||||
let status_label = controller.status_label.clone();
|
let status_label = controller.status_label.clone();
|
||||||
stream.connect_error_notify(move |stream| {
|
stream.connect_error_notify(move |stream| {
|
||||||
if let Some(error) = stream.error() {
|
if let Some(error) = stream.error() {
|
||||||
status_label.set_text(&format!("동영상을 재생할 수 없습니다: {error}"));
|
status_label.set_text(&format!("동영상을 재생할 수 없습니다: {error}"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
let loop_check = loop_check.downgrade();
|
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| {
|
stream.connect_ended_notify(move |stream| {
|
||||||
let Some(check) = loop_check.upgrade() else {
|
let Some(check) = loop_check_for_end.upgrade() else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
if !video_loop_restart_needed(stream.is_ended(), check.is_active()) {
|
schedule_video_loop_restart(stream, &check, &restart_pending_for_end);
|
||||||
return;
|
|
||||||
}
|
|
||||||
let stream = stream.clone();
|
|
||||||
let loop_check = loop_check.clone();
|
|
||||||
glib::timeout_add_local_once(Duration::from_millis(50), move || {
|
|
||||||
let Some(check) = loop_check.upgrade() else {
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
if video_loop_restart_needed(stream.is_ended(), check.is_active()) {
|
|
||||||
stream.seek(0);
|
|
||||||
stream.play();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
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();
|
||||||
|
loop_check.connect_toggled(move |check| {
|
||||||
|
schedule_video_loop_restart(&stream_for_loop_check, check, &restart_pending);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
controller.connect_signals();
|
controller.connect_signals();
|
||||||
|
|
@ -4084,8 +4079,52 @@ fn video_volume_target(volume: f64, delta: f64) -> f64 {
|
||||||
(volume + delta).clamp(0.0, 1.0)
|
(volume + delta).clamp(0.0, 1.0)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn video_loop_restart_needed(ended: bool, loop_active: bool) -> bool {
|
fn video_loop_restart_needed(
|
||||||
ended && loop_active
|
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>>,
|
||||||
|
) {
|
||||||
|
if !video_loop_restart_needed(
|
||||||
|
stream.is_ended(),
|
||||||
|
stream.timestamp(),
|
||||||
|
stream.duration(),
|
||||||
|
check.is_active(),
|
||||||
|
) {
|
||||||
|
pending.set(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if pending.replace(true) {
|
||||||
|
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 {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
if video_loop_restart_needed(
|
||||||
|
stream.is_ended(),
|
||||||
|
stream.timestamp(),
|
||||||
|
stream.duration(),
|
||||||
|
check.is_active(),
|
||||||
|
) {
|
||||||
|
stream.pause();
|
||||||
|
stream.seek(0);
|
||||||
|
stream.play();
|
||||||
|
} else {
|
||||||
|
pending.set(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn initialize_video_volume(stream: >k::MediaStream) {
|
fn initialize_video_volume(stream: >k::MediaStream) {
|
||||||
|
|
@ -4246,10 +4285,11 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn video_loop_restarts_only_after_ending_when_enabled() {
|
fn video_loop_restarts_only_after_ending_when_enabled() {
|
||||||
assert!(video_loop_restart_needed(true, true));
|
assert!(video_loop_restart_needed(true, 0, 10, true));
|
||||||
assert!(!video_loop_restart_needed(false, true));
|
assert!(video_loop_restart_needed(false, 11, 10, true));
|
||||||
assert!(!video_loop_restart_needed(true, false));
|
assert!(!video_loop_restart_needed(false, 9, 10, true));
|
||||||
assert!(!video_loop_restart_needed(false, false));
|
assert!(!video_loop_restart_needed(false, 11, 0, true));
|
||||||
|
assert!(!video_loop_restart_needed(true, 10, 10, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue