Added support to undo & redo file operations #2358

d2dyno1 · 2020-11-16T12:37:34Z

This PR features complete Undo, Redo functionality. This PR is compatible with newest commit without merge issues. Please be aware that there still might be some bugs out there that sild in unnoticed.

Resolves #1975
Closes #2250

This PR contains complete Undo, Redo functionallity. This PR is compatible with newest commit without merge issues. Please be aware that there still might be some bugs out there that sild in unnoticed.

Had this commented out because it wouldn't let me compile

d2dyno1 · 2020-11-16T12:42:08Z

The PR is Ready to be reviewed

Files/Filesystem/StorageHistory/Helpers/StorageHistoryHelpers.cs

gave92

Hi @d2dyno1 this is coming along nicely!

Some testing resulted in the following issues:

crash deleting from recycle bin
2020-11-16 23:37:51.9637|ERROR|Files.App|Accesso negato. (Exception from HRESULT: 0x80070005 (E_ACCESSDENIED))|System.UnauthorizedAccessException: Accesso negato. (Exception from HRESULT: 0x80070005 (E_ACCESSDENIED))
at Files.Helpers.StorageItemHelpers.ToStorageItemCollection(IEnumerable`1 listedItems)
at Files.Views.Pages.ModernShellPage.KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
at System.Threading.WinRTSynchronizationContextBase.Invoker.InvokeCore()
crash on drag and drop after hovering on a folder (and so navigating to it)
2020-11-16 23:39:21.3476|ERROR|Files.App|Object reference not set to an instance of an object.|System.NullReferenceException: Object reference not set to an instance of an object.
at Files.Filesystem.FilesystemHelpers.MoveItemAsync(IStorageItem source, String destination, Boolean registerHistory)
at Files.Filesystem.FilesystemHelpers.MoveItemsFromClipboard(DataPackageView packageView, String destination, Boolean registerHistory)
at Files.Filesystem.FilesystemHelpers.PerformOperationTypeAsync(DataPackageOperation operation, DataPackageView packageView, String destination, Boolean registerHistory)
at Files.BaseLayout.List_Drop(Object sender, DragEventArgs e)
at System.Threading.WinRTSynchronizationContextBase.Invoker.InvokeCore()
cltr-x copies instead of cutting
cannot copy paste shortcut (.lnk) files
crash pasting file to windows folder
2020-11-16 23:46:15.5820|ERROR|Files.App|Object reference not set to an instance of an object.|System.NullReferenceException: Object reference not set to an instance of an object.
at Files.Filesystem.FilesystemOperations.CopyAsync(IStorageItem source, String destination, IProgress1 progress, IProgress1 errorCode, CancellationToken cancellationToken)
at Files.Filesystem.FilesystemHelpers.CopyItemAsync(IStorageItem source, String destination, Boolean registerHistory)
at Files.Filesystem.FilesystemHelpers.CopyItemsFromClipboard(DataPackageView packageView, String destination, Boolean registerHistory)
at Files.Filesystem.FilesystemHelpers.PerformOperationTypeAsync(DataPackageOperation operation, DataPackageView packageView, String destination, Boolean registerHistory)
at Files.Interacts.Interaction.PasteItem()
at System.Threading.WinRTSynchronizationContextBase.Invoker.InvokeCore()
does not copy files to usb connected android phone anymore
crash when (this is difficult XD):

copypaste a file to its same folder
rename new file to something else
ctrlz
ctrlz
ctrly
2020-11-16 23:35:48.9522|ERROR|Files.App|Impossibile trovare il file specificato. (Exception from HRESULT: 0x80070002)|System.IO.FileNotFoundException: Impossibile trovare il file specificato. (Exception from HRESULT: 0x80070002)
at Files.Helpers.StorageItemHelpers.ToStorageItem(String path)
at Files.Filesystem.FilesystemHistory.StorageHistoryOperations.Redo(IStorageHistory history)
at Files.Filesystem.FilesystemHistory.StorageHistoryHelpers.Redo()
at Files.Views.Pages.ModernShellPage.KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
at System.Threading.WinRTSynchronizationContextBase.Invoker.InvokeCore()

Files/Filesystem/FilesystemOperations/FilesystemOperations.cs

Files/BaseLayout.cs

Files/DataModels/Status.cs

Files/Helpers/Convert/StorageItemHelpers.cs

d2dyno1 · 2020-11-16T23:03:09Z

Looks like I'll be busy...

d2dyno1 · 2020-11-16T23:11:20Z

crash when (this is difficult XD):

copypaste a file to its same folder

rename new file to something else

ctrlz

ctrlz

ctrly

Are you trying to cast spells with this combination? 😆

d2dyno1 · 2020-11-17T07:35:33Z

Delete dialog now works correctly. Files no longer crash when deleting from Recycle Bin. CTRL+X now moves items instead copying. Renamed Status enum to ReturnResult. Added SafeStorageItemHelpers class. Utilized FilesystemTasks on both StorageItemHelpers and SafeStorageItemHelpers

d2dyno1 · 2020-11-17T16:32:03Z

@gave92 Hmmm... It doesn't seem to crash for me

crash pasting file to windows folder

gave92 · 2020-11-17T16:34:44Z

@d2dyno1 I'll check again 👍

gave92 · 2020-11-17T18:34:07Z

Thanks for your work on this, I can confirm that many issues have been resolved.

From testing the updated PR:

crash pasting file to windows folder
-> I can confirm this, pasting to "C:\Program Files (x86)" does the same
witchcraft combination
copypaste a file to its same folder
rename new file to something else
ctrlz
ctrlz
ctrly
-> no crash anymore but the "ctrly" does nothing (should redo copy-paste) -> fixed!
quickly pressing ctrlz + ctrly often results in a crash
copypaste file
quickly press ctrlz and ctrly
2020-11-17 19:29:54.0065|ERROR|Files.App|Object reference not set to an instance of an object.|System.NullReferenceException: Object reference not set to an instance of an object.
at Files.Filesystem.FilesystemOperations.DeleteAsync(IStorageItem source, IProgress1 progress, IProgress1 errorCode, Boolean permanently, CancellationToken cancellationToken)
at Files.Filesystem.FilesystemHistory.StorageHistoryOperations.Redo(IStorageHistory history)
at Files.Filesystem.FilesystemHistory.StorageHistoryHelpers.Redo()
at Files.Views.Pages.ModernShellPage.KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
at System.Threading.WinRTSynchronizationContextBase.Invoker.InvokeCore()

Files/Controllers/TerminalController.cs

Code optimizations + I've created a little problem for myself in a StorageItemHelpers.ToStorageItem

Files/Filesystem/StorageFileHelpers/IStorageItemWithPath.cs

Files/Helpers/Convert/StorageItemHelpers.cs

Files/Filesystem/FilesystemOperations/FilesystemOperations.cs

Fixed Delete!!!!!!!!!!!!!!!!!!!

d2dyno1 · 2020-11-18T14:24:40Z

Ok, I got around my issue, but it'd be way cleaner if IStorageItemWithPath implemented IStorageItem
(We could then override the Path property)

gave92 · 2020-11-18T17:50:21Z

@d2dyno1 glad you solved it. But making IStorageItemWithPath implement IStorageItem is something that we can totally consider.

Changed private member names to camelCase

Resolved build error, fixed witchcraft combination. Added even more null checks

Files/Filesystem/StorageHistory/Helpers/StorageHistoryHelpers.cs

Files/Interacts/Interaction.cs

d2dyno1 · 2020-11-23T12:07:21Z

50th comment!

Files/Filesystem/StorageFileHelpers/FilesystemResult.cs

Files/Helpers/Convert/ErrorCodeConverter.cs

Files/Extensions/EnumerableExtensions.cs

Files/Extensions/EnumExtensions.cs

Files/Extensions/LinqExtensions.cs

d2dyno1 · 2020-11-23T22:10:48Z

👍

tsvietOK · 2020-11-24T16:24:05Z

@d2dyno1
Steps:

Create bitmap with any name.
Press F5.
Try to rename this file

For me it shows:

tsvietOK · 2020-11-24T16:46:42Z

@d2dyno1 By the way, when renaming item several times and trying doing undo several times, it reverts only last change.

tsvietOK · 2020-11-24T16:50:17Z

@d2dyno1 Steps:

Create folder and place file in this folder.
Remove this folder to recycle bin.
Press Ctrl+Z.
It restore only folder without file inside.

Fixed an issue where, restoring a folder that contained items within in, would not restore the items. Rewritten the App.StorageHistoryIndex (once again)

d2dyno1 · 2020-11-25T00:05:56Z

@tsvietOK Everything should be working now

Files/App.xaml.cs

Resolved

d2dyno1 · 2020-11-27T19:04:18Z

I'd like to thank everyone who helped me with this PR. Without you, this PR wouldn't be as it is now!

Thanks,
@gave92 @tsvietOK @yaichenbaum @duke7553

d2dyno1 added 2 commits November 16, 2020 13:36

Implement Undo, Redo

518c4ed

This PR contains complete Undo, Redo functionallity. This PR is compatible with newest commit without merge issues. Please be aware that there still might be some bugs out there that sild in unnoticed.

Reenable TerminalController.Init

fbecac7

Had this commented out because it wouldn't let me compile

CodeFactor

f072d88

yaira2 requested review from gave92 and tsvietOK November 16, 2020 15:02

yaira2 reviewed Nov 16, 2020

View reviewed changes

Files/Filesystem/StorageHistory/Helpers/StorageHistoryHelpers.cs Outdated Show resolved Hide resolved

gave92 previously requested changes Nov 16, 2020

View reviewed changes

Small Optimisations

b303f0f

yaira2 reviewed Nov 17, 2020

View reviewed changes

Files/Controllers/TerminalController.cs Outdated Show resolved Hide resolved

Update2 (Read description for more information)

78c5ac2

Code optimizations + I've created a little problem for myself in a StorageItemHelpers.ToStorageItem

d2dyno1 commented Nov 17, 2020

View reviewed changes

Files/Filesystem/StorageFileHelpers/IStorageItemWithPath.cs Show resolved Hide resolved

d2dyno1 commented Nov 17, 2020

View reviewed changes

Files/Helpers/Convert/StorageItemHelpers.cs Outdated Show resolved Hide resolved

d2dyno1 commented Nov 18, 2020

View reviewed changes

Files/Filesystem/FilesystemOperations/FilesystemOperations.cs Outdated Show resolved Hide resolved

d2dyno1 mentioned this pull request Nov 18, 2020

MVVM #2341

Closed

Update2

8dc93f9

Fixed Delete!!!!!!!!!!!!!!!!!!!

Added Null Checks

36d4599

d2dyno1 added 4 commits November 19, 2020 19:42

Code naming fixes

b05f1ca

Changed private member names to camelCase

Fixed couple issues + build error (read description)

d6a9878

Resolved build error, fixed witchcraft combination. Added even more null checks

Fixed Copying/Moving .lnk Files

a9bb74e

Code optimizations

cd20fa0

tsvietOK suggested changes Nov 22, 2020

View reviewed changes

Improved Codestyle

6613dc7

d2dyno1 requested a review from tsvietOK November 23, 2020 18:52

tsvietOK added 2 commits November 23, 2020 21:08

Move enums to Enums folder

0d5d124

Code align

3a05769

tsvietOK previously requested changes Nov 23, 2020

View reviewed changes

d2dyno1 added 2 commits November 23, 2020 23:06

Removed unnecessary code

2d04b1a

Update Repo

f5aa01e

d2dyno1 added 2 commits November 24, 2020 22:24

Fixes (read description)

2bdd9a4

Fixed an issue where, restoring a folder that contained items within in, would not restore the items. Rewritten the App.StorageHistoryIndex (once again)

Fix compilation error

afc6e87

d2dyno1 requested a review from tsvietOK November 26, 2020 22:22

yaira2 reviewed Nov 27, 2020

View reviewed changes

Files/App.xaml.cs Outdated Show resolved Hide resolved

yaira2 previously approved these changes Nov 27, 2020

View reviewed changes

yaira2 requested a review from lukeblevins November 27, 2020 15:08

Created a wrapper class for storage history list

7123af5

d2dyno1 dismissed yaira2’s stale review via 7123af5 November 27, 2020 16:22

yaira2 previously approved these changes Nov 27, 2020

View reviewed changes

Fixed an issue where folders wouldn't be copied

eec5a68

d2dyno1 dismissed yaira2’s stale review via eec5a68 November 27, 2020 17:52

lukeblevins approved these changes Nov 27, 2020

View reviewed changes

yaira2 merged commit b5d151e into files-community:master Nov 27, 2020

Uh oh!

Added support to undo & redo file operations #2358

Added support to undo & redo file operations #2358

Uh oh!

Conversation

d2dyno1 commented Nov 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

d2dyno1 commented Nov 16, 2020

Uh oh!

Uh oh!

gave92 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

d2dyno1 commented Nov 16, 2020

Uh oh!

d2dyno1 commented Nov 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

d2dyno1 commented Nov 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

d2dyno1 commented Nov 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gave92 commented Nov 17, 2020

Uh oh!

gave92 commented Nov 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

d2dyno1 commented Nov 18, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gave92 commented Nov 18, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

d2dyno1 commented Nov 23, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

d2dyno1 commented Nov 23, 2020

Uh oh!

tsvietOK commented Nov 24, 2020

Uh oh!

tsvietOK commented Nov 24, 2020

Uh oh!

tsvietOK commented Nov 24, 2020

Uh oh!

d2dyno1 commented Nov 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

d2dyno1 commented Nov 27, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

d2dyno1 commented Nov 16, 2020 •

edited

Loading

d2dyno1 commented Nov 16, 2020 •

edited

Loading

d2dyno1 commented Nov 17, 2020 •

edited

Loading

d2dyno1 commented Nov 17, 2020 •

edited

Loading

gave92 commented Nov 17, 2020 •

edited

Loading

d2dyno1 commented Nov 18, 2020 •

edited

Loading

d2dyno1 commented Nov 25, 2020 •

edited

Loading

d2dyno1 commented Nov 27, 2020 •

edited

Loading