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

Skip import of current calendar on error #31690

Merged
merged 2 commits into from
Mar 30, 2022
Merged

Skip import of current calendar on error #31690

merged 2 commits into from
Mar 30, 2022

Conversation

Pytal
Copy link
Member

@Pytal Pytal commented Mar 24, 2022 •
edited
Loading

Skip importing current calendar on error by throwing to stop continued calendar object imports in the foreach loops and move onto import of next calendar

@Pytal Pytal added bug 3. to review Waiting for reviews feature: dav feature: caldav Related to CalDAV internals feature: user migration Related to User migration labels Mar 24, 2022
@Pytal Pytal added this to the Nextcloud 24 milestone Mar 24, 2022
@Pytal Pytal requested review from come-nc and a team March 24, 2022 02:41
@Pytal Pytal self-assigned this Mar 24, 2022
@Pytal Pytal requested review from icewind1991 and blizzz and removed request for a team March 24, 2022 02:41
@Pytal Pytal force-pushed the fix/throw-import-calendar-error branch 2 times, most recently from 3545c27 to 9dfa58b Compare March 24, 2022 02:54
@Pytal Pytal changed the title Throw to stop execution on calendar import error Skip import of current calendar on error Mar 24, 2022
come-nc
come-nc reviewed Mar 24, 2022
View reviewed changes
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not clear to me what this PR does.

apps/dav/lib/UserMigration/CalendarMigrator.php Outdated Show resolved Hide resolved
@skjnldsv skjnldsv mentioned this pull request Mar 24, 2022
Merged
@Pytal Pytal force-pushed the fix/throw-import-calendar-error branch 2 times, most recently from f035cb4 to c68899d Compare March 25, 2022 04:21
@Pytal Pytal requested a review from come-nc March 25, 2022 04:22
@Pytal Pytal force-pushed the fix/throw-import-calendar-error branch 2 times, most recently from 2989d0f to 39a5f77 Compare March 28, 2022 18:45
@Pytal Pytal requested a review from artonge March 29, 2022 00:25
come-nc
come-nc approved these changes Mar 29, 2022
View reviewed changes
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Appart from verbose output question, fine by me.

@Pytal Pytal mentioned this pull request Mar 29, 2022
Closed
@Pytal
Skip import of current calendar on error
e4f1d41 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal
Show filename in output message
cdb93e7 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal Pytal force-pushed the fix/throw-import-calendar-error branch from 39a5f77 to cdb93e7 Compare March 29, 2022 23:13
@Pytal
Copy link
Member Author

Pytal commented Mar 29, 2022

Appart from verbose output question, fine by me.

Tracking here nextcloud/user_migration#68

@Pytal Pytal added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 30, 2022
@Pytal Pytal merged commit c57a001 into master Mar 30, 2022
@Pytal Pytal deleted the fix/throw-import-calendar-error branch March 30, 2022 00:06
@blizzz blizzz mentioned this pull request Mar 31, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artonge artonge artonge left review comments

@tcitworld tcitworld tcitworld approved these changes

@come-nc come-nc come-nc approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@blizzz blizzz Awaiting requested review from blizzz

Assignees

@Pytal Pytal

Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: caldav Related to CalDAV internals feature: dav feature: user migration Related to User migration
Projects
None yet
Milestone
Nextcloud 24
Development

Successfully merging this pull request may close these issues.
4 participants
@Pytal @tcitworld @artonge @come-nc