vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2026-04-06 02:01:34 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Context as Activity member; on_destroy context is released

Browse Source
This commit is contained in:
ChristianVisintin
2020-11-29 11:33:59 +01:00
parent 00c81634ed
commit 7e085096c8
4 changed files with 168 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/activity_manager.rs
View File

@@ -51,7 +51,7 @@ pub enum NextActivity {
///
/// The activity manager takes care of running activities and handling them until the application has ended
pub struct ActivityManager {
context: Context,
context: Option<Context>,
ftparams: Option<FileTransferParams>,
interval: Duration,
}
@@ -71,7 +71,7 @@ impl ActivityManager {
};
let ctx: Context = Context::new(host);
Ok(ActivityManager {
context: ctx,
context: Some(ctx),
ftparams: None,
interval: interval,
})
@@ -127,11 +127,16 @@ impl ActivityManager {
let mut activity: AuthActivity = AuthActivity::new();
// Prepare result
let result: Option<NextActivity>;
// Get context
let ctx: Context = match self.context.take() {
Some(ctx) => ctx,
None => return None
};
// Create activity
activity.on_create(&mut self.context);
activity.on_create(ctx);
loop {
// Draw activity
activity.on_draw(&mut self.context);
activity.on_draw();
// Check if has to be terminated
if activity.quit {
// Quit activities
@@ -161,7 +166,7 @@ impl ActivityManager {
sleep(self.interval);
}
// Destroy activity
activity.on_destroy(&mut self.context);
self.context = activity.on_destroy();
result
}
@@ -179,11 +184,16 @@ impl ActivityManager {
FileTransferActivity::new(self.ftparams.take().unwrap());
// Prepare result
let result: Option<NextActivity>;
// Get context
let ctx: Context = match self.context.take() {
Some(ctx) => ctx,
None => return None
};
// Create activity
activity.on_create(&mut self.context);
activity.on_create(ctx);
loop {
// Draw activity
activity.on_draw(&mut self.context);
activity.on_draw();
// Check if has to be terminated
if activity.quit {
// Quit activities
@@ -199,7 +209,7 @@ impl ActivityManager {
sleep(self.interval);
}
// Destroy activity
activity.on_destroy(&mut self.context);
self.context = activity.on_destroy();
result
}
}