Added ability to move and rename files

grive/src/main.cc

@@ -78,19 +78,19 @@ void InitLog( const po::variables_map& vm )
 		file_log->Enable( log::warning ) ;
 		file_log->Enable( log::error ) ;
 		file_log->Enable( log::critical ) ;
-		
+
 		// log grive version to log file
 		file_log->Log( log::Fmt("grive version " VERSION " " __DATE__ " " __TIME__), log::verbose ) ;
 		file_log->Log( log::Fmt("current time: %1%") % DateTime::Now(), log::verbose ) ;
-		
+
 		comp_log->Add( file_log ) ;
 	}
-	
+
 	if ( vm.count( "verbose" ) )
 	{
 		console_log->Enable( log::verbose ) ;
 	}
-	
+
 	if ( vm.count( "debug" ) )
 	{
 		console_log->Enable( log::verbose ) ;
@@ -102,7 +102,7 @@ void InitLog( const po::variables_map& vm )
 int Main( int argc, char **argv )
 {
 	InitGCrypt() ;
-	
+
 	// construct the program options
 	po::options_description desc( "Grive options" );
 	desc.add_options()
@@ -121,12 +121,13 @@ int Main( int argc, char **argv )
 		( "dry-run",	"Only detect which files need to be uploaded/downloaded, "
 						"without actually performing them." )
 		( "ignore",		po::value<std::string>(), "Ignore files relative paths of which match this Perl RegExp." )
+    ( "move,m", po::value<std::vector<std::string> >()->multitoken(), "Moves or renames a file without reuploading or redownloading." )
 	;
-	
+
 	po::variables_map vm;
 	po::store(po::parse_command_line( argc, argv, desc), vm );
 	po::notify(vm);
-	
+
 	// simple commands that doesn't require log or config
 	if ( vm.count("help") )
 	{
@@ -142,9 +143,9 @@ int Main( int argc, char **argv )
 
 	// initialize logging
 	InitLog(vm) ;
-	
+
 	Config config(vm) ;
-	
+
 	Log( "config file name %1%", config.Filename(), log::verbose );
 
 	std::auto_ptr<http::Agent> http( new http::CurlAgent );
@@ -154,26 +155,26 @@ int Main( int argc, char **argv )
 	if ( vm.count( "auth" ) )
 	{
 		OAuth2 token( http.get(), client_id, client_secret ) ;
-		
+
 		std::cout
 			<< "-----------------------\n"
 			<< "Please go to this URL and get an authentication code:\n\n"
 			<< token.MakeAuthURL()
 			<< std::endl ;
-		
+
 		std::cout
 			<< "\n-----------------------\n"
 			<< "Please input the authentication code here: " << std::endl ;
 		std::string code ;
 		std::cin >> code ;
-		
+
 		token.Auth( code ) ;
-		
+
 		// save to config
 		config.Set( "refresh_token", Val( token.RefreshToken() ) ) ;
 		config.Save() ;
 	}
-	
+
 	std::string refresh_token ;
 	try
 	{
@@ -185,25 +186,32 @@ int Main( int argc, char **argv )
 			"Please run grive with the \"-a\" option if this is the "
 			"first time you're accessing your Google Drive!",
 			log::critical ) ;
-		
+
 		return -1;
 	}
-	
+
 	OAuth2 token( http.get(), refresh_token, client_id, client_secret ) ;
 	AuthAgent agent( token, http.get() ) ;
 	v2::Syncer2 syncer( &agent );
 
 	Drive drive( &syncer, config.GetAll() ) ;
 	drive.DetectChanges() ;
 
-	if ( vm.count( "dry-run" ) == 0 )
+	if ( vm.count( "dry-run" ) == 0 && vm.count( "move" ) == 0 )
 	{
 		drive.Update() ;
 		drive.SaveState() ;
 	}
+  else if( vm.count( "move" ) > 0 ){
+    bool success = drive.Move();
+    if (success)
+      Log( "Move successful!", log::info );
+    else
+      Log( "Move failed.", log::error);
+  }
 	else
 		drive.DryRun() ;
-	
+
 	config.Save() ;
 	Log( "Finished!", log::info ) ;
 	return 0 ;

libgrive/src/base/Drive.cc

@@ -61,14 +61,14 @@ void Drive::FromRemote( const Entry& entry )
 	// entries from change feed does not have the parent HREF,
 	// so these checkings are done in normal entries only
 	Resource *parent = m_state.FindByHref( entry.ParentHref() ) ;
-	
+
 	if ( parent != 0 && !parent->IsFolder() )
 		Log( "warning: entry %1% has parent %2% which is not a folder, ignored",
 			entry.Title(), parent->Name(), log::verbose ) ;
-	
+
 	else if ( parent == 0 || !parent->IsInRootTree() )
 		Log( "file \"%1%\" parent doesn't exist, ignored", entry.Title(), log::verbose ) ;
-		
+
 	else
 		m_state.FromRemote( entry ) ;
 }
@@ -77,7 +77,7 @@ void Drive::FromChange( const Entry& entry )
 {
 	if ( entry.IsRemoved() )
 		Log( "file \"%1%\" represents a deletion, ignored", entry.Title(), log::verbose ) ;
-	
+
 	// folders go directly
 	else
 		m_state.FromRemote( entry ) ;
@@ -103,10 +103,10 @@ void Drive::SyncFolders( )
 			{
 				if ( e.ParentHrefs().size() != 1 )
 					Log( "folder \"%1%\" has multiple parents, ignored", e.Title(), log::verbose ) ;
-				
+
 				else if ( e.Title().find('/') != std::string::npos )
 					Log( "folder \"%1%\" contains a slash in its name, ignored", e.Title(), log::verbose ) ;
-				
+
 				else
 					m_state.FromRemote( e ) ;
 			}
@@ -120,10 +120,10 @@ void Drive::DetectChanges()
 {
 	Log( "Reading local directories", log::info ) ;
 	m_state.FromLocal( m_root ) ;
-	
+
 	long prev_stamp = m_state.ChangeStamp() ;
 	Trace( "previous change stamp is %1%", prev_stamp ) ;
-	
+
 	SyncFolders( ) ;
 
 	Log( "Reading remote server file list", log::info ) ;
@@ -135,7 +135,7 @@ void Drive::DetectChanges()
 			feed->begin(), feed->end(),
 			boost::bind( &Drive::FromRemote, this, _1 ) ) ;
 	}
-	
+
 	// pull the changes feed
 	if ( prev_stamp != -1 )
 	{
@@ -150,11 +150,20 @@ void Drive::DetectChanges()
 	}
 }
 
+bool Drive::Move()
+{
+  if (m_options["move"].As<std::vector<std::string> >().size() < 2){
+    Log("Not enough arguments for move!", log::info);
+    return false;
+  }
+    return m_state.Move( m_syncer, m_options["move"].As<std::vector<std::string> >()[0], m_options["move"].As<std::vector<std::string> >()[1] );
+}
+
 void Drive::Update()
 {
 	Log( "Synchronizing files", log::info ) ;
 	m_state.Sync( m_syncer, m_options ) ;
-	
+
 	UpdateChangeStamp( ) ;
 }
 

libgrive/src/base/Drive.hh

@@ -41,18 +41,19 @@ public :
 	Drive( Syncer *syncer, const Val& options ) ;
 
 	void DetectChanges() ;
+	bool Move();
 	void Update() ;
 	void DryRun() ;
 	void SaveState() ;
-	
+
 	struct Error : virtual Exception {} ;
-	
+
 private :
 	void SyncFolders( ) ;
 	void FromRemote( const Entry& entry ) ;
 	void FromChange( const Entry& entry ) ;
 	void UpdateChangeStamp( ) ;
-	
+
 private :
 	Syncer			*m_syncer ;
 	fs::path		m_root ;

libgrive/src/base/Entry.cc

@@ -117,7 +117,7 @@ bool Entry::IsRemoved() const
 
 std::string Entry::Name() const
 {
-	return !m_filename.empty() ? m_filename : m_title ;
+    return !m_title.empty() ? m_title : m_filename;
 }
 
 } // end of namespace gr