mirror of
https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess.git
synced 2025-04-20 03:36:30 +09:00
Compare commits
No commits in common. "main" and "v1.0.0" have entirely different histories.
11 changed files with 67 additions and 737 deletions
49
CHANGELOG.md
49
CHANGELOG.md
|
|
@ -7,56 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- `add-master-log` now always create CSV file
|
|
||||||
- `convert-master-log` can still append to a CSV file
|
|
||||||
|
|
||||||
## [2.0.1]
|
|
||||||
|
|
||||||
### Fix
|
|
||||||
|
|
||||||
- version in Cargo.toml
|
|
||||||
|
|
||||||
## [2.0.0]
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- `add-master-log` subcommand provide interactive session to upload master log to database via CSV
|
|
||||||
|
|
||||||
### Change
|
|
||||||
|
|
||||||
- *BREAKING* old `add-master-log` is now renamed to `convert-master-log`
|
|
||||||
|
|
||||||
## [1.1.0]
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- Use `out_<runid>.csv` as default output path
|
|
||||||
|
|
||||||
## [1.0.1]
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- update test for `retest` field
|
|
||||||
- version field in Cargo.toml
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- updated check-db for `abnormal resistance`
|
|
||||||
- Docs (for japanese)
|
|
||||||
- automatically detect boards to retest
|
|
||||||
|
|
||||||
## [1.0.0] - 2024-07-25
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Subcommand `add-master-log` to parse master log for shiftwork 0.1.0 and write out to CSV.
|
- Subcommand `add-master-log` to parse master log for shiftwork 0.1.0 and write out to CSV.
|
||||||
- Subcommand `check-db` to validate the database CSV file.
|
- Subcommand `check-db` to validate the database CSV file.
|
||||||
|
|
||||||
[Unreleased]: https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess/-/compare/v1.0.1...main
|
[Unreleased]: https://gitlab.cern.ch
|
||||||
[2.0.1]: https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess/-/compare/v2.0.0...v2.0.1
|
|
||||||
[2.0.0]: https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess/-/compare/v1.1.0...v2.0.0
|
|
||||||
[1.1.0]: https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess/-/compare/v1.0.1...v1.1.0
|
|
||||||
[1.0.1]: https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess/-/compare/v1.0.0...v1.0.1
|
|
||||||
[1.0.0]: https://gitlab.cern.ch/wotsubo/psboard-qaqc-postprocess/-/tags/v1.0.0
|
|
||||||
|
|
|
||||||
159
Cargo.lock
generated
159
Cargo.lock
generated
|
|
@ -260,31 +260,6 @@ version = "0.8.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
|
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crossterm"
|
|
||||||
version = "0.28.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"crossterm_winapi",
|
|
||||||
"mio",
|
|
||||||
"parking_lot",
|
|
||||||
"rustix",
|
|
||||||
"signal-hook",
|
|
||||||
"signal-hook-mio",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crossterm_winapi"
|
|
||||||
version = "0.9.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
|
|
||||||
dependencies = [
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "csv"
|
name = "csv"
|
||||||
version = "1.3.0"
|
version = "1.3.0"
|
||||||
|
|
@ -471,12 +446,6 @@ version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hermit-abi"
|
|
||||||
version = "0.3.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hex"
|
name = "hex"
|
||||||
version = "0.4.3"
|
version = "0.4.3"
|
||||||
|
|
@ -598,16 +567,6 @@ version = "0.4.14"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
|
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lock_api"
|
|
||||||
version = "0.4.12"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
|
|
||||||
dependencies = [
|
|
||||||
"autocfg",
|
|
||||||
"scopeguard",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
version = "0.4.22"
|
version = "0.4.22"
|
||||||
|
|
@ -620,19 +579,6 @@ version = "2.7.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mio"
|
|
||||||
version = "1.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
|
|
||||||
dependencies = [
|
|
||||||
"hermit-abi",
|
|
||||||
"libc",
|
|
||||||
"log",
|
|
||||||
"wasi",
|
|
||||||
"windows-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "normalize-line-endings"
|
name = "normalize-line-endings"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
|
|
@ -660,29 +606,6 @@ version = "1.19.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking_lot"
|
|
||||||
version = "0.12.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
|
|
||||||
dependencies = [
|
|
||||||
"lock_api",
|
|
||||||
"parking_lot_core",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking_lot_core"
|
|
||||||
version = "0.9.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"libc",
|
|
||||||
"redox_syscall",
|
|
||||||
"smallvec",
|
|
||||||
"windows-targets",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "powerfmt"
|
name = "powerfmt"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
|
|
@ -730,7 +653,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "psb-qaqc"
|
name = "psb-qaqc"
|
||||||
version = "2.0.1"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"assert_cmd",
|
"assert_cmd",
|
||||||
|
|
@ -739,7 +662,6 @@ dependencies = [
|
||||||
"clap",
|
"clap",
|
||||||
"clap-verbosity-flag",
|
"clap-verbosity-flag",
|
||||||
"clap_derive",
|
"clap_derive",
|
||||||
"crossterm",
|
|
||||||
"csv",
|
"csv",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"itertools",
|
"itertools",
|
||||||
|
|
@ -760,15 +682,6 @@ dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "redox_syscall"
|
|
||||||
version = "0.5.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex"
|
name = "regex"
|
||||||
version = "1.10.5"
|
version = "1.10.5"
|
||||||
|
|
@ -826,12 +739,6 @@ dependencies = [
|
||||||
"winapi-util",
|
"winapi-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "scopeguard"
|
|
||||||
version = "1.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "semver"
|
name = "semver"
|
||||||
version = "1.0.23"
|
version = "1.0.23"
|
||||||
|
|
@ -902,42 +809,6 @@ dependencies = [
|
||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "signal-hook"
|
|
||||||
version = "0.3.17"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"signal-hook-registry",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "signal-hook-mio"
|
|
||||||
version = "0.2.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"mio",
|
|
||||||
"signal-hook",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "signal-hook-registry"
|
|
||||||
version = "1.4.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "smallvec"
|
|
||||||
version = "1.13.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "strsim"
|
name = "strsim"
|
||||||
version = "0.11.1"
|
version = "0.11.1"
|
||||||
|
|
@ -1035,12 +906,6 @@ dependencies = [
|
||||||
"winapi-util",
|
"winapi-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasi"
|
|
||||||
version = "0.11.0+wasi-snapshot-preview1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "wasm-bindgen"
|
||||||
version = "0.2.92"
|
version = "0.2.92"
|
||||||
|
|
@ -1095,22 +960,6 @@ version = "0.2.92"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
|
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi"
|
|
||||||
version = "0.3.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
|
||||||
dependencies = [
|
|
||||||
"winapi-i686-pc-windows-gnu",
|
|
||||||
"winapi-x86_64-pc-windows-gnu",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-i686-pc-windows-gnu"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-util"
|
name = "winapi-util"
|
||||||
version = "0.1.8"
|
version = "0.1.8"
|
||||||
|
|
@ -1120,12 +969,6 @@ dependencies = [
|
||||||
"windows-sys",
|
"windows-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-x86_64-pc-windows-gnu"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-core"
|
name = "windows-core"
|
||||||
version = "0.52.0"
|
version = "0.52.0"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "psb-qaqc"
|
name = "psb-qaqc"
|
||||||
version = "2.0.1"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|
@ -17,7 +17,6 @@ regex = "1.10"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_with = "3.8"
|
serde_with = "3.8"
|
||||||
csv = "1.3"
|
csv = "1.3"
|
||||||
crossterm = "0.28"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
assert_cmd = "2.0"
|
assert_cmd = "2.0"
|
||||||
|
|
|
||||||
21
LICENSE
21
LICENSE
|
|
@ -1,21 +0,0 @@
|
||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2024 Wataru Otsubo
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
WIP
|
WIP
|
||||||
|
|
||||||
日本語: [README-ja.md](./docs/README-ja.md)
|
For Japanese: [./docs/README-ja.md](README-ja.md)
|
||||||
|
|
||||||
## For developers
|
## For developers
|
||||||
Use `rustup` to set up developing tools.
|
Use `rustup` to set up developing tools.
|
||||||
|
|
@ -36,6 +36,5 @@ cargo doc --open
|
||||||
- add csv check/validate subcommand
|
- add csv check/validate subcommand
|
||||||
- skew measurement?
|
- skew measurement?
|
||||||
- skew measurement test
|
- skew measurement test
|
||||||
- for start-shiftwork v1.0.0 (add start date parsing)
|
|
||||||
|
|
||||||
check `TODO`s in comments.
|
check `TODO`s in comments.
|
||||||
|
|
|
||||||
|
|
@ -1,70 +1,22 @@
|
||||||
# psb_qaqc
|
# psb_qaqc
|
||||||
QAQC実施直後にmasterでログをまとめるときに使うコマンドのマニュアル。
|
日本語ドキュメント(WIP)
|
||||||
|
|
||||||
## シフトでの使い方
|
|
||||||
|
|
||||||
### 1. masterのログをCSVに変換する
|
|
||||||
|
|
||||||
```
|
|
||||||
# psb-qaqc add-master-log <LOG FILE> <DATABASE CSV>
|
|
||||||
```
|
|
||||||
|
|
||||||
```sh
|
|
||||||
psb-qaqc add-master-log ./logs/20.log out_20.csv
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. 再試験にまわすボードを決める
|
|
||||||
TODO: 判断基準
|
|
||||||
|
|
||||||
masterのログまたはcsvを参照しながら再試験するかを判断し、
|
|
||||||
再試験するものはさっき作ったcsvファイルの右側の`false`を`true`に書き換える。
|
|
||||||
また、その右側にコメントを書き加える。
|
|
||||||
|
|
||||||
[CSVへの書き込みについて](#CSVへの書き込みについて)
|
|
||||||
|
|
||||||
### 3. Google sheetsにアップロードする
|
|
||||||
CSVをコピーして、[Google sheets](https://docs.google.com/spreadsheets/d/128qOseOy4QDotehYe4Wf2jj88tnwiXGVdR3NHrjcDYU/edit?pli=1&gid=408695746#gid=408695746)の一番下に加える。
|
|
||||||
*列をわける*のようなものを選択するとうまく貼れる。
|
|
||||||
|
|
||||||
### 4. CSVの後処理
|
|
||||||
アップロード済みである(編集しない)ことを明らかにするために、`log`ディレクトリに`_uploaded.csv`の名前にして移動させる。
|
|
||||||
|
|
||||||
## 機能
|
## 機能
|
||||||
サブコマンドごとに機能がわかれている。
|
サブコマンドごとに機能がわかれている。
|
||||||
各コマンドで`--help`を渡せばヘルプがみれる。
|
各コマンドで`--help`を渡せばドキュメントがみれる。
|
||||||
|
|
||||||
### `add-master-log`
|
### `add-master-log`
|
||||||
QAQC実施直後にMaster JATHub上で実行することでMasterでのログをCSVに書き加える。
|
QAQC実施直後にMaster JATHub上で実行することでMasterでのログをCSVに書き加える。
|
||||||
|
|
||||||
```
|
|
||||||
# psb-qaqc add-master-log <LOG FILE> <DATABASE CSV>
|
|
||||||
```
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
psb-qaqc add-master-log ./logs/20.log out.csv
|
psb-qaqc add-master-log ./logs/20240722_180104.log out.csv
|
||||||
```
|
```
|
||||||
|
|
||||||
### `check-db`
|
### `check-db` (WIP)
|
||||||
CSVファイルのフォーマットが正常か確認する。
|
CSVファイルのフォーマットが正常か確認する。
|
||||||
正常でない場合、0以外を返す。
|
正常でない場合、返り値は0以外を返す。
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
psb-qaqc check-db out.csv
|
psb-qaqc check-db out.csv
|
||||||
```
|
```
|
||||||
|
|
||||||
## CSVへの書き込みについて
|
|
||||||
CSVの一番最後の列にコメントを書き込めるようにしている。
|
|
||||||
以下コメントを書き込む際の注意点・推奨事項:
|
|
||||||
|
|
||||||
- `" "` で囲む
|
|
||||||
- `,`は書き込める
|
|
||||||
- `"`を使うときは`""`のように重ねてかく
|
|
||||||
- 一番うしろには`,`を書かない
|
|
||||||
|
|
||||||
*例*
|
|
||||||
```csv
|
|
||||||
,,"日本語も,かけます ""field"""
|
|
||||||
```
|
|
||||||
|
|
||||||
編集前にバックアップを作成することを推奨します。
|
|
||||||
|
|
||||||
|
|
|
||||||
350
src/main.rs
350
src/main.rs
|
|
@ -1,9 +1,8 @@
|
||||||
use core::str;
|
use core::str;
|
||||||
use std::{
|
use std::{
|
||||||
env,
|
|
||||||
fmt::Display,
|
fmt::Display,
|
||||||
fs::{self, File},
|
fs::File,
|
||||||
io::{self, BufRead, BufReader},
|
io::BufReader,
|
||||||
path::{self, PathBuf},
|
path::{self, PathBuf},
|
||||||
str::FromStr,
|
str::FromStr,
|
||||||
};
|
};
|
||||||
|
|
@ -11,9 +10,8 @@ use std::{
|
||||||
use anyhow::{anyhow, Context, Result};
|
use anyhow::{anyhow, Context, Result};
|
||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
use clap::{Parser, Subcommand};
|
use clap::{Parser, Subcommand};
|
||||||
use crossterm::{event, terminal};
|
use log::{debug, trace, warn};
|
||||||
use log::{debug, error, info, trace, warn};
|
use masterlog::MasterLogResult;
|
||||||
use masterlog::{get_output_filename, MasterLogResult};
|
|
||||||
use semver::Version;
|
use semver::Version;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_with::{serde_as, DisplayFromStr};
|
use serde_with::{serde_as, DisplayFromStr};
|
||||||
|
|
@ -33,27 +31,13 @@ struct Args {
|
||||||
|
|
||||||
#[derive(Subcommand, Debug)]
|
#[derive(Subcommand, Debug)]
|
||||||
pub enum Commands {
|
pub enum Commands {
|
||||||
/// Parse master log and convert to CSV and prompt post processes interactively.
|
/// Parse master jathub logfile for PS Board QAQC and write out to CSV.
|
||||||
AddMasterLog {
|
AddMasterLog {
|
||||||
/// Master log file.
|
/// Master log file.
|
||||||
master_log: path::PathBuf,
|
master_log: path::PathBuf,
|
||||||
/// Output CSV file.
|
/// Output CSV file.
|
||||||
/// Default is `out_<runid>.csv`
|
|
||||||
// #[arg(default_value = get_default_log_path().into_os_string())]
|
// #[arg(default_value = get_default_log_path().into_os_string())]
|
||||||
outfile: Option<PathBuf>,
|
outfile: PathBuf,
|
||||||
/// Editor to use.
|
|
||||||
/// Default is `$VISUAL` or `$EDITOR`.
|
|
||||||
#[arg(short, long)]
|
|
||||||
editor: Option<String>,
|
|
||||||
},
|
|
||||||
/// Parse master jathub logfile for PS Board QAQC and write out to CSV.
|
|
||||||
ConvertMasterLog {
|
|
||||||
/// Master log file.
|
|
||||||
master_log: path::PathBuf,
|
|
||||||
/// Output CSV file.
|
|
||||||
/// Default is `out_<runid>.csv`
|
|
||||||
// #[arg(default_value = get_default_log_path().into_os_string())]
|
|
||||||
outfile: Option<PathBuf>,
|
|
||||||
},
|
},
|
||||||
/// Check CSV format
|
/// Check CSV format
|
||||||
CheckDB {
|
CheckDB {
|
||||||
|
|
@ -200,7 +184,6 @@ pub struct PsbQaqcResult {
|
||||||
firmware_ver: Option<Version>,
|
firmware_ver: Option<Version>,
|
||||||
parameter_ver: Option<Version>,
|
parameter_ver: Option<Version>,
|
||||||
fpga_dna: Option<u64>,
|
fpga_dna: Option<u64>,
|
||||||
retest: bool,
|
|
||||||
comment: String,
|
comment: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -210,7 +193,6 @@ impl PsbQaqcResult {
|
||||||
pub fn from_masterlogresult(result: MasterLogResult) -> Vec<Self> {
|
pub fn from_masterlogresult(result: MasterLogResult) -> Vec<Self> {
|
||||||
let mut converted = vec![];
|
let mut converted = vec![];
|
||||||
for (pos, boardresult) in result.board_results {
|
for (pos, boardresult) in result.board_results {
|
||||||
let isretest = boardresult.is_need_retest().is_some();
|
|
||||||
let new = PsbQaqcResult {
|
let new = PsbQaqcResult {
|
||||||
motherboard_id: boardresult.id.id,
|
motherboard_id: boardresult.id.id,
|
||||||
daughterboard_id: None,
|
daughterboard_id: None,
|
||||||
|
|
@ -231,7 +213,6 @@ impl PsbQaqcResult {
|
||||||
firmware_ver: None,
|
firmware_ver: None,
|
||||||
parameter_ver: None,
|
parameter_ver: None,
|
||||||
fpga_dna: None,
|
fpga_dna: None,
|
||||||
retest: isretest,
|
|
||||||
comment: "".to_string(),
|
comment: "".to_string(),
|
||||||
};
|
};
|
||||||
converted.push(new);
|
converted.push(new);
|
||||||
|
|
@ -240,154 +221,6 @@ impl PsbQaqcResult {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// /// Iterator over output csv file but without results from abnormal resistance
|
|
||||||
// #[derive(Debug)]
|
|
||||||
// struct CsvMidReader<B> {
|
|
||||||
// lines: std::io::Lines<B>,
|
|
||||||
// /// skipped line numbers
|
|
||||||
// pub skipped: Vec<usize>,
|
|
||||||
// /// Current line count
|
|
||||||
// count: usize,
|
|
||||||
// linebuf: Vec<u8>,
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// impl<B> CsvMidReader<B> {
|
|
||||||
// pub fn new(lines: std::io::Lines<B>) -> Self {
|
|
||||||
// CsvMidReader {
|
|
||||||
// lines,
|
|
||||||
// skipped: vec![],
|
|
||||||
// count: 0,
|
|
||||||
// linebuf: b"".to_vec(),
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// impl<B: BufRead> Read for CsvMidReader<B> {
|
|
||||||
// fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
|
|
||||||
// let mut rest_buf_size = buf.len();
|
|
||||||
// let mut written_size = 0;
|
|
||||||
// while self.linebuf.len() <= rest_buf_size {
|
|
||||||
// trace!("linebuf: {:?}", self.linebuf.len());
|
|
||||||
// (0..(self.linebuf.len())).for_each(|i| {
|
|
||||||
// buf[i + written_size] = self.linebuf[i];
|
|
||||||
// });
|
|
||||||
// written_size += self.linebuf.len();
|
|
||||||
// rest_buf_size -= self.linebuf.len();
|
|
||||||
// self.linebuf = match self.lines.next() {
|
|
||||||
// None => {
|
|
||||||
// trace!("None");
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// Some(line) => {
|
|
||||||
// trace!("new line: {:?}", line);
|
|
||||||
// line?.as_bytes().to_vec()
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// }
|
|
||||||
// if self.lines.next().is_some() {
|
|
||||||
// (0..rest_buf_size).for_each(|i| {
|
|
||||||
// buf[i + written_size] = self.linebuf[i];
|
|
||||||
// });
|
|
||||||
// self.linebuf.drain(0..rest_buf_size);
|
|
||||||
// written_size += rest_buf_size;
|
|
||||||
// } else {
|
|
||||||
// self.linebuf = b"".to_vec();
|
|
||||||
// }
|
|
||||||
// trace!("size: {}", written_size);
|
|
||||||
// Ok(written_size)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// impl<B: BufRead> Iterator for CsvMidReader<B> {
|
|
||||||
// type Item = std::result::Result<String, std::io::Error>;
|
|
||||||
//
|
|
||||||
// fn next(&mut self) -> Option<Self::Item> {
|
|
||||||
// loop {
|
|
||||||
// match self.lines.next() {
|
|
||||||
// Some(line) => {
|
|
||||||
// self.count += 1;
|
|
||||||
// match line {
|
|
||||||
// Ok(line) => match line.contains("abnormal resistance") {
|
|
||||||
// true => {
|
|
||||||
// self.skipped.push(self.count);
|
|
||||||
// continue;
|
|
||||||
// }
|
|
||||||
// false => return Some(Ok(line)),
|
|
||||||
// },
|
|
||||||
// Err(e) => return Some(Err(e.into())),
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// None => return None,
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // impl<B> std::io::Read for CsvMidReader<B> {
|
|
||||||
// // fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
|
|
||||||
// // todo!()
|
|
||||||
// // }
|
|
||||||
// // }
|
|
||||||
// //
|
|
||||||
// fn filter_csv_lines(rdr: impl BufRead) -> Vec<String> {
|
|
||||||
// rdr.lines()
|
|
||||||
// .enumerate()
|
|
||||||
// .filter(|(num, line)| match line {
|
|
||||||
// Ok(line) => {
|
|
||||||
// if line.contains("abnormal resistance") {
|
|
||||||
// info!("Skipping line {}", num + 1);
|
|
||||||
// debug!("line: {}", line);
|
|
||||||
// false
|
|
||||||
// } else {
|
|
||||||
// true
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// Err(e) => {
|
|
||||||
// error!("Error while reading: {}", e);
|
|
||||||
// false
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// .map(|(_, line)| line.unwrap())
|
|
||||||
// .collect_vec()
|
|
||||||
// }
|
|
||||||
|
|
||||||
/// If `nonewfile` is `true`, out file is not created when there is already a file.
|
|
||||||
fn write_psbqaqc_csv(result: MasterLogResult, outfile: PathBuf, nonewfile: bool) -> Result<()> {
|
|
||||||
let expanded_results = PsbQaqcResult::from_masterlogresult(result);
|
|
||||||
|
|
||||||
let mut wtr = match (outfile.exists(), nonewfile) {
|
|
||||||
(true, false) => {
|
|
||||||
let file = File::options()
|
|
||||||
.read(true)
|
|
||||||
.append(true)
|
|
||||||
.open(outfile.clone())?;
|
|
||||||
csv::WriterBuilder::new()
|
|
||||||
.has_headers(false)
|
|
||||||
.from_writer(file)
|
|
||||||
}
|
|
||||||
(false, _) => {
|
|
||||||
println!("Creating new file: {}", outfile.display());
|
|
||||||
let file = File::options()
|
|
||||||
.create_new(true)
|
|
||||||
.write(true)
|
|
||||||
.open(outfile.clone())?;
|
|
||||||
csv::WriterBuilder::new()
|
|
||||||
.has_headers(true)
|
|
||||||
.from_writer(file)
|
|
||||||
}
|
|
||||||
(true, true) => {
|
|
||||||
error!("Out file already exists but specified not to make new file");
|
|
||||||
return Err(anyhow!("Out file already exists"));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
for result in expanded_results {
|
|
||||||
wtr.serialize(result)?;
|
|
||||||
}
|
|
||||||
wtr.flush()?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn main() -> Result<()> {
|
fn main() -> Result<()> {
|
||||||
let args = Args::parse();
|
let args = Args::parse();
|
||||||
env_logger::Builder::new()
|
env_logger::Builder::new()
|
||||||
|
|
@ -404,157 +237,58 @@ fn main() -> Result<()> {
|
||||||
Commands::AddMasterLog {
|
Commands::AddMasterLog {
|
||||||
master_log,
|
master_log,
|
||||||
outfile,
|
outfile,
|
||||||
editor,
|
|
||||||
} => {
|
} => {
|
||||||
let result = MasterLogResult::parse_file(master_log)?;
|
let result = {
|
||||||
|
let file = File::open(master_log.clone())?;
|
||||||
|
let reader = BufReader::new(file);
|
||||||
|
MasterLogResult::parse_file(
|
||||||
|
reader,
|
||||||
|
master_log
|
||||||
|
.file_name()
|
||||||
|
.unwrap()
|
||||||
|
.to_str()
|
||||||
|
.unwrap()
|
||||||
|
.to_string(),
|
||||||
|
)?
|
||||||
|
};
|
||||||
debug!("{:?}", result);
|
debug!("{:?}", result);
|
||||||
|
|
||||||
// Print boards to retest
|
let expanded_results = PsbQaqcResult::from_masterlogresult(result);
|
||||||
result.print_boards_to_retest(io::stdout())?;
|
|
||||||
|
|
||||||
let outfile = outfile.unwrap_or(get_output_filename(&result));
|
let mut wtr = match outfile.exists() {
|
||||||
|
true => {
|
||||||
write_psbqaqc_csv(result, outfile.clone(), true)?;
|
let file = File::options().read(true).append(true).open(outfile)?;
|
||||||
|
csv::WriterBuilder::new()
|
||||||
println!("Add comments about errors in the last column of the CSV file");
|
.has_headers(false)
|
||||||
println!("Press any key to start editting...");
|
.from_writer(file)
|
||||||
terminal::enable_raw_mode()?;
|
|
||||||
let _ = event::read()?;
|
|
||||||
terminal::disable_raw_mode()?;
|
|
||||||
|
|
||||||
let editor = match (editor, env::var("VISUAL"), env::var("EDITOR")) {
|
|
||||||
(Some(editor), _, _) => editor,
|
|
||||||
(None, Ok(editor), _) => {
|
|
||||||
info!("Use VISUAL");
|
|
||||||
editor
|
|
||||||
}
|
}
|
||||||
(None, Err(_), Ok(editor)) => {
|
false => {
|
||||||
info!("Use EDITOR");
|
println!("Creating new file: {}", outfile.display());
|
||||||
editor
|
let file = File::options().create_new(true).write(true).open(outfile)?;
|
||||||
}
|
csv::WriterBuilder::new()
|
||||||
(None, Err(e1), Err(e2)) => {
|
.has_headers(true)
|
||||||
warn!("No VISUAL nor EDITOR found, {}, {}", e1, e2);
|
.from_writer(file)
|
||||||
warn!("Using `nano` as a fallback editor");
|
|
||||||
"nano".to_string()
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
std::process::Command::new(editor)
|
for result in expanded_results {
|
||||||
.arg(outfile.clone())
|
wtr.serialize(result)?;
|
||||||
.spawn()
|
|
||||||
.context("Error during spawning editor")?
|
|
||||||
.wait()
|
|
||||||
.context("Error while waiting editor")?;
|
|
||||||
|
|
||||||
{
|
|
||||||
let f = File::open(outfile.clone())?;
|
|
||||||
let rdr = BufReader::new(f);
|
|
||||||
rdr.lines().for_each(|l| println!("{}", l.unwrap()));
|
|
||||||
}
|
}
|
||||||
println!();
|
wtr.flush()?;
|
||||||
println!("Copy the CSV above and paste it to the database(Google sheets)");
|
|
||||||
println!("Choose `Data->Split text to columns` to format it");
|
|
||||||
|
|
||||||
println!("Press any key when upload finished...");
|
|
||||||
terminal::enable_raw_mode()?;
|
|
||||||
let _ = event::read()?;
|
|
||||||
terminal::disable_raw_mode()?;
|
|
||||||
|
|
||||||
let uploaded_outfile = {
|
|
||||||
let mut new_file_name = outfile
|
|
||||||
.clone()
|
|
||||||
.file_stem()
|
|
||||||
.context("No file stem for out file")?
|
|
||||||
.to_owned();
|
|
||||||
new_file_name.push("_uploaded");
|
|
||||||
if let Some(ext) = outfile.extension() {
|
|
||||||
new_file_name.push(".");
|
|
||||||
new_file_name.push(ext);
|
|
||||||
};
|
|
||||||
PathBuf::from("log").join(new_file_name)
|
|
||||||
};
|
|
||||||
info!(
|
|
||||||
"Renaming {} to {}",
|
|
||||||
outfile.display(),
|
|
||||||
uploaded_outfile.is_dir()
|
|
||||||
);
|
|
||||||
fs::rename(outfile, uploaded_outfile)?;
|
|
||||||
}
|
|
||||||
Commands::ConvertMasterLog {
|
|
||||||
master_log,
|
|
||||||
outfile,
|
|
||||||
} => {
|
|
||||||
let result = MasterLogResult::parse_file(master_log)?;
|
|
||||||
debug!("{:?}", result);
|
|
||||||
|
|
||||||
// Print boards to retest
|
|
||||||
result.print_boards_to_retest(io::stdout())?;
|
|
||||||
|
|
||||||
let outfile = outfile.unwrap_or(get_output_filename(&result));
|
|
||||||
|
|
||||||
write_psbqaqc_csv(result, outfile, false)?;
|
|
||||||
}
|
}
|
||||||
Commands::CheckDB { csvfile } => {
|
Commands::CheckDB { csvfile } => {
|
||||||
// TODO: more friendly message (like row number)
|
// TODO: more friendly message (like row number)
|
||||||
// TODO: more validation options (e.g. for each stage(Master log, Slave log(end of
|
// TODO: more validation options (e.g. for each stage(Master log, Slave log(end of
|
||||||
// campaign)))
|
// campaign)))
|
||||||
// TODO: Masterログが得られたときや、行として完成していかないときなど複数段階のチェックを用意する
|
// TODO: Masterログが得られたときや、行として完成していかないときなど複数段階のチェックを用意する
|
||||||
let file = File::options().read(true).open(csvfile.clone())?;
|
let file = File::options().read(true).open(csvfile)?;
|
||||||
|
|
||||||
// tried to implement lazy evaluated `Read`er
|
|
||||||
// let bufrdr = BufReader::new(file);
|
|
||||||
// let skipped_reader = CsvMidReader::new(bufrdr.lines());
|
|
||||||
// let rdr = csv::Reader::from_reader(skipped_reader);
|
|
||||||
|
|
||||||
// filter and collect source beforehand
|
|
||||||
// let rdr = BufReader::new(file);
|
|
||||||
// let nl = "\n";
|
|
||||||
// let content = filter_csv_lines(rdr).join(nl);
|
|
||||||
// let content = content.as_bytes();
|
|
||||||
// let rdr = csv::Reader::from_reader(content);
|
|
||||||
|
|
||||||
let mut file_for_postfilter = {
|
|
||||||
let file = File::options().read(true).open(csvfile)?;
|
|
||||||
BufReader::new(file).lines()
|
|
||||||
};
|
|
||||||
let mut prev_postifilter_line = 0;
|
|
||||||
let rdr = csv::Reader::from_reader(file);
|
let rdr = csv::Reader::from_reader(file);
|
||||||
let mut isinvalid = false;
|
if !rdr
|
||||||
for (num, line) in rdr.into_deserialize::<PsbQaqcResult>().enumerate() {
|
.into_deserialize::<PsbQaqcResult>()
|
||||||
let line = match line {
|
.all(|row| row.is_ok())
|
||||||
Ok(line) => Ok(line),
|
{
|
||||||
Err(err) => {
|
return Err(anyhow!("Invalid csv"));
|
||||||
// catch
|
};
|
||||||
// line num is +1 because csv iterator doesn't include header line
|
|
||||||
match file_for_postfilter.nth(num + 1 - prev_postifilter_line) {
|
|
||||||
None => {
|
|
||||||
warn!("Error while reading file(line: {})", num + 1);
|
|
||||||
debug!("lines: {:?}", file_for_postfilter);
|
|
||||||
Err(err)
|
|
||||||
}
|
|
||||||
Some(line) => {
|
|
||||||
prev_postifilter_line = num + 2;
|
|
||||||
if let Ok(line) = line {
|
|
||||||
info!("error line on {}: line: {}", num, line);
|
|
||||||
if line.contains("abnormal resistance") {
|
|
||||||
println!("\"abnormal resistance\" at line {}", num + 1);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
if line.is_err() {
|
|
||||||
isinvalid = true;
|
|
||||||
}
|
|
||||||
// increment the following num for *header line* + *0-origin offset*
|
|
||||||
let line = line.inspect_err(|e| error!("Invalid line at {}: {}", num + 2, e));
|
|
||||||
debug!("{}: line {:?}", num, line);
|
|
||||||
}
|
|
||||||
if isinvalid {
|
|
||||||
return Err(anyhow!("Invalid CSV format."));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Commands::AddSkew { logfile, outfile } => {
|
Commands::AddSkew { logfile, outfile } => {
|
||||||
let skew = skew::parse_count_file(logfile).context("Error during getting skew")?;
|
let skew = skew::parse_count_file(logfile).context("Error during getting skew")?;
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,4 @@
|
||||||
use std::{
|
use std::{collections::BTreeMap, io::BufRead, str::FromStr};
|
||||||
collections::BTreeMap,
|
|
||||||
fs::File,
|
|
||||||
io::{BufRead, BufReader, Write},
|
|
||||||
path::PathBuf,
|
|
||||||
str::FromStr,
|
|
||||||
};
|
|
||||||
|
|
||||||
use anyhow::{anyhow, Context, Result};
|
use anyhow::{anyhow, Context, Result};
|
||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
|
|
@ -12,7 +6,7 @@ use log::{debug, info, trace};
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use semver::Version;
|
use semver::Version;
|
||||||
|
|
||||||
use crate::{Position, PositionLayer, PsbId, PsbQaqcResult};
|
use crate::{Position, PositionLayer, PsbId};
|
||||||
|
|
||||||
/// QAQC results for each boards extracted from master log.
|
/// QAQC results for each boards extracted from master log.
|
||||||
///
|
///
|
||||||
|
|
@ -30,36 +24,6 @@ pub struct MasterBoardResult {
|
||||||
pub result: u8,
|
pub result: u8,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MasterBoardResult {
|
|
||||||
/// Check the board needs to be retested with reason.
|
|
||||||
///
|
|
||||||
/// None if it doesn't need retest.
|
|
||||||
pub fn is_need_retest(&self) -> Option<String> {
|
|
||||||
let mut result = false;
|
|
||||||
let mut reasons = vec![];
|
|
||||||
if self.qspip != 1 {
|
|
||||||
result = true;
|
|
||||||
reasons.push(format!("QSPIp is not 1({})", self.qspip));
|
|
||||||
}
|
|
||||||
if self.recov != 1 {
|
|
||||||
result = true;
|
|
||||||
reasons.push(format!("Recov is not 1({})", self.recov));
|
|
||||||
}
|
|
||||||
if self.power != 1 {
|
|
||||||
result = true;
|
|
||||||
reasons.push(format!("Power is not 1({})", self.qspip));
|
|
||||||
}
|
|
||||||
if self.clock != 1 {
|
|
||||||
result = true;
|
|
||||||
reasons.push(format!("Clock is not 1({})", self.clock));
|
|
||||||
}
|
|
||||||
match result {
|
|
||||||
true => Some(reasons.join(", ")),
|
|
||||||
false => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Full result for a single QAQC run from a log file on JATHub master.
|
/// Full result for a single QAQC run from a log file on JATHub master.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct MasterLogResult {
|
pub struct MasterLogResult {
|
||||||
|
|
@ -108,21 +72,7 @@ fn extract_position_id(line: &str) -> Result<(Position, PsbId)> {
|
||||||
|
|
||||||
impl MasterLogResult {
|
impl MasterLogResult {
|
||||||
/// Parse log file on master jathub.
|
/// Parse log file on master jathub.
|
||||||
pub fn parse_file(master_log: PathBuf) -> Result<MasterLogResult> {
|
pub fn parse_file(file: impl BufRead, filename: String) -> Result<MasterLogResult> {
|
||||||
let file = File::open(master_log.clone())?;
|
|
||||||
let reader = BufReader::new(file);
|
|
||||||
MasterLogResult::parse_file_with_filename(
|
|
||||||
reader,
|
|
||||||
master_log
|
|
||||||
.file_name()
|
|
||||||
.unwrap()
|
|
||||||
.to_str()
|
|
||||||
.unwrap()
|
|
||||||
.to_string(),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_file_with_filename(file: impl BufRead, filename: String) -> Result<MasterLogResult> {
|
|
||||||
let mut lines = file.lines();
|
let mut lines = file.lines();
|
||||||
|
|
||||||
let version = {
|
let version = {
|
||||||
|
|
@ -321,23 +271,6 @@ impl MasterLogResult {
|
||||||
filename,
|
filename,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn print_boards_to_retest(&self, mut wtr: impl Write) -> Result<()> {
|
|
||||||
for (pos, boardresult) in &self.board_results {
|
|
||||||
if let Some(reason) = boardresult.is_need_retest() {
|
|
||||||
writeln!(
|
|
||||||
wtr,
|
|
||||||
"Board {} at {} need retest for {}",
|
|
||||||
boardresult.id.id, pos, reason
|
|
||||||
)?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_output_filename(result: &MasterLogResult) -> PathBuf {
|
|
||||||
PathBuf::from(format!("out_{}.csv", result.runid))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ mod test {
|
||||||
fn test_get_psbid_from_clklog() {
|
fn test_get_psbid_from_clklog() {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
get_psbid_from_clklogfile("120_1234.log".into()).unwrap(),
|
get_psbid_from_clklogfile("120_1234.log".into()).unwrap(),
|
||||||
(PsbId::new(120), 1234)
|
(PsbId::new(1020), 1234)
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
get_psbid_from_clklogfile("1024_124.log".into()).unwrap(),
|
get_psbid_from_clklogfile("1024_124.log".into()).unwrap(),
|
||||||
|
|
|
||||||
37
tests/cli.rs
37
tests/cli.rs
|
|
@ -1,13 +1,11 @@
|
||||||
mod integrated_test {
|
mod integrated_test {
|
||||||
use std::{
|
use std::{
|
||||||
env::current_dir,
|
fs::File,
|
||||||
ffi::OsString,
|
|
||||||
fs::{self, read_dir, File},
|
|
||||||
io::{BufRead, BufReader},
|
io::{BufRead, BufReader},
|
||||||
path::PathBuf,
|
path::PathBuf,
|
||||||
};
|
};
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
use anyhow::Result;
|
||||||
use assert_cmd::Command;
|
use assert_cmd::Command;
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use predicates::prelude::*;
|
use predicates::prelude::*;
|
||||||
|
|
@ -20,8 +18,8 @@ mod integrated_test {
|
||||||
// 1st file
|
// 1st file
|
||||||
let mut cmd = Command::cargo_bin("psb-qaqc")?;
|
let mut cmd = Command::cargo_bin("psb-qaqc")?;
|
||||||
cmd.current_dir("tests")
|
cmd.current_dir("tests")
|
||||||
.arg("convert-master-log")
|
.arg("add-master-log")
|
||||||
.arg("./example_logs/valid/44.log")
|
.arg("./example_logs/valid/7.log")
|
||||||
.arg(test_out.as_path())
|
.arg(test_out.as_path())
|
||||||
.assert()
|
.assert()
|
||||||
.success()
|
.success()
|
||||||
|
|
@ -33,8 +31,8 @@ mod integrated_test {
|
||||||
let f = File::open(test_out.clone())?;
|
let f = File::open(test_out.clone())?;
|
||||||
let r = BufReader::new(f);
|
let r = BufReader::new(f);
|
||||||
assert!(r.lines().any(|line| {
|
assert!(r.lines().any(|line| {
|
||||||
line.unwrap().eq(
|
line.unwrap().contains(
|
||||||
"214,,B-0-1,1,1,1,1,1,0,1,,44,2024-07-25T08:41:27Z,44.log,1.0.1,Bob,,,,false,",
|
"8866,,B-0-1,0,1,1,0,1,8,1,,7,2024-07-20T17:15:46Z,7.log,0.1.0,alice,,,,",
|
||||||
)
|
)
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
@ -49,7 +47,7 @@ mod integrated_test {
|
||||||
// 2nd file
|
// 2nd file
|
||||||
let mut cmd = Command::cargo_bin("psb-qaqc")?;
|
let mut cmd = Command::cargo_bin("psb-qaqc")?;
|
||||||
cmd.current_dir("tests")
|
cmd.current_dir("tests")
|
||||||
.arg("convert-master-log")
|
.arg("add-master-log")
|
||||||
.arg("./example_logs/valid/20.log")
|
.arg("./example_logs/valid/20.log")
|
||||||
.arg(test_out.as_path())
|
.arg(test_out.as_path())
|
||||||
.assert()
|
.assert()
|
||||||
|
|
@ -69,28 +67,17 @@ mod integrated_test {
|
||||||
#[test]
|
#[test]
|
||||||
fn partial_log() -> Result<()> {
|
fn partial_log() -> Result<()> {
|
||||||
let test_out_dir = assert_fs::TempDir::new()?;
|
let test_out_dir = assert_fs::TempDir::new()?;
|
||||||
fs::copy(
|
let test_out = PathBuf::new().join(&test_out_dir).join("out.csv");
|
||||||
"./tests/example_logs/valid/84.log",
|
|
||||||
test_out_dir.join("84.log"),
|
|
||||||
)
|
|
||||||
.context("Error preparing source file")?;
|
|
||||||
|
|
||||||
let mut cmd = Command::cargo_bin("psb-qaqc")?;
|
let mut cmd = Command::cargo_bin("psb-qaqc")?;
|
||||||
cmd.current_dir(&test_out_dir)
|
cmd.current_dir("tests")
|
||||||
.arg("convert-master-log")
|
.arg("add-master-log")
|
||||||
.arg("84.log")
|
.arg("./example_logs/valid/84.log")
|
||||||
|
.arg(test_out.as_path())
|
||||||
.assert()
|
.assert()
|
||||||
.success()
|
.success()
|
||||||
.stdout(predicate::str::contains("Creating new file"));
|
.stdout(predicate::str::contains("Creating new file"));
|
||||||
|
|
||||||
assert!(read_dir(&test_out_dir)
|
|
||||||
.context("Failed to read dir")?
|
|
||||||
.any(|entry| {
|
|
||||||
entry
|
|
||||||
.map_or(OsString::from(""), |entry| entry.file_name())
|
|
||||||
.eq("out_84.csv")
|
|
||||||
}));
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
Shift script: 1.0.1
|
|
||||||
----------------------
|
|
||||||
Date: 2024-07-25T08:41:27+0000
|
|
||||||
QAQC runid: 44
|
|
||||||
Shifters: Bob
|
|
||||||
----------------------
|
|
||||||
PBS Assignment:
|
|
||||||
Position / assigned-ID : B-0-1 / PS000214
|
|
||||||
Position / assigned-ID : B-1-1 / PS000215
|
|
||||||
Position / assigned-ID : B-0-2 / PS000213
|
|
||||||
Position / assigned-ID : B-1-2 / PS000211
|
|
||||||
Position / assigned-ID : B-0-3 / PS000212
|
|
||||||
Position / assigned-ID : B-1-3 / PS000210
|
|
||||||
Position / assigned-ID : B-0-4 / PS000207
|
|
||||||
Position / assigned-ID : B-1-4 / PS000209
|
|
||||||
Position / assigned-ID : B-0-5 / PS000208
|
|
||||||
Position / assigned-ID : B-1-5 / PS000206
|
|
||||||
Position / assigned-ID : B-0-6 / PS000205
|
|
||||||
Position / assigned-ID : B-1-6 / PS000204
|
|
||||||
Position / assigned-ID : B-0-7 / PS000203
|
|
||||||
Position / assigned-ID : B-1-7 / PS000202
|
|
||||||
Position / assigned-ID : B-0-8 / PS000201
|
|
||||||
Position / assigned-ID : B-1-8 / PS000239
|
|
||||||
Position / assigned-ID : B-0-9 / PS000238
|
|
||||||
Position / assigned-ID : B-1-9 / PS000237
|
|
||||||
======================
|
|
||||||
QAQC status| QSPIp | Recov | Power | Clock | ASDTP | Reset | Result |
|
|
||||||
----------------------------------------------------------------------
|
|
||||||
Station0
|
|
||||||
JATHub_ 1| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
JATHub_ 2| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
JATHub_ 3| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
JATHub_ 4| 1| 1| 1| 2| 1| 4| 2|
|
|
||||||
JATHub_ 5| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
JATHub_ 6| 1| 1| 1| 1| 1| 1| 1|
|
|
||||||
JATHub_ 7| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
JATHub_ 8| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
JATHub_ 9| 1| 1| 1| 2| 1| 0| 2|
|
|
||||||
Station1
|
|
||||||
JATHub_11| 2| 1| 2| 1| 2| 1| 2|
|
|
||||||
JATHub_12| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
JATHub_13| 1| 1| 1| 2| 1| 0| 2|
|
|
||||||
JATHub_14| 1| 1| 1| 2| 1| 0| 2|
|
|
||||||
JATHub_15| 1| 1| 1| 2| 1| 0| 2|
|
|
||||||
JATHub_16| 1| 1| 2| 1| 1| 1| 2|
|
|
||||||
JATHub_17| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
JATHub_18| 1| 1| 1| 1| 1| 3| 1|
|
|
||||||
JATHub_19| 1| 1| 1| 1| 1| 0| 1|
|
|
||||||
======================
|
|
||||||
Loading…
Add table
Reference in a new issue