From 37556df3b7131eabd1c2a0417913b8a0aae7cd1e Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sat, 27 Jun 2020 22:32:44 -0400 Subject: [PATCH] Set up Github Actions (#1) --- .github/workflows/build_test.yml | 60 ++++++++++++++++++++++++++++++++ .github/workflows/deploy.yml | 57 ++++++++++++++++++++++++++++++ README.md | 3 ++ youmubot-osu/src/test.rs | 10 ++++-- youmubot-prelude/src/args.rs | 2 +- 5 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build_test.yml create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml new file mode 100644 index 0000000..a8ea308 --- /dev/null +++ b/.github/workflows/build_test.yml @@ -0,0 +1,60 @@ +name: Build and Test + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + CARGO_TERM_COLOR: always + +jobs: + format_check: + name: Format check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + components: rustfmt + - name: Run rustfmt + run: cargo fmt -- --check + check: + name: Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + components: clippy + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-rust-check-${{ hashFiles('**/Cargo.lock') }} + - name: Run cargo check + run: cargo check + - name: Run clippy + run: cargo clippy + test: + name: Test + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-rust-debug-${{ hashFiles('**/Cargo.lock') }} + - name: Run cargo test + run: cargo test diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..6e229fc --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,57 @@ +name: Deploy + +# on: + # push: + # branches: [ master ] +on: [ push ] + +jobs: + build: + name: Build a Release Binary + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-rust-release-${{ hashFiles('**/Cargo.lock') }} + - name: Build release + run: cargo build --release + - name: Upload compiled binary artifact + uses: actions/upload-artifact@v1 + with: + name: youmubot-release + path: target/release/youmubot + deploy: + name: Deploy to remote + needs: build + runs-on: ubuntu-latest + steps: + - name: Collect artifact + uses: actions/download-artifact@v1 + with: + name: youmubot-release + - name: Upload binary + uses: appleboy/scp-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.SSH_KEY }} + port: ${{ secrets.PORT }} + source: youmubot-release/youmubot + target: youmubot + strip_components: 1 + - name: Restart youmubot + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.SSH_KEY }} + port: ${{ secrets.PORT }} + script: systemctl --user restart youmubot diff --git a/README.md b/README.md index f05978d..90c041e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # youmubot +![Deploy](https://github.com/natsukagami/youmubot/workflows/Deploy/badge.svg) +![Build and Test](https://github.com/natsukagami/youmubot/workflows/Build%20and%20Test/badge.svg) + A Discord bot made specifically for server "Dự tuyển Tổng Hợp". Written in Rust. All PRs welcome. diff --git a/youmubot-osu/src/test.rs b/youmubot-osu/src/test.rs index 63aea3e..304f200 100644 --- a/youmubot-osu/src/test.rs +++ b/youmubot-osu/src/test.rs @@ -1,9 +1,15 @@ const INPUT: &str = r#"[{"beatmapset_id":"542081","beatmap_id":"1149303","approved":"1","total_length":"44","hit_length":"42","version":"Insane","file_md5":"65bbda0ff3f3a8aa2add745d2ad90209","diff_size":"4.1","diff_overall":"8.2","diff_approach":"8","diff_drain":"5.5","mode":"0","count_normal":"117","count_slider":"24","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"1850215","passcount":"241349","max_combo":"172","diff_aim":"2.28424","diff_speed":"1.72122","difficultyrating":"4.28697"},{"beatmapset_id":"542081","beatmap_id":"1149619","approved":"1","total_length":"44","hit_length":"39","version":"Rain's Easy","file_md5":"49ee0a0d3a75fa95dc6cb655a99c9fcd","diff_size":"3","diff_overall":"2","diff_approach":"3","diff_drain":"2","mode":"0","count_normal":"18","count_slider":"22","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"277708","passcount":"168926","max_combo":"72","diff_aim":"0.802138","diff_speed":"0.706338","difficultyrating":"1.55638"},{"beatmapset_id":"542081","beatmap_id":"1149638","approved":"1","total_length":"44","hit_length":"42","version":"Sotarks' Insane","file_md5":"033dc9f25e5db2cb0296465b18b9b424","diff_size":"4","diff_overall":"8","diff_approach":"8","diff_drain":"5.5","mode":"0","count_normal":"82","count_slider":"38","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"2431913","passcount":"371089","max_combo":"160","diff_aim":"2.28972","diff_speed":"1.62158","difficultyrating":"4.24537"},{"beatmapset_id":"542081","beatmap_id":"1149713","approved":"1","total_length":"44","hit_length":"42","version":"Linada's Insane","file_md5":"0b6c067c2370af9d42fc9d49dd4408d5","diff_size":"3.6","diff_overall":"7.5","diff_approach":"8","diff_drain":"5.5","mode":"0","count_normal":"87","count_slider":"37","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"1993990","passcount":"372872","max_combo":"163","diff_aim":"2.05241","diff_speed":"1.61859","difficultyrating":"3.88792"},{"beatmapset_id":"542081","beatmap_id":"1149864","approved":"1","total_length":"44","hit_length":"42","version":"Akitoshi's Hard","file_md5":"cf873fddb4335c1b20cb7670e9efe366","diff_size":"3.5","diff_overall":"6","diff_approach":"7","diff_drain":"5","mode":"0","count_normal":"68","count_slider":"40","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"721693","passcount":"213582","max_combo":"150","diff_aim":"1.49837","diff_speed":"1.41785","difficultyrating":"2.95649"},{"beatmapset_id":"542081","beatmap_id":"1149925","approved":"1","total_length":"44","hit_length":"42","version":"Foxy's Hard","file_md5":"ef54e15e1f13ff881503574abcb8d277","diff_size":"3.5","diff_overall":"6.5","diff_approach":"7.5","diff_drain":"5","mode":"0","count_normal":"86","count_slider":"38","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"1415732","passcount":"270135","max_combo":"164","diff_aim":"1.88298","diff_speed":"1.6238","difficultyrating":"3.63637"},{"beatmapset_id":"542081","beatmap_id":"1150597","approved":"1","total_length":"41","hit_length":"39","version":"NiNo's Insane","file_md5":"395faa3a0c0dc3daf93a016e9e14ef9d","diff_size":"4.5","diff_overall":"8.3","diff_approach":"8","diff_drain":"5.5","mode":"0","count_normal":"119","count_slider":"21","count_spinner":"1","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"1036842","passcount":"107883","max_combo":"162","diff_aim":"2.45971","diff_speed":"1.73208","difficultyrating":"4.55561"},{"beatmapset_id":"542081","beatmap_id":"1153219","approved":"1","total_length":"44","hit_length":"42","version":"Haru's Insane","file_md5":"631a384255f9488ea7af2d47602ebd5e","diff_size":"3.7","diff_overall":"8.2","diff_approach":"8","diff_drain":"5.5","mode":"0","count_normal":"84","count_slider":"37","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"1301255","passcount":"222942","max_combo":"160","diff_aim":"2.35354","diff_speed":"1.63119","difficultyrating":"4.34591"},{"beatmapset_id":"542081","beatmap_id":"1153237","approved":"1","total_length":"44","hit_length":"42","version":"Hard","file_md5":"6aaee0420478208725529390e80c0037","diff_size":"4","diff_overall":"7","diff_approach":"7.7","diff_drain":"5","mode":"0","count_normal":"83","count_slider":"37","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"1356021","passcount":"277839","max_combo":"165","diff_aim":"1.91459","diff_speed":"1.67391","difficultyrating":"3.70884"},{"beatmapset_id":"542081","beatmap_id":"1153238","approved":"1","total_length":"44","hit_length":"42","version":"Ren's Insane","file_md5":"80f7447a70261ed53c9da5f2cc97e979","diff_size":"4","diff_overall":"7.3","diff_approach":"7.8","diff_drain":"5","mode":"0","count_normal":"83","count_slider":"39","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"1191468","passcount":"239132","max_combo":"163","diff_aim":"2.07017","diff_speed":"1.60208","difficultyrating":"3.90629"},{"beatmapset_id":"542081","beatmap_id":"1153285","approved":"1","total_length":"44","hit_length":"42","version":"Deppy's Normal","file_md5":"52af38d40492f2b2b2d0f7ede64279f7","diff_size":"3.3","diff_overall":"4","diff_approach":"4.5","diff_drain":"3","mode":"0","count_normal":"23","count_slider":"31","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"251532","passcount":"125554","max_combo":"102","diff_aim":"1.0051","diff_speed":"0.861233","difficultyrating":"1.93826"},{"beatmapset_id":"542081","beatmap_id":"1154509","approved":"1","total_length":"44","hit_length":"42","version":"Irre's Extra","file_md5":"1c268f17386e897bab4171bc7c4e5636","diff_size":"7","diff_overall":"8.6","diff_approach":"8.2","diff_drain":"5","mode":"0","count_normal":"84","count_slider":"32","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"302232","passcount":"52319","max_combo":"152","diff_aim":"2.79578","diff_speed":"1.59379","difficultyrating":"4.99056"},{"beatmapset_id":"542081","beatmap_id":"1155987","approved":"1","total_length":"44","hit_length":"42","version":"Gero's Hard","file_md5":"2c410c85e9637521e2c11a0e77bb4707","diff_size":"5","diff_overall":"7","diff_approach":"7.6","diff_drain":"5","mode":"0","count_normal":"79","count_slider":"41","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"653755","passcount":"141525","max_combo":"185","diff_aim":"1.90333","diff_speed":"1.65433","difficultyrating":"3.68217"},{"beatmapset_id":"542081","beatmap_id":"1158424","approved":"1","total_length":"44","hit_length":"42","version":"Andrea's Hard","file_md5":"2c3e659d9135233a6b71b1a996c01b5d","diff_size":"3.5","diff_overall":"5","diff_approach":"7","diff_drain":"4","mode":"0","count_normal":"53","count_slider":"36","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"473130","passcount":"179583","max_combo":"129","diff_aim":"1.51634","diff_speed":"1.31463","difficultyrating":"2.93182"},{"beatmapset_id":"542081","beatmap_id":"1205930","approved":"1","total_length":"41","hit_length":"39","version":"Ozzy's Oni","file_md5":"1ebd8a29b6fa1d7c6dc7a36cde084a10","diff_size":"5","diff_overall":"5","diff_approach":"5","diff_drain":"5","mode":"1","count_normal":"140","count_slider":"0","count_spinner":"1","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"24915","passcount":"7904","max_combo":null,"diff_aim":null,"diff_speed":null,"difficultyrating":"2.61693"},{"beatmapset_id":"542081","beatmap_id":"1205931","approved":"1","total_length":"41","hit_length":"39","version":"Ozzy's Muzukashii","file_md5":"daf1647f166d2bab8fb7d3bd61ffda61","diff_size":"5","diff_overall":"5","diff_approach":"5","diff_drain":"5","mode":"1","count_normal":"111","count_slider":"0","count_spinner":"1","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"45278","passcount":"19071","max_combo":null,"diff_aim":null,"diff_speed":null,"difficultyrating":"2.20401"},{"beatmapset_id":"542081","beatmap_id":"1207082","approved":"1","total_length":"41","hit_length":"39","version":"Ascendance's Rain","file_md5":"b522a0881628a75a18dfdc1dee94111d","diff_size":"3","diff_overall":"9","diff_approach":"9","diff_drain":"6","mode":"2","count_normal":"37","count_slider":"60","count_spinner":"1","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"69044","passcount":"12022","max_combo":"186","diff_aim":"3.33674","diff_speed":null,"difficultyrating":"3.33674"},{"beatmapset_id":"542081","beatmap_id":"1218649","approved":"1","total_length":"44","hit_length":"42","version":"Extra","file_md5":"9fe0cc30f3f2e8bf29d82ae53eda4520","diff_size":"5.1","diff_overall":"8.5","diff_approach":"8.1","diff_drain":"6","mode":"0","count_normal":"114","count_slider":"26","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"534184","passcount":"60346","max_combo":"172","diff_aim":"2.51862","diff_speed":"1.72511","difficultyrating":"4.64048"},{"beatmapset_id":"542081","beatmap_id":"1373950","approved":"1","total_length":"44","hit_length":"42","version":"Cookie-Triangle-Spicy-Cookie","file_md5":"c45c1b96ca051e721937b0115b1ea0b1","diff_size":"4","diff_overall":"9","diff_approach":"8.3","diff_drain":"6","mode":"0","count_normal":"119","count_slider":"23","count_spinner":"2","submit_date":"2016-12-06 08:06:14","approved_date":"2017-08-14 16:46:34","last_update":"2017-08-07 16:02:51","artist":"Elmo and Cookie Monster","title":"Cookie-Butter-Choco-Cookie","creator":"Monstrata","creator_id":"2706438","bpm":"136","source":"\u30bb\u30b5\u30df\u30b9\u30c8\u30ea\u30fc\u30c8","tags":"cbcc ppap pikotaro sesame street ozzyozrock ozzy irre irreversible nino snownino_ haruto haruto_aizawa haruto- sotarks linada red derandom otaku derandom_otaku gero foxy foxygrandpa akitoshi corinn andrea osuplayer111 deppyforce -_rain_- rain ascendance","genre_id":"7","language_id":"2","favourite_count":"1266","rating":"7.67281","download_unavailable":"0","audio_unavailable":"0","playcount":"2801222","passcount":"290627","max_combo":"172","diff_aim":"2.63586","diff_speed":"1.74142","difficultyrating":"4.8245"}]"#; -use crate::models::Beatmap; +use crate::models::{raw::Beatmap as RawBeatmap, Beatmap}; use serde_json::from_str as parse_str; +use std::convert::TryFrom; #[test] fn parse_beatmaps() { - parse_str::>(INPUT).unwrap(); + parse_str::>(INPUT) + .unwrap() + .into_iter() + .map(|v| Beatmap::try_from(v)) + .collect::, _>>() + .unwrap(); } diff --git a/youmubot-prelude/src/args.rs b/youmubot-prelude/src/args.rs index fba3324..cdb5979 100644 --- a/youmubot-prelude/src/args.rs +++ b/youmubot-prelude/src/args.rs @@ -166,7 +166,7 @@ mod duration { #[test] fn test_parse_fail() { - let tests = ["", "1w", "-1W", "1"]; + let tests = ["", "-1W", "1"]; for input in &tests { assert!( parse_duration_string(input).is_err(),