From a575fe4934096722234d384cef58116e2b30a428 Mon Sep 17 00:00:00 2001 From: ClSlaid Date: Sat, 28 Oct 2023 22:43:13 +0800 Subject: [PATCH] refactor: reload file hierarchies rename libs/src/platform/{linux => unix} Signed-off-by: ClSlaid --- libs/clipboard/src/platform/mod.rs | 6 +++--- libs/clipboard/src/platform/{linux => unix}/local_file.rs | 0 libs/clipboard/src/platform/{linux => unix}/mod.rs | 2 +- libs/clipboard/src/platform/{linux => unix}/url.rs | 0 libs/clipboard/src/platform/{linux => unix}/x11.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename libs/clipboard/src/platform/{linux => unix}/local_file.rs (100%) rename libs/clipboard/src/platform/{linux => unix}/mod.rs (99%) rename libs/clipboard/src/platform/{linux => unix}/url.rs (100%) rename libs/clipboard/src/platform/{linux => unix}/x11.rs (98%) diff --git a/libs/clipboard/src/platform/mod.rs b/libs/clipboard/src/platform/mod.rs index 1a171eb5c..8bc1d0ea6 100644 --- a/libs/clipboard/src/platform/mod.rs +++ b/libs/clipboard/src/platform/mod.rs @@ -17,8 +17,8 @@ pub fn create_cliprdr_context( #[cfg(any(target_os = "linux", target_os = "macos"))] /// use FUSE for file pasting on these platforms pub mod fuse; -#[cfg(target_os = "linux")] -pub mod linux; +#[cfg(any(target_os = "linux", target_os = "macos"))] +pub mod unix; #[cfg(target_os = "linux")] pub fn create_cliprdr_context( enable_files: bool, @@ -48,7 +48,7 @@ pub fn create_cliprdr_context( log::warn!("umount {:?} may fail: {:?}", mnt_path, e); } - let linux_ctx = linux::ClipboardContext::new(timeout, mnt_path.parse().unwrap())?; + let linux_ctx = unix::ClipboardContext::new(timeout, mnt_path.parse().unwrap())?; log::debug!("start cliprdr FUSE"); linux_ctx.run().expect("failed to start cliprdr FUSE"); diff --git a/libs/clipboard/src/platform/linux/local_file.rs b/libs/clipboard/src/platform/unix/local_file.rs similarity index 100% rename from libs/clipboard/src/platform/linux/local_file.rs rename to libs/clipboard/src/platform/unix/local_file.rs diff --git a/libs/clipboard/src/platform/linux/mod.rs b/libs/clipboard/src/platform/unix/mod.rs similarity index 99% rename from libs/clipboard/src/platform/linux/mod.rs rename to libs/clipboard/src/platform/unix/mod.rs index 38e85475b..b74c583c8 100644 --- a/libs/clipboard/src/platform/linux/mod.rs +++ b/libs/clipboard/src/platform/unix/mod.rs @@ -14,7 +14,7 @@ use lazy_static::lazy_static; use parking_lot::Mutex; use crate::{ - platform::{fuse::FileDescription, linux::local_file::construct_file_list}, + platform::{fuse::FileDescription, unix::local_file::construct_file_list}, send_data, ClipboardFile, CliprdrError, CliprdrServiceContext, }; diff --git a/libs/clipboard/src/platform/linux/url.rs b/libs/clipboard/src/platform/unix/url.rs similarity index 100% rename from libs/clipboard/src/platform/linux/url.rs rename to libs/clipboard/src/platform/unix/url.rs diff --git a/libs/clipboard/src/platform/linux/x11.rs b/libs/clipboard/src/platform/unix/x11.rs similarity index 98% rename from libs/clipboard/src/platform/linux/x11.rs rename to libs/clipboard/src/platform/unix/x11.rs index 779b86151..e137deac2 100644 --- a/libs/clipboard/src/platform/linux/x11.rs +++ b/libs/clipboard/src/platform/unix/x11.rs @@ -10,7 +10,7 @@ use parking_lot::Mutex; use x11_clipboard::Clipboard; use x11rb::protocol::xproto::Atom; -use crate::{platform::linux::send_format_list, CliprdrError}; +use crate::{platform::unix::send_format_list, CliprdrError}; use super::{encode_path_to_uri, parse_plain_uri_list, SysClipboard};