Skip to content

Commit aa23fa0

Browse files
committed
Refactor imports and comments for clarity in TUI and Uniffi modules
- Updated import statements in `home.rs`, `send_files_to.rs`, and `ready_to_receive.rs` for improved readability and organization. - Enhanced comments in `ready_to_receive_manager.rs` and `send_files_progress.rs` to clarify functionality and maintain consistency in code style. - Adjusted layout constraints in `send_files_to.rs` for better alignment and presentation. These changes contribute to a cleaner and more maintainable codebase, enhancing overall developer experience. Signed-off-by: Pushkar Mishra <[email protected]>
1 parent b3d8c81 commit aa23fa0

File tree

8 files changed

+46
-31
lines changed

8 files changed

+46
-31
lines changed

drop-core/tui/src/apps/home.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ impl HomeApp {
253253
}
254254

255255
fn start_ready_to_receive(&self) {
256-
use arkdropx_receiver::ReceiverProfile;
257-
use arkdropx_receiver::ready_to_receive::{
258-
ReadyToReceiveConfig, ReadyToReceiveRequest,
256+
use arkdropx_receiver::{
257+
ReceiverProfile,
258+
ready_to_receive::{ReadyToReceiveConfig, ReadyToReceiveRequest},
259259
};
260260

261261
let config = self.b.get_config();

drop-core/tui/src/apps/send_files_progress.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ impl App for SendFilesProgressApp {
114114
KeyCode::Esc => {
115115
self.b.get_navigation().go_back();
116116
}
117-
// T/Y copy shortcuts - only in waiting mode (before transfer starts)
117+
// T/Y copy shortcuts - only in waiting mode (before
118+
// transfer starts)
118119
KeyCode::Char('t') | KeyCode::Char('T')
119120
if !self.has_transfer_started() =>
120121
{

drop-core/tui/src/apps/send_files_to.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ use crate::{
33
BrowserMode, ControlCapture, OpenFileBrowserRequest, Page, SortMode,
44
};
55
use arkdrop_common::FileData;
6-
use arkdropx_sender::send_files_to::SendFilesToRequest;
7-
use arkdropx_sender::{SenderConfig, SenderFile, SenderProfile};
6+
use arkdropx_sender::{
7+
SenderConfig, SenderFile, SenderProfile, send_files_to::SendFilesToRequest,
8+
};
89
use ratatui::{
910
Frame,
1011
crossterm::event::{Event, KeyCode, KeyModifiers},
@@ -658,8 +659,10 @@ impl SendFilesToApp {
658659
.direction(Direction::Horizontal)
659660
.margin(1)
660661
.constraints([
661-
Constraint::Percentage(55), // Left side - connection + files input
662-
Constraint::Percentage(45), // Right side - file list + send button
662+
Constraint::Percentage(55), /* Left side - connection +
663+
* files input */
664+
Constraint::Percentage(45), /* Right side - file list + send
665+
* button */
663666
])
664667
.split(area);
665668

drop-core/tui/src/ready_to_receive_manager.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ impl AppReadyToReceiveManager for MainAppReadyToReceiveManager {
3838
bub.subscribe(sub);
3939
}
4040

41-
// No explicit start needed - the bubble starts waiting immediately
41+
// No explicit start needed - the bubble starts waiting
42+
// immediately
4243
curr_bubble.write().unwrap().replace(bub);
4344
}
4445
Err(e) => {

drop-core/uniffi/src/receiver/ready_to_receive.rs

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ impl ReadyToReceiveBubble {
7878
pub fn unsubscribe(&self, subscriber: Arc<dyn ReadyToReceiveSubscriber>) {
7979
let adapted_subscriber =
8080
ReadyToReceiveSubscriberAdapter { inner: subscriber };
81-
self.inner.unsubscribe(Arc::new(adapted_subscriber))
81+
self.inner
82+
.unsubscribe(Arc::new(adapted_subscriber))
8283
}
8384
}
8485

@@ -135,9 +136,9 @@ impl arkdropx_receiver::ready_to_receive::ReadyToReceiveSubscriber
135136
self.inner.get_id()
136137
}
137138

138-
fn log(&self, message: String) {
139+
fn log(&self, _message: String) {
139140
#[cfg(debug_assertions)]
140-
return self.inner.log(message.clone());
141+
return self.inner.log(_message.clone());
141142
}
142143

143144
fn notify_receiving(
@@ -210,11 +211,18 @@ fn create_adapted_request(
210211
avatar_b64: request.profile.avatar_b64,
211212
};
212213
let config = match request.config {
213-
Some(config) => arkdropx_receiver::ready_to_receive::ReadyToReceiveConfig {
214-
chunk_size: config.chunk_size,
215-
parallel_streams: config.parallel_streams,
216-
},
217-
None => arkdropx_receiver::ready_to_receive::ReadyToReceiveConfig::default(),
214+
Some(config) => {
215+
arkdropx_receiver::ready_to_receive::ReadyToReceiveConfig {
216+
chunk_size: config.chunk_size,
217+
parallel_streams: config.parallel_streams,
218+
}
219+
}
220+
None => {
221+
arkdropx_receiver::ready_to_receive::ReadyToReceiveConfig::default()
222+
}
218223
};
219-
arkdropx_receiver::ready_to_receive::ReadyToReceiveRequest { profile, config }
224+
arkdropx_receiver::ready_to_receive::ReadyToReceiveRequest {
225+
profile,
226+
config,
227+
}
220228
}

drop-core/uniffi/src/receiver/receive_files.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ impl arkdropx_receiver::ReceiveFilesSubscriber
121121
self.inner.get_id()
122122
}
123123

124-
fn log(&self, message: String) {
124+
fn log(&self, _message: String) {
125125
#[cfg(debug_assertions)]
126-
return self.inner.log(message.clone());
126+
return self.inner.log(_message.clone());
127127
}
128128

129129
fn notify_receiving(

drop-core/uniffi/src/sender/send_files.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ impl arkdropx_sender::SendFilesSubscriber for SendFilesSubscriberAdapter {
123123
self.inner.get_id()
124124
}
125125

126-
fn log(&self, message: String) {
126+
fn log(&self, _message: String) {
127127
#[cfg(debug_assertions)]
128-
return self.inner.log(message.clone());
128+
return self.inner.log(_message.clone());
129129
}
130130

131131
fn notify_sending(&self, event: arkdropx_sender::SendFilesSendingEvent) {

drop-core/uniffi/src/sender/send_files_to.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ impl SendFilesToBubble {
6868
pub fn unsubscribe(&self, subscriber: Arc<dyn SendFilesToSubscriber>) {
6969
let adapted_subscriber =
7070
SendFilesToSubscriberAdapter { inner: subscriber };
71-
self.inner.unsubscribe(Arc::new(adapted_subscriber))
71+
self.inner
72+
.unsubscribe(Arc::new(adapted_subscriber))
7273
}
7374
}
7475

@@ -117,21 +118,22 @@ impl arkdropx_sender::send_files_to::SendFilesToSubscriber
117118
self.inner.get_id()
118119
}
119120

120-
fn log(&self, message: String) {
121+
fn log(&self, _message: String) {
121122
#[cfg(debug_assertions)]
122-
return self.inner.log(message.clone());
123+
return self.inner.log(_message.clone());
123124
}
124125

125126
fn notify_sending(
126127
&self,
127128
event: arkdropx_sender::send_files_to::SendFilesToSendingEvent,
128129
) {
129-
self.inner.notify_sending(SendFilesToSendingEvent {
130-
id: event.id,
131-
name: event.name,
132-
sent: event.sent,
133-
remaining: event.remaining,
134-
})
130+
self.inner
131+
.notify_sending(SendFilesToSendingEvent {
132+
id: event.id,
133+
name: event.name,
134+
sent: event.sent,
135+
remaining: event.remaining,
136+
})
135137
}
136138

137139
fn notify_connecting(

0 commit comments

Comments
 (0)