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

ignore files and folders that is not inside the root tree. 

also ignore files/folders with multiple parents
pull/40/head
Matchman Green 2012-05-13 01:57:15 +08:00
parent 931f743b58
commit 9631031931
8 changed files with 78 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libgrive/src/drive/Collection.cc
View File

@ -18,8 +18,8 @@
*/
#include "Collection.hh"
#include "CommonUri.hh"
#include "protocol/Json.hh"
#include "util/Path.hh"
#include "util/OS.hh"
#include "xml/Node.hh"
@ -37,6 +37,13 @@ Collection::Collection( const xml::Node& entry ) :
m_parent ( 0 )
{
}
Collection::Collection( const Entry& entry ) :
m_entry ( entry ),
m_parent ( 0 )
{
}
Collection::Collection(
const std::string& title,
const std::string& href ) :
@ -85,20 +92,6 @@ void Collection::AddLeaf( const std::string& filename )
m_leaves.push_back( filename ) ;
}
bool Collection::IsCollection( const Json& entry )
{
Json node ;
return
entry["category"].FindInArray( "scheme", "http://schemas.google.com/g/2005#kind", node ) &&
node["label"].As<std::string>() == "folder" ;
}
bool Collection::IsCollection( const xml::Node& entry )
{
return entry["category"].Find( "@scheme", "http://schemas.google.com/g/2005#kind" )["@label"].front().Value()
== "folder" ;
}
void Collection::Swap( Collection& coll )
{
m_entry.Swap( coll.m_entry ) ;
@ -131,6 +124,11 @@ Path Collection::Dir() const
return m_parent != 0 ? (m_parent->Dir() / m_entry.Title()) : Path() ;
}
bool Collection::IsInRootTree() const
{
return m_parent == 0 ? (SelfHref() == root_href) : m_parent->IsInRootTree() ;
}
} // end of namespace
namespace std

6
libgrive/src/drive/Collection.hh
View File

@ -27,26 +27,24 @@
namespace gr {
class Json ;
class Path ;
class Collection
{
public :
explicit Collection( const xml::Node& entry ) ;
explicit Collection( const Entry& entry ) ;
Collection( const std::string& title, const std::string& href ) ;
// default copy ctor & op= are fine
static bool IsCollection( const Json& entry ) ;
static bool IsCollection( const xml::Node& entry ) ;
std::string Title() const ;
std::string SelfHref() const ;
const Collection* Parent() const ;
Collection* Parent() ;
std::string ParentHref() const ;
Path Dir() const ;
bool IsInRootTree() const ;
void AddChild( Collection *child ) ;
void AddLeaf( const std::string& filename ) ;

94
libgrive/src/drive/Drive.cc
View File

@ -46,8 +46,7 @@
namespace gr {
Drive::Drive( OAuth2& auth ) :
m_auth( auth ),
m_root( ".", root_href )
m_auth( auth )
{
m_http_hdr.push_back( "Authorization: Bearer " + m_auth.AccessToken() ) ;
m_http_hdr.push_back( "GData-Version: 3.0" ) ;
@ -58,7 +57,7 @@ Drive::Drive( OAuth2& auth ) :
http::XmlResponse xrsp ;
http::ResponseLog log( "first-", ".xml", &xrsp ) ;
http.Get( feed_base + "?showfolders=true", &log, m_http_hdr ) ;
http.Get( feed_base + "?showfolders=true&showroot=true", &log, m_http_hdr ) ;
xml::Node resp = xrsp.Response() ;
m_resume_link = resp["link"].
@ -70,9 +69,14 @@ Drive::Drive( OAuth2& auth ) :
xml::NodeSet entries = resp["entry"] ;
for ( xml::NodeSet::iterator i = entries.begin() ; i != entries.end() ; ++i )
{
if ( !Collection::IsCollection( *i ) )
Entry file( *i ) ;
if ( file.Kind() != "folder" )
{
UpdateFile( *i, &http ) ;
FolderListIterator pit = FindFolder( file.ParentHref() ) ;
if ( pit != m_coll.end() && pit->IsInRootTree() )
UpdateFile( file, *pit, &http ) ;
else
std::cout << "file " << file.Title() << " parent doesn't exist, ignored" << std::endl ;
}
}
@ -81,7 +85,8 @@ Drive::Drive( OAuth2& auth ) :
if ( has_next )
{
http.Get( nss["@href"], &xrsp, m_http_hdr ) ;
http::ResponseLog log2( "second-", ".xml", &xrsp ) ;
http.Get( nss["@href"], &log2, m_http_hdr ) ;
resp = xrsp.Response() ;
}
} while ( has_next ) ;
@ -102,14 +107,21 @@ struct SortCollectionByHref
Drive::FolderListIterator Drive::FindFolder( const std::string& href )
{
// try to find the parent by its href
std::vector<Collection>::iterator it =
std::lower_bound(
std::pair<FolderListIterator,FolderListIterator> its =
std::equal_range(
m_coll.begin(),
m_coll.end(),
Collection( "", href ),
SortCollectionByHref() ) ;
return (it != m_coll.end() && it->SelfHref() == href) ? it : m_coll.end() ;
return (its.first != its.second) ? its.first : m_coll.end() ;
}
Drive::FolderListIterator Drive::Root( )
{
FolderListIterator root = FindFolder( root_href ) ;
assert( root != m_coll.end() ) ;
return root ;
}
void Drive::ConstructDirTree( http::Agent *http )
@ -122,6 +134,7 @@ void Drive::ConstructDirTree( http::Agent *http )
xml::Node resp = xml.Response() ;
assert( m_coll.empty() ) ;
m_coll.push_back( Collection( ".", root_href ) ) ;
while ( true )
{
@ -130,8 +143,14 @@ void Drive::ConstructDirTree( http::Agent *http )
// first, get all collections from the query result
for ( xml::NodeSet::iterator i = entries.begin() ; i != entries.end() ; ++i )
{
if ( Collection::IsCollection( *i ) )
m_coll.push_back( Collection( *i ) ) ;
Entry e( *i ) ;
if ( e.Kind() == "folder" )
{
if ( e.ParentHrefs().size() == 1 )
m_coll.push_back( Collection( e ) ) ;
else
std::cout << e.Title() << " has multiple parents, ignored" << std::endl ;
}
}
xml::NodeSet next = resp["link"].Find( "@rel", "next" ) ;
@ -146,52 +165,33 @@ void Drive::ConstructDirTree( http::Agent *http )
std::sort( m_coll.begin(), m_coll.end(), SortCollectionByHref() ) ;
for ( FolderListIterator i = m_coll.begin() ; i != m_coll.end() ; ++i )
{
if ( i->ParentHref().empty() )
FolderListIterator pit = FindFolder( i->ParentHref() ) ;
if ( pit != m_coll.end() )
{
std::cout << "folder \"" << i->Title() << "\" not in root folder, ignored" << std::endl ;
}
else if ( i->ParentHref() == root_href )
m_root.AddChild( &*i ) ;
else
{
FolderListIterator pit = FindFolder( i->ParentHref() ) ;
if ( pit != m_coll.end() )
{
// it shouldn't happen, just in case
if ( &*i == &*pit )
std::cout
<< "the parent of folder " << i->Title()
<< " is itself. ignored" << std::endl ;
else
pit->AddChild( &*i ) ;
}
// it shouldn't happen, just in case
if ( &*i == &*pit )
std::cout
<< "the parent of folder " << i->Title()
<< " is itself. ignored" << std::endl ;
else
std::cout << "can't find folder " << i->Title() << " " << i->ParentHref() << std::endl ;
pit->AddChild( &*i ) ;
}
else
std::cout << "can't find folder " << i->Title() << " \"" << i->ParentHref() << "\"" << std::endl ;
}
// lastly, iterating from the root, create the directories in the local file system
assert( m_root.Parent() == 0 ) ;
m_root.CreateSubDir( Path() ) ;
assert( Root()->Parent() == 0 ) ;
Root()->CreateSubDir( Path() ) ;
}
void Drive::UpdateFile( const xml::Node& entry, http::Agent *http )
void Drive::UpdateFile( Entry& file, const Collection& parent, http::Agent *http )
{
// only handle uploaded files
if ( !entry["docs:suggestedFilename"].empty() )
if ( !file.Filename().empty() )
{
Entry file( entry ) ;
bool changed = true ;
Path path = Path() / file.Filename() ;
// determine which folder the file belongs to
if ( !file.ParentHref().empty() )
{
FolderListIterator pit = FindFolder( file.ParentHref() ) ;
if ( pit != m_coll.end() )
path = pit->Dir() / file.Filename() ;
}
Path path = parent.Dir() / file.Filename() ;
// compare checksum first if file exists
std::ifstream ifile( path.Str().c_str(), std::ios::binary | std::ios::in ) ;
@ -221,6 +221,10 @@ std::cout << path << " is read only" << std::endl ;
}
}
}
else
{
std::cout << file.Title() << " is a google document, ignored" << std::endl ;
}
}
} // end of namespace

4
libgrive/src/drive/Drive.hh
View File

@ -49,11 +49,12 @@ public :
~Drive( ) ;
private :
void UpdateFile( const xml::Node& entry, http::Agent *http ) ;
void UpdateFile( Entry& file, const Collection& parent, http::Agent *http ) ;
void ConstructDirTree( http::Agent *http ) ;
FolderListIterator FindFolder( const std::string& href ) ;
FolderListIterator Root( ) ;
private :
OAuth2& m_auth ;
@ -62,7 +63,6 @@ private :
std::string m_resume_link ;
FolderList m_coll ;
Collection m_root ;
} ;
} // end of namespace

5
libgrive/src/xml/Node.cc
View File

@ -343,6 +343,11 @@ Node::operator std::string() const
return Value() ;
}
bool Node::operator==( const std::string& value ) const
{
return Value() == value ;
}
std::ostream& operator<<( std::ostream& os, const Node& node )
{
if ( node.GetType() == Node::element )

1
libgrive/src/xml/Node.hh
View File

@ -58,6 +58,7 @@ public :
NodeSet operator[]( const std::string& name ) const ;
operator std::string() const ;
bool operator==( const std::string& value ) const ;
const std::string& Name() const ;
std::string Value() const ;

5
libgrive/src/xml/NodeSet.cc
View File

@ -133,6 +133,11 @@ NodeSet::operator std::string() const
return empty() ? "" : front().Value() ;
}
bool NodeSet::operator==( const std::string& value ) const
{
return operator std::string() == value ;
}
bool NodeSet::empty() const
{
return m_first == m_last ;

1
libgrive/src/xml/NodeSet.hh
View File

@ -53,6 +53,7 @@ public :
// forwarding common Node operations to Node
operator std::string() const ;
NodeSet operator[]( const std::string& name ) const ;
bool operator==( const std::string& value ) const ;
private :
Node m_tmp ;