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 file upload fallback #2603

Merged
merged 4 commits into from
Jan 25, 2024
Merged

Fix file upload fallback #2603

merged 4 commits into from
Jan 25, 2024

Conversation

JC-comp
Copy link

@JC-comp JC-comp commented Jan 22, 2024

Regarding #2527 (#2595), when moving the new file upload to be treated as a modified item, it should not be handled inside the created parallel thread. Changed it to upload after all new files are done uploading.

Changes

  • Move uploading changed items after all new files are done uploading
  • Increase log level of number of items to upload
  • Suppress integrity check warning if the item is marked as changed item

@abraunegg
Copy link
Owner

@JC-comp
1009d28 is adding odd line breaks into the application output:

Sync with Microsoft OneDrive is complete
Successfully created the remote directory ./random_data on Microsoft OneDrive
Successfully created the remote directory ./random_data/random_files on Microsoft OneDrive
Successfully created the remote directory ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112 on Microsoft OneDrive
Successfully created the remote directory ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN on Microsoft OneDrive
Successfully created the remote directory ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5 on Microsoft OneDrive
Successfully created the remote directory ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1 on Microsoft OneDrive
Successfully created the remote directory ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ on Microsoft OneDrive

New items to upload to OneDrive: 50
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file2.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file7.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file5.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file0.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file2.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file3.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file5.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file4.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file6.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file0.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file4.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file9.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file8.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file3.data ... done.
Uploading new file ./random_data/random_files/cNFYji3n1ZMUGMhHjT70SabzetN74112/file1.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file1.data ... done.
Uploading: ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file4.data ... 0%   |  ETA    --:--:--
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file5.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file9.data ... done.
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file2.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file6.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file1.data ... done.
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file7.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file8.data ... done.
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file1.data ... done.
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file6.data ... done.
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file3.data ... done.
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file9.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file0.data ... done.
Uploading: ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file4.data ... 100% | DONE in 00:00:04
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file4.data ... done.
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file8.data ... done.
Uploading new file ./random_data/random_files/R0jA9qhKAvxh07KaGPmOfvbZmqbSJ7oN/file7.data ... done.
Uploading new file ./random_data/random_files/AqJ4VAXkD5Yn5EFoFuFkNJHBYamKXUH5/file0.data ... done.
Uploading: ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file3.data ... 0%   |  ETA    --:--:--
Uploading: ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file0.data ... 0%   |  ETA    --:--:--
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file9.data ... done.
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file4.data ... done.
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file6.data ... done.
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file5.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file8.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file6.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file7.data ... done.
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file2.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file2.data ... done.
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file7.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file5.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file3.data ... done.
Uploading: ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file0.data ... 100% | DONE in 00:00:07
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file0.data ... done.
Uploading new file ./random_data/random_files/k9kru8EEpeXqjhP6UNrgWBUx2S0YcSu1/file4.data ... done.
Uploading: ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file3.data ... 100% | DONE in 00:00:07
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file3.data ... done.
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file1.data ... done.
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file8.data ... done.
Uploading new file ./random_data/random_files/SyHL9uDKHYeVfAqnvLhzH604JSpToRhQ/file9.data ... done.


Successfully created the remote directory random_data/random_images on Microsoft OneDrive
Successfully created the remote directory random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8 on Microsoft OneDrive
Successfully created the remote directory random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur on Microsoft OneDrive
Successfully created the remote directory random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg on Microsoft OneDrive
Successfully created the remote directory random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK on Microsoft OneDrive
Successfully created the remote directory random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH on Microsoft OneDrive

New items to upload to OneDrive: 50
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image3.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image0.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image2.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image1.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image1.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image4.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image3.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image0.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image6.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image5.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image8.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image5.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image9.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image2.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image4.png ... done.
Uploading new file random_data/random_images/NHcso6zQDdZcwaXThywWkrJDOE4FFdp8/image7.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image8.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image5.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image9.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image7.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image6.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image2.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image1.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image0.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image3.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image4.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image9.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image6.png ... done.
Uploading new file random_data/random_images/TDVJVOFaUPyjv29fLS7N4Z3vkdVosbXg/image0.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image1.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image7.png ... done.
Uploading new file random_data/random_images/VHAcWYUKHn7mGLkce9FOIIUMqSQnfAur/image8.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image9.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image7.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image2.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image6.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image5.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image2.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image5.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image3.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image1.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image6.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image7.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image8.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image3.png ... done.
Uploading new file random_data/random_images/4BiZmi25R0RZpWMEHs8oEkPblfxVwAOK/image4.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image4.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image0.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image9.png ... done.
Uploading new file random_data/random_images/PU3avAZNskpHGI11pIOi7FTRqBmb15WH/image8.png ... done.

Please remove this commit from this PR and use a new PR for this different change please

@JC-comp
Copy link
Author

JC-comp commented Jan 23, 2024

1009d28 removed

@abraunegg
Copy link
Owner

@JC-comp
This now conflicts with 'alpha-5' - please can you rebase / fix this PR

@JC-comp
Copy link
Author

JC-comp commented Jan 24, 2024

PR fixed

@abraunegg abraunegg merged commit 8094d86 into abraunegg:onedrive-v2.5.0-alpha-5 Jan 25, 2024
@JC-comp JC-comp deleted the hotfix branch January 25, 2024 02:26
@JC-comp JC-comp restored the hotfix branch January 28, 2024 05:46
@abraunegg
Copy link
Owner

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

Repository owner locked and limited conversation to collaborators Feb 5, 2024
@abraunegg abraunegg added this to the v2.5.0 milestone Feb 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.5.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@JC-comp @abraunegg