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

NXDRIVE-2844: Nuxeo Drive transfer failed after removing hardware (Sourcery refactored) #4024

Conversation

sourcery-ai[bot]
Copy link
Contributor

@sourcery-ai sourcery-ai bot commented Jul 13, 2023

Pull Request #4023 refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the wip-NXDRIVE-2844-Nuxeo-Drive-transfer-failed-after-removing-hardware branch, then run:

git fetch origin sourcery/wip-NXDRIVE-2844-Nuxeo-Drive-transfer-failed-after-removing-hardware
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

@sourcery-ai sourcery-ai bot requested a review from gitofanindya July 13, 2023 11:11
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.


Sourcery AI seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@codecov
Copy link

codecov bot commented Jul 13, 2023

Codecov Report

Patch coverage: 20.00% and project coverage change: -0.01% ⚠️

Comparison is base (b3a1039) 47.23% compared to head (acfa69a) 47.23%.

Additional details and impacted files
@@                                           Coverage Diff                                            @@
##           wip-NXDRIVE-2844-Nuxeo-Drive-transfer-failed-after-removing-hardware    #4024      +/-   ##
========================================================================================================
- Coverage                                                                 47.23%   47.23%   -0.01%     
========================================================================================================
  Files                                                                        93       93              
  Lines                                                                     15645    15638       -7     
========================================================================================================
- Hits                                                                       7390     7386       -4     
+ Misses                                                                     8255     8252       -3     
Flag Coverage Δ
functional 37.80% <10.00%> (+<0.01%) ⬆️
integration 1.98% <0.00%> (+<0.01%) ⬆️
unit 35.72% <10.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
nxdrive/engine/processor.py 10.94% <11.11%> (-0.17%) ⬇️
nxdrive/tracing.py 64.00% <100.00%> (-2.67%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sourcery-ai sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2844-Nuxeo-Drive-transfer-failed-after-removing-hardware branch 5 times, most recently from f741570 to 86d2d68 Compare July 26, 2023 04:23
@sourcery-ai sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2844-Nuxeo-Drive-transfer-failed-after-removing-hardware branch 3 times, most recently from 0e098df to 365477b Compare July 26, 2023 07:53
@sourcery-ai sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2844-Nuxeo-Drive-transfer-failed-after-removing-hardware branch from 365477b to acfa69a Compare July 26, 2023 10:28
if should_ignore(event):
# The event will not be sent if None is returned
return None

return event
return None if should_ignore(event) else event
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Function before_send refactored with the following changes:

This removes the following comments ( why? ):

# The event will not be sent if None is returned

state = self.dao.get_state_from_id(item.id)
if state:
if state := self.dao.get_state_from_id(item.id):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Function Processor._get_next_doc_pair refactored with the following changes:

Comment on lines -463 to +462
self.dao.remove_filter(
doc_pair.remote_parent_path + "/" + doc_pair.remote_ref
)
self.dao.remove_filter(f"{doc_pair.remote_parent_path}/{doc_pair.remote_ref}")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Function Processor._execute refactored with the following changes:

Comment on lines -565 to +563
if WINDOWS:
path = doc_pair.local_path
else:
# The path retrieved from the database will have its starting slash trimmed, restore it
path = Path(f"/{doc_pair.local_path}")

path = doc_pair.local_path if WINDOWS else Path(f"/{doc_pair.local_path}")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Function Processor._synchronize_direct_transfer refactored with the following changes:

This removes the following comments ( why? ):

# The path retrieved from the database will have its starting slash trimmed, restore it

Comment on lines -618 to +611
# Update session then handle the status
session = self.dao.get_session(doc_pair.session)
if session:
if session := self.dao.get_session(doc_pair.session):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Function Processor._direct_transfer_end refactored with the following changes:

This removes the following comments ( why? ):

# Update session then handle the status

Comment on lines -659 to +650
modified = self.dao.get_state_from_local(doc_pair.local_path)
if modified:
if modified := self.dao.get_state_from_local(doc_pair.local_path):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Function Processor._synchronize_if_not_remotely_dirty refactored with the following changes:

@gitofanindya gitofanindya deleted the branch wip-NXDRIVE-2844-Nuxeo-Drive-transfer-failed-after-removing-hardware July 27, 2023 05:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants