diff --git a/.github/workflows/release-samtool.yml b/.github/workflows/release-seg.yml similarity index 87% rename from .github/workflows/release-samtool.yml rename to .github/workflows/release-seg.yml index b11322e..14fdaa0 100644 --- a/.github/workflows/release-samtool.yml +++ b/.github/workflows/release-seg.yml @@ -1,4 +1,4 @@ -name: Release Samtool +name: Release Seg on: push: @@ -29,7 +29,7 @@ jobs: target: x86_64-pc-windows-msvc artifact: windows-x64 - - os: macos-13 + - os: macos-latest target: x86_64-apple-darwin artifact: macos-x64 @@ -48,14 +48,14 @@ jobs: targets: ${{ matrix.target }} - name: Build - working-directory: crates/samtool + working-directory: crates/seg run: cargo build --release --target ${{ matrix.target }} - name: Upload Binary uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }} - path: crates/samtool/target/${{ matrix.target }}/release/ + path: crates/seg/target/${{ matrix.target }}/release/ publish: needs: build @@ -79,11 +79,11 @@ jobs: run: find artifacts - name: Generate npm packages - working-directory: crates/samtool + working-directory: crates/seg run: cargo npm generate - name: Publish npm packages - working-directory: crates/samtool + working-directory: crates/seg env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} run: cargo npm publish diff --git a/.gitignore b/.gitignore index 0262b76..1a65a05 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ dist2/ *.exe /crates/easy-git-ignore/target/ /.samengine/tags.txt +/crates/seg/target diff --git a/crates/samtool/npm/@shadowdara/samtool-linux-arm64-musl/package.json b/crates/samtool/npm/@shadowdara/samtool-linux-arm64-musl/package.json deleted file mode 100644 index e5cca16..0000000 --- a/crates/samtool/npm/@shadowdara/samtool-linux-arm64-musl/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "@shadowdara/samtool-linux-arm64-musl", - "version": "0.1.6", - "license": "Apache-2.0", - "repository": { - "type": "git", - "url": "git+https://github.com/shadowdara/samengine.git" - }, - "os": [ - "linux" - ], - "cpu": [ - "arm64" - ], - "libc": [ - "musl" - ] -} \ No newline at end of file diff --git a/crates/samtool/npm/@shadowdara/samtool-linux-arm64/package.json b/crates/samtool/npm/@shadowdara/samtool-linux-arm64/package.json deleted file mode 100644 index 820b177..0000000 --- a/crates/samtool/npm/@shadowdara/samtool-linux-arm64/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "@shadowdara/samtool-linux-arm64", - "version": "0.1.6", - "license": "Apache-2.0", - "repository": { - "type": "git", - "url": "git+https://github.com/shadowdara/samengine.git" - }, - "os": [ - "linux" - ], - "cpu": [ - "arm64" - ], - "libc": [ - "glibc" - ] -} \ No newline at end of file diff --git a/crates/samtool/npm/@shadowdara/samtool-linux-x64-musl/package.json b/crates/samtool/npm/@shadowdara/samtool-linux-x64-musl/package.json deleted file mode 100644 index 1bc786a..0000000 --- a/crates/samtool/npm/@shadowdara/samtool-linux-x64-musl/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "@shadowdara/samtool-linux-x64-musl", - "version": "0.1.6", - "license": "Apache-2.0", - "repository": { - "type": "git", - "url": "git+https://github.com/shadowdara/samengine.git" - }, - "os": [ - "linux" - ], - "cpu": [ - "x64" - ], - "libc": [ - "musl" - ] -} \ No newline at end of file diff --git a/crates/samtool/npm/@shadowdara/samtool-linux-x64/LICENSE b/crates/samtool/npm/@shadowdara/samtool-linux-x64/LICENSE deleted file mode 100644 index d2f30b7..0000000 --- a/crates/samtool/npm/@shadowdara/samtool-linux-x64/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the 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. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2025 Shadowdara - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/crates/samtool/npm/@shadowdara/samtool-win32-x64/LICENSE b/crates/samtool/npm/@shadowdara/samtool-win32-x64/LICENSE deleted file mode 100644 index d2f30b7..0000000 --- a/crates/samtool/npm/@shadowdara/samtool-win32-x64/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the 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. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2025 Shadowdara - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/crates/samtool/.gitignore b/crates/seg/.gitignore similarity index 100% rename from crates/samtool/.gitignore rename to crates/seg/.gitignore diff --git a/crates/samtool/Cargo.lock b/crates/seg/Cargo.lock similarity index 99% rename from crates/samtool/Cargo.lock rename to crates/seg/Cargo.lock index 236dd3b..d88d3d9 100644 --- a/crates/samtool/Cargo.lock +++ b/crates/seg/Cargo.lock @@ -201,16 +201,16 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "samfileparser" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7195ae8b3e5ae8e90d530d8a4e6260f1bb6b82335492b3731f02d21420ac0d54" +checksum = "0b9412f7370de81565734cd6041d563c87920c62224dfcc3cea92c10a48b7eae" dependencies = [ "fluaterm", ] [[package]] name = "samtool" -version = "0.1.2" +version = "0.1.7" dependencies = [ "chrono", "fluaterm", diff --git a/crates/samtool/Cargo.toml b/crates/seg/Cargo.toml similarity index 94% rename from crates/samtool/Cargo.toml rename to crates/seg/Cargo.toml index b3f6d77..d99a0ee 100644 --- a/crates/samtool/Cargo.toml +++ b/crates/seg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "samtool" -version = "0.1.7" +version = "0.1.8" edition = "2024" authors = ["Shadowdara"] readme = "README.md" @@ -22,6 +22,10 @@ chrono = { version = "0.4", features = ["serde"] } [target.'cfg(windows)'.dependencies] win-utf8-rs = "0.2.1" +[[bin]] +name = "seg" +path = "src/main.rs" + [profile.release] opt-level = 3 # 0 -> no optimizing, 3 -> max speed lto = "fat" # oder "thin" für schnelleren Build @@ -34,15 +38,15 @@ incremental = false [package.metadata.npm] # Main package name. Defaults to the crate name. -name = "@shadowdara/samtool" +name = "seg" # Platform package name prefix. Defaults to "{name}-". It is recommended to # use a scoped prefix (e.g. "@myorg/my-tool-") as publishing many packages # at once can trigger npm spam detection. -prefix = "@shadowdara/samtool-" +prefix = "@shadowdara/seg-" # Binaries to include. Defaults to all [[bin]] targets in the crate. -bins = ["samtool"] +bins = ["seg"] # Target triples to generate packages for. When unset, falls back to # build.target in .cargo/config.toml. diff --git a/crates/samtool/LICENSE b/crates/seg/LICENSE similarity index 100% rename from crates/samtool/LICENSE rename to crates/seg/LICENSE diff --git a/crates/samtool/npm/@shadowdara/samtool/README.md b/crates/seg/README.md similarity index 93% rename from crates/samtool/npm/@shadowdara/samtool/README.md rename to crates/seg/README.md index 7bf4780..b5b2682 100644 --- a/crates/samtool/npm/@shadowdara/samtool/README.md +++ b/crates/seg/README.md @@ -1,4 +1,4 @@ -# samtool +# seg (samtool) [![Release Samtool](https://github.com/ShadowDara/samengine/actions/workflows/release-samtool.yml/badge.svg)](https://github.com/ShadowDara/samengine/actions/workflows/release-samtool.yml) diff --git a/crates/samtool/npm/.gitignore b/crates/seg/npm/.gitignore similarity index 100% rename from crates/samtool/npm/.gitignore rename to crates/seg/npm/.gitignore diff --git a/crates/samtool/npm/@shadowdara/samtool-darwin-arm64/LICENSE b/crates/seg/npm/@shadowdara/seg-darwin-arm64/LICENSE similarity index 100% rename from crates/samtool/npm/@shadowdara/samtool-darwin-arm64/LICENSE rename to crates/seg/npm/@shadowdara/seg-darwin-arm64/LICENSE diff --git a/crates/samtool/npm/@shadowdara/samtool-darwin-arm64/package.json b/crates/seg/npm/@shadowdara/seg-darwin-arm64/package.json similarity index 73% rename from crates/samtool/npm/@shadowdara/samtool-darwin-arm64/package.json rename to crates/seg/npm/@shadowdara/seg-darwin-arm64/package.json index 1f690ba..3df3a97 100644 --- a/crates/samtool/npm/@shadowdara/samtool-darwin-arm64/package.json +++ b/crates/seg/npm/@shadowdara/seg-darwin-arm64/package.json @@ -1,6 +1,6 @@ { - "name": "@shadowdara/samtool-darwin-arm64", - "version": "0.1.7", + "name": "@shadowdara/seg-darwin-arm64", + "version": "0.1.8", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/crates/samtool/npm/@shadowdara/samtool-darwin-x64/LICENSE b/crates/seg/npm/@shadowdara/seg-darwin-x64/LICENSE similarity index 100% rename from crates/samtool/npm/@shadowdara/samtool-darwin-x64/LICENSE rename to crates/seg/npm/@shadowdara/seg-darwin-x64/LICENSE diff --git a/crates/samtool/npm/@shadowdara/samtool-darwin-x64/package.json b/crates/seg/npm/@shadowdara/seg-darwin-x64/package.json similarity index 73% rename from crates/samtool/npm/@shadowdara/samtool-darwin-x64/package.json rename to crates/seg/npm/@shadowdara/seg-darwin-x64/package.json index 74f791b..39d4015 100644 --- a/crates/samtool/npm/@shadowdara/samtool-darwin-x64/package.json +++ b/crates/seg/npm/@shadowdara/seg-darwin-x64/package.json @@ -1,6 +1,6 @@ { - "name": "@shadowdara/samtool-darwin-x64", - "version": "0.1.7", + "name": "@shadowdara/seg-darwin-x64", + "version": "0.1.8", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/crates/samtool/npm/@shadowdara/samtool-linux-arm64-musl/LICENSE b/crates/seg/npm/@shadowdara/seg-linux-x64/LICENSE similarity index 100% rename from crates/samtool/npm/@shadowdara/samtool-linux-arm64-musl/LICENSE rename to crates/seg/npm/@shadowdara/seg-linux-x64/LICENSE diff --git a/crates/samtool/npm/@shadowdara/samtool-linux-x64/package.json b/crates/seg/npm/@shadowdara/seg-linux-x64/package.json similarity index 76% rename from crates/samtool/npm/@shadowdara/samtool-linux-x64/package.json rename to crates/seg/npm/@shadowdara/seg-linux-x64/package.json index bf295a8..3650b0d 100644 --- a/crates/samtool/npm/@shadowdara/samtool-linux-x64/package.json +++ b/crates/seg/npm/@shadowdara/seg-linux-x64/package.json @@ -1,6 +1,6 @@ { - "name": "@shadowdara/samtool-linux-x64", - "version": "0.1.7", + "name": "@shadowdara/seg-linux-x64", + "version": "0.1.8", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/crates/samtool/npm/@shadowdara/samtool-linux-arm64/LICENSE b/crates/seg/npm/@shadowdara/seg-win32-x64/LICENSE similarity index 100% rename from crates/samtool/npm/@shadowdara/samtool-linux-arm64/LICENSE rename to crates/seg/npm/@shadowdara/seg-win32-x64/LICENSE diff --git a/crates/samtool/npm/@shadowdara/samtool-win32-x64/package.json b/crates/seg/npm/@shadowdara/seg-win32-x64/package.json similarity index 74% rename from crates/samtool/npm/@shadowdara/samtool-win32-x64/package.json rename to crates/seg/npm/@shadowdara/seg-win32-x64/package.json index 19602ac..7d3de87 100644 --- a/crates/samtool/npm/@shadowdara/samtool-win32-x64/package.json +++ b/crates/seg/npm/@shadowdara/seg-win32-x64/package.json @@ -1,6 +1,6 @@ { - "name": "@shadowdara/samtool-win32-x64", - "version": "0.1.7", + "name": "@shadowdara/seg-win32-x64", + "version": "0.1.8", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/crates/samtool/npm/@shadowdara/samtool-linux-x64-musl/LICENSE b/crates/seg/npm/seg/LICENSE similarity index 100% rename from crates/samtool/npm/@shadowdara/samtool-linux-x64-musl/LICENSE rename to crates/seg/npm/seg/LICENSE diff --git a/crates/samtool/README.md b/crates/seg/npm/seg/README.md similarity index 93% rename from crates/samtool/README.md rename to crates/seg/npm/seg/README.md index 7bf4780..b5b2682 100644 --- a/crates/samtool/README.md +++ b/crates/seg/npm/seg/README.md @@ -1,4 +1,4 @@ -# samtool +# seg (samtool) [![Release Samtool](https://github.com/ShadowDara/samengine/actions/workflows/release-samtool.yml/badge.svg)](https://github.com/ShadowDara/samengine/actions/workflows/release-samtool.yml) diff --git a/crates/samtool/npm/@shadowdara/samtool/bin/samtool.js b/crates/seg/npm/seg/bin/seg.js similarity index 70% rename from crates/samtool/npm/@shadowdara/samtool/bin/samtool.js rename to crates/seg/npm/seg/bin/seg.js index 92d69c2..a6c14f8 100644 --- a/crates/samtool/npm/@shadowdara/samtool/bin/samtool.js +++ b/crates/seg/npm/seg/bin/seg.js @@ -3,14 +3,14 @@ const PLATFORMS = { darwin: { - arm64: '@shadowdara/samtool-darwin-arm64/samtool', - x64: '@shadowdara/samtool-darwin-x64/samtool', + arm64: '@shadowdara/seg-darwin-arm64/seg', + x64: '@shadowdara/seg-darwin-x64/seg', }, linux: { - x64: '@shadowdara/samtool-linux-x64/samtool', + x64: '@shadowdara/seg-linux-x64/seg', }, win32: { - x64: '@shadowdara/samtool-win32-x64/samtool.exe', + x64: '@shadowdara/seg-win32-x64/seg.exe', }, } diff --git a/crates/samtool/npm/@shadowdara/samtool/package.json b/crates/seg/npm/seg/package.json similarity index 55% rename from crates/samtool/npm/@shadowdara/samtool/package.json rename to crates/seg/npm/seg/package.json index 003472e..951387a 100644 --- a/crates/samtool/npm/@shadowdara/samtool/package.json +++ b/crates/seg/npm/seg/package.json @@ -1,18 +1,6 @@ { - "name": "@shadowdara/samtool", - "version": "0.1.7", - "bin": { - "samtool": "bin/samtool.js" - }, - "engines": { - "node": ">=14" - }, - "optionalDependencies": { - "@shadowdara/samtool-darwin-arm64": "0.1.7", - "@shadowdara/samtool-darwin-x64": "0.1.7", - "@shadowdara/samtool-linux-x64": "0.1.7", - "@shadowdara/samtool-win32-x64": "0.1.7" - }, + "name": "seg", + "version": "0.1.8", "description": "the fast cli tool for samengine", "keywords": [ "samengine", @@ -23,5 +11,17 @@ "repository": { "type": "git", "url": "git+https://github.com/shadowdara/samengine.git" + }, + "bin": { + "seg": "bin/seg.js" + }, + "engines": { + "node": ">=14" + }, + "optionalDependencies": { + "@shadowdara/seg-darwin-arm64": "0.1.8", + "@shadowdara/seg-darwin-x64": "0.1.8", + "@shadowdara/seg-linux-x64": "0.1.8", + "@shadowdara/seg-win32-x64": "0.1.8" } } \ No newline at end of file diff --git a/crates/samtool/src/birthdaytool.rs b/crates/seg/src/birthdaytool.rs similarity index 100% rename from crates/samtool/src/birthdaytool.rs rename to crates/seg/src/birthdaytool.rs diff --git a/crates/samtool/src/help.rs b/crates/seg/src/help.rs similarity index 91% rename from crates/samtool/src/help.rs rename to crates/seg/src/help.rs index db6f4f7..54c52a4 100644 --- a/crates/samtool/src/help.rs +++ b/crates/seg/src/help.rs @@ -4,6 +4,13 @@ use crate::PROGNAME; // Help Message pub fn help() { + let help2 = r#"CLI Help + -h, --help Show Help + --init create a new samfile + --linksaver, -l run linksaver + --birthday, -b run the birthday tool +"#; + println!(r#"{} ███████╗ █████╗ ███╗ ███╗███████╗███╗ ██╗ ██████╗ ██╗███╗ ██╗███████╗ ██╔════╝██╔══██╗████╗ ████║██╔════╝████╗ ██║██╔════╝ ██║████╗ ██║██╔════╝ @@ -35,8 +42,6 @@ pub fn help() { or {}-l{} instead of linksaver check {}https://samengine.vercel.app/docs/linksaver{} for more Infos -{}: - Run {} or {} and then a Tag which should be added to the Git Repository - and pushed to Github. -"#, RED, END, GREEN, END, YELLOW, PROGNAME, END, YELLOW, END, BLUE, END, PURPLE, END, GREEN, END, YELLOW, PROGNAME, END, PURPLE, END, BLUE, END, green("Tags"), purple("-t"), purple("--tag")); +{} +"#, RED, END, GREEN, END, YELLOW, PROGNAME, END, YELLOW, END, BLUE, END, PURPLE, END, GREEN, END, YELLOW, PROGNAME, END, PURPLE, END, BLUE, END, help2); } diff --git a/crates/samtool/src/linksaver.rs b/crates/seg/src/linksaver.rs similarity index 100% rename from crates/samtool/src/linksaver.rs rename to crates/seg/src/linksaver.rs diff --git a/crates/samtool/src/main.rs b/crates/seg/src/main.rs similarity index 100% rename from crates/samtool/src/main.rs rename to crates/seg/src/main.rs