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

Fix TUS progress reporting #9437

Merged
merged 3 commits into from
Feb 11, 2022
Merged

Fix TUS progress reporting #9437

merged 3 commits into from
Feb 11, 2022

Conversation

TheOneRing
Copy link
Member

Fixes: #9121

@TheOneRing TheOneRing added this to the 2.10.1 milestone Feb 11, 2022
@TheOneRing TheOneRing requested a review from a team February 11, 2022 09:46
fmoc
fmoc reviewed Feb 11, 2022
View reviewed changes
Copy link
Contributor

@fmoc fmoc left a comment

Choose a reason for hiding this comment

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

I wonder which of these changes actually fixed the issue. Do you have to start the job before connecting signals?

changelog/unreleased/9121 Outdated Show resolved Hide resolved
@TheOneRing
Copy link
Member Author

I wonder which of these changes actually fixed the issue. Do you have to start the job before connecting signals?

I need to start the job in order to have a reply ready....

@TheOneRing
Copy link
Member Author

I wonder which of these changes actually fixed the issue. Do you have to start the job before connecting signals?

I need to start the job in order to have a reply ready....

Thinking about it, this is still wrong if the job gets restarted.... :sigh:

@TheOneRing
Copy link
Member Author

AAAAA thats wrong all over the place...

@TheOneRing
Copy link
Member Author

Please check whether I overlooked one
git grep "connect.*reply"

@TheOneRing TheOneRing requested review from fmoc, a team and dragotin February 11, 2022 11:41
@TheOneRing
Ensure we connect to an existing object
26b0abc 
12-13 13:35:17:462 [ warning default ]: QObject::connect(QNetworkReply, OCC::UploadDevice): invalid null parameter
12-13 13:35:17:462 [ warning default ]: QObject::connect(QNetworkReply, OCC::PropagateUploadFileTUS): invalid null parameter

Fixes: #9121
@TheOneRing
Ocis nowadays reports the permissions
3bba001
@TheOneRing
Fix connects on replies
1b2857a
fmoc
fmoc approved these changes Feb 11, 2022
View reviewed changes
src/libsync/networkjobs.h
@@ -427,16 +430,22 @@ class OWNCLOUDSYNC_EXPORT SimpleNetworkJob : public AbstractNetworkJob

void start() override;

void addNewReplyHook(std::function<void(QNetworkReply *)> &&hook);
Copy link
Contributor

Choose a reason for hiding this comment

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

Might use a typedef here, DRY.

@TheOneRing TheOneRing merged commit ec4e206 into 2.10 Feb 11, 2022
@delete-merged-branch delete-merged-branch bot deleted the work/tus branch February 11, 2022 15:01
@sonarcloud
Copy link

sonarcloud bot commented Feb 11, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@TheOneRing TheOneRing mentioned this pull request Mar 10, 2022
Closed
55 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erikjv erikjv erikjv approved these changes

@fmoc fmoc fmoc approved these changes

@dragotin dragotin Awaiting requested review from dragotin

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

Successfully merging this pull request may close these issues.
3 participants
@TheOneRing @erikjv @fmoc