Initial implementation of the new EpisodeWidget.
This commit is contained in:
Jordan Petridis
parent
fe136c8dbe
commit
ebbebf7735
@ -2,27 +2,111 @@
|
|||||||
<!-- Generated with glade 3.20.2 -->
|
<!-- Generated with glade 3.20.2 -->
|
||||||
<interface>
|
<interface>
|
||||||
<requires lib="gtk+" version="3.20"/>
|
<requires lib="gtk+" version="3.20"/>
|
||||||
<object class="GtkBox" id="episode_box">
|
<object class="GtkBox" id="episode_container">
|
||||||
<property name="width_request">100</property>
|
<property name="visible">True</property>
|
||||||
<property name="height_request">25</property>
|
<property name="can_focus">False</property>
|
||||||
|
<property name="orientation">vertical</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="margin_top">5</property>
|
|
||||||
<property name="margin_bottom">5</property>
|
|
||||||
<property name="spacing">5</property>
|
<property name="spacing">5</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkButton" id="play_button">
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="orientation">vertical</property>
|
||||||
|
<property name="spacing">5</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="title_label">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="halign">start</property>
|
||||||
|
<property name="label" translatable="yes">Episode Title</property>
|
||||||
|
<property name="use_markup">True</property>
|
||||||
|
<property name="wrap">True</property>
|
||||||
|
<property name="ellipsize">end</property>
|
||||||
|
<property name="lines">1</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">True</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="spacing">5</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="duration_label">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="label" translatable="yes">42 min</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkImage" id="an_indicator">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="icon_name">document-save-symbolic</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">True</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">True</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="padding">5</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkButton" id="cancel_button">
|
||||||
|
<property name="label" translatable="yes">Cancel</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="receives_default">True</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="padding">5</property>
|
||||||
|
<property name="pack_type">end</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkButton" id="delete_button">
|
||||||
|
<property name="name">delete_button</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="receives_default">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="halign">end</property>
|
<property name="halign">end</property>
|
||||||
<property name="valign">center</property>
|
|
||||||
<property name="margin_top">5</property>
|
|
||||||
<property name="margin_bottom">5</property>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkImage">
|
<object class="GtkImage">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="icon_name">media-playback-start-symbolic</property>
|
<property name="icon_name">user-trash-symbolic</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
@ -31,7 +115,7 @@
|
|||||||
<property name="fill">False</property>
|
<property name="fill">False</property>
|
||||||
<property name="padding">5</property>
|
<property name="padding">5</property>
|
||||||
<property name="pack_type">end</property>
|
<property name="pack_type">end</property>
|
||||||
<property name="position">0</property>
|
<property name="position">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
@ -40,9 +124,6 @@
|
|||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="receives_default">True</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="halign">end</property>
|
<property name="halign">end</property>
|
||||||
<property name="valign">center</property>
|
|
||||||
<property name="margin_top">5</property>
|
|
||||||
<property name="margin_bottom">5</property>
|
|
||||||
<property name="always_show_image">True</property>
|
<property name="always_show_image">True</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkImage">
|
<object class="GtkImage">
|
||||||
@ -57,135 +138,35 @@
|
|||||||
<property name="fill">False</property>
|
<property name="fill">False</property>
|
||||||
<property name="padding">5</property>
|
<property name="padding">5</property>
|
||||||
<property name="pack_type">end</property>
|
<property name="pack_type">end</property>
|
||||||
<property name="position">0</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkButton" id="delete_button">
|
|
||||||
<property name="name">delete_button</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="receives_default">True</property>
|
|
||||||
<property name="halign">end</property>
|
|
||||||
<property name="valign">center</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkImage">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="icon_name">user-trash-symbolic</property>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">False</property>
|
|
||||||
<property name="pack_type">end</property>
|
|
||||||
<property name="position">0</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkButton" id="mark_unplayed_button">
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="receives_default">True</property>
|
|
||||||
<property name="tooltip_text" translatable="yes">Mark episode as Unplayed.</property>
|
|
||||||
<property name="halign">end</property>
|
|
||||||
<property name="valign">center</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkImage">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="icon_name">edit-undo-symbolic</property>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">False</property>
|
|
||||||
<property name="pack_type">end</property>
|
|
||||||
<property name="position">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkButton" id="mark_played_button">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="receives_default">True</property>
|
|
||||||
<property name="tooltip_text" translatable="yes">Mark episode as played.</property>
|
|
||||||
<property name="halign">end</property>
|
|
||||||
<property name="valign">center</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkImage">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="icon_name">object-select-symbolic</property>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">False</property>
|
|
||||||
<property name="pack_type">end</property>
|
|
||||||
<property name="position">2</property>
|
<property name="position">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox">
|
<object class="GtkButton" id="play_button">
|
||||||
<property name="visible">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="receives_default">True</property>
|
||||||
<property name="orientation">vertical</property>
|
<property name="halign">end</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel" id="title_label">
|
<object class="GtkImage">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="halign">start</property>
|
<property name="icon_name">media-playback-start-symbolic</property>
|
||||||
<property name="valign">center</property>
|
</object>
|
||||||
<property name="use_markup">True</property>
|
</child>
|
||||||
<property name="wrap">True</property>
|
|
||||||
<property name="ellipsize">end</property>
|
|
||||||
<property name="lines">1</property>
|
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="fill">False</property>
|
<property name="fill">False</property>
|
||||||
<property name="position">0</property>
|
<property name="padding">5</property>
|
||||||
|
<property name="pack_type">end</property>
|
||||||
|
<property name="position">3</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
|
||||||
<object class="GtkExpander" id="expand_desc">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="label_fill">True</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkScrolledWindow">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="shadow_type">in</property>
|
|
||||||
<property name="min_content_height">100</property>
|
|
||||||
<property name="max_content_height">600</property>
|
|
||||||
<property name="propagate_natural_width">True</property>
|
|
||||||
<property name="propagate_natural_height">True</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkTextView" id="desc_text_view">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">True</property>
|
|
||||||
<property name="margin_bottom">5</property>
|
|
||||||
<property name="editable">False</property>
|
|
||||||
<property name="wrap_mode">word-char</property>
|
|
||||||
<property name="cursor_visible">False</property>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
<child type="label">
|
|
||||||
<object class="GtkLabel">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="label" translatable="yes">Description:</property>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
|
<property name="padding">5</property>
|
||||||
<property name="position">1</property>
|
<property name="position">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
@ -193,7 +174,19 @@
|
|||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="position">3</property>
|
<property name="padding">5</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkProgressBar" id="progress_bar">
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="padding">5</property>
|
||||||
|
<property name="position">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
|||||||
@ -1,68 +1,75 @@
|
|||||||
use glib;
|
use glib;
|
||||||
use gtk;
|
use gtk;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::{ContainerExt, TextBufferExt};
|
|
||||||
|
|
||||||
use open;
|
use open;
|
||||||
use dissolve::strip_html_tags;
|
|
||||||
|
|
||||||
use hammond_data::dbqueries;
|
use hammond_data::dbqueries;
|
||||||
use hammond_data::{Episode, Podcast};
|
use hammond_data::{Episode, Podcast};
|
||||||
use hammond_downloader::downloader;
|
use hammond_downloader::downloader;
|
||||||
use hammond_data::utils::*;
|
use hammond_data::utils::*;
|
||||||
use hammond_data::errors::*;
|
use hammond_data::errors::*;
|
||||||
use hammond_data::utils::replace_extra_spaces;
|
|
||||||
|
|
||||||
use std::thread;
|
use std::thread;
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::sync::mpsc::{channel, Receiver};
|
use std::sync::mpsc::{channel, Receiver};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
type Foo = RefCell<Option<(gtk::Button, gtk::Button, gtk::Button, Receiver<bool>)>>;
|
type Foo = RefCell<
|
||||||
|
Option<
|
||||||
|
(
|
||||||
|
gtk::Button,
|
||||||
|
gtk::Button,
|
||||||
|
gtk::Button,
|
||||||
|
gtk::Button,
|
||||||
|
gtk::ProgressBar,
|
||||||
|
Receiver<bool>,
|
||||||
|
),
|
||||||
|
>,
|
||||||
|
>;
|
||||||
|
|
||||||
thread_local!(static GLOBAL: Foo = RefCell::new(None));
|
thread_local!(static GLOBAL: Foo = RefCell::new(None));
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct EpisodeWidget {
|
struct EpisodeWidget {
|
||||||
container: gtk::Box,
|
container: gtk::Box,
|
||||||
download: gtk::Button,
|
|
||||||
play: gtk::Button,
|
play: gtk::Button,
|
||||||
delete: gtk::Button,
|
delete: gtk::Button,
|
||||||
played: gtk::Button,
|
download: gtk::Button,
|
||||||
unplayed: gtk::Button,
|
cancel: gtk::Button,
|
||||||
title: gtk::Label,
|
title: gtk::Label,
|
||||||
description: gtk::TextView,
|
duration: gtk::Label,
|
||||||
// description: gtk::Label,
|
progress: gtk::ProgressBar,
|
||||||
expander: gtk::Expander,
|
an_indicator: gtk::Image,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl EpisodeWidget {
|
impl EpisodeWidget {
|
||||||
fn new() -> EpisodeWidget {
|
fn new() -> EpisodeWidget {
|
||||||
// This is just a prototype and will be reworked probably.
|
|
||||||
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episode_widget.ui");
|
let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episode_widget.ui");
|
||||||
|
|
||||||
let container: gtk::Box = builder.get_object("episode_box").unwrap();
|
let container: gtk::Box = builder.get_object("episode_container").unwrap();
|
||||||
|
|
||||||
|
let progress: gtk::ProgressBar = builder.get_object("progress_bar").unwrap();
|
||||||
|
let an_indicator: gtk::Image = builder.get_object("an_indicator").unwrap();
|
||||||
|
|
||||||
let download: gtk::Button = builder.get_object("download_button").unwrap();
|
let download: gtk::Button = builder.get_object("download_button").unwrap();
|
||||||
let play: gtk::Button = builder.get_object("play_button").unwrap();
|
let play: gtk::Button = builder.get_object("play_button").unwrap();
|
||||||
let delete: gtk::Button = builder.get_object("delete_button").unwrap();
|
let delete: gtk::Button = builder.get_object("delete_button").unwrap();
|
||||||
let played: gtk::Button = builder.get_object("mark_played_button").unwrap();
|
let cancel: gtk::Button = builder.get_object("cancel_button").unwrap();
|
||||||
let unplayed: gtk::Button = builder.get_object("mark_unplayed_button").unwrap();
|
|
||||||
|
|
||||||
let title: gtk::Label = builder.get_object("title_label").unwrap();
|
let title: gtk::Label = builder.get_object("title_label").unwrap();
|
||||||
let expander: gtk::Expander = builder.get_object("expand_desc").unwrap();
|
let duration: gtk::Label = builder.get_object("duration_label").unwrap();
|
||||||
let description: gtk::TextView = builder.get_object("desc_text_view").unwrap();
|
|
||||||
// let description: gtk::Label = builder.get_object("desc_text").unwrap();
|
|
||||||
|
|
||||||
EpisodeWidget {
|
EpisodeWidget {
|
||||||
container,
|
container,
|
||||||
|
progress,
|
||||||
|
an_indicator,
|
||||||
download,
|
download,
|
||||||
play,
|
play,
|
||||||
|
cancel,
|
||||||
delete,
|
delete,
|
||||||
played,
|
|
||||||
unplayed,
|
|
||||||
title,
|
title,
|
||||||
expander,
|
duration,
|
||||||
description,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -76,27 +83,6 @@ impl EpisodeWidget {
|
|||||||
self.title.set_xalign(0.0);
|
self.title.set_xalign(0.0);
|
||||||
self.title.set_text(episode.title());
|
self.title.set_text(episode.title());
|
||||||
|
|
||||||
if episode.description().is_some() {
|
|
||||||
let text = episode.description().unwrap().to_owned();
|
|
||||||
let description = &self.description;
|
|
||||||
self.expander
|
|
||||||
.connect_activate(clone!(description, text => move |_| {
|
|
||||||
// let mut text = text.clone();
|
|
||||||
// html_to_markup(&mut text);
|
|
||||||
// description.set_markup(&text)
|
|
||||||
|
|
||||||
let plain_text = strip_html_tags(&text).join(" ");
|
|
||||||
// TODO: handle unwrap
|
|
||||||
let buff = description.get_buffer().unwrap();
|
|
||||||
buff.set_text(&replace_extra_spaces(&plain_text));
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
if episode.played().is_some() {
|
|
||||||
self.unplayed.show();
|
|
||||||
self.played.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show or hide the play/delete/download buttons upon widget initialization.
|
// Show or hide the play/delete/download buttons upon widget initialization.
|
||||||
let local_uri = episode.local_uri();
|
let local_uri = episode.local_uri();
|
||||||
if local_uri.is_some() && Path::new(local_uri.unwrap()).exists() {
|
if local_uri.is_some() && Path::new(local_uri.unwrap()).exists() {
|
||||||
@ -105,15 +91,10 @@ impl EpisodeWidget {
|
|||||||
self.delete.show();
|
self.delete.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
let played = &self.played;
|
self.play.connect_clicked(clone!(episode => move |_| {
|
||||||
let unplayed = &self.unplayed;
|
|
||||||
self.play
|
|
||||||
.connect_clicked(clone!(episode, played, unplayed => move |_| {
|
|
||||||
let mut episode = episode.clone();
|
let mut episode = episode.clone();
|
||||||
on_play_bttn_clicked(episode.rowid());
|
on_play_bttn_clicked(episode.rowid());
|
||||||
let _ = episode.set_played_now();
|
let _ = episode.set_played_now();
|
||||||
played.hide();
|
|
||||||
unplayed.show();
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
let play = &self.play;
|
let play = &self.play;
|
||||||
@ -126,38 +107,24 @@ impl EpisodeWidget {
|
|||||||
download.show();
|
download.show();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
let unplayed = &self.unplayed;
|
|
||||||
self.played
|
|
||||||
.connect_clicked(clone!(episode, unplayed => move |played| {
|
|
||||||
let mut episode = episode.clone();
|
|
||||||
let _ = episode.set_played_now();
|
|
||||||
played.hide();
|
|
||||||
unplayed.show();
|
|
||||||
}));
|
|
||||||
|
|
||||||
let played = &self.played;
|
|
||||||
self.unplayed
|
|
||||||
.connect_clicked(clone!(episode, played => move |un| {
|
|
||||||
let mut episode = episode.clone();
|
|
||||||
episode.set_played(None);
|
|
||||||
let _ = episode.save();
|
|
||||||
un.hide();
|
|
||||||
played.show();
|
|
||||||
}));
|
|
||||||
|
|
||||||
let pd_title = pd.title().to_owned();
|
let pd_title = pd.title().to_owned();
|
||||||
let play = &self.play;
|
let play = &self.play;
|
||||||
let delete = &self.delete;
|
let delete = &self.delete;
|
||||||
self.download
|
let cancel = &self.cancel;
|
||||||
.connect_clicked(clone!(play, delete, episode => move |dl| {
|
let progress = &self.progress;
|
||||||
|
self.download.connect_clicked(
|
||||||
|
clone!(play, delete, episode, cancel, progress => move |dl| {
|
||||||
on_download_clicked(
|
on_download_clicked(
|
||||||
&pd_title,
|
&pd_title,
|
||||||
&mut episode.clone(),
|
&mut episode.clone(),
|
||||||
dl,
|
dl,
|
||||||
&play,
|
&play,
|
||||||
&delete,
|
&delete,
|
||||||
|
&cancel,
|
||||||
|
&progress
|
||||||
|
);
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -168,17 +135,30 @@ fn on_download_clicked(
|
|||||||
download_bttn: >k::Button,
|
download_bttn: >k::Button,
|
||||||
play_bttn: >k::Button,
|
play_bttn: >k::Button,
|
||||||
del_bttn: >k::Button,
|
del_bttn: >k::Button,
|
||||||
|
cancel_bttn: >k::Button,
|
||||||
|
progress_bar: >k::ProgressBar,
|
||||||
) {
|
) {
|
||||||
// Create a async channel.
|
// Create a async channel.
|
||||||
let (sender, receiver) = channel();
|
let (sender, receiver) = channel();
|
||||||
|
|
||||||
// Pass the desired arguments into the Local Thread Storage.
|
// Pass the desired arguments into the Local Thread Storage.
|
||||||
GLOBAL.with(clone!(download_bttn, play_bttn, del_bttn => move |global| {
|
GLOBAL.with(
|
||||||
*global.borrow_mut() = Some((download_bttn, play_bttn, del_bttn, receiver));
|
clone!(download_bttn, play_bttn, del_bttn, cancel_bttn, progress_bar => move |global| {
|
||||||
}));
|
*global.borrow_mut() = Some((
|
||||||
|
download_bttn,
|
||||||
|
play_bttn,
|
||||||
|
del_bttn,
|
||||||
|
cancel_bttn,
|
||||||
|
progress_bar,
|
||||||
|
receiver));
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
let pd_title = pd_title.to_owned();
|
let pd_title = pd_title.to_owned();
|
||||||
let mut ep = ep.clone();
|
let mut ep = ep.clone();
|
||||||
|
cancel_bttn.show();
|
||||||
|
progress_bar.show();
|
||||||
|
download_bttn.hide();
|
||||||
thread::spawn(move || {
|
thread::spawn(move || {
|
||||||
let download_fold = downloader::get_download_folder(&pd_title).unwrap();
|
let download_fold = downloader::get_download_folder(&pd_title).unwrap();
|
||||||
let e = downloader::get_episode(&mut ep, download_fold.as_str());
|
let e = downloader::get_episode(&mut ep, download_fold.as_str());
|
||||||
@ -223,13 +203,21 @@ fn on_delete_bttn_clicked(episode_id: i32) {
|
|||||||
|
|
||||||
fn receive() -> glib::Continue {
|
fn receive() -> glib::Continue {
|
||||||
GLOBAL.with(|global| {
|
GLOBAL.with(|global| {
|
||||||
if let Some((ref download_bttn, ref play_bttn, ref del_bttn, ref reciever)) =
|
if let Some((
|
||||||
*global.borrow()
|
ref download_bttn,
|
||||||
|
ref play_bttn,
|
||||||
|
ref del_bttn,
|
||||||
|
ref cancel_bttn,
|
||||||
|
ref progress_bar,
|
||||||
|
ref reciever,
|
||||||
|
)) = *global.borrow()
|
||||||
{
|
{
|
||||||
if reciever.try_recv().is_ok() {
|
if reciever.try_recv().is_ok() {
|
||||||
download_bttn.hide();
|
download_bttn.hide();
|
||||||
play_bttn.show();
|
play_bttn.show();
|
||||||
del_bttn.show();
|
del_bttn.show();
|
||||||
|
cancel_bttn.hide();
|
||||||
|
progress_bar.hide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -35,5 +35,5 @@ cp -rf vendor $DIST/
|
|||||||
|
|
||||||
# packaging
|
# packaging
|
||||||
cd $DEST/dist
|
cd $DEST/dist
|
||||||
tar -czvf $VERSION.tar.gz $VERSION
|
tar -cJvf $VERSION.tar.xz $VERSION
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user