Skip to content

Commit

Permalink
Merge pull request #2 from gilcu3/develop
Browse files Browse the repository at this point in the history
merge develop
  • Loading branch information
gilcu3 authored Jul 23, 2024
2 parents 469bf69 + 07bfdf6 commit 0d159b1
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 24 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changelog

## v0.1.0 (2024/05/20)
## v0.1.0 (2024/07/02)

- Initial fork
- Initial release
22 changes: 14 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,23 @@ features stated below, while learning `rust` at the same time.
- [ ] Add option to play next from queue automatically
- [ ] Add history of episode actions
- [ ] Avoid repeated elements in queue
- [ ] Fix bug where queue actions are not persistent, hard to reproduce
- [ ] Fix gpodder test, it should use local files

## Installing hullcaster

### Archlinux

The package is available in the `AUR` [hullcaster-git](https://aur.archlinux.org/packages/hullcaster-git).

### NixOS / Nix

With [flakes](https://wiki.nixos.org/wiki/Flakes) enabled, run:

```bash
nix run github:gilcu3/hullcaster
```

### On Linux distributions

Currently, the only option is to build from source.
Expand All @@ -69,14 +83,6 @@ cargo build --release # add or remove any features with --features
cp target/release/hullcaster ~/.local/bin
```

### NixOS / Nix

With [flakes](https://wiki.nixos.org/wiki/Flakes) enabled, run:

```bash
nix run github:gilcu3/hullcaster
```

## Running hullcaster

In your terminal, run:
Expand Down
1 change: 0 additions & 1 deletion config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ download_all = [ "D" ]
delete = [ "x" ]
delete_all = [ "X" ]
remove = [ "r" ]
remove_all = [ "R" ]

filter_played = [ "1" ]
filter_downloaded = [ "2" ]
Expand Down
2 changes: 0 additions & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ pub struct KeybindingsFromToml {
pub delete: Option<Vec<String>>,
pub delete_all: Option<Vec<String>>,
pub remove: Option<Vec<String>>,
pub remove_all: Option<Vec<String>>,
pub filter_played: Option<Vec<String>>,
pub filter_downloaded: Option<Vec<String>>,
pub enqueue: Option<Vec<String>>,
Expand Down Expand Up @@ -178,7 +177,6 @@ impl Config {
delete: None,
delete_all: None,
remove: None,
remove_all: None,
filter_played: None,
filter_downloaded: None,
enqueue: None,
Expand Down
4 changes: 3 additions & 1 deletion src/gpodder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,8 @@ mod tests {
} else {
None
};
assert!(sync_agent.unwrap().testing().is_some());
if sync_agent.is_some() {
assert!(sync_agent.unwrap().testing().is_some());
}
}
}
15 changes: 8 additions & 7 deletions src/main_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,15 @@ impl MainController {
Message::Dl(DownloadMsg::Complete(ep_data)) => {
self.download_complete(ep_data);
}
Message::Dl(DownloadMsg::ResponseError(_)) => {
self.notif_to_ui("Error sending download request.".to_string(), true)
}
Message::Dl(DownloadMsg::FileCreateError(_)) => {
self.notif_to_ui("Error creating file.".to_string(), true)
Message::Dl(DownloadMsg::ResponseError(ep)) => self.notif_to_ui(
"Error sending download request. ".to_string() + &ep.url,
true,
),
Message::Dl(DownloadMsg::FileCreateError(ep)) => {
self.notif_to_ui("Error creating file. ".to_string() + &ep.title, true)
}
Message::Dl(DownloadMsg::FileWriteError(_)) => {
self.notif_to_ui("Error downloading episode.".to_string(), true)
Message::Dl(DownloadMsg::FileWriteError(ep)) => {
self.notif_to_ui("Error downloading episode. ".to_string() + &ep.title, true)
}

Message::Ui(UiMsg::Delete(pod_id, ep_id)) => {
Expand Down
1 change: 1 addition & 0 deletions src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ pub struct Podcast {
pub url: String,
pub description: Option<String>,
pub author: Option<String>,
#[allow(dead_code)]
pub explicit: Option<bool>,
pub last_checked: DateTime<Utc>,
pub episodes: LockVec<Episode>,
Expand Down
4 changes: 1 addition & 3 deletions src/ui/details_panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ pub struct DetailsPanel {
pub panel: Panel,
pub details: Option<Details>,
pub content: Vec<DetailsLine>,
pub top_row: u16, // top row of text shown in window
pub total_rows: u16, // the total number of rows the details take up
pub top_row: u16, // top row of text shown in window
}

impl DetailsPanel {
Expand All @@ -51,7 +50,6 @@ impl DetailsPanel {
details: None,
content: Vec::new(),
top_row: 0,
total_rows: 0,
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/ui/mock_panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ use super::AppColors;
#[derive(Debug)]
pub struct Panel {
pub buffer: Vec<String>,
#[allow(dead_code)]
pub screen_pos: usize,
pub colors: Rc<AppColors>,
#[allow(dead_code)]
pub title: String,
pub start_x: u16,
pub n_row: u16,
Expand Down

0 comments on commit 0d159b1

Please sign in to comment.