Skip to content

Commit

Permalink
Open files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pkulak
pkulak committed Apr 11, 2023
1 parent e839e55 commit a129f96
Show file tree
Hide file tree
Showing 6 changed files with 155 additions and 61 deletions.
11 changes: 11 additions & 0 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ dirs = "5.0"
emojis = "0.5"
futures = "0.3.24"
log = "0.4"
mime = "0.3"
once_cell = "1.17"
open = "4.0"
rand = "0.8.5"
serde = { version = "1.0", features = ["derive"] }
simple-logging = "2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub struct App {

impl App {
pub fn new(send: Sender<Event>) -> Self {
let matrix = Matrix::new(send.clone());
let matrix = Matrix::default();

// Save the sender for future threads.
SENDER
Expand Down
137 changes: 83 additions & 54 deletions src/matrix/matrix.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@ use std::sync::Arc;

use crate::app::App;
use crate::event::Event;
use crate::event::Event::{Matui, Tick};
use crate::event::Event::Matui;
use crate::handler::MatuiEvent::{
Error, ProgressComplete, ProgressStarted, VerificationCompleted, VerificationStarted,
};
use crate::handler::{Batch, MatuiEvent, SyncType};
use crate::matrix::roomcache::{DecoratedRoom, RoomCache};
use crate::spawn::view_file;
use anyhow::{bail, Context};
use futures::stream::StreamExt;
use log::{error, info, warn};
use matrix_sdk::config::SyncSettings;
use matrix_sdk::encryption::verification::{Emoji, SasState, SasVerification, Verification};
use matrix_sdk::media::{MediaFormat, MediaRequest};
use matrix_sdk::room::{Joined, MessagesOptions, Room};
use matrix_sdk::ruma::api::client::filter::{
FilterDefinition, LazyLoadOptions, RoomEventFilter, RoomFilter,
Expand All @@ -34,6 +36,8 @@ use rand::rngs::OsRng;
use rand::{distributions::Alphanumeric, Rng};
use ruma::events::reaction::ReactionEventContent;
use ruma::events::relation::Annotation;
use ruma::events::room::message::MessageType::Image;
use ruma::events::room::message::MessageType::Video;
use ruma::events::room::message::RoomMessageEventContent;
use ruma::events::{AnySyncTimelineEvent, AnyTimelineEvent};
use ruma::{OwnedEventId, UInt};
Expand All @@ -46,11 +50,10 @@ pub struct Matrix {
rt: Arc<Runtime>,
client: Arc<OnceCell<Client>>,
room_cache: Arc<RoomCache>,
send: Sender<Event>,
}

impl Matrix {
pub fn new(send: Sender<Event>) -> Matrix {
impl Default for Matrix {
fn default() -> Self {
let rt = tokio::runtime::Builder::new_multi_thread()
.worker_threads(2)
.enable_all()
Expand All @@ -61,10 +64,11 @@ impl Matrix {
rt: Arc::new(rt),
client: Arc::new(OnceCell::default()),
room_cache: Arc::new(RoomCache::default()),
send,
}
}
}

impl Matrix {
fn dirs() -> (PathBuf, PathBuf) {
let data_dir = dirs::data_dir()
.expect("no data directory found")
Expand All @@ -81,8 +85,8 @@ impl Matrix {
.to_owned()
}

fn send(&self, event: MatuiEvent) {
self.send
fn send(event: MatuiEvent) {
App::get_sender()
.send(Matui(event))
.expect("could not send Matrix event");
}
Expand All @@ -93,19 +97,19 @@ impl Matrix {
let (_, session_file) = Matrix::dirs();

if !session_file.exists() {
self.send(MatuiEvent::LoginRequired);
Matrix::send(MatuiEvent::LoginRequired);
return;
}

let matrix = self.clone();

self.rt.spawn(async move {
matrix.send(MatuiEvent::SyncStarted(SyncType::Latest));
Matrix::send(MatuiEvent::SyncStarted(SyncType::Latest));

let (client, token) = match restore_session(session_file.as_path()).await {
Ok(tuple) => tuple,
Err(err) => {
matrix.send(Error(err.to_string()));
Matrix::send(Error(err.to_string()));
return;
}
};
Expand All @@ -118,13 +122,13 @@ impl Matrix {
.expect("could not set client");

if let Err(err) = sync_once(client.clone(), token, &session_file).await {
matrix.send(Error(err.to_string()));
Matrix::send(Error(err.to_string()));
return;
};

matrix.room_cache.populate(client).await;

matrix.send(MatuiEvent::SyncComplete);
Matrix::send(MatuiEvent::SyncComplete);
});
}

Expand All @@ -135,12 +139,12 @@ impl Matrix {
let matrix = self.clone();

self.rt.spawn(async move {
matrix.send(MatuiEvent::LoginStarted);
Matrix::send(MatuiEvent::LoginStarted);

let client = match login(&data_dir, &session_file, &user, &pass).await {
Ok(client) => client,
Err(err) => {
matrix.send(Error(err.to_string()));
Matrix::send(Error(err.to_string()));
return;
}
};
Expand All @@ -150,17 +154,17 @@ impl Matrix {
.set(client.clone())
.expect("could not set client");

matrix.send(MatuiEvent::LoginComplete);
matrix.send(MatuiEvent::SyncStarted(SyncType::Initial));
Matrix::send(MatuiEvent::LoginComplete);
Matrix::send(MatuiEvent::SyncStarted(SyncType::Initial));

if let Err(err) = sync_once(client.clone(), None, &session_file).await {
matrix.send(Error(err.to_string()));
Matrix::send(Error(err.to_string()));
return;
};

matrix.room_cache.populate(client).await;

matrix.send(MatuiEvent::SyncComplete);
Matrix::send(MatuiEvent::SyncComplete);
});
}

Expand Down Expand Up @@ -199,12 +203,10 @@ impl Matrix {
}

pub fn confirm_verification(&self, sas: SasVerification) {
let matrix = self.clone();

self.rt.spawn(async move {
if let Err(err) = sas.confirm().await {
error!("could not verify: {}", err.to_string());
matrix.send(Error(format!("Could not verify: {}", err.to_string())));
Matrix::send(Error(format!("Could not verify: {}", err.to_string())));
}
});
}
Expand All @@ -224,9 +226,6 @@ impl Matrix {
}

pub fn fetch_messages(&self, room: Joined, cursor: Option<String>) {
let matrix = self.clone();
let sender = self.send.clone();

self.rt.spawn(async move {
// fetch the actual messages
let mut options = MessagesOptions::new(Direction::Backward);
Expand All @@ -236,7 +235,7 @@ impl Matrix {
let messages = match room.messages(options).await {
Ok(msg) => msg,
Err(err) => {
matrix.send(Error(err.to_string()));
Matrix::send(Error(err.to_string()));
return;
}
};
Expand All @@ -253,61 +252,93 @@ impl Matrix {
cursor: messages.end,
};

sender
.send(Matui(MatuiEvent::TimelineBatch(batch)))
.expect("could not send messages event");
Matrix::send(MatuiEvent::TimelineBatch(batch));

// and look up the detail about every user
async fn send_member_event(
msg: &AnyTimelineEvent,
room: Joined,
sender: Sender<Event>,
) -> anyhow::Result<()> {
// this needs to go away
async fn send_member_event(msg: &AnyTimelineEvent, room: Joined) -> anyhow::Result<()> {
let member = room
.get_member(msg.sender())
.await?
.context("not a member")?;

sender.send(Matui(MatuiEvent::Member(member)))?;
Matrix::send(MatuiEvent::Member(member));

Ok(())
}

for msg in unpacked {
let sender = sender.clone();

if let Err(e) = send_member_event(&msg, room.clone(), sender).await {
if let Err(e) = send_member_event(&msg, room.clone()).await {
warn!("Could not send room member event: {}", e.to_string());
}
}

// finally, send a tick event to force a render
sender.send(Tick).expect("could not send click event")
});
}

pub fn send_text_message(&self, room: Joined, message: String) {
pub fn open_content(&self, message: MessageType) {
let matrix = self.clone();

self.rt.spawn(async move {
matrix.send(ProgressStarted("Sending message.".to_string()));
Matrix::send(ProgressStarted("Downloading file.".to_string()));

let (content_type, request) = match message {
Image(content) => (
content.info.unwrap().mimetype.unwrap(),
MediaRequest {
source: content.source,
format: MediaFormat::File,
},
),
Video(content) => (
content.info.unwrap().mimetype.unwrap(),
MediaRequest {
source: content.source,
format: MediaFormat::File,
},
),
_ => {
Matrix::send(Error("Unknown file type.".to_string()));
return;
}
};

let handle = match matrix
.client()
.media()
.get_media_file(&request, &content_type.parse().unwrap(), true)
.await
{
Err(err) => {
Matrix::send(Error(err.to_string()));
return;
}
Ok(mfh) => mfh,
};

Matrix::send(ProgressComplete);

tokio::task::spawn_blocking(move || view_file(handle));
});
}

pub fn send_text_message(&self, room: Joined, message: String) {
self.rt.spawn(async move {
Matrix::send(ProgressStarted("Sending message.".to_string()));

if let Err(err) = room
.send(RoomMessageEventContent::text_plain(message), None)
.await
{
matrix.send(Error(err.to_string()));
Matrix::send(Error(err.to_string()));
}

matrix.send(ProgressComplete);
Matrix::send(ProgressComplete);
});
}

pub fn send_reaction(&self, room: Joined, event_id: OwnedEventId, key: String) {
let matrix = self.clone();

self.rt.spawn(async move {
matrix.send(ProgressStarted("Sending reaction.".to_string()));
Matrix::send(ProgressStarted("Sending reaction.".to_string()));

if let Err(err) = room
.send(
Expand All @@ -316,24 +347,22 @@ impl Matrix {
)
.await
{
matrix.send(Error(err.to_string()));
Matrix::send(Error(err.to_string()));
}

matrix.send(ProgressComplete);
Matrix::send(ProgressComplete);
});
}

pub fn redact_event(&self, room: Joined, event_id: OwnedEventId) {
let matrix = self.clone();

self.rt.spawn(async move {
matrix.send(ProgressStarted("Removing.".to_string()));
Matrix::send(ProgressStarted("Removing.".to_string()));

if let Err(err) = room.redact(&event_id, None, None).await {
matrix.send(Error(err.to_string()));
Matrix::send(Error(err.to_string()));
}

matrix.send(ProgressComplete);
Matrix::send(ProgressComplete);
});
}

Expand Down
14 changes: 14 additions & 0 deletions src/spawn.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use anyhow::bail;
use matrix_sdk::media::MediaFileHandle;
use std::env::var;
use std::io::Read;
use std::process::Command;
Expand Down Expand Up @@ -37,3 +38,16 @@ pub fn get_text() -> anyhow::Result<Option<String>> {

Ok(Some(contents))
}

pub fn view_file(handle: MediaFileHandle) -> anyhow::Result<()> {
let status = open::commands(handle.path())[0].status()?;

// keep the file handle open until the viewer exits
drop(handle);

if !status.success() {
bail!("Invalid status code.")
}

Ok(())
}
Loading

0 comments on commit a129f96

Please sign in to comment.