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.

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

Bugfix/30078 #30113

Merged
merged 2 commits into from
Jan 16, 2018
Merged

Bugfix/30078 #30113

merged 2 commits into from
Jan 16, 2018

Conversation

DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Jan 12, 2018

Description

Outside of the CardDAV collection we shall not change the file content.

In addition:

  • also only load calendar plugins when inside the calendar collection
  • fix avatar output - jpg was putput for png as well

Related Issue

fixes #30078

How Has This Been Tested?

  • manual testing
  • unit tests added for avatar

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍 code looks good

@@ -117,7 +125,7 @@ public function __construct(IRequest $request, $baseUri) {
// with performance and locking issues because it will query
// every parent node which might trigger an implicit rescan in the
// case of external storages with update detection
if (strpos($this->server->getRequestUri(), 'files/') !== 0) {
if (!$this->requestIsForSubtree('files')) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd have gone with isRequestForSubtree as starting method name with is is some kind of convention.
Optional, up to you.

@DeepDiver1975
Copy link
Member Author

again mariadb timout - :godmode: :damn:

@codecov
Copy link

codecov bot commented Jan 12, 2018

Codecov Report

Merging #30113 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #30113      +/-   ##
============================================
- Coverage     58.24%   58.22%   -0.03%     
- Complexity    18525    18528       +3     
============================================
  Files          1094     1094              
  Lines         63739    63749      +10     
============================================
- Hits          37126    37118       -8     
- Misses        26613    26631      +18
Impacted Files Coverage Δ Complexity Δ
drone/src/apps/dav/lib/CardDAV/Plugin.php 0% <0%> (-15%) 8% <0%> (ø)
drone/src/apps/dav/lib/Server.php 39.84% <0%> (-9.34%) 15% <0%> (+3%)
drone/src/apps/dav/lib/DAV/Sharing/Plugin.php 63.41% <0%> (-4.88%) 14% <0%> (ø)
...c/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php 61.11% <0%> (-3.71%) 18% <0%> (ø)
drone/src/apps/dav/lib/CalDAV/Plugin.php 0% <0%> (ø) 2% <0%> (ø) ⬇️
drone/src/apps/dav/lib/CalDAV/Schedule/Plugin.php 0% <0%> (ø) 2% <0%> (ø) ⬇️
drone/src/apps/dav/lib/Avatars/AvatarNode.php 72% <0%> (+32%) 9% <0%> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7c5f87c...74b2998. Read the comment docs.

@DeepDiver1975 DeepDiver1975 merged commit adf61da into master Jan 16, 2018
@DeepDiver1975 DeepDiver1975 deleted the bugfix/30078 branch January 16, 2018 07:38
@DeepDiver1975 DeepDiver1975 mentioned this pull request Jan 16, 2018
9 tasks
@lock
Copy link

lock bot commented Aug 1, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 1, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Malformed vCard downloads trough the new webDAV endpoint result in a server error
4 participants