feat: make ADBDeviceExt dyn-compatible

adb_cli/src/main.rs

@@ -5,6 +5,7 @@ mod adb_termios;
 
 mod commands;
 mod models;
+mod utils;
 
 use adb_client::{
     ADBDeviceExt, ADBEmulatorDevice, ADBServer, ADBTcpDevice, ADBUSBDevice, DeviceShort,
@@ -17,25 +18,12 @@ use models::{Command, Opts};
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
+use utils::setup_logger;
 
 fn main() -> Result<()> {
     let opts = Opts::parse();
 
-    // RUST_LOG variable has more priority then "--debug" flag
-    if std::env::var("RUST_LOG").is_err() {
-        let level = match opts.debug {
-            true => "trace",
-            false => "info",
-        };
-
-        std::env::set_var("RUST_LOG", level);
-    }
-
-    // Setting default log level as "info" if not set
-    if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
-    }
-    env_logger::init();
+    setup_logger(opts.debug);
 
     match opts.command {
         Command::Local(local) => {

adb_cli/src/utils.rs

@@ -0,0 +1,17 @@
+pub fn setup_logger(debug: bool) {
+    // RUST_LOG variable has more priority then "--debug" flag
+    if std::env::var("RUST_LOG").is_err() {
+        let level = match debug {
+            true => "trace",
+            false => "info",
+        };
+
+        std::env::set_var("RUST_LOG", level);
+    }
+
+    // Setting default log level as "info" if not set
+    if std::env::var("RUST_LOG").is_err() {
+        std::env::set_var("RUST_LOG", "info");
+    }
+    env_logger::init();
+}

adb_client/src/adb_device_ext.rs

@@ -1,6 +1,8 @@
 use std::io::{Read, Seek, Write};
 use std::path::Path;
 
+use image::{ImageBuffer, ImageFormat, Rgba};
+
 use crate::models::AdbStatResponse;
 use crate::{RebootType, Result};
 
@@ -11,27 +13,38 @@ pub trait ADBDeviceExt {
         &mut self,
         command: impl IntoIterator<Item = S>,
         output: W,
-    ) -> Result<()>;
+    ) -> Result<()>
+    where
+        Self: Sized;
 
     /// Starts an interactive shell session on the device.
     /// Input data is read from reader and write to writer.
     /// W has a 'static bound as it is internally used in a thread.
-    fn shell<R: Read, W: Write + Send + 'static>(&mut self, reader: R, writer: W) -> Result<()>;
+    fn shell<R: Read, W: Write + Send + 'static>(&mut self, reader: R, writer: W) -> Result<()>
+    where
+        Self: Sized;
 
     /// Display the stat information for a remote file
     fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse>;
 
     /// Pull the remote file pointed to by `source` and write its contents into `output`
-    fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()>;
+    fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()>
+    where
+        Self: Sized;
 
     /// Push `stream` to `path` on the device.
-    fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()>;
+    fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()>
+    where
+        Self: Sized;
 
     /// Reboot the device using given reboot type
     fn reboot(&mut self, reboot_type: RebootType) -> Result<()>;
 
     /// Run `activity` from `package` on device. Return the command output.
-    fn run_activity(&mut self, package: &str, activity: &str) -> Result<Vec<u8>> {
+    fn run_activity(&mut self, package: &str, activity: &str) -> Result<Vec<u8>>
+    where
+        Self: Sized,
+    {
         let mut output = Vec::new();
         self.shell_command(
             ["am", "start", &format!("{package}/{package}.{activity}")],
@@ -42,13 +55,31 @@ pub trait ADBDeviceExt {
     }
 
     /// Install an APK pointed to by `apk_path` on device.
-    fn install<P: AsRef<Path>>(&mut self, apk_path: P) -> Result<()>;
+    fn install<P: AsRef<Path>>(&mut self, apk_path: P) -> Result<()>
+    where
+        Self: Sized;
+
+    /// Inner method requesting framebuffer from an Android device
+    fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>>;
 
     /// Dump framebuffer of this device into given path
-    fn framebuffer<P: AsRef<Path>>(&mut self, path: P) -> Result<()>;
+    fn framebuffer<P: AsRef<Path>>(&mut self, path: P) -> Result<()>
+    where
+        Self: Sized,
+    {
+        // Big help from AOSP source code (<https://android.googlesource.com/platform/system/adb/+/refs/heads/main/framebuffer_service.cpp>)
+        let img = self.framebuffer_inner()?;
+        Ok(img.save(path.as_ref())?)
+    }
 
     /// Dump framebuffer of this device and return corresponding bytes.
     ///
     /// Output data format is currently only `PNG`.
-    fn framebuffer_bytes<W: Write + Seek>(&mut self, writer: W) -> Result<()>;
+    fn framebuffer_bytes<W: Write + Seek>(&mut self, mut writer: W) -> Result<()>
+    where
+        Self: Sized,
+    {
+        let img = self.framebuffer_inner()?;
+        Ok(img.write_to(&mut writer, ImageFormat::Png)?)
+    }
 }

adb_client/src/device/adb_message_device_commands.rs

@@ -36,11 +36,7 @@ impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
         self.install(apk_path)
     }
 
-    fn framebuffer<P: AsRef<std::path::Path>>(&mut self, path: P) -> Result<()> {
-        self.framebuffer(path)
-    }
-
-    fn framebuffer_bytes<W: Write + std::io::Seek>(&mut self, writer: W) -> Result<()> {
-        self.framebuffer_bytes(writer)
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.framebuffer_inner()
     }
 }

adb_client/src/device/adb_tcp_device.rs

@@ -110,13 +110,8 @@ impl ADBDeviceExt for ADBTcpDevice {
     }
 
     #[inline]
-    fn framebuffer<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
-        self.inner.framebuffer(path)
-    }
-
-    #[inline]
-    fn framebuffer_bytes<W: std::io::Write + std::io::Seek>(&mut self, writer: W) -> Result<()> {
-        self.inner.framebuffer_bytes(writer)
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.inner.framebuffer_inner()
     }
 }
 

adb_client/src/device/adb_usb_device.rs

@@ -292,13 +292,8 @@ impl ADBDeviceExt for ADBUSBDevice {
     }
 
     #[inline]
-    fn framebuffer<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
-        self.inner.framebuffer(path)
-    }
-
-    #[inline]
-    fn framebuffer_bytes<W: std::io::Write + std::io::Seek>(&mut self, writer: W) -> Result<()> {
-        self.inner.framebuffer_bytes(writer)
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.inner.framebuffer_inner()
     }
 }
 

adb_client/src/device/commands/framebuffer.rs

@@ -1,7 +1,7 @@
-use std::io::{Cursor, Read, Write};
+use std::io::{Cursor, Read};
 
 use byteorder::{LittleEndian, ReadBytesExt};
-use image::{ImageBuffer, ImageFormat, Rgba};
+use image::{ImageBuffer, Rgba};
 
 use crate::{
     device::{adb_message_device::ADBMessageDevice, MessageCommand},
@@ -10,17 +10,7 @@ use crate::{
 };
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
-    pub fn framebuffer<P: AsRef<std::path::Path>>(&mut self, path: P) -> Result<()> {
-        let img = self.framebuffer_inner()?;
-        Ok(img.save(path.as_ref())?)
-    }
-
-    pub fn framebuffer_bytes<W: Write + std::io::Seek>(&mut self, mut writer: W) -> Result<()> {
-        let img = self.framebuffer_inner()?;
-        Ok(img.write_to(&mut writer, ImageFormat::Png)?)
-    }
-
-    fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>> {
+    pub(crate) fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>> {
         self.open_session(b"framebuffer:\0")?;
 
         let response = self.recv_and_reply_okay()?;

adb_client/src/server_device/adb_server_device_commands.rs

@@ -131,11 +131,7 @@ impl ADBDeviceExt for ADBServerDevice {
         self.install(apk_path)
     }
 
-    fn framebuffer<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
-        self.framebuffer(path)
-    }
-
-    fn framebuffer_bytes<W: Write + std::io::Seek>(&mut self, writer: W) -> Result<()> {
-        self.framebuffer_bytes(writer)
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.framebuffer_inner()
     }
 }

adb_client/src/server_device/commands/framebuffer.rs

@@ -1,34 +1,16 @@
-use std::{
-    io::{Read, Seek, Write},
-    path::Path,
-};
+use std::io::Read;
 
 use byteorder::{LittleEndian, ReadBytesExt};
-use image::{ImageBuffer, ImageFormat, Rgba};
+use image::{ImageBuffer, Rgba};
 
 use crate::{
     models::{AdbServerCommand, FrameBufferInfoV1, FrameBufferInfoV2},
     ADBServerDevice, Result, RustADBError,
 };
 
 impl ADBServerDevice {
-    /// Dump framebuffer of this device into given ['path']
-    /// Big help from source code (<https://android.googlesource.com/platform/system/adb/+/refs/heads/main/framebuffer_service.cpp>)
-    pub(crate) fn framebuffer<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
-        let img = self.framebuffer_inner()?;
-        Ok(img.save(path.as_ref())?)
-    }
-
-    /// Dump framebuffer of this device and return corresponding bytes.
-    ///
-    /// Output data format is currently only `PNG`.
-    pub(crate) fn framebuffer_bytes<W: Write + Seek>(&mut self, mut writer: W) -> Result<()> {
-        let img = self.framebuffer_inner()?;
-        Ok(img.write_to(&mut writer, ImageFormat::Png)?)
-    }
-
     /// Inner method requesting framebuffer from Android device
-    fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>> {
+    pub(crate) fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>> {
         let serial: String = self.identifier.clone();
         self.connect()?
             .send_adb_request(AdbServerCommand::TransportSerial(serial))?;