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

Fix local index updating for items already in sync

pull/59/head
Vitaliy Filippov 2016-01-06 01:37:52 +03:00
parent c76cdecad2
commit 60acb75967
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libgrive/src/base/Resource.cc
View File

@ -574,14 +574,14 @@ void Resource::SyncSelf( Syncer* syncer, ResourceTree *res_tree, const Val& opti
case sync : case sync :
Log( "sync %1% already in sync", path, log::verbose ) ; Log( "sync %1% already in sync", path, log::verbose ) ;
if ( !IsRoot() )
SetIndex( false ) ;
break ; break ;
// shouldn't go here // shouldn't go here
case unknown : case unknown :
assert( false ) ;
break ;
default : default :
assert( false ) ;
break ; break ;
} }
@ -635,15 +635,17 @@ void Resource::DeleteIndex()
void Resource::SetIndex( bool re_stat ) void Resource::SetIndex( bool re_stat )
{ {
assert( m_parent->m_json != NULL ); assert( m_parent && m_parent->m_json != NULL );
if ( !m_json ) if ( !m_json )
m_json = &((*m_parent->m_json)["tree"]).Item( Name() ); m_json = &((*m_parent->m_json)["tree"]).Item( Name() );
bool is_dir; bool is_dir;
if ( re_stat ) if ( re_stat )
os::Stat( Path(), &m_ctime, NULL, &is_dir ); os::Stat( Path(), &m_ctime, NULL, &is_dir );
else
is_dir = IsFolder();
m_json->Set( "ctime", Val( m_ctime.Sec() ) );
if ( !is_dir ) if ( !is_dir )
{ {
m_json->Set( "ctime", Val( m_ctime.Sec() ) );
m_json->Set( "md5", Val( m_md5 ) ); m_json->Set( "md5", Val( m_md5 ) );
m_json->Del( "tree" ); m_json->Del( "tree" );
} }

2
libgrive/src/json/Val.cc
View File

@ -116,6 +116,8 @@ const Val& Val::operator[]( std::size_t index ) const
std::string Val::Str() const std::string Val::Str() const
{ {
if ( Type() == int_type )
return boost::to_string( As<long long>() );
return As<std::string>() ; return As<std::string>() ;
} }