From f39f8613445bdddc44c44abdfa71ab0b1533ef67 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Thu, 4 Jul 2024 00:33:42 -0400
Subject: [PATCH] feat!: merge `userstyles` subcommands into root `query` and
 `init` (#34)

---
 README.md                  | 200 ++++-----------------------
 src/cli.rs                 |  57 ++++----
 src/init.rs                | 194 +++++++++++++++++++++++++++
 src/lib.rs                 |  47 +------
 src/main.rs                |  31 +++--
 src/models/shared.rs       |  26 ++++
 src/{ports.rs => query.rs} | 131 ++++++------------
 src/userstyles.rs          | 268 -------------------------------------
 8 files changed, 332 insertions(+), 622 deletions(-)
 create mode 100644 src/init.rs
 rename src/{ports.rs => query.rs} (64%)
 delete mode 100644 src/userstyles.rs

diff --git a/README.md b/README.md
index 7355459..ae0c890 100644
--- a/README.md
+++ b/README.md
@@ -32,20 +32,15 @@ purr <COMMAND> [-h | --help] [-V | --version]
   - [`stars`](#stars)
   - [`whiskers`](#whiskers)
 - [`init`](#init)
-- [`userstyles`](#userstyles)
-  - [`query`](#query-1)
-    - [`maintained`](#maintained-1)
-    - [`has`](#has-1)
-  - [`init`](#init-1)
 - [`whiskerify`](#whiskerify)
 
 ### `query`
 
 ```
-purr query [--for <PORT>] [-g | --get] [-c | --count]
+purr query [--for <PORT>] [-g | --get] [-c | --count] [--userstyles | --no-userstyles | --only-userstyles]
 ```
 
-Query the ports.yml data source. With no arguments, all ports are displayed.
+Query the ports.yml data source. With no arguments, all ports are displayed. The `--count` and userstyles-related flags work for all of the query subcommands.
 
 <details>
 <summary>Examples</summary>
@@ -56,13 +51,24 @@ Query the ports.yml data source. With no arguments, all ports are displayed.
   purr query
   ```
 
+- List all ports excluding userstyles.
+
+  ```
+  purr query --no-userstyles
+  ```
+
+- List all userstyles.
+
+  ```
+  purr query --only-userstyles
+  ```
+
 - Count the number of ports.
 
   ```
   purr query --count
   ```
 
-
 - List the names of all ports.
 
   ```
@@ -146,8 +152,11 @@ purr query has [PROPERTIES] [-n | --not] [-c | --count]
 
 - `--name <NAME>`
 - `--category <CATEGORIES>`
+- `--upstreamed`
+- `--platform <PLATFORM>`
 - `--icon <ICON>`
 - `--color <COLOR>`
+- `--alias`
 - `--url <URL>`
 
 <details>
@@ -230,7 +239,7 @@ purr query whiskers [--is <STATE>] [-n | --not] [-c | --count | -p | --percentag
 <summary>Examples</summary>
 
 - Get the overall statistics of the Whiskerification process.
-  
+
   ```
   purr query whiskers
   ```
@@ -253,7 +262,7 @@ purr query whiskers [--is <STATE>] [-n | --not] [-c | --count | -p | --percentag
   purr query whiskers --is not-applicable
   ```
 
-- List repositories Whiskers *is* applicable for.
+- List repositories Whiskers _is_ applicable for.
 
   ```
   purr query whiskers --is not-applicable --not
@@ -266,172 +275,15 @@ purr query whiskers [--is <STATE>] [-n | --not] [-c | --count | -p | --percentag
 The `init` command accepts each value (name, categories, etc.) via arguments, though if not provided a series of prompts will be displayed instead.
 
 ```
-purr init [PROPERTIES]
-```
-
-**Properties**:
-
-- `--name <NAME>`
-- `--url <URL>`
-
-### `userstyles`
-
-#### `query`
-
-```
-purr userstyles query [--for <USERSTYLE>] [-g | --get] [-c | --count]
-```
-
-Query the userstyles.yml data source. With no arguments, all userstyles are displayed.
-
-<details>
-<summary>Examples</summary>
-
-- List all userstyles.
-
-  ```
-  purr userstyles query
-  ```
-
-- Count the number of userstyles.
-
-  ```
-  purr userstyles query --count
-  ```
-
-
-- List the names of all userstyles.
-
-  ```
-  purr userstyles query --get name
-  ```
-
-- List the current maintainers of the `youtube` userstyle.
-
-  ```
-  purr userstyles query --for youtube --get current-maintainers 
-  ```
-
-</details>
-
-##### `maintained`
-
-```
-purr userstyles query maintained [--by <NAME>] [-n | --not] [-c | --count]
-```
-
-<details>
-<summary>Examples</summary>
-
-- List maintained userstyles.
-
-  ```
-  purr userstyles query maintained
-  ```
-
-- Count the number of maintained userstyles.
-
-  ```
-  purr userstyles query maintained --count
-  ```
-
-- List *un*maintained userstyles.
-
-  ```
-  purr userstyles query maintained --not
-  ```
-
-- Count the number of *un*maintained userstyles.
-
-  ```
-  purr userstyles query maintained --not --count
-  ```
-
-- List userstyles maintained by `<username>`.
-
-  ```
-  purr userstyles query maintained --by "<username>"
-  ```
-
-- Count the number of userstyles maintained by `<username>`.
-
-  ```
-  purr userstyles query maintained --by "<username>" --count
-  ```
-
-- List userstyles _not_ maintained by `<username>`.
-
-  ```
-  purr userstyles query maintained --by "<username>" --not
-  ```
-
-- Count the number of userstyles _not_ maintained by `<username>`.
-
-  ```
-  purr userstyles query maintained --by "<username>" --not --count
-  ```
-
-</details>
-
-##### `has`
-
-```
-purr userstyles query has [PROPERTIES] [-n | --not] [-c | --count]
-```
-
-**Properties:**
-
-- `--name <NAME>`
-- `--category <CATEGORIES>`
-- `--icon <ICON>`
-- `--color <COLOR>`
-- `--app-link <APP_LINK>`
-
-<details>
-<summary>Examples</summary>
-
-- List userstyles with `color` set to `mauve`.
-
-  ```
-  purr userstyles query has --color mauve
-  ```
-
-- Count the number of userstyles that have `color` set to `mauve`.
-
-  ```
-  purr userstyles query has --color mauve --count
-  ```
-
-- Count the number of userstyles that have `color` set to anything other than `mauve`.
-
-  ```
-  purr userstyles query has --color mauve --not --count
-  ```
-
-- List userstyles that do not have `icon` defined.
-
-  ```
-  purr userstyles query has --icon --not
-  ```
-
-</details>
-
-#### `init`
-
-The `init` command accepts each value (name, categories, etc.) via arguments, though if not provided a series of prompts will be displayed instead.
-
-```
-purr userstyles init [PROPERTIES]
+purr init <TEMPLATE> [PROPERTIES]
 ```
 
-**Properties**:
-
-- `--name <NAME>`
-- `--category <CATEGORIES>`
-- `--icon <ICON>`
-- `--color <COLOR>`
-- `--app-link <APP_LINK>`
+#### Templates
 
+| Template    | Available Properties/Flags                 |
+| ----------- | ------------------------------------------ |
+| `port`      | `name`, `url`                              |
+| `userstyle` | `name`, `category`, `icon`, `color`, `url` |
 
 ### `whiskerify`
 
@@ -439,7 +291,7 @@ purr userstyles init [PROPERTIES]
 purr whiskerify <PATH> [-o | --output <PATH>]
 ```
 
-Whiskerify a file by replacing Catppuccin colors and names with Tera expressions. Prints the output or writes to the `--output` file path if passed.
+Whiskerify a file by replacing Catppuccin colors and names with Tera expressions. Prints the output or writes to the `--output` file path if given.
 
 ## License
 
diff --git a/src/cli.rs b/src/cli.rs
index 3c88b4e..b513550 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use clap::{arg, Args, Parser, Subcommand, ValueEnum};
+use clap::{arg, ArgAction, Args, Parser, Subcommand, ValueEnum};
 use color_eyre::owo_colors::OwoColorize;
 use url::Url;
 
@@ -19,7 +19,7 @@ pub struct Cli {
 
 #[derive(Subcommand)]
 pub enum Commands {
-	/// Query about the ports.yml data source
+	/// Query ports and userstyles
 	Query {
 		#[command(subcommand)]
 		command: Option<Query>,
@@ -35,21 +35,23 @@ pub enum Commands {
 		/// Extract a specific property each result
 		#[arg(short, long, value_enum, default_value_t)]
 		get: Key,
-	},
-	/// Initialize a new port from catppuccin/template
-	Init {
-		/// Name of the application
-		#[arg(long)]
-		name: Option<String>,
 
-		/// URL to the application
-		#[arg(long, value_parser = valid_url)]
-		url: Option<String>,
+		// See https://jwodder.github.io/kbits/posts/clap-bool-negate/.
+		// Cursed code to enable the correct relationship between `--userstyles` and `--no-userstyles`.
+		/// Include userstyles in query results
+		#[clap(long = "userstyles", overrides_with = "userstyles", global = true)]
+		_no_userstyles: bool,
+		/// Exclude userstyles in query results
+		#[clap(long = "no-userstyles", action = ArgAction::SetFalse, global = true)]
+		userstyles: bool,
+		/// Exclude non-userstyles from query results
+		#[arg(long, conflicts_with_all = ["userstyles", "_no_userstyles"], global = true)]
+		only_userstyles: bool,
 	},
-	/// Userstyles-related subcommands
-	Userstyles {
+	/// Initialize a new port or userstyle
+	Init {
 		#[command(subcommand)]
-		command: Userstyles,
+		command: Template,
 	},
 	/// Convert a theme file to a Whiskers template
 	Whiskerify {
@@ -61,26 +63,19 @@ pub enum Commands {
 }
 
 #[derive(Subcommand)]
-pub enum Userstyles {
-	/// Query about the userstyles.yml data source
-	Query {
-		#[command(subcommand)]
-		command: Option<UserstylesQuery>,
-
-		/// Query data for a specific userstyle
-		#[arg(long, name = "USERSTYLE", conflicts_with = "count", requires = "get")]
-		r#for: Option<String>,
-
-		/// Count the number of results
-		#[arg(short, long)]
-		count: bool,
+pub enum Template {
+	/// Initialize a new port from catppuccin/template
+	Port {
+		/// Name of the application
+		#[arg(long)]
+		name: Option<String>,
 
-		/// Extract a specific property each result
-		#[arg(short, long, value_enum, default_value_t)]
-		get: UserstyleKey,
+		/// URL to the application
+		#[arg(long, value_parser = valid_url)]
+		url: Option<String>,
 	},
 	/// Initialize a new userstyle from the template
-	Init {
+	Userstyle {
 		/// Name of the application
 		#[arg(long)]
 		name: Option<String>,
diff --git a/src/init.rs b/src/init.rs
new file mode 100644
index 0000000..abf7efa
--- /dev/null
+++ b/src/init.rs
@@ -0,0 +1,194 @@
+use std::collections::HashMap;
+use std::{env, fs, io, path};
+
+use color_eyre::eyre::{bail, Result};
+use convert_case::Casing;
+use inquire::validator::Validation;
+use inquire::{MultiSelect, Select, Text};
+use url::Url;
+
+use crate::cache::Cache;
+use crate::models::shared::{StringOrStrings, CATEGORIES};
+use crate::models::userstyles::{Readme, Userstyle, UserstylesRoot};
+use crate::{fetch_text, github};
+
+pub fn port(name: Option<String>, url: Option<String>) -> Result<()> {
+	let name = name.unwrap_or_else(|| {
+		Text::new("What is the name of this port?")
+			.prompt()
+			.unwrap()
+	});
+	let name_kebab = name.to_case(convert_case::Case::Kebab);
+
+	let url = url.unwrap_or_else(|| {
+		Text::new("What is the URL of this port?")
+			.with_validator(|input: &str| {
+				if Url::parse(input).is_ok() {
+					Ok(Validation::Valid)
+				} else {
+					Ok(Validation::Invalid("Input must be a valid URL.".into()))
+				}
+			})
+			.prompt()
+			.unwrap()
+	});
+
+	let target = env::current_dir()?.join(path::PathBuf::from(&name_kebab));
+	if target.exists() {
+		bail!("Directory already exists",)
+	}
+	let response = github::rest("repos/catppuccin/template/tarball", None)?;
+
+	let temp = env::temp_dir();
+	let tarball = temp.join("repo.tar.gz");
+	let mut tarball_file = fs::File::create(&tarball)?;
+	io::copy(&mut response.bytes()?.as_ref(), &mut tarball_file)?;
+	let tar_gz = fs::File::open(tarball)?;
+	let tar = flate2::read::GzDecoder::new(tar_gz);
+	let mut archive = tar::Archive::new(tar);
+	let temp_unpacked = temp.join("unpacked");
+	archive.unpack(&temp_unpacked)?;
+
+	for entry in fs::read_dir(&temp_unpacked)? {
+		let entry = entry?;
+		let path = entry.path();
+		fs::rename(path, &target)?;
+	}
+
+	let readme = &target.join("README.md");
+	let contents = fs::read_to_string(readme)?
+		.replace(
+			"<a href=\"https://github.com/catppuccin/template\">App</a>",
+			&format!("<a href=\"{url}\">{name}</a>"),
+		)
+		.replace(
+			"catppuccin/template",
+			&format!("catppuccin/{}", &name_kebab),
+		)
+		.replace(
+			"https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/previews/",
+			"assets/",
+		);
+	fs::write(readme, contents)?;
+
+	Ok(())
+}
+
+pub fn userstyle(
+	mut cache: Cache,
+	name: Option<String>,
+	categories: Option<Vec<String>>,
+	icon: Option<String>,
+	color: Option<String>,
+	url: Option<String>,
+) -> Result<()> {
+	let cwd = env::current_dir()?;
+	if !cwd
+		.join(path::PathBuf::from("scripts/userstyles.yml"))
+		.exists()
+	{
+		bail!("Not in userstyles repository")
+	}
+
+	let name = name.unwrap_or_else(|| {
+		Text::new("What is the name of this website?")
+			.prompt()
+			.unwrap()
+	});
+	let name_kebab = name.to_case(convert_case::Case::Kebab);
+
+	let categories = categories.unwrap_or_else(|| {
+		MultiSelect::new(
+			"What categories apply to this website?",
+			CATEGORIES.to_vec(),
+		)
+		.prompt()
+		.unwrap()
+		.iter()
+		.map(|&s| s.to_string())
+		.collect()
+	});
+
+	let color = color.unwrap_or_else(|| {
+		Select::new(
+			"What is the primary brand color of this website?",
+			catppuccin::PALETTE
+				.mocha
+				.colors
+				.into_iter()
+				.filter(|c| c.accent)
+				.map(catppuccin::Color::identifier)
+				.collect(),
+		)
+		.prompt()
+		.unwrap()
+		.to_string()
+	});
+
+	let url = url.unwrap_or_else(|| {
+		Text::new("What is the URL of this website?")
+			.with_validator(|input: &str| {
+				if Url::parse(input).is_ok() {
+					Ok(Validation::Valid)
+				} else {
+					Ok(Validation::Invalid("Input must be a valid URL.".into()))
+				}
+			})
+			.prompt()
+			.unwrap()
+	});
+
+	let target = cwd.join(path::PathBuf::from("styles/".to_string() + &name_kebab));
+	if target.exists() {
+		bail!("Userstyle already exists",)
+	}
+	fs::create_dir(&target)?;
+
+	let mut template = cache
+		.get_or("userstyles-template", || {
+			fetch_text(
+				"https://github.com/catppuccin/userstyles/raw/main/template/catppuccin.user.css",
+			)
+		})?
+		.replace("<port-name> Catppuccin", &format!("{} Catppuccin", &name))
+		.replace(
+			"Soothing pastel theme for <port-name>",
+			&format!("Soothing pastel theme for {}", &name),
+		)
+		.replace("<port-name>", &name_kebab)
+		.replace(
+			"<website-domain>",
+			Url::parse(&url)?
+				.host_str()
+				.expect("App link should be a valid URL"),
+		);
+
+	let comment_re =
+		fancy_regex::Regex::new(r"\/\*(?:(?!\*\/|==UserStyle==|prettier-ignore)[\s\S])*?\*\/")?;
+	template = comment_re.replace_all(&template, "").to_string();
+
+	fs::write(
+		target.join(path::PathBuf::from("catppuccin.user.css")),
+		&template,
+	)?;
+
+	let metadata = Userstyle {
+		name: StringOrStrings::Single(name),
+		categories,
+		icon,
+		color,
+		readme: Readme {
+			app_link: StringOrStrings::Single(url),
+		},
+		current_maintainers: vec![],
+		past_maintainers: None,
+	};
+	let mut bare = HashMap::new();
+	bare.insert(name_kebab, metadata);
+	println!(
+		"{}",
+		serde_yaml::to_string(&UserstylesRoot { userstyles: bare }).unwrap()
+	);
+
+	Ok(())
+}
diff --git a/src/lib.rs b/src/lib.rs
index baec940..2dba8af 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,19 +1,18 @@
 use color_eyre::eyre::{Context, Ok, Result};
 use serde_json::{json, Value};
 
-use cli::{Key, UserstyleKey};
+use cli::Key;
 use models::{
 	ports::Port,
 	shared::{Maintainer, StringOrStrings},
-	userstyles::Userstyle,
 };
 
 pub mod cache;
 pub mod cli;
 pub mod github;
+pub mod init;
 pub mod models;
-pub mod ports;
-pub mod userstyles;
+pub mod query;
 pub mod whiskerify;
 
 fn matches_current_maintainer(current_maintainers: &[Maintainer], by: &Option<String>) -> bool {
@@ -94,46 +93,6 @@ pub fn get_key(entry: (String, Port), key: Key) -> Value {
 	}
 }
 
-pub fn get_userstyle_key(entry: (String, Userstyle), key: UserstyleKey) -> Value {
-	match key {
-		UserstyleKey::Identifier => Value::String(entry.0),
-		UserstyleKey::Name => match entry.1.name {
-			StringOrStrings::Single(name) => Value::String(name),
-			StringOrStrings::Multiple(names) => {
-				Value::Array(names.into_iter().map(Value::String).collect())
-			}
-		},
-		UserstyleKey::Categories => {
-			Value::Array(entry.1.categories.into_iter().map(Value::String).collect())
-		}
-		UserstyleKey::Icon => Value::String(entry.1.icon.expect("icon should exist")),
-		UserstyleKey::Color => Value::String(entry.1.color),
-		UserstyleKey::AppLink => match entry.1.readme.app_link {
-			StringOrStrings::Single(link) => Value::String(link),
-			StringOrStrings::Multiple(links) => {
-				Value::Array(links.into_iter().map(Value::String).collect())
-			}
-		},
-		UserstyleKey::CurrentMaintainers => Value::Array(
-			entry
-				.1
-				.current_maintainers
-				.into_iter()
-				.map(|m| json!({ "name": m.name, "url": m.url }))
-				.collect(),
-		),
-		UserstyleKey::PastMaintainers => Value::Array(
-			entry
-				.1
-				.past_maintainers
-				.into_iter()
-				.flatten()
-				.map(|m| json!({ "name": m.name, "url": m.url }))
-				.collect(),
-		),
-	}
-}
-
 fn fetch_text(url: &str) -> Result<String> {
 	let response = reqwest::blocking::get(url)?;
 	let text = response.text()?;
diff --git a/src/main.rs b/src/main.rs
index 44de6f3..da5e4a5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,7 @@
 use catppuccin_purr::{
 	cache::Cache,
-	cli::{Cli, Commands, Userstyles},
-	ports, userstyles, whiskerify,
+	cli::{Cli, Commands, Template},
+	init, query, whiskerify,
 };
 use clap::Parser;
 use color_eyre::eyre::Result;
@@ -29,22 +29,27 @@ fn main() -> Result<()> {
 			r#for,
 			count,
 			get,
-		} => ports::query(cache, command, r#for, count, get)?,
-		Commands::Init { name, url } => ports::init(name, url)?,
-		Commands::Userstyles { command } => match command {
-			Userstyles::Query {
-				command,
-				r#for,
-				count,
-				get,
-			} => userstyles::query(cache, command, r#for, count, get)?,
-			Userstyles::Init {
+			_no_userstyles,
+			userstyles,
+			only_userstyles,
+		} => query::query(
+			cache,
+			command,
+			r#for,
+			count,
+			get,
+			userstyles,
+			only_userstyles,
+		)?,
+		Commands::Init { command } => match command {
+			Template::Port { name, url } => init::port(name, url)?,
+			Template::Userstyle {
 				name,
 				categories,
 				icon,
 				color,
 				url,
-			} => userstyles::init(cache, name, categories, icon, color, url)?,
+			} => init::userstyle(cache, name, categories, icon, color, url)?,
 		},
 		Commands::Whiskerify { input, output } => whiskerify::handle(input, output)?,
 	}
diff --git a/src/models/shared.rs b/src/models/shared.rs
index bd08c59..30aeed8 100644
--- a/src/models/shared.rs
+++ b/src/models/shared.rs
@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
 
+use super::{ports::Port, userstyles::Userstyle};
+
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum StringOrStrings {
@@ -56,3 +58,27 @@ pub struct Maintainer {
 	pub name: Option<String>,
 	pub url: String,
 }
+
+impl From<Userstyle> for Port {
+	fn from(userstyle: Userstyle) -> Self {
+		Port {
+			name: match userstyle.name {
+				StringOrStrings::Single(s) => s,
+				StringOrStrings::Multiple(s) => s.join("/"),
+			},
+			categories: userstyle.categories,
+			upstreamed: Some(false),
+			platform: StringOrStrings::Single("agnostic".to_string()),
+			url: Some(match userstyle.readme.app_link {
+				StringOrStrings::Single(s) => s,
+				StringOrStrings::Multiple(s) => s[0].clone(),
+			}),
+			links: None,
+			icon: userstyle.icon,
+			color: userstyle.color,
+			alias: None,
+			current_maintainers: userstyle.current_maintainers,
+			past_maintainers: userstyle.past_maintainers,
+		}
+	}
+}
diff --git a/src/ports.rs b/src/query.rs
similarity index 64%
rename from src/ports.rs
rename to src/query.rs
index a8e0281..10de9bc 100644
--- a/src/ports.rs
+++ b/src/query.rs
@@ -1,19 +1,13 @@
-use std::{env, fs, io, path};
-
-use color_eyre::eyre::{bail, eyre, Context, Result};
-use convert_case::Casing;
-use inquire::validator::Validation;
-use inquire::Text;
+use color_eyre::eyre::{eyre, Context, Result};
 use serde_json::Value;
-use url::Url;
 
-use crate::cache::Cache;
-use crate::cli::{Key, Query, WhiskersCustomProperty};
-use crate::github::{
-	self, fetch_all_repositories, fetch_whiskers_custom_property, RepositoryResponse,
+use crate::{
+	cache::Cache,
+	cli::{Key, Query, WhiskersCustomProperty},
+	github::{self, fetch_all_repositories, fetch_whiskers_custom_property, RepositoryResponse},
+	models::{self, ports::Port, shared::StringOrStrings},
 };
-use crate::models::ports::Root;
-use crate::models::shared::StringOrStrings;
+
 use crate::{
 	display_json_or_count, fetch_text, get_key, is_booleanish_match, matches_current_maintainer,
 };
@@ -24,17 +18,40 @@ pub fn query(
 	r#for: Option<String>,
 	count: bool,
 	get: Key,
+	include_userstyles: bool,
+	only_userstyles: bool,
 ) -> Result<()> {
-	let ports = cache.get_or("ports-yml", || {
+	let ports = serde_yaml::from_str::<models::ports::Root>(&cache.get_or("ports-yml", || {
 		fetch_text("https://github.com/catppuccin/catppuccin/raw/main/resources/ports.yml")
-	})?;
-	let data: Root = serde_yaml::from_str(&ports).unwrap();
+	})?)
+	.unwrap()
+	.ports
+	.into_iter()
+	.collect::<Vec<_>>();
+
+	let userstyles = serde_yaml::from_str::<models::userstyles::Root>(
+		&cache.get_or("userstyles-yml", || {
+			fetch_text("https://github.com/catppuccin/userstyles/raw/main/scripts/userstyles.yml")
+		})?,
+	)
+	.unwrap()
+	.userstyles
+	.into_iter()
+	.map(|(key, userstyle)| (key, Port::from(userstyle.clone())))
+	.collect::<Vec<_>>();
+
+	let data = if only_userstyles {
+		userstyles
+	} else if include_userstyles {
+		[ports, userstyles].concat()
+	} else {
+		ports
+	}
+	.into_iter();
 
 	match command {
 		Some(Query::Maintained { by, options }) => {
 			let result = data
-				.ports
-				.into_iter()
 				.filter(|port| {
 					let current_maintainers = &port.1.current_maintainers;
 					let matches = matches_current_maintainer(current_maintainers, &by);
@@ -62,8 +79,6 @@ pub fn query(
 			options,
 		}) => {
 			let result = data
-				.ports
-				.into_iter()
 				.filter(|port| {
 					let matches: bool = {
 						if let Some(name) = &name {
@@ -137,10 +152,10 @@ pub fn query(
 			token,
 		}) => {
 			if let Some(repository) = r#for {
-				let data = github::rest(&format!("repos/catppuccin/{repository}"), Some(token))?
+				let res = github::rest(&format!("repos/catppuccin/{repository}"), Some(token))?
 					.json::<RepositoryResponse>()?;
 
-				println!("{}", data.stargazers_count);
+				println!("{}", res.stargazers_count);
 			} else {
 				let repositories = fetch_all_repositories(&token)?;
 
@@ -233,9 +248,7 @@ pub fn query(
 				println!(
 					"{}",
 					serde_json::to_string_pretty(
-						data.ports
-							.into_iter()
-							.filter(|port| port.0.to_lowercase() == r#for.to_lowercase())
+						data.filter(|port| port.0.to_lowercase() == r#for.to_lowercase())
 							.map(|port| get_key(port, get))
 							.collect::<Vec<_>>()
 							.first()
@@ -245,11 +258,7 @@ pub fn query(
 				);
 			} else {
 				display_json_or_count(
-					&data
-						.ports
-						.into_iter()
-						.map(|port| get_key(port, get))
-						.collect::<Vec<_>>(),
+					&data.map(|port| get_key(port, get)).collect::<Vec<_>>(),
 					count,
 				)?;
 			}
@@ -258,65 +267,3 @@ pub fn query(
 
 	Ok(())
 }
-
-pub fn init(name: Option<String>, url: Option<String>) -> Result<()> {
-	let name = name.unwrap_or_else(|| {
-		Text::new("What is the name of this port?")
-			.prompt()
-			.unwrap()
-	});
-	let name_kebab = name.to_case(convert_case::Case::Kebab);
-
-	let url = url.unwrap_or_else(|| {
-		Text::new("What is the URL of this port?")
-			.with_validator(|input: &str| {
-				if Url::parse(input).is_ok() {
-					Ok(Validation::Valid)
-				} else {
-					Ok(Validation::Invalid("Input must be a valid URL.".into()))
-				}
-			})
-			.prompt()
-			.unwrap()
-	});
-
-	let target = env::current_dir()?.join(path::PathBuf::from(&name_kebab));
-	if target.exists() {
-		bail!("Directory already exists",)
-	}
-	let response = github::rest("repos/catppuccin/template/tarball", None)?;
-
-	let temp = env::temp_dir();
-	let tarball = temp.join("repo.tar.gz");
-	let mut tarball_file = fs::File::create(&tarball)?;
-	io::copy(&mut response.bytes()?.as_ref(), &mut tarball_file)?;
-	let tar_gz = fs::File::open(tarball)?;
-	let tar = flate2::read::GzDecoder::new(tar_gz);
-	let mut archive = tar::Archive::new(tar);
-	let temp_unpacked = temp.join("unpacked");
-	archive.unpack(&temp_unpacked)?;
-
-	for entry in fs::read_dir(&temp_unpacked)? {
-		let entry = entry?;
-		let path = entry.path();
-		fs::rename(path, &target)?;
-	}
-
-	let readme = &target.join("README.md");
-	let contents = fs::read_to_string(readme)?
-		.replace(
-			"<a href=\"https://github.com/catppuccin/template\">App</a>",
-			&format!("<a href=\"{url}\">{name}</a>"),
-		)
-		.replace(
-			"catppuccin/template",
-			&format!("catppuccin/{}", &name_kebab),
-		)
-		.replace(
-			"https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/previews/",
-			"assets/",
-		);
-	fs::write(readme, contents)?;
-
-	Ok(())
-}
diff --git a/src/userstyles.rs b/src/userstyles.rs
deleted file mode 100644
index 8a005fd..0000000
--- a/src/userstyles.rs
+++ /dev/null
@@ -1,268 +0,0 @@
-use std::collections::HashMap;
-use std::{env, fs, path};
-
-use color_eyre::eyre::{bail, eyre, Context, Result};
-use convert_case::Casing;
-use inquire::validator::Validation;
-use inquire::{MultiSelect, Select, Text};
-use url::Url;
-
-use crate::cache::Cache;
-use crate::cli::{UserstyleKey, UserstylesQuery};
-use crate::models::shared::{StringOrStrings, CATEGORIES};
-use crate::models::userstyles::{Readme, Root, Userstyle, UserstylesRoot};
-use crate::{
-	display_json_or_count, fetch_text, get_userstyle_key, is_booleanish_match,
-	matches_current_maintainer,
-};
-
-pub fn query(
-	mut cache: Cache,
-	command: Option<UserstylesQuery>,
-	r#for: Option<String>,
-	count: bool,
-	get: UserstyleKey,
-) -> Result<()> {
-	let userstyles = cache.get_or("userstyles-yml", || {
-		fetch_text("https://github.com/catppuccin/userstyles/raw/main/scripts/userstyles.yml")
-	})?;
-	let data: Root = serde_yaml::from_str(&userstyles).unwrap();
-
-	match command {
-		Some(UserstylesQuery::Maintained { by, options }) => {
-			let result = data
-				.userstyles
-				.into_iter()
-				.filter(|userstyle| {
-					let current_maintainers = &userstyle.1.current_maintainers;
-					let matches = matches_current_maintainer(current_maintainers, &by);
-
-					if options.not {
-						!matches
-					} else {
-						matches
-					}
-				})
-				.map(|userstyle| get_userstyle_key(userstyle, options.get))
-				.collect::<Vec<_>>();
-
-			display_json_or_count(&result, options.count)?;
-		}
-		Some(UserstylesQuery::Has {
-			name,
-			categories,
-			icon,
-			color,
-			app_link,
-			options,
-		}) => {
-			let result = data
-				.userstyles
-				.into_iter()
-				.filter(|userstyle| {
-					let matches: bool = {
-						if let Some(name) = &name {
-							*name == userstyle.0
-								|| match &userstyle.1.name {
-									StringOrStrings::Multiple(n) => n.contains(name),
-									StringOrStrings::Single(n) => *n == *name,
-								}
-						} else {
-							true
-						}
-					} && {
-						if let Some(categories) = &categories {
-							categories
-								.iter()
-								.all(|c| userstyle.1.categories.contains(c))
-						} else {
-							true
-						}
-					} && {
-						if let Some(icon) = &icon {
-							let value = &userstyle.1.icon;
-							is_booleanish_match(value.clone(), icon)
-						} else {
-							true
-						}
-					} && {
-						if let Some(color) = &color {
-							color
-								.parse()
-								.unwrap_or_else(|_| *color == userstyle.1.color)
-						} else {
-							true
-						}
-					} && {
-						if let Some(app_link) = &app_link {
-							app_link.parse().unwrap_or_else(|_| {
-								match &userstyle.1.readme.app_link {
-									StringOrStrings::Multiple(l) => l.contains(app_link),
-									StringOrStrings::Single(l) => *l == *app_link,
-								}
-							})
-						} else {
-							true
-						}
-					};
-
-					if options.not {
-						!matches
-					} else {
-						matches
-					}
-				})
-				.map(|userstyle| get_userstyle_key(userstyle, options.get))
-				.collect::<Vec<_>>();
-
-			display_json_or_count(&result, options.count)?;
-		}
-		None => {
-			if let Some(r#for) = r#for {
-				println!(
-					"{}",
-					serde_json::to_string_pretty(
-						data.userstyles
-							.into_iter()
-							.filter(|userstyle| userstyle.0.to_lowercase() == r#for.to_lowercase())
-							.map(|userstyle| get_userstyle_key(userstyle, get))
-							.collect::<Vec<_>>()
-							.first()
-							.ok_or_else(|| eyre!("no userstyle with the name '{}'", r#for))?
-					)
-					.context("Failed to serialize results")?
-				);
-			} else {
-				display_json_or_count(
-					&data
-						.userstyles
-						.into_iter()
-						.map(|userstyle| get_userstyle_key(userstyle, get))
-						.collect::<Vec<_>>(),
-					count,
-				)?;
-			}
-		}
-	}
-
-	Ok(())
-}
-
-pub fn init(
-	mut cache: Cache,
-	name: Option<String>,
-	categories: Option<Vec<String>>,
-	icon: Option<String>,
-	color: Option<String>,
-	url: Option<String>,
-) -> Result<()> {
-	let cwd = env::current_dir()?;
-	if !cwd
-		.join(path::PathBuf::from("scripts/userstyles.yml"))
-		.exists()
-	{
-		bail!("Not in userstyles repository")
-	}
-
-	let name = name.unwrap_or_else(|| {
-		Text::new("What is the name of this website?")
-			.prompt()
-			.unwrap()
-	});
-	let name_kebab = name.to_case(convert_case::Case::Kebab);
-
-	let categories = categories.unwrap_or_else(|| {
-		MultiSelect::new(
-			"What categories apply to this website?",
-			CATEGORIES.to_vec(),
-		)
-		.prompt()
-		.unwrap()
-		.iter()
-		.map(|&s| s.to_string())
-		.collect()
-	});
-
-	let color = color.unwrap_or_else(|| {
-		Select::new(
-			"What is the primary brand color of this website?",
-			catppuccin::PALETTE
-				.mocha
-				.colors
-				.into_iter()
-				.filter(|c| c.accent)
-				.map(catppuccin::Color::identifier)
-				.collect(),
-		)
-		.prompt()
-		.unwrap()
-		.to_string()
-	});
-
-	let url = url.unwrap_or_else(|| {
-		Text::new("What is the URL of this website?")
-			.with_validator(|input: &str| {
-				if Url::parse(input).is_ok() {
-					Ok(Validation::Valid)
-				} else {
-					Ok(Validation::Invalid("Input must be a valid URL.".into()))
-				}
-			})
-			.prompt()
-			.unwrap()
-	});
-
-	let target = cwd.join(path::PathBuf::from("styles/".to_string() + &name_kebab));
-	if target.exists() {
-		bail!("Userstyle already exists",)
-	}
-	fs::create_dir(&target)?;
-
-	let mut template = cache
-		.get_or("userstyles-template", || {
-			fetch_text(
-				"https://github.com/catppuccin/userstyles/raw/main/template/catppuccin.user.css",
-			)
-		})?
-		.replace("<port-name> Catppuccin", &format!("{} Catppuccin", &name))
-		.replace(
-			"Soothing pastel theme for <port-name>",
-			&format!("Soothing pastel theme for {}", &name),
-		)
-		.replace("<port-name>", &name_kebab)
-		.replace(
-			"<website-domain>",
-			Url::parse(&url)?
-				.host_str()
-				.expect("App link should be a valid URL"),
-		);
-
-	let comment_re =
-		fancy_regex::Regex::new(r"\/\*(?:(?!\*\/|==UserStyle==|prettier-ignore)[\s\S])*?\*\/")?;
-	template = comment_re.replace_all(&template, "").to_string();
-
-	fs::write(
-		target.join(path::PathBuf::from("catppuccin.user.css")),
-		&template,
-	)?;
-
-	let metadata = Userstyle {
-		name: StringOrStrings::Single(name),
-		categories,
-		icon,
-		color,
-		readme: Readme {
-			app_link: StringOrStrings::Single(url),
-		},
-		current_maintainers: vec![],
-		past_maintainers: None,
-	};
-	let mut bare = HashMap::new();
-	bare.insert(name_kebab, metadata);
-	println!(
-		"{}",
-		serde_yaml::to_string(&UserstylesRoot { userstyles: bare }).unwrap()
-	);
-
-	Ok(())
-}