added extra list view in own files.

libretroshare/src/file_sharing/dir_hierarchy.cc

@@ -865,7 +865,7 @@ void InternalFileHierarchyStorage::print() const
     for(uint32_t i=0;i<mNodes.size();++i)
         if(mNodes[i] == NULL)
         {
-            std::cerr << "  Node " << i << ": empty " << std::endl;
+            //std::cerr << "  Node " << i << ": empty " << std::endl;
             ++nempty ;
         }
         else if(mNodes[i]->type() == FileStorageNode::TYPE_DIR)
@@ -1183,6 +1183,11 @@ bool InternalFileHierarchyStorage::load(const std::string& fname)
         }
         free(buffer) ;
 
+        std::string err_str ;
+
+        if(!check(err_str))
+            std::cerr << "(EE) Error while loading file hierarchy " << fname << std::endl;
+
         return true ;
     }
     catch(read_error& e)

libretroshare/src/file_sharing/file_sharing_defaults.h

@@ -25,6 +25,7 @@ static const uint32_t DELAY_BETWEEN_DIRECTORY_UPDATES           =  600 ; // 10 m
 static const uint32_t DELAY_BETWEEN_REMOTE_DIRECTORY_SYNC_REQ   =  120 ; // 2 minutes
 static const uint32_t DELAY_BETWEEN_LOCAL_DIRECTORIES_TS_UPDATE =   20 ; // 20 sec. But we only update for real if something has changed.
 static const uint32_t DELAY_BETWEEN_REMOTE_DIRECTORIES_SWEEP    =   60 ; // 60 sec.
+static const uint32_t DELAY_BETWEEN_EXTRA_FILES_CACHE_UPDATES   =    2 ; //  2 sec.
 
 static const uint32_t DELAY_BEFORE_DELETE_NON_EMPTY_REMOTE_DIR  = 60*24*86400 ; // delete non empty remoe directories after 60 days of inactivity
 static const uint32_t DELAY_BEFORE_DELETE_EMPTY_REMOTE_DIR      =  5*24*86400 ; // delete empty remote directories after 5 days of inactivity

libretroshare/src/file_sharing/p3filelists.cc

@@ -38,6 +38,7 @@
 
 //#define DEBUG_P3FILELISTS 1
 #define DEBUG_CONTENT_FILTERING 1
+#define DEBUG_FILE_HIERARCHY 1
 
 static const uint32_t P3FILELISTS_UPDATE_FLAG_NOTHING_CHANGED     = 0x0000 ;
 static const uint32_t P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED  = 0x0001 ;
@@ -71,6 +72,7 @@ p3FileDatabase::p3FileDatabase(p3ServiceControl *mpeers)
 
     mUpdateFlags = P3FILELISTS_UPDATE_FLAG_NOTHING_CHANGED ;
     mLastRemoteDirSweepTS = 0 ;
+    mLastExtraFilesCacheUpdate = 0;
     mLastCleanupTime = 0 ;
     mLastDataRecvTS = 0 ;
     mTrustFriendNodesForBannedFiles = TRUST_FRIEND_NODES_FOR_BANNED_FILES_DEFAULT;
@@ -884,6 +886,8 @@ void p3FileDatabase::requestDirUpdate(void *ref)
     }
 }
 
+// Finds the pointer to the sub-element #row under element ref.
+
 bool p3FileDatabase::findChildPointer( void *ref, int row, void *& result,
                                        FileSearchFlags flags ) const
 {
@@ -891,10 +895,10 @@ bool p3FileDatabase::findChildPointer( void *ref, int row, void *& result,
     {
         if(flags & RS_FILE_HINTS_LOCAL)
         {
-            if(row != 0)
+            if(row != 0 && row != 1)
                 return false ;
 
-            convertEntryIndexToPointer<sizeof(void*)>(0,0,result);
+            convertEntryIndexToPointer<sizeof(void*)>(0,row,result);
 
             return true ;
         }
@@ -913,12 +917,18 @@ bool p3FileDatabase::findChildPointer( void *ref, int row, void *& result,
     convertPointerToEntryIndex<sizeof(void*)>(ref,e,fi);
 
     // check consistency
-    if( (fi == 0 && !(flags & RS_FILE_HINTS_LOCAL)) ||  (fi > 0 && (flags & RS_FILE_HINTS_LOCAL)))
+    if( (fi == 0 && !(flags & RS_FILE_HINTS_LOCAL)) ||  (fi > 1 && (flags & RS_FILE_HINTS_LOCAL)))
     {
         P3FILELISTS_ERROR() << "(EE) remote request on local index or local request on remote index. This should not happen." << std::endl;
         return false ;
     }
-    DirectoryStorage *storage = (fi==0)? ((DirectoryStorage*)mLocalSharedDirs) : ((DirectoryStorage*)mRemoteDirectories[fi-1]);
+
+    if(fi==1 && (flags & RS_FILE_HINTS_LOCAL)) // extra list
+    {
+		convertEntryIndexToPointer<sizeof(void*)>(row+1,1,result);
+        return true;
+    }
+    DirectoryStorage *storage = (flags & RS_FILE_HINTS_LOCAL)? ((DirectoryStorage*)mLocalSharedDirs) : ((DirectoryStorage*)mRemoteDirectories[fi-1]);
 
     // Case where the index is the top of a single person. Can be us, or a friend.
 
@@ -950,6 +960,65 @@ int p3FileDatabase::getSharedDirStatistics(const RsPeerId& pid,SharedDirStats& s
     }
 }
 
+void p3FileDatabase::getExtraFilesDirDetails(void *ref,DirectoryStorage::EntryIndex e,DirDetails& d) const
+{
+    // update the cache of extra files if last requested too long ago
+
+    time_t now = time(NULL);
+
+    if(mLastExtraFilesCacheUpdate + DELAY_BETWEEN_EXTRA_FILES_CACHE_UPDATES <= now)
+    {
+        mExtraFiles->getExtraFileList(mExtraFilesCache);
+        mLastExtraFilesCacheUpdate = now;
+    }
+
+    //
+
+	if(e == 0)	// "virtual extra files directory" => create a dir with as many child as they are extra files
+	{
+		d.parent = NULL ;
+
+		d.prow = 0;//fi-1 ;
+		d.type = DIR_TYPE_DIR;
+		d.hash.clear() ;
+		d.count   = mExtraFilesCache.size();
+		d.max_mtime = time(NULL);
+		d.mtime     = time(NULL);
+		d.name    = "Temporary shared files";
+		d.path    = "/";
+		d.ref     = ref ;
+
+        for(uint32_t i=0;i<mExtraFilesCache.size();++i)
+		{
+			DirStub stub;
+			stub.type = DIR_TYPE_FILE;
+			stub.name = mExtraFilesCache[i].fname;
+			convertEntryIndexToPointer<sizeof(void*)>(i,1,stub.ref);	// local shared files from extra list
+
+			d.children.push_back(stub);
+		}
+	}
+	else	// extra file. Just query the corresponding data from ftExtra
+	{
+		d.prow = 1;//fi-1 ;
+		d.type = DIR_TYPE_FILE;
+
+        FileInfo& f(mExtraFilesCache[(int)e-1]) ;
+
+		d.hash      = f.hash;
+		d.count     = 0;
+		d.max_mtime = time(NULL);
+		d.mtime     = time(NULL);
+		d.name      = f.fname;
+		d.path      = "/";
+		d.ref       = ref ;
+
+		convertEntryIndexToPointer<sizeof(void*)>(0,1,d.parent) ;
+	}
+
+	d.id = RsPeerId();
+}
+
 // This function converts a pointer into directory details, to be used by the AbstractItemModel for browsing the files.
 int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags flags) const
 {
@@ -975,10 +1044,8 @@ int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags
     {
         d.ref = NULL ;
         d.type = DIR_TYPE_ROOT;
-        d.count = 1;
         d.parent = NULL;
         d.prow = -1;
-        d.ref = NULL;
         d.name = "root";
         d.hash.clear() ;
         d.path = "";
@@ -989,13 +1056,26 @@ int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags
         if(flags & RS_FILE_HINTS_LOCAL)
         {
             void *p;
-            convertEntryIndexToPointer<sizeof(void*)>(0,0,p);
 
+            {
+			convertEntryIndexToPointer<sizeof(void*)>(0,0,p);	// root of own directories
             DirStub stub;
             stub.type = DIR_TYPE_PERSON;
             stub.name = mServCtrl->getOwnId().toStdString();
             stub.ref  = p;
             d.children.push_back(stub);
+			}
+            {
+            convertEntryIndexToPointer<sizeof(void*)>(0,1,p);	// local shared files from extra list
+            DirStub stub;
+            stub.type = DIR_TYPE_PERSON;
+            stub.name = "Temporary shared files";
+            stub.ref  = p;
+
+            d.children.push_back(stub);
+            }
+
+
         }
         else for(uint32_t i=0;i<mRemoteDirectories.size();++i)
             if(mRemoteDirectories[i] != NULL)
@@ -1014,6 +1094,7 @@ int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags
 
 #ifdef DEBUG_FILE_HIERARCHY
         P3FILELISTS_DEBUG() << "ExtractData: ref=" << ref << ", flags=" << flags << " : returning this: " << std::endl;
+		P3FILELISTS_DEBUG() << d << std::endl;
 #endif
 
         return true ;
@@ -1025,12 +1106,25 @@ int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags
     convertPointerToEntryIndex<sizeof(void*)>(ref,e,fi);
 
     // check consistency
-    if( (fi == 0 && !(flags & RS_FILE_HINTS_LOCAL)) ||  (fi > 0 && (flags & RS_FILE_HINTS_LOCAL)))
+    if( (fi == 0 && !(flags & RS_FILE_HINTS_LOCAL)) ||  (fi > 1 && (flags & RS_FILE_HINTS_LOCAL)))
     {
         P3FILELISTS_ERROR() << "(EE) remote request on local index or local request on remote index. This should not happen." << std::endl;
         return false ;
     }
-    DirectoryStorage *storage = (fi==0)? ((DirectoryStorage*)mLocalSharedDirs) : ((DirectoryStorage*)mRemoteDirectories[fi-1]);
+
+    if((flags & RS_FILE_HINTS_LOCAL) && fi == 1) // extra list
+    {
+        getExtraFilesDirDetails(ref,e,d);
+
+#ifdef DEBUG_FILE_HIERARCHY
+		P3FILELISTS_DEBUG() << "ExtractData: ref=" << ref << ", flags=" << flags << " : returning this: " << std::endl;
+		P3FILELISTS_DEBUG() << d << std::endl;
+#endif
+        return true;
+    }
+
+
+    DirectoryStorage *storage = (flags & RS_FILE_HINTS_LOCAL)? ((DirectoryStorage*)mLocalSharedDirs) : ((DirectoryStorage*)mRemoteDirectories[fi-1]);
 
     // Case where the index is the top of a single person. Can be us, or a friend.
 

libretroshare/src/file_sharing/p3filelists.h

@@ -45,6 +45,7 @@
 #pragma once
 
 #include "ft/ftsearch.h"
+#include "ft/ftextralist.h"
 #include "retroshare/rsfiles.h"
 #include "services/p3service.h"
 
@@ -87,9 +88,10 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
             // [...] more to add here
         };
 
-        explicit p3FileDatabase(p3ServiceControl *mpeers) ;
+        explicit p3FileDatabase(p3ServiceControl *mpeers);
         ~p3FileDatabase();
 
+        void setExtraList(ftExtraList *f) { mExtraFiles = f ; }
         /*!
         * \brief forceSyncWithPeers
         *
@@ -169,6 +171,7 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
 		bool hashingProcessPaused();
 
     protected:
+		void getExtraFilesDirDetails(void *ref,DirectoryStorage::EntryIndex e,DirDetails& d) const;
 
         int filterResults(const std::list<void*>& firesults,std::list<DirDetails>& results,FileSearchFlags flags,const RsPeerId& peer_id) const;
         std::string makeRemoteFileName(const RsPeerId& pid) const;
@@ -219,8 +222,8 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
 
         std::vector<RemoteDirectoryStorage *> mRemoteDirectories ;
         LocalDirectoryStorage *mLocalSharedDirs ;
-
         LocalDirectoryUpdater *mLocalDirWatcher ;
+		ftExtraList *mExtraFiles;
 
         // utility functions to make/get a pointer out of an (EntryIndex,PeerId) pair. This is further documented in the .cc
 
@@ -268,6 +271,8 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
 		std::map<RsFileHash,BannedFileEntry> mPrimaryBanList ;	// primary list (user controlled) of files banned from FT search and forwarding. map<real hash, BannedFileEntry>
         std::map<RsPeerId,PeerBannedFilesEntry> mPeerBannedFiles ;   // records of which files other peers ban, stored as H(H(f))
 		std::set<RsFileHash> mBannedFileList ;	// list of banned hashes. This include original hashs and H(H(f)) when coming from friends.
+        mutable std::vector<FileInfo> mExtraFilesCache;	// cache for extra files, to avoid requesting them too often.
+        mutable time_t mLastExtraFilesCacheUpdate ;
         bool mTrustFriendNodesForBannedFiles ;
         bool mBannedFileListNeedsUpdate;
         time_t mLastPrimaryBanListChangeTimeStamp;

libretroshare/src/ft/ftextralist.cc

@@ -96,7 +96,7 @@ void ftExtraList::hashAFile()
 	FileDetails details;
 
 	{
-		RsStackMutex stack(extMutex);
+		RS_STACK_MUTEX(extMutex);
 
 		if (mToHash.empty())
 			return;
@@ -116,7 +116,7 @@ void ftExtraList::hashAFile()
 	if (RsDirUtil::hashFile(details.info.path, details.info.fname, 
 				details.info.hash, details.info.size))
 	{
-		RsStackMutex stack(extMutex);
+		RS_STACK_MUTEX(extMutex);
 
 		/* stick it in the available queue */
 		mFiles[details.info.hash] = details;
@@ -146,7 +146,7 @@ bool	ftExtraList::addExtraFile(std::string path, const RsFileHash& hash,
 	std::cerr << std::endl;
 #endif
 
-	RsStackMutex stack(extMutex);
+	RS_STACK_MUTEX(extMutex);
 
 	FileDetails details;
 
@@ -179,7 +179,7 @@ bool ftExtraList::removeExtraFile(const RsFileHash& hash, TransferRequestFlags f
 	std::cerr << std::endl;
 #endif
 
-	RsStackMutex stack(extMutex);
+	RS_STACK_MUTEX(extMutex);
 
     mHashOfHash.erase(makeEncryptedHash(hash)) ;
 
@@ -230,7 +230,7 @@ bool	ftExtraList::cleanupOldFiles()
 	std::cerr << std::endl;
 #endif
 
-	RsStackMutex stack(extMutex);
+	RS_STACK_MUTEX(extMutex);
 
 	time_t now = time(NULL);
 
@@ -286,7 +286,7 @@ bool 	ftExtraList::hashExtraFile(std::string path, uint32_t period, TransferRequ
 #endif
 
 	/* add into queue */
-	RsStackMutex stack(extMutex);
+	RS_STACK_MUTEX(extMutex);
 
 	FileDetails details(path, period, flags);
 	details.info.age = time(NULL) + period;
@@ -305,7 +305,7 @@ bool	ftExtraList::hashExtraFileDone(std::string path, FileInfo &info)
     RsFileHash hash;
 	{
 		/* Find in the path->hash map */
-		RsStackMutex stack(extMutex);
+		RS_STACK_MUTEX(extMutex);
 
         std::map<std::string, RsFileHash>::iterator it;
 		if (mHashedList.end() == (it = mHashedList.find(path)))
@@ -420,7 +420,7 @@ bool ftExtraList::saveList(bool &cleanup, std::list<RsItem *>& sList)
 	std::cerr << std::endl;
 #endif
 
-	RsStackMutex stack(extMutex);
+	RS_STACK_MUTEX(extMutex);
 
 
     std::map<RsFileHash, FileDetails>::const_iterator it;
@@ -489,8 +489,8 @@ bool    ftExtraList::loadList(std::list<RsItem *>& load)
 		/* add into system */
 		FileDetails file;
 
-		RsStackMutex stack(extMutex);
+		RS_STACK_MUTEX(extMutex);
-	
+
 		FileDetails details;
 	
 		details.info.path = fi->file.path;
@@ -513,3 +513,12 @@ bool    ftExtraList::loadList(std::list<RsItem *>& load)
 	return true;
 }
 
+void ftExtraList::getExtraFileList(std::vector<FileInfo>& files) const
+{
+	RS_STACK_MUTEX(extMutex);
+
+    files.clear();
+
+    for(auto it(mFiles.begin());it!=mFiles.end();++it)
+        files.push_back(it->second.info);
+}

libretroshare/src/ft/ftextralist.h

@@ -137,6 +137,12 @@ public:
 		 **/
 	virtual bool    search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const;
 
+    /*!
+     * \brief getExtraFileList
+     * 				Retrieves the list for display purposes
+     */
+    void getExtraFileList(std::vector<FileInfo>& files) const ;
+
 	/***
 		 * Thread Main Loop
 		 **/
@@ -146,6 +152,7 @@ public:
 		 * Configuration - store extra files.
 		 *
 		 **/
+
 protected:
 	virtual RsSerialiser *setupSerialiser();
 	virtual bool saveList(bool &cleanup, std::list<RsItem*>&);

libretroshare/src/ft/ftserver.cc

@@ -174,8 +174,11 @@ void ftServer::SetupFtServer()
 void ftServer::connectToFileDatabase(p3FileDatabase *fdb)
 {
 	mFileDatabase = fdb ;
+
 	mFtSearch->addSearchMode(fdb, RS_FILE_HINTS_LOCAL);	// due to a bug in addSearchModule, modules can only be added one by one. Using | between flags wont work.
 	mFtSearch->addSearchMode(fdb, RS_FILE_HINTS_REMOTE);
+
+    mFileDatabase->setExtraList(mFtExtra);
 }
 void ftServer::connectToTurtleRouter(p3turtle *fts)
 {

libretroshare/src/retroshare/rstypes.h

@@ -160,6 +160,7 @@ struct PeerBandwidthLimits : RsSerializable
 #define DIR_TYPE_PERSON  	0x02
 #define DIR_TYPE_DIR  		0x04
 #define DIR_TYPE_FILE 		0x08
+#define DIR_TYPE_EXTRA		0x10
 
 /* flags for Directry request -
  * two types;

retroshare-gui/src/gui/RemoteDirModel.cpp

@@ -1158,9 +1158,9 @@ void FlatStyle_RDM::postMods()
 
 bool RetroshareDirModel::requestDirDetails(void *ref, bool remote,DirDetails& d) const
 {
-#ifdef RDM_DEBUG
+//#ifdef RDM_DEBUG
 	std::cerr << "RequestDirDetails:: ref = " << ref << ", remote=" << remote << std::endl;
-#endif
+//#endif
 
     // We look in cache and re-use the last result if the reference and remote are the same.