X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=de6b11dd169ea626d5255a2a64b5f2813607ad10;hb=5970066f11bb2288cc7dc9fe173051c2a343789d;hp=836808395e118e3c1518272d0d01c79948ce4a8a;hpb=ae1371ed82d34f009708de7fa89d4096f3311184;p=creaImageIO.git diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp index 8368083..de6b11d 100644 --- a/src2/creaImageIOGimmick.cpp +++ b/src2/creaImageIOGimmick.cpp @@ -3,7 +3,7 @@ #include #include #include - +//#include "io.h" #ifndef PATH_MAX // If not defined yet : do it # define PATH_MAX 2048 #endif @@ -39,6 +39,11 @@ namespace creaImageIO } //============================================================== + //============================================================== + void Gimmick::Initialize(const std::string& path) + { + Initialize(); + } //============================================================== void Gimmick::Initialize() @@ -48,49 +53,25 @@ namespace creaImageIO CreateUserSettingsDirectory(); // Sets the current directory to the home dir mCurrentDirectory = GetHomeDirectory(); - mSynchronizer= new Synchronizer(GetUserSettingsDirectory()); + mSynchronizer= new Synchronizer(GetUserSettingsDirectory()+"Shared/gimmick/"); mSettings = new Settings(mCurrentDirectory); std::string dbpath = GetLocalDatabasePath(); // Create or open local database - mLocalDatabase = createDB(i_nameDB, mCurrentDirectory + "\\.gimmick\\localdatabase_Descriptor.txt", dbpath); + std::string dpath= mCurrentDirectory + "/.gimmick/Shared/gimmick/localdatabase_Descriptor.txt"; + boost::algorithm::replace_all( dpath, + INVALID_FILE_SEPARATOR , + VALID_FILE_SEPARATOR); + mLocalDatabase = createDB(i_nameDB, dpath, dbpath); // Add it to the TreeHandlerMap mTreeHandlerMap[i_nameDB] = mLocalDatabase; //Add additional DB from user Settings addDBSettings(); - // Creates files and directories database - mTimestampDatabase = new TimestampDatabaseHandler(GetTimestampDatabasePath()); - // Create or open local database - if (! boost::filesystem::exists( GetTimestampDatabasePath() ) ) - { - std::string mess = "Timestamp database '"; - mess += GetTimestampDatabasePath(); - mess += "' does not exist : creating it"; - GimmickMessage(1,mess<Create() ) - { - GimmickError("ERROR CREATING '"<Open() ) - { - GimmickError("ERROR OPENING '"<second; } - delete mTimestampDatabase; } //============================================================== @@ -205,129 +185,6 @@ namespace creaImageIO } //================================================================ - //================================================================ - int Gimmick::GetBinaryDirectory(char *pname, size_t pathsize) - { - - #ifdef LINUX - /* Oddly, the readlink(2) man page says no NULL is appended. */ - /* So you have to do it yourself, based on the return value: */ - pathsize --; /* Preserve a space to add the trailing NULL */ - long result = readlink("/proc/self/exe", pname, pathsize); - if (result > 0) - { - pname[result] = 0; /* add the #@!%ing NULL */ - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL (falls - through) */ - } - #endif /* LINUX */ - - #ifdef WIN32 - long result = GetModuleFileName(NULL, pname, pathsize); - if (result > 0) - { - /* fix up the dir slashes... */ - int len = strlen(pname); - int idx; - for (idx = 0; idx < len; idx++) - { - if (pname[idx] == '\\') pname[idx] = '/'; - } - - for (idx = len-1; idx >=0 ; idx--) - { - if (pname[idx] == '/') - { - pname[idx+1] = '\0'; - idx = -1; - } - } - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL (falls - through) */ - } - #endif /* WIN32 */ - - #ifdef SOLARIS - char *p = getexecname(); - if (p) - { - /* According to the Sun manpages, getexecname will - "normally" return an */ - /* absolute path - BUT might not... AND that IF it is not, - pre-pending */ - /* getcwd() will "usually" be the correct thing... Urgh! - */ - - /* check pathname is absolute (begins with a / ???) */ - if (p[0] == '/') /* assume this means we have an - absolute path */ - { - strncpy(pname, p, pathsize); - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - } - else /* if not, prepend getcwd() then check if file - exists */ - { - getcwd(pname, pathsize); - long result = strlen(pname); - strncat(pname, "/", (pathsize - result)); - result ++; - strncat(pname, p, (pathsize - result)); - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL - (falls through) */ - } - } - #endif /* SOLARIS */ - - #ifdef MACOSX /* assume this is OSX */ - /* - from http://www.hmug.org/man/3/NSModule.html - - extern int _NSGetExecutablePath(char *buf, unsigned long - *bufsize); - - _NSGetExecutablePath copies the path of the executable - into the buffer and returns 0 if the path was successfully - copied in the provided buffer. If the buffer is not large - enough, -1 is returned and the expected buffer size is - copied in *bufsize. Note that _NSGetExecutablePath will - return "a path" to the executable not a "real path" to the - executable. That is the path may be a symbolic link and - not the real file. And with deep directories the total - bufsize needed could be more than MAXPATHLEN. - */ - - int status = -1; - char *given_path = (char*)malloc(MAXPATHLEN * 2); - if (!given_path) return status; - - uint32_t npathsize = MAXPATHLEN * 2; - long result = _NSGetExecutablePath(given_path, &npathsize); - if (result == 0) - { /* OK, we got something - now try and resolve the real path... - */ - if (realpath(given_path, pname) != NULL) - { - if ((access(pname, 0) == 0)) - status = 0; /* file exists, return OK */ - } - } - free (given_path); - return status; - #endif /* MACOSX */ - - return -1; /* Path Lookup Failed */ - } //================================================================ const std::string& Gimmick::GetLocalDatabasePath() @@ -335,7 +192,7 @@ namespace creaImageIO if (mLocalDatabasePath.size()==0) { mLocalDatabasePath = GetUserSettingsDirectory(); - mLocalDatabasePath += "local_database.sqlite3"; + mLocalDatabasePath += "Shared/gimmick/local_database.sqlite3"; boost::algorithm::replace_all( mLocalDatabasePath, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); @@ -343,21 +200,7 @@ namespace creaImageIO return mLocalDatabasePath; } - //================================================================ - //================================================================ - const std::string& Gimmick::GetTimestampDatabasePath() - { - if (mTimestampDatabasePath.size()==0) - { - mTimestampDatabasePath = GetUserSettingsDirectory(); - mTimestampDatabasePath += "timestamp_database.sqlite3"; - boost::algorithm::replace_all( mTimestampDatabasePath, - INVALID_FILE_SEPARATOR , - VALID_FILE_SEPARATOR); - } - return mTimestampDatabasePath; - } //======================================================================== //======================================================================== @@ -378,16 +221,26 @@ namespace creaImageIO boost::algorithm::replace_all( setDir, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); + setDir+="Shared/"; + boost::filesystem::create_directory( setDir ); + setDir+="gimmick/"; + boost::filesystem::create_directory( setDir ); setDir+="localdatabase_Descriptor.txt"; - //if(!boost::filesystem::is_regular_file(setDir)) //JPRX + if(!boost::filesystem::is_regular(setDir)) { char name[PATH_MAX]; - int err = GetBinaryDirectory(name, PATH_MAX); +//EED int err = GetBinaryDirectory(name, PATH_MAX); + crea::System::GetAppPath(name,PATH_MAX); + std::cout<second; } - //======================================================================== - ///Returns the timestamp database handler - TimestampDatabaseHandler* Gimmick::GetTimestampDatabase() const - { - return mTimestampDatabase; - } //======================================================================== @@ -443,9 +290,8 @@ namespace creaImageIO mImageAdder.SetCurrentDatabase(d); mImageAdder.SetTreeHandler(GetTreeHandler(d)); - mImageAdder.SetTimestampHandler(mTimestampDatabase); mImageAdder.SetSynchronizer(mSynchronizer); - mImageAdder.AddFiles(filenames); + mImageAdder.AddFiles(filenames); } //======================================================================== @@ -461,7 +307,6 @@ namespace creaImageIO TreeHandler * handler=GetTreeHandler(d); mImageAdder.SetCurrentDatabase(d); mImageAdder.SetTreeHandler(handler); - mImageAdder.SetTimestampHandler(mTimestampDatabase); mImageAdder.SetSynchronizer(mSynchronizer); mImageAdder.AddDirectory(f,recurse); } @@ -474,7 +319,6 @@ namespace creaImageIO { mImageAdder.SetCurrentDatabase(d); mImageAdder.SetSynchronizer(mSynchronizer); - mTimestampDatabase->RemoveNode("PATH",node,d); mImageAdder.RemoveFile(node); } //======================================================================== @@ -486,7 +330,6 @@ namespace creaImageIO TreeHandler * handler=GetTreeHandler(d); mImageAdder.SetCurrentDatabase(d); mImageAdder.SetTreeHandler(handler); - mImageAdder.SetTimestampHandler(mTimestampDatabase); mImageAdder.SetSynchronizer(mSynchronizer); mImageAdder.CopyFiles(filenames, mSettings->getValue(SETTINGS_COPY_PATH)); } @@ -498,7 +341,6 @@ namespace creaImageIO TreeHandler * handler=GetTreeHandler(d); mImageAdder.SetCurrentDatabase(d); mImageAdder.SetTreeHandler(handler); - mImageAdder.SetTimestampHandler(mTimestampDatabase); mImageAdder.SetSynchronizer(mSynchronizer); return mImageAdder.Synchronize(repair, checkAttributes); } @@ -519,6 +361,21 @@ namespace creaImageIO //======================================================================== + void Gimmick::GetAttributes(const std::string& d, + const std::string& filename, + const std::vector& params, + std::vector& results) + { + TreeHandler * handler=GetTreeHandler(d); + mImageAdder.SetCurrentDatabase(d); + mImageAdder.SetTreeHandler(handler); + mImageAdder.SetSynchronizer(mSynchronizer); + mImageAdder.GetAttributes(params, filename, results); + } + //======================================================================== + + //======================================================================== + void Gimmick::UpdateSetting(const std::string& name, const std::string& value) { mSettings->updateSetting(name,value); @@ -534,7 +391,6 @@ namespace creaImageIO mImageAdder.SetTreeHandler(it->second); mImageAdder.DeleteDriveFromMainDB(drive); } - mImageAdder.SetTimestampHandler(mTimestampDatabase); mImageAdder.SetSynchronizer(mSynchronizer); mImageAdder.DeleteDriveFromOtherDB(drive); }