vitalif
/
grive2
mirror of https://github.com/vitalif/grive2
1
0
Fork 0
Code Issues Releases Wiki Activity

enabled code to "delete" files

pull/40/head
Matchman Green 2012-06-01 00:40:07 +08:00
parent 59d0761d68
commit da6c99089f
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libgrive/src/drive/Resource.cc
View File

@ -128,7 +128,7 @@ void Resource::FromRemote( const Entry& remote, const DateTime& last_sync )
}
else
{
Log( "file %1% should be erased in remote", path, log::verbose ) ;
Log( "file %1% is deleted in local", path, log::verbose ) ;
m_state = local_deleted ;
}
}
@ -290,7 +290,8 @@ void Resource::Sync( http::Agent *http, const http::Headers& auth )
break ;
case local_deleted :
Log( "sync %1% deleted in local. delete?", Path(), log::verbose ) ;
Log( "sync %1% deleted in local. deleting remote", Path(), log::verbose ) ;
DeleteRemote( http, auth ) ;
break ;
case local_changed :
@ -307,7 +308,8 @@ void Resource::Sync( http::Agent *http, const http::Headers& auth )
break ;
case remote_deleted :
Log( "sync %1% deleted in remote. delete?", Path(), log::verbose ) ;
Log( "sync %1% deleted in remote. deleting local", Path(), log::verbose ) ;
DeleteLocal() ;
break ;
case sync :
@ -319,13 +321,43 @@ void Resource::Sync( http::Agent *http, const http::Headers& auth )
}
}
void Resource::Delete( http::Agent *http, const http::Headers& auth )
/// this function doesn't really remove the local file. it renames it.
void Resource::DeleteLocal()
{
assert( m_parent != 0 ) ;
fs::path parent = m_parent->Path() ;
fs::path dest = parent / ( "." + Name() ) ;
std::size_t idx = 1 ;
while ( fs::exists( dest ) && idx != 0 )
{
std::ostringstream oss ;
oss << '.' << Name() << "-" << idx++ ;
dest = parent / oss.str() ;
}
// wrap around! just remove the file
if ( idx == 0 )
fs::remove_all( Path() ) ;
else
fs::rename( Path(), dest ) ;
}
void Resource::DeleteRemote( http::Agent *http, const http::Headers& auth )
{
http::Headers hdr( auth ) ;
hdr.push_back( "If-Match: " + m_entry.ETag() ) ;
http::StringResponse str ;
http->Custom( "DELETE", feed_base + "/" + m_entry.ResourceID() + "?delete=true", &str, hdr ) ;
try
{
http->Custom( "DELETE", m_entry.SelfHref(), &str, hdr ) ;
}
catch ( Exception& )
{
Trace( "response = %1%", str.Response() ) ;
throw ;
}
}

3
libgrive/src/drive/Resource.hh
View File

@ -72,7 +72,6 @@ public :
void FromLocal( const DateTime& last_sync ) ;
void Sync( http::Agent *http, const http::Headers& auth ) ;
void Delete( http::Agent* http, const http::Headers& auth ) ;
Json Serialize() const ;
@ -124,6 +123,8 @@ private :
bool Create( http::Agent* http, const http::Headers& auth ) ;
bool Upload( http::Agent* http, const std::string& link, const http::Headers& auth, bool post ) ;
void FromRemoteFolder( const Entry& remote, const DateTime& last_sync ) ;
void DeleteLocal() ;
void DeleteRemote( http::Agent* http, const http::Headers& auth ) ;
private :
Entry m_entry ;