Found nice fix from User Indian4646, merging...

Merge branch 'master' of https://github.com/indian4646/grive

Conflicts:
	grive/src/main.cc
	libgrive/src/drive/Drive.cc
	libgrive/src/drive/Resource.cc
	libgrive/src/drive/Resource.hh
	libgrive/src/drive/State.cc
	libgrive/src/drive/State.hh
	libgrive/src/http/Agent.hh
	libgrive/src/http/CurlAgent.cc
	libgrive/src/http/CurlAgent.hh
	libgrive/src/util/File.hh
	libgrive/src/util/StdioFile.cc

Author: Juraj Puchky

grive/src/main.cc

@@ -66,6 +66,7 @@ void InitGCrypt()
 
 void InitLog( const po::variables_map& vm )
 {
+<<<<<<< HEAD
 	std::auto_ptr<log::CompositeLog> comp_log(new log::CompositeLog) ;
 	LogBase* console_log = comp_log->Add( std::auto_ptr<LogBase>( new log::DefaultLog ) ) ;
 
@@ -85,6 +86,14 @@ void InitLog( const po::variables_map& vm )
 
 		comp_log->Add( file_log ) ;
 	}
+=======
+	InitGCrypt() ;
+	
+	Config config ;
+	
+	std::auto_ptr<gr::log::CompositeLog> comp_log(new gr::log::CompositeLog) ;
+	LogBase* console_log = comp_log->Add( std::auto_ptr<LogBase>( new gr::log::DefaultLog ) ) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 
 	if ( vm.count( "verbose" ) )
 	{
@@ -174,6 +183,46 @@ int Main( int argc, char **argv )
 		config.Set( "refresh_token", Json( token.RefreshToken() ) ) ;
 		config.Save() ;
 	}
+<<<<<<< HEAD
+=======
+	if ( vm.count( "log" ) )
+	{
+		std::auto_ptr<LogBase> file_log(new gr::log::DefaultLog( vm["log"].as<std::string>() )) ;
+		file_log->Enable( gr::log::debug ) ;
+		file_log->Enable( gr::log::verbose ) ;
+		file_log->Enable( gr::log::info ) ;
+		file_log->Enable( gr::log::warning ) ;
+		file_log->Enable( gr::log::error ) ;
+		file_log->Enable( gr::log::critical ) ;
+		
+		// log grive version to log file
+		file_log->Log( gr::log::Fmt("grive version " VERSION " " __DATE__ " " __TIME__), gr::log::verbose ) ;
+		file_log->Log( gr::log::Fmt("current time: %1%") % DateTime::Now(), gr::log::verbose ) ;
+		
+		comp_log->Add( file_log ) ;
+	}
+	if ( vm.count( "version" ) )
+	{
+		std::cout
+			<< "grive version " << VERSION << ' ' << __DATE__ << ' ' << __TIME__ << std::endl ;
+		return 0 ;
+	}
+	if ( vm.count( "verbose" ) )
+	{
+		console_log->Enable( gr::log::verbose ) ;
+	}
+	if ( vm.count( "debug" ) )
+	{
+		console_log->Enable( gr::log::verbose ) ;
+		console_log->Enable( gr::log::debug ) ;
+	}
+	if ( vm.count( "force" ) )
+	{
+		options.Add( "force", Json(true) ) ;
+	}
+	
+	LogBase::Inst( std::auto_ptr<LogBase>(comp_log.release()) ) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 
 	std::string refresh_token ;
 	try
@@ -185,7 +234,7 @@ int Main( int argc, char **argv )
 		Log(
 			"Please run grive with the \"-a\" option if this is the "
 			"first time you're accessing your Google Drive!",
-			log::critical ) ;
+			gr::log::critical ) ;
 
 		return -1;
 	}
@@ -198,14 +247,14 @@ int Main( int argc, char **argv )
 
 	if ( vm.count( "dry-run" ) == 0 )
 	{
-		drive.Update() ;
+		drive.Update( token ) ;
 		drive.SaveState() ;
 	}
 	else
-		drive.DryRun() ;
+		drive.DryRun( token ) ;
 
 	config.Save() ;
-	Log( "Finished!", log::info ) ;
+	Log( "Finished!", gr::log::info ) ;
 	return 0 ;
 }
 
@@ -217,15 +266,15 @@ int main( int argc, char **argv )
 	}
 	catch ( Exception& e )
 	{
-		Log( "exception: %1%", boost::diagnostic_information(e), log::critical ) ;
+		Log( "exception: %1%", boost::diagnostic_information(e), gr::log::critical ) ;
 	}
 	catch ( std::exception& e )
 	{
-		Log( "exception: %1%", e.what(), log::critical ) ;
+		Log( "exception: %1%", e.what(), gr::log::critical ) ;
 	}
 	catch ( ... )
 	{
-		Log( "unexpected exception", log::critical ) ;
+		Log( "unexpected exception", gr::log::critical ) ;
 	}
 	return -1 ;
 }

libgrive/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(libgrive)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-
+ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES)
 find_package(LibGcrypt REQUIRED)
 find_package(JSONC REQUIRED)
 find_package(CURL REQUIRED)

libgrive/src/drive/Drive.cc

@@ -169,18 +169,27 @@ void Drive::DetectChanges()
 	}
 }
 
-void Drive::Update()
+void Drive::Update( OAuth2& auth )
 {
 	Log( "Synchronizing files", log::info ) ;
+<<<<<<< HEAD
 	m_state.Sync( m_http, m_options ) ;
+=======
+	http::CurlAgent http ;
+	m_state.Sync( &http, m_http_hdr, auth) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 
 	UpdateChangeStamp( ) ;
 }
 
-void Drive::DryRun()
+void Drive::DryRun( OAuth2& auth )
 {
 	Log( "Synchronizing files (dry-run)", log::info ) ;
+<<<<<<< HEAD
 	m_state.Sync( 0, m_options ) ;
+=======
+	m_state.Sync( 0, m_http_hdr, auth ) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 }
 
 void Drive::UpdateChangeStamp( )

libgrive/src/drive/Drive.hh

@@ -45,8 +45,8 @@ public :
 	Drive( http::Agent *agent, const Json& options ) ;
 
 	void DetectChanges() ;
-	void Update() ;
-	void DryRun() ;
+	void Update( OAuth2& auth ) ;
+	void DryRun( OAuth2& auth ) ;
 	void SaveState() ;
 
 	struct Error : virtual Exception {} ;

libgrive/src/drive/Resource.cc

@@ -36,12 +36,13 @@
 #include "xml/Node.hh"
 #include "xml/NodeSet.hh"
 #include "xml/String.hh"
+#include "protocol/OAuth2.hh"
 
 #include <boost/bind.hpp>
 #include <boost/exception/all.hpp>
 
 #include <cassert>
-
+#include <time.h>
 // for debugging
 #include <iostream>
 
@@ -366,21 +367,45 @@ Resource* Resource::FindChild( const std::string& name )
 }
 
 // try to change the state to "sync"
+<<<<<<< HEAD
 void Resource::Sync( http::Agent *http, DateTime& sync_time, const Json& options )
+=======
+void Resource::Sync( http::Agent *http, const http::Header& auth, OAuth2& oauth )
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 {
 	assert( m_state != unknown ) ;
 	assert( !IsRoot() || m_state == sync ) ;	// root folder is already synced
+ 	std::vector<std::string> m_auth;
+	//m_auth.assign(auth.begin(), auth.end());	
+	time_t t;
+        time(&t);
+	std::cout << auth  << std::endl;
+        if(t-oauth.Time() > oauth.ExpiresIn()-100){
+		oauth.Refresh();
+		m_auth.clear();
+		oauth.m_time = t;
+	}
+	m_auth.push_back( "Authorization: Bearer " + oauth.AccessToken() ) ;
+	m_auth.push_back( "GData-Version: 3.0" ) ;
 
+<<<<<<< HEAD
 	SyncSelf( http, options ) ;
 
 	// we want the server sync time, so we will take the server time of the last file uploaded to store as the sync time
 	// m_mtime is updated to server modified time when the file is uploaded
 	sync_time = std::max(sync_time, m_mtime);
+=======
+	SyncSelf( http, (const http::Header&)m_auth ) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 
 	// if myself is deleted, no need to do the childrens
 	if ( m_state != local_deleted && m_state != remote_deleted )
 		std::for_each( m_child.begin(), m_child.end(),
+<<<<<<< HEAD
 			boost::bind( &Resource::Sync, _1, http, boost::ref(sync_time), options ) ) ;
+=======
+			boost::bind( &Resource::Sync, _1, http, auth,  oauth ) ) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 }
 
 void Resource::SyncSelf( http::Agent* http, const Json& options )
@@ -577,18 +602,45 @@ bool Resource::Create( http::Agent* http )
 	}
 }
 
+<<<<<<< HEAD
 bool Resource::Upload(
 	http::Agent* 		http,
 	const std::string&	link,
 	bool 				post)
+=======
+struct WriteThis {
+  const char *readptr;
+  off_t sizeleft;
+  FILE* file;
+  bool post;
+};
+bool Resource::Upload( http::Agent* http, const std::string& link, const http::Header& auth, bool post )
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 {
 	assert( http != 0 ) ;
+	const fs::path& path = Path();
+	struct WriteThis pooh;
+	struct WriteThis meta_a;
+	// TODO: upload in chunks
 
+<<<<<<< HEAD
 	File file( Path() ) ;
 	std::ostringstream xcontent_len ;
 	xcontent_len << "X-Upload-Content-Length: " << file.Size() ;
 
 	http::Header hdr ;
+=======
+	pooh.file = fopen64(path.string().c_str(),"r");
+        fseeko(pooh.file, 0, SEEK_END);
+        pooh.sizeleft = ftello(pooh.file);
+        rewind (pooh.file);
+	
+	pooh.post = 1;
+
+	std::ostringstream xcontent_len ;
+	xcontent_len << "X-Upload-Content-Length: " << pooh.sizeleft;	
+	http::Header hdr( auth ) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 	hdr.Add( "Content-Type: application/atom+xml" ) ;
 	hdr.Add( "X-Upload-Content-Type: application/octet-stream" ) ;
 	hdr.Add( xcontent_len.str() ) ;
@@ -599,12 +651,14 @@ bool Resource::Upload(
 		% m_kind
 		% xml::Escape(m_name)
 	).str() ;
-	
+	meta_a.readptr=meta.c_str();
+	meta_a.sizeleft=meta.size();
+	meta_a.post=post;
 	http::StringResponse str ;
 	if ( post )
 		http->Post( link, meta, &str, hdr ) ;
 	else
-		http->Put( link, meta, &str, hdr ) ;
+		http->Put( link, &meta_a, &str, hdr ) ;
 
 	http::Header uphdr ;
 	uphdr.Add( "Expect:" ) ;
@@ -614,7 +668,12 @@ bool Resource::Upload(
 	std::string uplink = http->RedirLocation() ;
 	http::XmlResponse xml ;
 
+<<<<<<< HEAD
 	http->Put( uplink, &file, &xml, uphdr ) ;
+=======
+	http->Put( uplink, &pooh, &xml, uphdr ) ;
+	fclose(pooh.file);
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 	AssignIDs( Entry( xml.Response() ) ) ;
   m_mtime = Entry(xml.Response()).MTime();
 

libgrive/src/drive/Resource.hh

@@ -34,9 +34,15 @@ namespace http
 	class Agent ;
 }
 
+<<<<<<< HEAD
 class Json ;
 
 namespace v1 {
+=======
+
+
+class OAuth2;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 
 class Entry ;
 
@@ -80,7 +86,11 @@ public :
 	void FromRemote( const Entry& remote, const DateTime& last_sync ) ;
 	void FromLocal( const DateTime& last_sync ) ;
 
+<<<<<<< HEAD
 	void Sync( http::Agent* http, DateTime& sync_time, const Json& options ) ;
+=======
+	void Sync( http::Agent* http, const http::Header& auth, OAuth2& oauth ) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 
 	// children access
 	iterator begin() const ;

libgrive/src/drive/State.cc

@@ -260,6 +260,7 @@ void State::Write( const fs::path& filename ) const
 	fs << result ;
 }
 
+<<<<<<< HEAD
 void State::Sync( http::Agent *http, const Json& options )
 {
 	// set the last sync time from the time returned by the server for the last file synced
@@ -282,6 +283,12 @@ void State::Sync( http::Agent *http, const Json& options )
 		Trace( "updating last sync? %1%", last_sync_time ) ;
     	m_last_sync = last_sync_time;
   	}
+=======
+void State::Sync( http::Agent *http, const http::Header& auth, OAuth2::OAuth2& oauth)
+{
+	m_res.Root()->Sync( http, auth ,oauth) ;
+	m_last_sync = DateTime::Now() ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 }
 
 long State::ChangeStamp() const

libgrive/src/drive/State.hh

@@ -23,6 +23,7 @@
 
 #include "util/DateTime.hh"
 #include "util/FileSystem.hh"
+#include "protocol/OAuth2.hh"
 
 #include <memory>
 
@@ -59,7 +60,11 @@ public :
 	Resource* FindByHref( const std::string& href ) ;
 	Resource* FindByID( const std::string& id ) ;
 
+<<<<<<< HEAD
 	void Sync( http::Agent *http, const Json& options ) ;
+=======
+	void Sync( http::Agent *http, const http::Header& auth, OAuth2::OAuth2& oauth ) ;
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 
 	iterator begin() ;
 	iterator end() ;

libgrive/src/http/Agent.hh

@@ -37,8 +37,13 @@ public :
 
 	virtual long Put(
 		const std::string&	url,
+<<<<<<< HEAD
 		const std::string&	data,
 		DataStream			*dest,
+=======
+		void*	data,
+		Receivable			*dest,
+>>>>>>> f3e914a0ba807a1ebccf5d80d508c20920a7c215
 		const Header&		hdr ) = 0 ;
 
 	virtual long Put(