diff --git a/Cargo.toml b/Cargo.toml index 615bda8..0c6605a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["ethylene-amd", "ethylene-amd-chromium", "ethylene-amd-gui", "ethylene-amd-tui"] +members = ["amdhelper", "amdhelper-chromium", "amdhelper-tui"] resolver = "2" [profile.release] diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 63ad0b2..0000000 --- a/LICENSE +++ /dev/null @@ -1,50 +0,0 @@ -Licensed under the Thou Shalt Not Profit License version 1.5 - -1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: - -a) to reproduce the Original Work in copies, either alone or as part of a collective work; - -b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; - -c) to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Thou Shalt Not Profit License; - -d) to perform the Original Work publicly; and - -e) to display the Original Work publicly. - -2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. - -3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. - -4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. - -5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). - -6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. - -7) Warranty of Provenance and Disclaimer of Warranty. The Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. - -8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. - -9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honouring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honour the conditions in Section 1(c). - -10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. - -11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. - -12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. - -13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. - -14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means -(i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or -(ii) ownership of fifty percent (50%) or more of the outstanding shares, or -(iii) beneficial ownership of such entity. - -15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. - -16) Modification of This License. This License is Copyright © 2023 ChefKiss Inc. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: -(i) You may not indicate in any way that your Modified License is the "Thou Shalt Not Profit License" or "TSNPL" and you may not use those names in the name of your Modified License; and -(ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License. - -17) Non-Commercial Use. Non-Commercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Thou Shalt Not Profit 1.5 license, the exchange of the Original Work or Derivative Works for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is Non-Commercial provided there is no payment of monetary compensation in connection with the exchange. Licensor grants You the right to distribute or communicate the Original Work or Derivative Works thereof under this Thou Shalt Not Profit 1.5 license only under Non-Commercial purposes. Otherwise, You shall not distribute or communicate the Original Work or Derivative Works. diff --git a/README.md b/README.md index 01dd45f..4740a10 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -# EthyleneAMD ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ChefKissInc/EthyleneAMD/main.yml?branch=master&logo=github&style=for-the-badge) +# AMDHelper -Beware: dangerous to flowers! - -Tool with workarounds for AMD systems running macOS. - -The EthyleneAMD project is licensed under the `Thou Shalt Not Profit License version 1.5`. See [`LICENSE`](https://github.com/ChefKissInc/EthyleneAMD/blob/master/LICENSE). +Tool with workarounds for AMD systems running macOS. \ No newline at end of file diff --git a/ethylene-amd-chromium/Cargo.toml b/amdhelper-chromium/Cargo.toml similarity index 78% rename from ethylene-amd-chromium/Cargo.toml rename to amdhelper-chromium/Cargo.toml index d364172..0611186 100644 --- a/ethylene-amd-chromium/Cargo.toml +++ b/amdhelper-chromium/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ethylene-amd-chromium" +name = "amdhelper-chromium" version = "0.1.0" edition = "2021" diff --git a/ethylene-amd-chromium/src/main.rs b/amdhelper-chromium/src/main.rs similarity index 100% rename from ethylene-amd-chromium/src/main.rs rename to amdhelper-chromium/src/main.rs diff --git a/ethylene-amd/Cargo.toml b/amdhelper/Cargo.toml similarity index 73% rename from ethylene-amd/Cargo.toml rename to amdhelper/Cargo.toml index 84d9a9a..165842b 100644 --- a/ethylene-amd/Cargo.toml +++ b/amdhelper/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ethylene-amd" +name = "amdhelper" version = "0.1.0" edition = "2021" diff --git a/ethylene-amd/src/lib.rs b/amdhelper/src/lib.rs similarity index 66% rename from ethylene-amd/src/lib.rs rename to amdhelper/src/lib.rs index b8a5f7a..810f299 100644 --- a/ethylene-amd/src/lib.rs +++ b/amdhelper/src/lib.rs @@ -1,17 +1,17 @@ #![warn(clippy::nursery, unused_extern_crates)] use std::{env, fs, path::Path}; -use patch::{chromium::ChromiumPatch, EthylenePatch}; +use patch::{chromium::ChromiumPatch, AMDHelperPatch}; pub mod patch; #[derive(Clone)] -pub struct EthyleneApp { +pub struct AMDHelperApp { pub name: String, pub path: std::path::PathBuf, } -pub fn get_apps(patches: &Vec) -> std::io::Result> { +pub fn get_apps(patches: &Vec) -> std::io::Result> { Ok(std::fs::read_dir("/Applications")? .flatten() .filter_map(|dir| { @@ -20,7 +20,7 @@ pub fn get_apps(patches: &Vec) -> std::io::Result) -> std::io::Result Vec{ +pub fn get_patches() -> Vec{ vec![ChromiumPatch] } -pub fn apply_chromium_patch(patch: ChromiumPatch, apps: Vec<&EthyleneApp>){ +pub fn apply_chromium_patch(patch: ChromiumPatch, apps: Vec<&AMDHelperApp>){ let supported_apps = apps.iter() .filter_map(|app| if patch.supported_for(&app) { Some(app.name.as_str()) } else { None }) .collect::>().join(","); - let ethylene_chromium_path = env::current_dir().unwrap().parent().unwrap().join("target") - .join("debug").join("ethylene-amd-chromium"); - if fs::copy(ethylene_chromium_path.to_str().unwrap(), CHROMIUM_GLOBAL_PATH).is_err(){ + let AMDHelper_chromium_path = env::current_dir().unwrap().parent().unwrap().join("target") + .join("debug").join("amdhelper-chromium"); + if fs::copy(AMDHelper_chromium_path.to_str().unwrap(), CHROMIUM_GLOBAL_PATH).is_err(){ println!("Failed to save chromium patch to global path..."); return } @@ -56,20 +56,20 @@ pub fn apply_chromium_patch(patch: ChromiumPatch, apps: Vec<&EthyleneApp>){ } } -const CHROMIUM_GLOBAL_PATH: &str = "/usr/local/bin/ethylene-amd-chromium"; -const CHROMIUM_PLIST_PATH: &str = "/Library/LaunchAgents/com.ChefKiss.ethylene-amd-chromium.plist"; +const CHROMIUM_GLOBAL_PATH: &str = "/usr/local/bin/amdhelper-chromium"; +const CHROMIUM_PLIST_PATH: &str = "/Library/LaunchAgents/org.alvindimas05.amdhelper-chromium.plist"; const CHROMIUM_PLIST_VALUE: &str = r#" Label - com.ChefKiss.ethylene-amd-chromium + org.alvindimas05.amdhelper-chromium LaunchOnlyOnce ProgramArguments - /Library/Scripts/ethylene-amd-chromium + /Library/Scripts/amdhelper-chromium -a $APPLIST diff --git a/ethylene-amd/src/patch/chromium.rs b/amdhelper/src/patch/chromium.rs similarity index 78% rename from ethylene-amd/src/patch/chromium.rs rename to amdhelper/src/patch/chromium.rs index 9e50ad4..985cbbc 100644 --- a/ethylene-amd/src/patch/chromium.rs +++ b/amdhelper/src/patch/chromium.rs @@ -1,9 +1,9 @@ -use crate::{patch::EthylenePatch, EthyleneApp}; +use crate::{patch::AMDHelperPatch, AMDHelperApp}; pub struct ChromiumPatch; impl ChromiumPatch { - fn is_chromium(app_item: &EthyleneApp) -> bool { + fn is_chromium(app_item: &AMDHelperApp) -> bool { let fw_path = app_item.path.join("Contents").join("Frameworks"); let Ok(fw_dir) = fw_path.read_dir() else { @@ -28,7 +28,7 @@ impl ChromiumPatch { .unwrap_or_default() } - fn is_electron(app_item: &EthyleneApp) -> bool { + fn is_electron(app_item: &AMDHelperApp) -> bool { let fw_path = app_item.path.join("Contents").join("Frameworks"); std::fs::exists(fw_path.join("Electron Framework.framework")).unwrap_or_default() || std::fs::exists(fw_path.join("Chromium Embedded Framework.framework")) @@ -36,12 +36,12 @@ impl ChromiumPatch { } } -impl EthylenePatch for ChromiumPatch { - fn supported_for(&self, app_item: &EthyleneApp) -> bool { +impl AMDHelperPatch for ChromiumPatch { + fn supported_for(&self, app_item: &AMDHelperApp) -> bool { Self::is_electron(app_item) || Self::is_chromium(app_item) } - fn apply_to(&self, app_item: &EthyleneApp) { + fn apply_to(&self, app_item: &AMDHelperApp) { todo!() } } diff --git a/amdhelper/src/patch/mod.rs b/amdhelper/src/patch/mod.rs new file mode 100644 index 0000000..afedb52 --- /dev/null +++ b/amdhelper/src/patch/mod.rs @@ -0,0 +1,8 @@ +use crate::AMDHelperApp; + +pub mod chromium; + +pub trait AMDHelperPatch: Sized { + fn supported_for(&self, app_item: &AMDHelperApp) -> bool; + fn apply_to(&self, app_item: &AMDHelperApp); +} diff --git a/ethylene-amd-gui/Cargo.toml b/ethylene-amd-gui/Cargo.toml deleted file mode 100644 index 69aa7d2..0000000 --- a/ethylene-amd-gui/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[package] -name = "ethylene-amd-gui" -version = "0.1.0" -edition = "2021" - -[dependencies] diff --git a/ethylene-amd-gui/src/main.rs b/ethylene-amd-gui/src/main.rs deleted file mode 100644 index f328e4d..0000000 --- a/ethylene-amd-gui/src/main.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() {} diff --git a/ethylene-amd-tui/Cargo.toml b/ethylene-amd-tui/Cargo.toml deleted file mode 100644 index ccf7fa4..0000000 --- a/ethylene-amd-tui/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "ethylene-amd-tui" -version = "0.1.0" -edition = "2021" - -[dependencies] -ethylene-amd = { path = "../ethylene-amd" } -crossterm = "0.28.1" -ratatui = "0.28.1" diff --git a/ethylene-amd-tui/src/main.rs b/ethylene-amd-tui/src/main.rs deleted file mode 100644 index af66f62..0000000 --- a/ethylene-amd-tui/src/main.rs +++ /dev/null @@ -1,168 +0,0 @@ -#![warn(clippy::nursery, unused_extern_crates)] - -use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind}; -use ethylene_amd::{apply_chromium_patch, get_apps, get_patches, patch::{chromium::ChromiumPatch, EthylenePatch}, EthyleneApp}; -use ratatui::{ - buffer::Buffer, - layout::{Alignment, Rect}, - style::{palette::tailwind::SLATE, Modifier, Style, Stylize}, - text::Line, - widgets::{ - block::{Position, Title}, - Block, List, ListItem, ListState, StatefulWidget, Widget, - }, - DefaultTerminal, -}; -fn main() -> std::io::Result<()> { - let mut terminal = ratatui::init(); - terminal.clear()?; - - let app_result = App::default().and_then(|v| v.run(&mut terminal)); - ratatui::restore(); - app_result -} - -const SELECTED_STYLE: Style = Style::new().bg(SLATE.c300).add_modifier(Modifier::BOLD); - -struct App { - exit: bool, - app_list: AppList, -} - -struct AppList { - items: Vec, - selected_items: Vec, - state: ListState, -} - -impl App { - fn default() -> std::io::Result { - let patches = get_patches(); - Ok(Self { - exit: false, - app_list: AppList { - items: get_apps(&patches)?, - selected_items: vec![], - state: ListState::default(), - }, - }) - } - - pub fn run(mut self, terminal: &mut DefaultTerminal) -> std::io::Result<()> { - while !self.exit { - terminal.draw(|frame| frame.render_widget(&mut self, frame.area()))?; - self.handle_events()?; - } - Ok(()) - } - - fn handle_events(&mut self) -> std::io::Result<()> { - match crossterm::event::read()? { - Event::Key(key_event) if key_event.kind == KeyEventKind::Press => { - self.handle_key_event(key_event) - } - _ => {} - }; - Ok(()) - } - - fn handle_key_event(&mut self, key_event: KeyEvent) { - match key_event.code { - KeyCode::Char('q') | KeyCode::Esc => self.exit(), - KeyCode::Char('j') | KeyCode::Down => self.select_next(), - KeyCode::Char('k') | KeyCode::Up => self.select_previous(), - KeyCode::Char('a') => self.apply_patches(), - KeyCode::Enter => self.select_item(), - _ => {} - } - } - - fn apply_patches(&mut self) { - if self.app_list.selected_items.len() < 1 { return } - apply_chromium_patch(ChromiumPatch, self.get_selected_apps()); - - self.app_list.selected_items = vec![]; - } - - fn get_selected_apps(&mut self) -> Vec<&EthyleneApp> { - self.app_list.selected_items.iter().map(|i| self.app_list.items.get(*i).unwrap()).collect::>() - } - - fn exit(&mut self) { - self.exit = true; - } - - fn select_item(&mut self) { - let selected_index = self.app_list.state.selected().unwrap(); - let selected_items = self.app_list.selected_items.clone(); - if selected_items.contains(&selected_index) { - self.app_list.selected_items.remove( - selected_items - .iter() - .position(|item| *item == selected_index) - .unwrap(), - ); - } else { - self.app_list.selected_items.push(selected_index); - } - } - - fn select_next(&mut self) { - self.app_list.state.select_next(); - } - - fn select_previous(&mut self) { - self.app_list.state.select_previous(); - } -} - -impl Widget for &mut App { - fn render(self, area: Rect, buf: &mut Buffer) { - let title = Title::from(" EthyleneAMD ".bold()).alignment(Alignment::Center); - let instructions = Title::from(Line::from(vec![ - " ".red(), - "Apply".into(), - " ".red(), - "Quit ".into(), - ])) - .alignment(Alignment::Center) - .position(Position::Bottom); - let block = Block::bordered() - .title(title) - .title(instructions) - .border_type(ratatui::widgets::BorderType::Rounded); - - self.render_list(block, area, buf); - } -} - -impl App { - fn render_list(&mut self, block: Block<'_>, area: Rect, buf: &mut Buffer) { - let items: Vec = self - .app_list - .items - .iter() - .enumerate() - .map(|(i, app_item)| { - ListItem::from(format!( - "{}. {}", - i + 1, - app_item.name.clone() - + (if self.app_list.selected_items.contains(&i) { - " <" - } else { - "" - }) - )) - }) - .collect(); - - let list = List::new(items) - .block(block) - .highlight_style(SELECTED_STYLE) - .highlight_symbol(">") - .highlight_spacing(ratatui::widgets::HighlightSpacing::Always); - - StatefulWidget::render(list, area, buf, &mut self.app_list.state); - } -} diff --git a/ethylene-amd/src/patch/mod.rs b/ethylene-amd/src/patch/mod.rs deleted file mode 100644 index 35e67be..0000000 --- a/ethylene-amd/src/patch/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -use crate::EthyleneApp; - -pub mod chromium; - -pub trait EthylenePatch: Sized { - fn supported_for(&self, app_item: &EthyleneApp) -> bool; - fn apply_to(&self, app_item: &EthyleneApp); -}