Mirror von
https://github.com/Chaoscaot/schemsearch
synchronisiert 2024-10-02 20:50:10 +02:00
Merge branch 'master' into chaoscaot/support_sponge_v1_v3
Dieser Commit ist enthalten in:
Commit
80f5191ae8
6
.github/dependabot.yml
vendored
Normale Datei
6
.github/dependabot.yml
vendored
Normale Datei
@ -0,0 +1,6 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "cargo"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "weekly"
|
24
.github/workflows/master-build.yml
vendored
24
.github/workflows/master-build.yml
vendored
@ -19,32 +19,36 @@ jobs:
|
|||||||
- name: Cache Cargo modules
|
- name: Cache Cargo modules
|
||||||
id: cache-cargo
|
id: cache-cargo
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
env:
|
continue-on-error: false
|
||||||
cache-name: cache-cargo-target-debug
|
|
||||||
with:
|
with:
|
||||||
path: target
|
path: |
|
||||||
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
|
~/.cargo/registry
|
||||||
|
~/.cargo/git
|
||||||
|
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-${{ env.cache-name }}-
|
${{ runner.os }}-cargo-
|
||||||
- name: Build
|
- name: Build
|
||||||
run: make debug
|
run: make debug
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: cargo test --verbose -p schemsearch-lib
|
run: cargo test --verbose -p schemsearch-lib
|
||||||
|
|
||||||
build-release:
|
build-release:
|
||||||
|
needs:
|
||||||
|
- build
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Cache Cargo modules
|
- name: Cache Cargo modules
|
||||||
id: cache-cargo
|
id: cache-cargo
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
env:
|
continue-on-error: false
|
||||||
cache-name: cache-cargo-target-release
|
|
||||||
with:
|
with:
|
||||||
path: target
|
path: |
|
||||||
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
|
~/.cargo/registry
|
||||||
|
~/.cargo/git
|
||||||
|
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-${{ env.cache-name }}-
|
${{ runner.os }}-cargo-
|
||||||
- name: Build
|
- name: Build
|
||||||
run: make
|
run: make
|
||||||
- name: Upload a Build Artifact
|
- name: Upload a Build Artifact
|
||||||
|
11
.github/workflows/release-build.yml
vendored
11
.github/workflows/release-build.yml
vendored
@ -22,13 +22,14 @@ jobs:
|
|||||||
- name: Cache Cargo modules
|
- name: Cache Cargo modules
|
||||||
id: cache-cargo
|
id: cache-cargo
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
env:
|
continue-on-error: false
|
||||||
cache-name: cache-cargo-target-release
|
|
||||||
with:
|
with:
|
||||||
path: target
|
path: |
|
||||||
key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
|
~/.cargo/registry
|
||||||
|
~/.cargo/git
|
||||||
|
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-${{ env.cache-name }}-
|
${{ runner.os }}-cargo-
|
||||||
- name: Build
|
- name: Build
|
||||||
run: make
|
run: make
|
||||||
- name: Create Tarball
|
- name: Create Tarball
|
||||||
|
128
CODE_OF_CONDUCT.md
Normale Datei
128
CODE_OF_CONDUCT.md
Normale Datei
@ -0,0 +1,128 @@
|
|||||||
|
# Contributor Covenant Code of Conduct
|
||||||
|
|
||||||
|
## Our Pledge
|
||||||
|
|
||||||
|
We as members, contributors, and leaders pledge to make participation in our
|
||||||
|
community a harassment-free experience for everyone, regardless of age, body
|
||||||
|
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
||||||
|
identity and expression, level of experience, education, socio-economic status,
|
||||||
|
nationality, personal appearance, race, religion, or sexual identity
|
||||||
|
and orientation.
|
||||||
|
|
||||||
|
We pledge to act and interact in ways that contribute to an open, welcoming,
|
||||||
|
diverse, inclusive, and healthy community.
|
||||||
|
|
||||||
|
## Our Standards
|
||||||
|
|
||||||
|
Examples of behavior that contributes to a positive environment for our
|
||||||
|
community include:
|
||||||
|
|
||||||
|
* Demonstrating empathy and kindness toward other people
|
||||||
|
* Being respectful of differing opinions, viewpoints, and experiences
|
||||||
|
* Giving and gracefully accepting constructive feedback
|
||||||
|
* Accepting responsibility and apologizing to those affected by our mistakes,
|
||||||
|
and learning from the experience
|
||||||
|
* Focusing on what is best not just for us as individuals, but for the
|
||||||
|
overall community
|
||||||
|
|
||||||
|
Examples of unacceptable behavior include:
|
||||||
|
|
||||||
|
* The use of sexualized language or imagery, and sexual attention or
|
||||||
|
advances of any kind
|
||||||
|
* Trolling, insulting or derogatory comments, and personal or political attacks
|
||||||
|
* Public or private harassment
|
||||||
|
* Publishing others' private information, such as a physical or email
|
||||||
|
address, without their explicit permission
|
||||||
|
* Other conduct which could reasonably be considered inappropriate in a
|
||||||
|
professional setting
|
||||||
|
|
||||||
|
## Enforcement Responsibilities
|
||||||
|
|
||||||
|
Community leaders are responsible for clarifying and enforcing our standards of
|
||||||
|
acceptable behavior and will take appropriate and fair corrective action in
|
||||||
|
response to any behavior that they deem inappropriate, threatening, offensive,
|
||||||
|
or harmful.
|
||||||
|
|
||||||
|
Community leaders have the right and responsibility to remove, edit, or reject
|
||||||
|
comments, commits, code, wiki edits, issues, and other contributions that are
|
||||||
|
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
||||||
|
decisions when appropriate.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
This Code of Conduct applies within all community spaces, and also applies when
|
||||||
|
an individual is officially representing the community in public spaces.
|
||||||
|
Examples of representing our community include using an official e-mail address,
|
||||||
|
posting via an official social media account, or acting as an appointed
|
||||||
|
representative at an online or offline event.
|
||||||
|
|
||||||
|
## Enforcement
|
||||||
|
|
||||||
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||||
|
reported to the community leaders responsible for enforcement at
|
||||||
|
chaoscaot@zohomail.eu.
|
||||||
|
All complaints will be reviewed and investigated promptly and fairly.
|
||||||
|
|
||||||
|
All community leaders are obligated to respect the privacy and security of the
|
||||||
|
reporter of any incident.
|
||||||
|
|
||||||
|
## Enforcement Guidelines
|
||||||
|
|
||||||
|
Community leaders will follow these Community Impact Guidelines in determining
|
||||||
|
the consequences for any action they deem in violation of this Code of Conduct:
|
||||||
|
|
||||||
|
### 1. Correction
|
||||||
|
|
||||||
|
**Community Impact**: Use of inappropriate language or other behavior deemed
|
||||||
|
unprofessional or unwelcome in the community.
|
||||||
|
|
||||||
|
**Consequence**: A private, written warning from community leaders, providing
|
||||||
|
clarity around the nature of the violation and an explanation of why the
|
||||||
|
behavior was inappropriate. A public apology may be requested.
|
||||||
|
|
||||||
|
### 2. Warning
|
||||||
|
|
||||||
|
**Community Impact**: A violation through a single incident or series
|
||||||
|
of actions.
|
||||||
|
|
||||||
|
**Consequence**: A warning with consequences for continued behavior. No
|
||||||
|
interaction with the people involved, including unsolicited interaction with
|
||||||
|
those enforcing the Code of Conduct, for a specified period of time. This
|
||||||
|
includes avoiding interactions in community spaces as well as external channels
|
||||||
|
like social media. Violating these terms may lead to a temporary or
|
||||||
|
permanent ban.
|
||||||
|
|
||||||
|
### 3. Temporary Ban
|
||||||
|
|
||||||
|
**Community Impact**: A serious violation of community standards, including
|
||||||
|
sustained inappropriate behavior.
|
||||||
|
|
||||||
|
**Consequence**: A temporary ban from any sort of interaction or public
|
||||||
|
communication with the community for a specified period of time. No public or
|
||||||
|
private interaction with the people involved, including unsolicited interaction
|
||||||
|
with those enforcing the Code of Conduct, is allowed during this period.
|
||||||
|
Violating these terms may lead to a permanent ban.
|
||||||
|
|
||||||
|
### 4. Permanent Ban
|
||||||
|
|
||||||
|
**Community Impact**: Demonstrating a pattern of violation of community
|
||||||
|
standards, including sustained inappropriate behavior, harassment of an
|
||||||
|
individual, or aggression toward or disparagement of classes of individuals.
|
||||||
|
|
||||||
|
**Consequence**: A permanent ban from any sort of public interaction within
|
||||||
|
the community.
|
||||||
|
|
||||||
|
## Attribution
|
||||||
|
|
||||||
|
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
||||||
|
version 2.0, available at
|
||||||
|
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
|
||||||
|
|
||||||
|
Community Impact Guidelines were inspired by [Mozilla's code of conduct
|
||||||
|
enforcement ladder](https://github.com/mozilla/diversity).
|
||||||
|
|
||||||
|
[homepage]: https://www.contributor-covenant.org
|
||||||
|
|
||||||
|
For answers to common questions about this code of conduct, see the FAQ at
|
||||||
|
https://www.contributor-covenant.org/faq. Translations are available at
|
||||||
|
https://www.contributor-covenant.org/translations.
|
4
Makefile
4
Makefile
@ -2,6 +2,10 @@ default:
|
|||||||
@echo "Building (Release)...";
|
@echo "Building (Release)...";
|
||||||
cargo rustc --release --color=always -p schemsearch-cli -- -C target-feature=+avx2
|
cargo rustc --release --color=always -p schemsearch-cli -- -C target-feature=+avx2
|
||||||
|
|
||||||
|
sql:
|
||||||
|
@echo "Building (Release)...";
|
||||||
|
cargo rustc --release --color=always -p schemsearch-cli --features sql -- -C target-feature=+avx2
|
||||||
|
|
||||||
debug:
|
debug:
|
||||||
@echo "Building (Debug)...";
|
@echo "Building (Debug)...";
|
||||||
cargo build -p schemsearch-cli
|
cargo build -p schemsearch-cli
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "schemsearch-cli"
|
name = "schemsearch-cli"
|
||||||
version = "0.1.1"
|
version = "0.1.2"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
mod types;
|
mod types;
|
||||||
mod json_output;
|
mod json_output;
|
||||||
mod sinks;
|
mod sinks;
|
||||||
|
mod stderr;
|
||||||
|
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
@ -40,6 +41,7 @@ use crate::types::SqlSchematicSupplier;
|
|||||||
use indicatif::*;
|
use indicatif::*;
|
||||||
use schemsearch_files::{SchematicVersioned};
|
use schemsearch_files::{SchematicVersioned};
|
||||||
use crate::sinks::{OutputFormat, OutputSink};
|
use crate::sinks::{OutputFormat, OutputSink};
|
||||||
|
use crate::stderr::MaschineStdErr;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
#[allow(unused_mut)]
|
#[allow(unused_mut)]
|
||||||
@ -139,6 +141,24 @@ fn main() {
|
|||||||
.default_value("0")
|
.default_value("0")
|
||||||
.value_parser(|s: &str| s.parse::<usize>().map_err(|e| e.to_string())),
|
.value_parser(|s: &str| s.parse::<usize>().map_err(|e| e.to_string())),
|
||||||
)
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::new("machine")
|
||||||
|
.help("Output for machines")
|
||||||
|
.short('m')
|
||||||
|
.long("machine")
|
||||||
|
.action(ArgAction::Set)
|
||||||
|
.default_value("0")
|
||||||
|
.value_parser(|s: &str| s.parse::<u16>().map_err(|e| e.to_string()))
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::new("limit")
|
||||||
|
.help("The maximum number of matches to return [0 = Unlimited]")
|
||||||
|
.short('l')
|
||||||
|
.long("limit")
|
||||||
|
.action(ArgAction::Set)
|
||||||
|
.default_value("50")
|
||||||
|
.value_parser(|s: &str| s.parse::<usize>().map_err(|e| e.to_string())),
|
||||||
|
)
|
||||||
.about("Searches for a pattern in a schematic")
|
.about("Searches for a pattern in a schematic")
|
||||||
.bin_name("schemsearch");
|
.bin_name("schemsearch");
|
||||||
|
|
||||||
@ -246,9 +266,14 @@ fn main() {
|
|||||||
|
|
||||||
ThreadPoolBuilder::new().num_threads(*matches.get_one::<usize>("threads").expect("Could not get threads")).build_global().unwrap();
|
ThreadPoolBuilder::new().num_threads(*matches.get_one::<usize>("threads").expect("Could not get threads")).build_global().unwrap();
|
||||||
|
|
||||||
let bar = ProgressBar::new(schematics.len() as u64);
|
let bar = ProgressBar::new(schematics.len() as u64); // "maschine"
|
||||||
bar.set_style(ProgressStyle::with_template("[{elapsed}, ETA: {eta}] {wide_bar} {pos}/{len} {per_sec}").unwrap());
|
bar.set_style(ProgressStyle::with_template("[{elapsed}, ETA: {eta}] {wide_bar} {pos}/{len} {per_sec}").unwrap());
|
||||||
bar.set_draw_target(ProgressDrawTarget::stderr_with_hz(5));
|
let term_size = *matches.get_one::<u16>("machine").expect("Could not get machine");
|
||||||
|
if term_size != 0 {
|
||||||
|
bar.set_draw_target(ProgressDrawTarget::term_like(Box::new(MaschineStdErr { size: term_size })))
|
||||||
|
}
|
||||||
|
|
||||||
|
let max_matching = *matches.get_one::<usize>("limit").expect("Could not get max-matching");
|
||||||
|
|
||||||
let matches: Vec<SearchResult> = schematics.par_iter().progress_with(bar).map(|schem| {
|
let matches: Vec<SearchResult> = schematics.par_iter().progress_with(bar).map(|schem| {
|
||||||
match schem {
|
match schem {
|
||||||
@ -286,13 +311,19 @@ fn main() {
|
|||||||
}
|
}
|
||||||
}).collect();
|
}).collect();
|
||||||
|
|
||||||
for matching in matches {
|
let mut matches_count = 0;
|
||||||
|
|
||||||
|
'outer: for matching in matches {
|
||||||
let schem_name = matching.name;
|
let schem_name = matching.name;
|
||||||
let matching = matching.matches;
|
let matching = matching.matches;
|
||||||
for x in matching {
|
for x in matching {
|
||||||
for out in &mut output {
|
for out in &mut output {
|
||||||
write!(out.1, "{}", out.0.found_match(&schem_name, x)).unwrap();
|
write!(out.1, "{}", out.0.found_match(&schem_name, x)).unwrap();
|
||||||
}
|
}
|
||||||
|
matches_count += 1;
|
||||||
|
if max_matching != 0 && matches_count >= max_matching {
|
||||||
|
break 'outer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,8 +49,8 @@ impl FromStr for OutputSink {
|
|||||||
impl OutputSink {
|
impl OutputSink {
|
||||||
pub fn output(&self) -> Box<dyn Write> {
|
pub fn output(&self) -> Box<dyn Write> {
|
||||||
match self {
|
match self {
|
||||||
OutputSink::Stdout => Box::new(std::io::stdout().lock()),
|
OutputSink::Stdout => Box::new(std::io::stdout()),
|
||||||
OutputSink::Stderr => Box::new(std::io::stderr().lock()),
|
OutputSink::Stderr => Box::new(std::io::stderr()),
|
||||||
OutputSink::File(path) => Box::new(BufWriter::new(File::create(path).unwrap()))
|
OutputSink::File(path) => Box::new(BufWriter::new(File::create(path).unwrap()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
44
schemsearch-cli/src/stderr.rs
Normale Datei
44
schemsearch-cli/src/stderr.rs
Normale Datei
@ -0,0 +1,44 @@
|
|||||||
|
use std::fmt::Debug;
|
||||||
|
use std::io::Write;
|
||||||
|
use indicatif::TermLike;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct MaschineStdErr { pub(crate) size: u16}
|
||||||
|
|
||||||
|
impl TermLike for MaschineStdErr {
|
||||||
|
fn width(&self) -> u16 {
|
||||||
|
self.size
|
||||||
|
}
|
||||||
|
|
||||||
|
fn move_cursor_up(&self, _: usize) -> std::io::Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn move_cursor_down(&self, _: usize) -> std::io::Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn move_cursor_right(&self, _: usize) -> std::io::Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn move_cursor_left(&self, _: usize) -> std::io::Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_line(&self, s: &str) -> std::io::Result<()> {
|
||||||
|
writeln!(std::io::stderr(), "{}", s)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_str(&self, s: &str) -> std::io::Result<()> {
|
||||||
|
write!(std::io::stderr(), "{}", s)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn clear_line(&self) -> std::io::Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flush(&self) -> std::io::Result<()> {
|
||||||
|
std::io::stderr().flush()
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "schemsearch-files"
|
name = "schemsearch-files"
|
||||||
version = "0.1.1"
|
version = "0.1.2"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "schemsearch-lib"
|
name = "schemsearch-lib"
|
||||||
version = "0.1.1"
|
version = "0.1.2"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ pub fn search(
|
|||||||
|
|
||||||
let air_id = if search_behavior.ignore_air || search_behavior.air_as_any { pattern_schem.palette.get("minecraft:air").unwrap_or(&-1) } else { &-1};
|
let air_id = if search_behavior.ignore_air || search_behavior.air_as_any { pattern_schem.palette.get("minecraft:air").unwrap_or(&-1) } else { &-1};
|
||||||
|
|
||||||
let pattern_blocks = (pattern_schem.width * pattern_schem.height * pattern_schem.length) as f32;
|
let pattern_blocks = pattern_data.len() as f32;
|
||||||
|
|
||||||
let pattern_width = pattern_schem.width as usize;
|
let pattern_width = pattern_schem.width as usize;
|
||||||
let pattern_height = pattern_schem.height as usize;
|
let pattern_height = pattern_schem.height as usize;
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren