1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 13:47:38 +08:00
Commit Graph

24 Commits

Author SHA1 Message Date
smoogipoo
9da7bfd615 Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts
# Conflicts:
#	osu.Game/Database/ArchiveModelManager.cs
2018-05-31 14:02:52 +09:00
Dean Herbert
eb89317494 Remove performance optimisation tracking disables to keep things simple for now 2018-05-30 13:43:43 +09:00
Dean Herbert
31ab6f2408 Fix event flushing sticking on early return 2018-05-29 19:43:52 +09:00
Dean Herbert
4a18951cce Report full error to log file 2018-05-29 18:37:45 +09:00
Dean Herbert
47d88a48a2 Add logging on import processes 2018-05-29 16:26:42 +09:00
Dean Herbert
3d3026a80c Report any error during import to the write context to allow for rollback 2018-05-29 16:23:38 +09:00
Dean Herbert
a3287b8cf2 Correctly rollback failed imports 2018-05-29 16:23:38 +09:00
Dean Herbert
bcb04f6168 Improve transaction handling flexibility 2018-05-29 16:23:27 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
b97c4e8b44 Fix all possible cases of crossthread import data races 2018-04-09 12:45:44 +09:00
smoogipoo
ffa712dccb Fix post-merge issues 2018-03-24 15:19:45 +09:00
Dean Herbert
9a20839b74
Merge branch 'master' into better-import-notice 2018-03-22 14:57:04 +09:00
smoogipoo
dc9fb84e25 Update progress with the current item, not the next item
In the case where there is no next item, the progress will not get updated, so we'll essentially skip one element from filling the progress bar further. In the future we may/will want to not hide the notification upon completion, so this will look better in such scenarios.
2018-03-22 14:46:25 +09:00
Dean Herbert
101caf3064 Apply same logic fixes to delete/restore all notifications 2018-03-22 11:28:40 +09:00
Dean Herbert
625e561fc8 Fix whitespace 2018-03-20 18:01:09 +09:00
Dean Herbert
f565cc861d Hard bail on attempting to import an invalid archive format 2018-03-19 20:41:12 +09:00
Dean Herbert
994c7bfabd Further improvements to messaging 2018-03-19 20:40:14 +09:00
Dean Herbert
18368d2446 Make import notifications fail when any imports fail 2018-03-19 20:18:23 +09:00
Dean Herbert
57e61b0b0e Update xmldoc 2018-02-19 14:50:42 +09:00
Dean Herbert
fa05822d7d Add missing licence headers 2018-02-15 16:33:33 +09:00
Dean Herbert
b9ef32b09b Further xmldoc and restoring of Cleanup method 2018-02-15 16:31:42 +09:00
Dean Herbert
a0a65abcac Crentalise all import logic 2018-02-15 14:22:39 +09:00
Dean Herbert
d3dd31dadb Make deletion and purging logic even more global 2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00