FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve external SVN support.

Browse Source 
Support white-space paths when calling external SVN utility.
Support optional configuration of absolute path to SVN utility.
This commit is contained in:
ThorstenB
2011-06-20 22:05:37 +02:00
parent d534dcadfb
commit 22198d8bd2
1 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/tsync/terrasync.cxx
+43 -18
View File
@@ -56,6 +56,7 @@
#include "terrasync.hxx" #include "terrasync.hxx"
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/misc/strutils.hxx>
#include <simgear/threads/SGQueue.hxx> #include <simgear/threads/SGQueue.hxx>
#include <simgear/scene/tgdb/TileCache.hxx> #include <simgear/scene/tgdb/TileCache.hxx>
#include <simgear/misc/sg_dir.hxx> #include <simgear/misc/sg_dir.hxx>
@@ -89,8 +90,8 @@ using namespace simgear;
const char* rsync_cmd = const char* rsync_cmd =
"rsync --verbose --archive --delete --perms --owner --group"; "rsync --verbose --archive --delete --perms --owner --group";
const char* svn_cmd = const char* svn_options =
"svn checkout -q"; "checkout -q";
typedef map<string,time_t> CompletedTiles; typedef map<string,time_t> CompletedTiles;
@@ -124,11 +125,12 @@ public:
bool hasNewTiles() { return !_freshTiles.empty();} bool hasNewTiles() { return !_freshTiles.empty();}
WaitingTile getNewTile() { return _freshTiles.pop_front();} WaitingTile getNewTile() { return _freshTiles.pop_front();}
void setSvnServer(string server) { _svn_server = server;} void setSvnServer(string server) { _svn_server = simgear::strutils::strip(server);}
void setRsyncServer(string server) { _rsync_server = server;} void setExtSvnUtility(string svn_util) { _svn_command = simgear::strutils::strip(svn_util);}
void setLocalDir(string dir) { _local_dir = dir;} void setRsyncServer(string server) { _rsync_server = simgear::strutils::strip(server);}
string getLocalDir() { return _local_dir;} void setLocalDir(string dir) { _local_dir = simgear::strutils::strip(dir);}
void setUseSvn(bool use_svn) { _use_svn = use_svn;} string getLocalDir() { return _local_dir;}
void setUseSvn(bool use_svn) { _use_svn = use_svn;}
#ifdef HAVE_SVN_CLIENT_H #ifdef HAVE_SVN_CLIENT_H
void setUseBuiltin(bool built_in) { _use_built_in = built_in;} void setUseBuiltin(bool built_in) { _use_built_in = built_in;}
@@ -168,6 +170,7 @@ private:
SGBlockingDeque <WaitingTile> _freshTiles; SGBlockingDeque <WaitingTile> _freshTiles;
bool _use_svn; bool _use_svn;
string _svn_server; string _svn_server;
string _svn_command;
string _rsync_server; string _rsync_server;
string _local_dir; string _local_dir;
}; };
@@ -229,7 +232,7 @@ bool SGTerraSync::SvnThread::start()
if (_local_dir=="") if (_local_dir=="")
{ {
SG_LOG(SG_TERRAIN,SG_ALERT, SG_LOG(SG_TERRAIN,SG_ALERT,
"Cannot start scenery download. No local cache directory defined."); "Cannot start scenery download. Local cache directory is undefined.");
_fail_count++; _fail_count++;
_stalled = true; _stalled = true;
return false; return false;
@@ -276,10 +279,29 @@ bool SGTerraSync::SvnThread::start()
_stalled = false; _stalled = false;
_running = true; _running = true;
string status;
#ifdef HAVE_SVN_CLIENT_H
if (_use_svn && _use_built_in)
status = "Using built-in SVN support. ";
else
#endif
if (_use_svn)
{
status = "Using external SVN utility '";
status += _svn_command;
status += "'. ";
}
else
{
status = "Using RSYNC. ";
}
// not really an alert - but we want to (always) see this message, so user is // not really an alert - but we want to (always) see this message, so user is
// aware we're downloading scenery (and using bandwidth). // aware we're downloading scenery (and using bandwidth).
SG_LOG(SG_TERRAIN,SG_ALERT, SG_LOG(SG_TERRAIN,SG_ALERT,
"Starting automatic scenery download/synchronization. Directory: '" << _local_dir << "'"); "Starting automatic scenery download/synchronization. "
<< status
<< "Directory: '" << _local_dir << "'.");
OpenThreads::Thread::start(); OpenThreads::Thread::start();
return true; return true;
@@ -390,12 +412,12 @@ bool SGTerraSync::SvnThread::syncTreeExternal(const char* dir)
if (_use_svn) if (_use_svn)
{ {
snprintf( command, 512, snprintf( command, 512,
"%s %s/%s %s/%s", svn_cmd, "\"%s\" %s %s/%s \"%s/%s\"", _svn_command.c_str(), svn_options,
_svn_server.c_str(), dir, _svn_server.c_str(), dir,
_local_dir.c_str(), dir ); _local_dir.c_str(), dir );
} else { } else {
snprintf( command, 512, snprintf( command, 512,
"%s %s/%s/ %s/%s/", rsync_cmd, "%s %s/%s/ \"%s/%s/\"", rsync_cmd,
_rsync_server.c_str(), dir, _rsync_server.c_str(), dir,
_local_dir.c_str(), dir ); _local_dir.c_str(), dir );
} }
@@ -584,24 +606,25 @@ void SGTerraSync::init()
void SGTerraSync::reinit() void SGTerraSync::reinit()
{ {
// do not reinit when enabled and we're already up and running // do not reinit when enabled and we're already up and running
if ((_terraRoot->getNode("enabled",true)->getBoolValue())&& if ((_terraRoot->getBoolValue("enabled",false))&&
(_svnThread->_active && _svnThread->_running)) (_svnThread->_active && _svnThread->_running))
return; return;
_svnThread->stop(); _svnThread->stop();
if (_terraRoot->getNode("enabled",true)->getBoolValue()) if (_terraRoot->getBoolValue("enabled",false))
{ {
_svnThread->setSvnServer(_terraRoot->getNode("svn-server",true)->getStringValue()); _svnThread->setSvnServer(_terraRoot->getStringValue("svn-server",""));
_svnThread->setRsyncServer(_terraRoot->getNode("rsync-server",true)->getStringValue()); _svnThread->setRsyncServer(_terraRoot->getStringValue("rsync-server",""));
_svnThread->setLocalDir(_terraRoot->getNode("scenery-dir",true)->getStringValue()); _svnThread->setLocalDir(_terraRoot->getStringValue("scenery-dir",""));
#ifdef HAVE_SVN_CLIENT_H #ifdef HAVE_SVN_CLIENT_H
_svnThread->setUseBuiltin(_terraRoot->getNode("use-built-in-svn",true)->getBoolValue()); _svnThread->setUseBuiltin(_terraRoot->getBoolValue("use-built-in-svn",true));
#else #else
_terraRoot->getNode("use-built-in-svn",true)->setBoolValue(false); _terraRoot->getNode("use-built-in-svn",true)->setBoolValue(false);
#endif #endif
_svnThread->setUseSvn(_terraRoot->getNode("use-svn",true)->getBoolValue()); _svnThread->setUseSvn(_terraRoot->getBoolValue("use-svn",true));
_svnThread->setExtSvnUtility(_terraRoot->getStringValue("ext-svn-utility","svn"));
if (_svnThread->start()) if (_svnThread->start())
syncAirportsModels(); syncAirportsModels();
@@ -624,6 +647,8 @@ void SGTerraSync::bind()
_terraRoot->getNode("update-count", true)->setAttribute(SGPropertyNode::WRITE,false); _terraRoot->getNode("update-count", true)->setAttribute(SGPropertyNode::WRITE,false);
_terraRoot->getNode("error-count", true)->setAttribute(SGPropertyNode::WRITE,false); _terraRoot->getNode("error-count", true)->setAttribute(SGPropertyNode::WRITE,false);
_terraRoot->getNode("tile-count", true)->setAttribute(SGPropertyNode::WRITE,false); _terraRoot->getNode("tile-count", true)->setAttribute(SGPropertyNode::WRITE,false);
_terraRoot->getNode("use-built-in-svn", true)->setAttribute(SGPropertyNode::USERARCHIVE,false);
_terraRoot->getNode("use-svn", true)->setAttribute(SGPropertyNode::USERARCHIVE,false);
// stalled is used as a signal handler (to connect listeners triggering GUI pop-ups) // stalled is used as a signal handler (to connect listeners triggering GUI pop-ups)
_stalled_node = _terraRoot->getNode("stalled", true); _stalled_node = _terraRoot->getNode("stalled", true);
_stalled_node->setBoolValue(_svnThread->_stalled); _stalled_node->setBoolValue(_svnThread->_stalled);