Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-22 06:05:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Share Flags

Browse Source 
- 1st attempt at displaying share properties in the SharedFlagsDialog.
	- added share flags in DirDetails structure in place of Rank, that is not used anymore.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1509 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-08-10 18:55:49 +00:00
parent 2380b0c793
commit a808ab9173
8 changed files with 225 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libretroshare/src/dbase/fimonitor.cc
View File

@ -932,7 +932,39 @@ int FileIndexMonitor::RequestDirDetails(void *ref, DirDetails &details, uint32_t
fi.root->checkParentPointers(); fi.root->checkParentPointers();
#endif #endif
return fi.RequestDirDetails(ref,details,flags) ; // return details as reported by the FileIndex
bool b = fi.RequestDirDetails(ref,details,flags) ;
// look for the top level and setup flags accordingly
FileEntry *file = (FileEntry *) ref;
DirEntry *dir = dynamic_cast<DirEntry *>(file);
DirEntry *last_dir = NULL ;
if(dir != NULL)
while(dir->parent != NULL)
{
last_dir = dir ;
dir = dir->parent ;
}
if(last_dir != NULL)
{
std::cerr << "FileIndexMonitor::RequestDirDetails: parent->name=" << last_dir->name << std::endl ;
std::map<std::string,SharedDirInfo>::const_iterator it = directoryMap.find(last_dir->name) ;
if(it == directoryMap.end())
std::cerr << "*********** ERROR *********** In " << __PRETTY_FUNCTION__ << std::endl ;
else
{
details.flags |= (( (it->second.shareflags & RS_FILE_HINTS_BROWSABLE)>0)?DIR_FLAGS_BROWSABLE:0) ;
details.flags |= (( (it->second.shareflags & RS_FILE_HINTS_NETWORK_WIDE)>0)?DIR_FLAGS_NETWORK_WIDE:0) ;
std::cerr << "flags = " << details.flags << std::endl ;
}
}
return b ;
} }

8
libretroshare/src/dbase/findex.cc
View File

@ -1120,7 +1120,7 @@ int FileIndex::RequestDirDetails(void *ref, DirDetails &details, uint32_t flags)
if (!ref) if (!ref)
{ {
#ifdef FI_DEBUG #ifdef FI_DEBUG
std::cerr << "FileIndexMonitor::RequestDirDetails() ref=NULL (root)" << std::endl; std::cerr << "FileIndex::RequestDirDetails() ref=NULL (root)" << std::endl;
#endif #endif
/* local only */ /* local only */
DirStub stub; DirStub stub;
@ -1138,14 +1138,14 @@ int FileIndex::RequestDirDetails(void *ref, DirDetails &details, uint32_t flags)
details.hash = ""; details.hash = "";
details.path = ""; details.path = "";
details.age = 0; details.age = 0;
details.rank = 0; details.flags = 0;
} }
else else
{ {
if (dir) /* has children --- fill */ if (dir) /* has children --- fill */
{ {
#ifdef FI_DEBUG #ifdef FI_DEBUG
std::cerr << "FileIndexStore::RequestDirDetails() ref=dir" << std::endl; std::cerr << "FileIndex::RequestDirDetails() ref=dir" << std::endl;
#endif #endif
std::map<std::string, FileEntry *>::iterator fit; std::map<std::string, FileEntry *>::iterator fit;
std::map<std::string, DirEntry *>::iterator dit; std::map<std::string, DirEntry *>::iterator dit;
@ -1190,7 +1190,7 @@ int FileIndex::RequestDirDetails(void *ref, DirDetails &details, uint32_t flags)
details.name = file->name; details.name = file->name;
details.hash = file->hash; details.hash = file->hash;
details.age = time(NULL) - file->modtime; details.age = time(NULL) - file->modtime;
details.rank = file->pop; details.flags = 0;//file->pop;
/* find parent pointer, and row */ /* find parent pointer, and row */
DirEntry *parent = file->parent; DirEntry *parent = file->parent;

6
libretroshare/src/dbase/fistore.cc
View File

@ -219,7 +219,7 @@ int FileIndexStore::RequestDirDetails(void *ref, DirDetails &details, uint32_t f
details.hash = ""; details.hash = "";
details.path = ""; details.path = "";
details.age = 0; details.age = 0;
details.rank = 0; details.flags = 0;
} }
else else
{ {
@ -244,7 +244,7 @@ int FileIndexStore::RequestDirDetails(void *ref, DirDetails &details, uint32_t f
details.path = ""; details.path = "";
details.count = indices.size(); details.count = indices.size();
details.age = 0; details.age = 0;
details.rank = 0; details.flags = 0;
} }
} }
else else
@ -300,7 +300,7 @@ int FileIndexStore::RequestDirDetails(void *ref, DirDetails &details, uint32_t f
details.name = file->name; details.name = file->name;
details.hash = file->hash; details.hash = file->hash;
details.age = time(NULL) - file->modtime; details.age = time(NULL) - file->modtime;
details.rank = file->pop; details.flags = 0;//file->pop;
/* find parent pointer, and row */ /* find parent pointer, and row */
DirEntry *parent = file->parent; DirEntry *parent = file->parent;

4
libretroshare/src/rsiface/rstypes.h
View File

@ -203,6 +203,8 @@ class SearchRequest
#define DIR_FLAGS_PARENT 0x0001 #define DIR_FLAGS_PARENT 0x0001
#define DIR_FLAGS_DETAILS 0x0002 #define DIR_FLAGS_DETAILS 0x0002
#define DIR_FLAGS_CHILDREN 0x0004 #define DIR_FLAGS_CHILDREN 0x0004
#define DIR_FLAGS_NETWORK_WIDE 0x0008
#define DIR_FLAGS_BROWSABLE 0x0010
class DirStub class DirStub
{ {
@ -226,7 +228,7 @@ class DirDetails
std::string path; std::string path;
uint64_t count; uint64_t count;
uint32_t age; uint32_t age;
uint32_t rank; uint32_t flags;
std::list<DirStub> children; std::list<DirStub> children;
}; };

4
retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp
View File

@ -459,7 +459,7 @@ void ChanMsgDialog::insertFileList(const std::list<DirDetails>& files_info)
FileInfo info ; FileInfo info ;
info.fname = it->name ; info.fname = it->name ;
info.hash = it->hash ; info.hash = it->hash ;
info.rank = it->rank ; info.rank = 0;//it->rank ;
info.size = it->count ; info.size = it->count ;
_recList.push_back(info) ; _recList.push_back(info) ;
@ -468,7 +468,7 @@ void ChanMsgDialog::insertFileList(const std::list<DirDetails>& files_info)
item->setText(0, QString::fromStdString(it->name)); /* (0) Filename */ item->setText(0, QString::fromStdString(it->name)); /* (0) Filename */
item->setText(1, misc::friendlyUnit(it->count)); /* (1) Size */ item->setText(1, misc::friendlyUnit(it->count)); /* (1) Size */
item->setText(2, QString::number(it->rank)); item->setText(2, QString::number(0)) ;//it->rank));
item->setText(3, QString::fromStdString(it->hash)); item->setText(3, QString::fromStdString(it->hash));
item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
item->setCheckState(0, Qt::Checked); item->setCheckState(0, Qt::Checked);

25
retroshare-gui/src/rsiface/RemoteDirModel.cpp
View File

@ -137,6 +137,17 @@ void RemoteDirModel::treeStyle()
{ {
return 4; return 4;
} }
QString RemoteDirModel::getFlagsString(uint32_t flags)
{
switch(flags & (DIR_FLAGS_NETWORK_WIDE|DIR_FLAGS_BROWSABLE))
{
case DIR_FLAGS_NETWORK_WIDE: return QString("Anonymous") ;
case DIR_FLAGS_NETWORK_WIDE | DIR_FLAGS_BROWSABLE: return QString("Anonymous and browsable by friends") ;
case DIR_FLAGS_BROWSABLE: return QString("Only browsable by friends") ;
default:
return QString() ;
}
}
QVariant RemoteDirModel::data(const QModelIndex &index, int role) const QVariant RemoteDirModel::data(const QModelIndex &index, int role) const
{ {
@ -160,6 +171,7 @@ void RemoteDirModel::treeStyle()
else else
flags |= DIR_FLAGS_LOCAL; flags |= DIR_FLAGS_LOCAL;
if (!rsFiles->RequestDirDetails(ref, details, flags)) if (!rsFiles->RequestDirDetails(ref, details, flags))
{ {
return QVariant(); return QVariant();
@ -413,9 +425,7 @@ void RemoteDirModel::treeStyle()
break; break;
case 2: case 2:
{ {
std::ostringstream out; return getFlagsString(details.flags);
out << details.rank;
return QString::fromStdString(out.str());
} }
break; break;
case 3: case 3:
@ -446,8 +456,7 @@ void RemoteDirModel::treeStyle()
} }
break; break;
case 2: case 2:
return QString(""); return getFlagsString(details.flags);
//return QString::fromStdString(details.path);
break; break;
default: default:
@ -474,7 +483,7 @@ void RemoteDirModel::treeStyle()
QVariant RemoteDirModel::headerData(int section, Qt::Orientation orientation, QVariant RemoteDirModel::headerData(int section, Qt::Orientation orientation,
int role) const int role) const
{ {
if (role == Qt::SizeHintRole) if (role == Qt::SizeHintRole)
{ {
int defw = 50; int defw = 50;
@ -507,7 +516,7 @@ void RemoteDirModel::treeStyle()
return QString(tr("Size")); return QString(tr("Size"));
break; break;
case 2: case 2:
return QString(tr("Rank")); return QString(tr("Share type"));
break; break;
case 3: case 3:
return QString(tr("Age")); return QString(tr("Age"));
@ -517,7 +526,7 @@ void RemoteDirModel::treeStyle()
} }
else else
return QString("Row %1").arg(section); return QString("Row %1").arg(section);
} }
QModelIndex RemoteDirModel::index(int row, int column, QModelIndex RemoteDirModel::index(int row, int column,
const QModelIndex & parent) const const QModelIndex & parent) const

1
retroshare-gui/src/rsiface/RemoteDirModel.h
View File

@ -70,6 +70,7 @@ virtual QStringList mimeTypes () const;
void update (const QModelIndex &index ); void update (const QModelIndex &index );
void treeStyle(); void treeStyle();
void downloadDirectory(const DirDetails & details, int prefixLen); void downloadDirectory(const DirDetails & details, int prefixLen);
static QString getFlagsString(uint32_t) ;
QIcon categoryIcon; QIcon categoryIcon;
QIcon peerIcon; QIcon peerIcon;

4
retroshare-gui/src/rsiface/rstypes.h
View File

@ -203,6 +203,8 @@ class SearchRequest
#define DIR_FLAGS_PARENT 0x0001 #define DIR_FLAGS_PARENT 0x0001
#define DIR_FLAGS_DETAILS 0x0002 #define DIR_FLAGS_DETAILS 0x0002
#define DIR_FLAGS_CHILDREN 0x0004 #define DIR_FLAGS_CHILDREN 0x0004
#define DIR_FLAGS_NETWORK_WIDE 0x0008
#define DIR_FLAGS_BROWSABLE 0x0010
class DirStub class DirStub
{ {
@ -226,7 +228,7 @@ class DirDetails
std::string path; std::string path;
uint64_t count; uint64_t count;
uint32_t age; uint32_t age;
uint32_t rank; uint32_t flags;
std::list<DirStub> children; std::list<DirStub> children;
}; };