Added ability to move and rename files #36

dylanwulf · 2015-10-12T05:44:39Z

I added the ability to move and rename files using grive without needing to reupload or redownload. It works like this:
grive -m [--move] source destination
I thought it would be useful to people who often deal with large files or have slow internet connections. It should also be fairly simple to implement the ability to copy or move multiple files at once.

Conflicts: libgrive/src/drive2/Syncer2.cc

vitalif · 2015-10-12T14:25:24Z

libgrive/src/json/Val.hh

@@ -138,6 +138,7 @@ template <> struct Val::Type2Enum<double>		{ static const TypeEnum type = double
 template <> struct Val::Type2Enum<std::string>	{ static const TypeEnum type = string_type ; } ;
 template <> struct Val::Type2Enum<Val::Array>	{ static const TypeEnum type = array_type ; } ;
 template <> struct Val::Type2Enum<Val::Object>	{ static const TypeEnum type = object_type ; } ;
+template <> struct Val::Type2Enum<std::vector<std::string> >	{ static const TypeEnum type = string_list_type ; } ;


I don't like this thing... array of strings should be implemented via array Val of string Vals, like in json: [ str1, str2, ... ]

I did it this way because boost accepts program arguments with multiple values as a vector of strings, and I'm not quite sure how I could convert it to an array Val of string Vals

in fact I think it doesn't really matter because the proper place for move operation arguments is just in Drive::Move() function arguments :-) and it should also be simpler to implement :-)

Yeah, you're right. I'll change this

vitalif · 2015-10-12T14:51:49Z

Overall, thanks for this feature :-)
By the way, is it capable of moving directories?
I think the best way would be to try and detect renames automatically... but that's probably something that I will try to implement later.

dylanwulf · 2015-10-12T17:21:40Z

Yes, it works on directories just fine. I'm still learning C++, so the reason I did this was mostly to get more experience with it. Sorry for any noobish mistakes I made :[

dylanwulf · 2015-10-12T18:01:16Z

I think if you want to automatically detect moves and renames, you would have to store every file's hash in a file, so you would know which file was renamed/moved and where it came from. But that would get problematic if the user has two files with the exact same contents...

vitalif · 2015-10-12T19:09:11Z

Yes, it works on directories just fine. I'm still learning C++, so the reason I did this was mostly to get more experience with it. Sorry for any noobish mistakes I made :[

I'm also not a very big C++ guru so everything's ok =)

you would have to store every file's hash in a file

That's what I want to implement anyway, because grive currently scans all files in the working directory and calculates md5 hashes on every invocation, and it gets very slow if there are a lot of files. Grive definitely needs some sort of "index" (like the similar structure is called in git). File ctimes (inode change times) should also be stored there. That's how git tracks changes in the working directory: when file ctime is the same it knows file is unchanged, and when file size changes it knows the file is obviously modified. And only if ctime is changed, but the file size isn't, it checks the modification status by comparing the hash.

...Hm... In fact it's not necessary for rename detection to store hashes, because they're recalculated every time, i.e. they're already available at the moment of downloading/uploading to/from the server...

…t_type from Val, updated file move logic

dylanwulf · 2015-10-12T21:03:04Z

I made all the changes you suggested.
Also, I don't think renaming files changes the ctimes, not sure if that would be a problem.

vitalif · 2015-10-12T21:14:00Z

ctime is changed by the filesystem on every inode change - it's basically a non-fakeable mtime. :-) the only way to fake it is to change block device directly while it's unmounted. that's very useful for change tracking :)

dylanwulf · 2015-10-12T21:18:47Z

Ooh, I see. Does Google Drive have something similar, or does it only track mtime?

vitalif · 2015-10-12T21:32:15Z

I think server-side mtime is also non-fakeable.

dylanwulf · 2015-10-12T22:01:42Z

https://developers.google.com/drive/v2/reference/files/update
It accepts a parameter called "modifiedDateBehavior" which can be set to now, noChange, or any date from the request body. Also, local ctime changes when a file is moved or renamed, but server mtime does not change when a file is moved or renamed from the web UI.

vitalif · 2015-10-12T22:04:28Z

In fact I have some more comments on code:

There's some mess with indents and curly braces in Syncer2::Move()
It does not handle the case when the new parent is not yet synced with server
It segfaults when I run it with grive -p dir -m dir/from dir/to and does not work when I run it with grive -p dir -m from to
:)

vitalif · 2015-10-12T22:07:33Z

Ok, so it's possible to change server-side mtime ... but I see there's 'version' field for which the doc says "A monotonically increasing version number for the file. This reflects every change made to the file on the server, even those not visible to the requesting user."

dylanwulf · 2015-10-12T22:58:03Z

I'll work on fixing that. What's the difference between -p and -s options?

vitalif · 2015-10-12T23:05:13Z

-p specifies sync directory different from current working directory
-s select one subdir to sync
i.e. grive -p dir is similar to cd dir; grive

…path inputs

dylanwulf · 2015-10-14T03:42:58Z

Okay, should be all fixed now.

Fixed the indents and curly braces
I changed it so it always syncs before moving, to make sure everything is up to date. The move will check to make sure the source file and destination folder are up to date, and fail if they are not.
It should work with the -p option now, and move accepts both absolute paths and paths relative to current directory as valid arguments

…exist yet

vitalif · 2015-11-10T09:54:54Z

OK, I've just merged your code.
For cleaner version history I've squashed all your commits into a single commit with preserved authorship.
Thanks :)

dylanwulf · 2015-11-11T02:43:17Z

Thank you for all your helpful feedback :)

vitalif · 2016-01-03T13:03:21Z

Look at the latest commits, I've implemented automatic rename detection along with a local "index" structure :)

dylanwulf · 2016-01-11T07:51:34Z

Ah, very nice!

dylanwulf added 10 commits September 27, 2015 04:05

Adding methods to support renaming

18c4931

Now prefers title over original filename to support renaming

8e98249

Renaming no longer changes modified date on server

7e222b9

Merge branch 'master' of https://github.com/vitalif/grive2

bdc5afd

Conflicts: libgrive/src/drive2/Syncer2.cc

Changed rename to move

4409ad7

Added command line option and fixed errors

fe3c597

Merge branch 'master' of https://github.com/vitalif/grive2

a11d8c7

Changed success/failure message on file move

a1dc212

Added some logic for moving files

be8aa02

Just added some newlines, nothing to see here.

3c699d7

vitalif reviewed Oct 12, 2015
View reviewed changes

dylanwulf added 4 commits October 12, 2015 16:08

Changed Drive.Move() to accept paths as arguments, removed string_lis…

4a8cbc0

…t_type from Val, updated file move logic

Fixed indents

27ce2df

Fixed more indents

db9d11c

Couple more slight indent fixes

0f4b1d5

dylanwulf added 5 commits October 12, 2015 23:15

Fixed funky indents in Syncer2::Move()

3a85c76

Made move option compatible with -p option

540a825

Now always syncs before moving files.

8cbc57b

Extra logic to prevent crashing

c41072c

Converts paths to canonical paths, which makes it work with relative …

a592721

…path inputs

dylanwulf added 2 commits October 14, 2015 03:47

Added case when source and destination are equal

83b730b

Stopped fs::canonical() from complaining about new_p when it doesn't …

93d44c5

…exist yet

vitalif closed this Nov 10, 2015

CryptoSiD mentioned this pull request May 16, 2019

Grive not working on ubuntu 19.04 #272

Open

caputchinefrobles mentioned this pull request Dec 5, 2019

2nd JSON parser exception after refreshing token #293

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added ability to move and rename files #36

Added ability to move and rename files #36

dylanwulf commented Oct 12, 2015

vitalif Oct 12, 2015

dylanwulf Oct 12, 2015

vitalif Oct 12, 2015

dylanwulf Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 14, 2015

vitalif commented Nov 10, 2015

dylanwulf commented Nov 11, 2015

vitalif commented Jan 3, 2016

dylanwulf commented Jan 11, 2016

Added ability to move and rename files #36

Added ability to move and rename files #36

Conversation

dylanwulf commented Oct 12, 2015

vitalif Oct 12, 2015

Choose a reason for hiding this comment

dylanwulf Oct 12, 2015

Choose a reason for hiding this comment

vitalif Oct 12, 2015

Choose a reason for hiding this comment

dylanwulf Oct 12, 2015

Choose a reason for hiding this comment

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 12, 2015

vitalif commented Oct 12, 2015

dylanwulf commented Oct 14, 2015

vitalif commented Nov 10, 2015

dylanwulf commented Nov 11, 2015

vitalif commented Jan 3, 2016

dylanwulf commented Jan 11, 2016