Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try/catch added to con reading to prevent crashing #312

Merged
merged 7 commits into from
May 13, 2023
Merged

Try/catch added to con reading to prevent crashing #312

merged 7 commits into from
May 13, 2023

Conversation

TheFatBastid
Copy link
Contributor

Without this, when an "access denied" folder is scanned, it will throw an IO error and end the scanning, and thus no cache is created.

@TheFatBastid
Updated Readme to remove duplicate
aa0ba88 
The merge part was duplicated
@TheFatBastid
Added Mogg filename error output
f4fbb91 
Change the error struct to add a file name. Added to when a con error is scanned, "" gets added for .ini songs
@TheFatBastid
Added a try/catch to con reading
8582a79 
Without this, when an "access denied" folder is scanned, it will throw an IO error and end the scanning, and thus no cache is created.
@TheFatBastid
Fixed small error when scrolling past limits
f1fed7f 
While things still worked fine, we shouldn't have errors being generated.
@TheFatBastid
Merge branch 'dev' into dev
b8b7946
@TheFatBastid
Added Json support for currentSong
43c8862 
Note: There is no GUI button for this yet!

Also, added a toast to updateChecker
@EliteAsian123
Copy link
Member

Thanks!

@EliteAsian123 EliteAsian123 merged commit e513a6a into YARC-Official:dev May 13, 2023
EliteAsian123 added a commit that referenced this pull request May 15, 2023
@EliteAsian123
Scores and stars tuning (#311)
281a2d0 
commit 9c49bd1
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Mon May 15 16:06:56 2023 -0400

    Merge fixes

commit 532a398
Merge: bfd1c2a 3897e28
Author: EliteAsian <29520859+EliteAsian123@users.noreply.github.com>
Date:   Mon May 15 16:02:34 2023 -0400

    Merge branch 'dev' into score-tuning-ch-scale

commit bfd1c2a
Merge: 8a514e3 5c95258
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 22:12:22 2023 -0700

    Merge remote-tracking branch 'upstream/dev' into score-tuning-ch-scale

commit 8a514e3
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 17:35:29 2023 -0700

    reword WIP score notice

commit 4fc7428
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 17:29:04 2023 -0700

    add WIP score system notice at PlayResult

commit 1182bd4
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 16:51:19 2023 -0700

    Squashed commit of the following:

    commit bd3be26
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Sat May 13 13:31:03 2023 -0400

        ACTUALLY GOOD TRACK SCALING (MATH MOMENT)

    commit 3279990
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Sat May 13 12:18:45 2023 -0400

        Formatting

    commit 96dbca3
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Sat May 13 12:04:23 2023 -0400

        Fixed error

    commit e513a6a
    Author: TheFatBastid <tfb@sof.ws>
    Date:   Sat May 13 12:01:37 2023 -0400

        Try/catch added to con reading to prevent crashing (#312)

        * Updated Readme to remove duplicate

        The merge part was duplicated

        * Added Mogg filename error output

        Change the error struct to add a file name. Added to when a con error is scanned, "" gets added for .ini songs

        * Added a try/catch to con reading

        Without this, when an "access denied" folder is scanned, it will throw an IO error and end the scanning, and thus no cache is created.

        * Fixed small error when scrolling past limits

        While things still worked fine, we shouldn't have errors being generated.

        * Added Json support for currentSong

        Note: There is no GUI button for this yet!

        Also, added a toast to updateChecker

        * Update SongScanThread.cs

        fixed spacing

    commit 1a09596
    Author: muskit <15199219+muskit@users.noreply.github.com>
    Date:   Sat May 13 08:50:23 2023 -0700

        New play result screen (#317)

        * migration from bad branch

        * finish the PlayResult migration

    commit 574018e
    Author: LocalH <41028672+LocalH@users.noreply.github.com>
    Date:   Sat May 13 11:10:14 2023 -0400

        Track speed to two decimals (#318)

    commit 1d22dce
    Author: Jalen Jackson <jalenjacksoncs@gmail.com>
    Date:   Fri May 12 22:55:57 2023 -0400

        Fixed scrolling bug & argument exception not using _selectedIndex variable (#316)

    commit 7984581
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Fri May 12 18:14:34 2023 -0400

        Fixed score bug

    commit 2034903
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Fri May 12 17:53:59 2023 -0400

        Fixed album art text click

    commit b866dd9
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Fri May 12 17:32:30 2023 -0400

        Area behind buttons in settings now allow scroll

    commit 9a74da3
    Author: Paulo Cardoso <50218490+nevespt@users.noreply.github.com>
    Date:   Fri May 12 22:03:56 2023 +0100

        Dev Watermark (#292)

        * Dev Watermark

        [Added]
        - a script to check if is beta version or not

        [Changed]
        - Elements at persistant Scene

        * Getting a better condition

        from
        `Constants.VERSION_TAG.ToString().EndsWith("b")`
        to
        `Constants.VERSION_TAG.beta`

        * Fix following styling

    commit 9767c8d
    Author: grishhung <93692315+grishhung@users.noreply.github.com>
    Date:   Fri May 12 17:03:10 2023 -0400

        Abstract Track Performance Text (BASS GROOVE, HOT START, etc.) (#295)

        * Hot start, bass groove, and strong finish

        * Corrected issue with STRONG FINISH

        Fixed an issue where STRONG FINISH could be achieved despite not actually hitting the last note

        * Added a X00-NOTE STREAK counter

        We most likely want to have this disabled by default. A lot of players have mentioned that it gives them anxiety lol

        * Prevent performance text from appearing during a solo

        * Made the cutoffs public variables for easy tweaking

        * Fix STRONG FINISH bug by using Chart.Count

        * Implemented FULL COMBO text

        * Change FULL COMBO text to trump STRONG FINISH

        Also left justified vocal performance text

        * Removed bold from vocal performance text for consistency

        * Labeled a variable that's not used but may be later on

        * Added a toggle to check whether or not FC text trumps STRONG FINISH or not

        * Added lots of toggles

        * fixed a bug with custom note intervals

        * Added support for X/2-NOTE COMBO notifs for all non-bass instruments

        * Added OVERDRIVE READY notif (really think this should be off by default)

        * Updated an incorrect comment

        * Oops, forgot to make BASS GROOVE work for Pro Bass too

        * Removed check for BASS GROOVE and simply made BASS GROOVE trump NOTE STREAK

        * converting ToLower() is unnecessary

        * Reordered update functions to make them actually function as intended

        * Explained PerformanceTextFontSize()

    commit 2886324
    Author: rjkiv <76180273+rjkiv@users.noreply.github.com>
    Date:   Fri May 12 17:02:49 2023 -0400

        Song update functionality (#304)

        * add hopo_threshold support to please jnack

        * fix DXT3 image byte parsing

        * DXT3 loop cleanup

        * hopo threshold fix

        * actually reference hopo_threshold this time

        * small RB fixes

        * song metadata updates

        * image updates

        * mogg dta updates

        * midi updates implemented

        * mogg updates implemented

        * attempted cleanup of update code

        * remove debug statements and fix con updating

        * remove debug statement

        * fix song scanner not reading midi preparser properly

    commit 016bbb6
    Author: TheFatBastid <tfb@sof.ws>
    Date:   Fri May 12 16:57:25 2023 -0400

        Updated Readme to remove duplicate (#307)

        * Updated Readme to remove duplicate

        The merge part was duplicated

        * Added Mogg filename error output

        Change the error struct to add a file name. Added to when a con error is scanned, "" gets added for .ini songs

    commit e6c317f
    Author: rjkiv <76180273+rjkiv@users.noreply.github.com>
    Date:   Fri May 12 16:56:20 2023 -0400

        fixed/cleaned up Xbox image parsing (#308)

        * add hopo_threshold support to please jnack

        * fix DXT3 image byte parsing

        * DXT3 loop cleanup

        * hopo threshold fix

        * actually reference hopo_threshold this time

        * small RB fixes

        * Update Credits.txt

        * cleaned up DXT block parsing for xbox images

        * move Texture2D declaration

        ---------

        Co-authored-by: EliteAsian <lavasnakegaming@gmail.com>

    commit 8058f94
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Fri May 12 13:55:47 2023 -0700

        Highway Fadeout Shader (#309)

        * Ignore Folder

        * Highway Fade Shader

    commit 361cb9f
    Author: Jalen Jackson <jalenjacksoncs@gmail.com>
    Date:   Fri May 12 16:55:17 2023 -0400

        Handle Song Selection Errors When No Songs to Select (#310)

        * Fix argument exception when no songs to select

        * Reset selected song variable if removed after scan

    commit 4a11900
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 21:42:28 2023 -0400

        Patch time!

    commit e54c2e2
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 21:30:14 2023 -0400

        Forgot to assign field

    commit 5532222
    Merge: 28a1f97 6932320
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 21:18:27 2023 -0400

        Merge branch 'JayDiddyThaGOAT-post-song-goes-to-song-selection' into dev

    commit 6932320
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 21:17:00 2023 -0400

        Fixed merge issues

    commit efd7122
    Author: Jalen Jackson <jalenjacksoncs@gmail.com>
    Date:   Thu May 11 20:42:09 2023 -0400

        Song Selection goes back to Last Song Played

    commit 466640b
    Author: Jalen Jackson <jalenjacksoncs@gmail.com>
    Date:   Thu May 11 17:41:03 2023 -0400

        PostSong goes to Song Selection

    commit 98e7348
    Author: RileyTheFox <jacobchambers@hotmail.co.uk>
    Date:   Thu May 11 23:46:26 2023 +0100

        Handle some exceptions with chart preparsing (#302)

    commit 28a1f97
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 18:45:36 2023 -0400

        Bruh

    commit 5356f66
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 18:27:30 2023 -0400

        Fixed Discord and Twitch (and added tag stripping)

    commit 1165d59
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 17:45:08 2023 -0400

        Only show "Sit Out" if more than one player

    commit e53e65d
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 17:23:15 2023 -0400

        Added `.webm`, `.mov`, `.jpg` support for backgrounds

    commit 3f1b51e
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 16:47:10 2023 -0400

        Clean up for backgrounds

    commit e2131ac
    Merge: e098a5d 7c02feb
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 16:04:11 2023 -0400

        Merge branch 'NyxTheShield-master' into dev

    commit 7c02feb
    Merge: e098a5d 64fb0ff
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 16:03:57 2023 -0400

        Merge branch 'master' of https://github.com/NyxTheShield/YARG into NyxTheShield-master

    commit e098a5d
    Author: Nathan <nathanhurst03@gmail.com>
    Date:   Thu May 11 13:30:36 2023 -0600

        Update PlasticBand-Unity to v0.2.3 (#301)

        Fixes 4-lane drumkits not mapping correctly

    commit 64fb0ff
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 23:22:12 2023 -0400

        FIxed wrong imports for build

    commit 7603328
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 23:16:23 2023 -0400

        Support for VIdeo, PNG and Custom YARGrounds (Trombone Champ Style AssetBundles for customizable 3D BGs)

    commit aa67dc2
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Wed May 10 22:03:40 2023 -0400

        Fixed "Graphics" tab in settings

    commit 5af2d05
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 18:56:34 2023 -0700

        Custom Post Processing Shader to Enable Transparency on Render Textures (#298)

        * Updated Readme (#291)

        * Update README.md

        Changed the URL from personal to YARC

        * Update README.md

        Changed the URL from personal to YARC

        * Custom Post Processing Shader to Enable Transparency on Render Textures

        ---------

        Co-authored-by: TheFatBastid <tfb@sof.ws>
        Co-authored-by: EliteAsian <lavasnakegaming@gmail.com>

    commit 4ea9b28
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 21:36:50 2023 -0400

        Custom Background Testing

    commit bd04472
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 21:31:44 2023 -0400

        Custom Post Processing Shader to Enable Transparency on Render Textures

    commit 26ced71
    Merge: b6a14f0 20736b6
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 21:39:01 2023 -0400

        Merge branch 'dev' for v0.10.1

    commit 20736b6
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 21:30:49 2023 -0400

        UPDATE TIME

    commit b1dc6cd
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 21:18:48 2023 -0400

        Fixed multiple issues

    commit c8075ed
    Author: PixelatedPope <Pixelated_Pope@hotmail.com>
    Date:   Tue May 9 18:35:21 2023 -0600

        Update song count text on folder after pressing refresh. (#294)

        Co-authored-by: Jonathan Peterson <jonathan.peterson@hexagon.com>

    commit 16a2f56
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 18:31:10 2023 -0400

        Category text

    commit 92b51f9
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 18:19:10 2023 -0400

        Added artist name clicking back

    commit 9826116
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 17:58:05 2023 -0400

        Album cover optimizations and fixes

    commit ce94cee
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 15:56:01 2023 -0400

        I forgot that song packs existed

    commit 9cc8679
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 15:46:47 2023 -0400

        Speeded up standard song scanning

    commit bd68d2f
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 15:17:03 2023 -0400

        Added metadata back (Hugh L)

    commit b8f9ad3
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 15:08:19 2023 -0400

        Update DESIGNING.md

    commit 0888e0b
    Author: rjkiv <76180273+rjkiv@users.noreply.github.com>
    Date:   Tue May 9 15:06:50 2023 -0400

        CON file native integration (#286)

        * i hate you riley

        * lazy midi file stream implementation

        * i think CONs work now?

        * only validate CON songs if any were found

        * account for potentially different path name schemes

        * removed unused file

        * rebase with current YARG dev branch

    commit 0b355d5
    Author: grishhung <93692315+grishhung@users.noreply.github.com>
    Date:   Tue May 9 15:06:36 2023 -0400

        Refactored performance text sizing code (#287)

    commit 247bb08
    Author: Paulo Cardoso <50218490+nevespt@users.noreply.github.com>
    Date:   Tue May 9 20:06:10 2023 +0100

        FPS Counter (#290)

        [Added]
        - FPS_Circle Asset
        - An option at Setting to enable the counter
        - FpsCounter Script
        - Entry in Localization

        [Changed]
        - Elements at persistant Scene

    commit b6a14f0
    Author: TheFatBastid <tfb@sof.ws>
    Date:   Tue May 9 15:01:54 2023 -0400

        Updated Readme (#291)

        * Update README.md

        Changed the URL from personal to YARC

        * Update README.md

        Changed the URL from personal to YARC

    commit bba5010
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Mon May 8 18:17:43 2023 -0400

        New music library code

    commit 52553c5
    Author: muskit <15199219+muskit@users.noreply.github.com>
    Date:   Mon May 8 13:02:18 2023 -0700

        adjust alpha of gold star progress' top bar (#278)

    commit a5e12c6
    Author: RileyTheFox <jacobchambers@hotmail.co.uk>
    Date:   Mon May 8 21:02:03 2023 +0100

        Change mogg loading stuff (#283)

    commit 1930fa6
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Mon May 8 15:45:49 2023 -0400

        Excon stuff (#282)

        * Expanded upon ExtractedCONSongEntry class (#265)

        * add hopo_threshold support to please jnack

        * fix DXT3 image byte parsing

        * DXT3 loop cleanup

        * hopo threshold fix

        * actually reference hopo_threshold this time

        * small RB fixes

        * expand ExtractedCONSongEntry class

        * improved dta parsing (#267)

        * add hopo_threshold support to please jnack

        * fix DXT3 image byte parsing

        * DXT3 loop cleanup

        * hopo threshold fix

        * actually reference hopo_threshold this time

        * small RB fixes

        * expand ExtractedCONSongEntry class

        * Fixed icons

        * "Reset Camera Settings" button

        * Did someone say UPDATE?

        * improve dta parsing

        ---------

        Co-authored-by: EliteAsian <lavasnakegaming@gmail.com>

        * (maybe) fix issue with dta files containing brackets in symbols (#268)

        * ExtractedCONSongEntry full integration (#275)

        * modify ExtractedCONSongEntry to not use Xbox classes

        * remove XboxSong scanner

        * remove unused Xbox classes

        * add notes for songs.dta members

        * Fixed hopo threshold bug (#280)

        * modify ExtractedCONSongEntry to not use Xbox classes

        * remove XboxSong scanner

        * remove unused Xbox classes

        * add notes for songs.dta members

        * begin con integration with CONSongEntry class and CON file detection

        * begin creating ConSongEntry

        * CON scanning now returns a List of ConSongEntry objects

        * CONSongEntry validator implemented

        * clean up mogg BASS function, fix hopo threshold bug

        * edit mogg and png_xbox loaders to accept byte arrays

        ---------

        Co-authored-by: rjkiv <76180273+rjkiv@users.noreply.github.com>
        Co-authored-by: Emma <webmaster@invoxiplaygames.uk>

    commit dbcdc26
    Author: Kadu Waengertner <87105274+kaduwaengertner@users.noreply.github.com>
    Date:   Mon May 8 16:41:45 2023 -0300

        Fixed Gold Star Texture (#281)

        + Something wrong when exported, two shines didn't had proper blending mode applied

    commit 70ba2e3
    Author: RileyTheFox <jacobchambers@hotmail.co.uk>
    Date:   Mon May 8 20:40:08 2023 +0100

        Fix caches not being scanned in parallel on error (#279)

    commit 280009e
    Author: Cisco <PikminGuts92@users.noreply.github.com>
    Date:   Sun May 7 21:42:28 2023 -0400

        Clear phrase after ending for generic vox (#276)

        * Parse phrase length from midi and clear phrase when complete for generic vox

        * Ignore percussion phrases when parsing midi for generic vox

    commit c29e3f4
    Author: RileyTheFox <jacobchambers@hotmail.co.uk>
    Date:   Mon May 8 00:03:51 2023 +0100

        Add preview audio loading code (#274)

        * Set bass channel position

        * Load preview audio and fade functions

        * Try fix volume slide

        * Adjust play function for fade

commit b5a75af
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 16:39:46 2023 -0700

    remove 5.5% non-solo base score bump

commit 2cad203
Merge: d912fe0 ab7ab5a
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:58:05 2023 -0700

    Merge branch 'score-tuning-solo-base' into score-tuning-ch-scale

commit ab7ab5a
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:57:01 2023 -0700

    boost StarScoreKeeper.BaseScore when there's no solo

commit d912fe0
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:35:29 2023 -0700

    double solo bonus points too, remove 5% solo bonus

commit 684f38d
Merge: eb4a974 f55cab3
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:22:04 2023 -0700

    Merge branch 'score-tuning-solo-base' into score-tuning-ch-scale

commit f55cab3
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:21:01 2023 -0700

    make StarScoreKeeper.BaseScore's solo notes be double pts

commit eb4a974
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 18:29:13 2023 -0700

    double ALL the points

commit 87e2348
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 17:22:14 2023 -0700

    Add bonus solo points to StarScoreKeeper.BaseScore

commit c90bc46
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 17:15:57 2023 -0700

    fix score thresholds using RB4DX reference

commit 49306ea
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 15:26:14 2023 -0700

    refactor StarScoreKeeper for easier adjustments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EliteAsian123 EliteAsian123 EliteAsian123 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TheFatBastid @EliteAsian123