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

Merge pull request #1236 from csoler/v0.6-FileLists

Browse Source 
V0.6 file lists
This commit is contained in:
csoler 2018-04-22 22:07:48 +02:00 committed by GitHub
commit 8f84b1c8a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 210 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretroshare/src/pqi/pqissl.cc
View File

@ -716,10 +716,11 @@ int pqissl::Initiate_Connection()
//std::cerr << "Setting Connect Timeout " << mConnectTimeout << " Seconds into Future " << std::endl; //std::cerr << "Setting Connect Timeout " << mConnectTimeout << " Seconds into Future " << std::endl;
sockaddr_storage_ipv4_to_ipv6(addr); sockaddr_storage_ipv4_to_ipv6(addr);
#ifdef PQISSL_DEBUG
std::cerr << __PRETTY_FUNCTION__ << " Connecting To: " std::cerr << __PRETTY_FUNCTION__ << " Connecting To: "
<< PeerId().toStdString() <<" via: " << PeerId().toStdString() <<" via: "
<< sockaddr_storage_tostring(addr) << std::endl; << sockaddr_storage_tostring(addr) << std::endl;
#endif
if (0 != (err = unix_connect(osock, addr))) if (0 != (err = unix_connect(osock, addr)))
{ {
@ -730,11 +731,13 @@ int pqissl::Initiate_Connection()
sockfd = osock; sockfd = osock;
return 0; return 0;
default: default:
#ifdef PQISSL_DEBUG
std::cerr << __PRETTY_FUNCTION__ << " Failure connect " std::cerr << __PRETTY_FUNCTION__ << " Failure connect "
<< sockaddr_storage_tostring(addr) << sockaddr_storage_tostring(addr)
<< " returns: " << " returns: "
<< err << " -> errno: " << errno << " " << err << " -> errno: " << errno << " "
<< socket_errorType(errno) << std::endl; << socket_errorType(errno) << std::endl;
#endif
net_internal_close(osock); net_internal_close(osock);
osock = -1; osock = -1;

2
libretroshare/src/pqi/pqissllistener.cc
View File

@ -119,8 +119,10 @@ int pqissllistenbase::setuplisten()
reinterpret_cast<uint8_t*>(&no), sizeof(no)); reinterpret_cast<uint8_t*>(&no), sizeof(no));
if (err) std::cerr << __PRETTY_FUNCTION__ if (err) std::cerr << __PRETTY_FUNCTION__
<< ": Error setting IPv6 socket dual stack" << std::endl; << ": Error setting IPv6 socket dual stack" << std::endl;
#ifdef DEBUG_LISTENNER
else std::cerr << __PRETTY_FUNCTION__ else std::cerr << __PRETTY_FUNCTION__
<< ": Success setting IPv6 socket dual stack" << std::endl; << ": Success setting IPv6 socket dual stack" << std::endl;
#endif
#endif // IPV6_V6ONLY #endif // IPV6_V6ONLY
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/ /********************************** WINDOWS/UNIX SPECIFIC PART ******************/

10
libretroshare/src/retroshare/rsexpr.h
View File

@ -182,7 +182,7 @@ private:
class StringExpression: public Expression class StringExpression: public Expression
{ {
public: public:
StringExpression(enum StringOperator op, std::list<std::string> &t, bool ic): Op(op),terms(t), IgnoreCase(ic){} StringExpression(enum StringOperator op, const std::list<std::string> &t, bool ic): Op(op),terms(t), IgnoreCase(ic){}
virtual void linearize(LinearizedExpression& e) const ; virtual void linearize(LinearizedExpression& e) const ;
virtual std::string toStdString(const std::string& varstr) const; virtual std::string toStdString(const std::string& varstr) const;
@ -275,7 +275,7 @@ Some implementations of StringExpressions.
class NameExpression: public StringExpression class NameExpression: public StringExpression
{ {
public: public:
NameExpression(enum StringOperator op, std::list<std::string> &t, bool ic): NameExpression(enum StringOperator op, const std::list<std::string> &t, bool ic):
StringExpression(op,t,ic) {} StringExpression(op,t,ic) {}
bool eval(const ExpFileEntry& file); bool eval(const ExpFileEntry& file);
@ -290,7 +290,7 @@ public:
class PathExpression: public StringExpression { class PathExpression: public StringExpression {
public: public:
PathExpression(enum StringOperator op, std::list<std::string> &t, bool ic): PathExpression(enum StringOperator op, const std::list<std::string> &t, bool ic):
StringExpression(op,t,ic) {} StringExpression(op,t,ic) {}
bool eval(const ExpFileEntry& file); bool eval(const ExpFileEntry& file);
@ -305,7 +305,7 @@ public:
class ExtExpression: public StringExpression { class ExtExpression: public StringExpression {
public: public:
ExtExpression(enum StringOperator op, std::list<std::string> &t, bool ic): ExtExpression(enum StringOperator op, const std::list<std::string> &t, bool ic):
StringExpression(op,t,ic) {} StringExpression(op,t,ic) {}
bool eval(const ExpFileEntry& file); bool eval(const ExpFileEntry& file);
@ -320,7 +320,7 @@ public:
class HashExpression: public StringExpression { class HashExpression: public StringExpression {
public: public:
HashExpression(enum StringOperator op, std::list<std::string> &t): HashExpression(enum StringOperator op, const std::list<std::string> &t):
StringExpression(op,t, true) {} StringExpression(op,t, true) {}
bool eval(const ExpFileEntry& file); bool eval(const ExpFileEntry& file);

184
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
View File

@ -36,6 +36,8 @@
#include "gui/settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"
#include "util/QtVersion.h" #include "util/QtVersion.h"
#include "util/RsAction.h" #include "util/RsAction.h"
#include "util/misc.h"
#include "util/rstime.h"
#include <retroshare/rsexpr.h> #include <retroshare/rsexpr.h>
#include <retroshare/rsfiles.h> #include <retroshare/rsfiles.h>
@ -167,17 +169,24 @@ SharedFilesDialog::SharedFilesDialog(RetroshareDirModel *_tree_model,RetroshareD
flat_model = _flat_model ; flat_model = _flat_model ;
connect(flat_model, SIGNAL(layoutChanged()), this, SLOT(updateDirTreeView()) ); connect(flat_model, SIGNAL(layoutChanged()), this, SLOT(updateDirTreeView()) );
// For filtering items we use a trick: the underlying model will use this FilterRole role to highlight selected items
// while the filterProxyModel will select them using the pre-chosen string "filtered".
tree_proxyModel = new SFDSortFilterProxyModel(tree_model, this); tree_proxyModel = new SFDSortFilterProxyModel(tree_model, this);
tree_proxyModel->setSourceModel(tree_model); tree_proxyModel->setSourceModel(tree_model);
tree_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); tree_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
tree_proxyModel->setSortRole(RetroshareDirModel::SortRole); tree_proxyModel->setSortRole(RetroshareDirModel::SortRole);
tree_proxyModel->sort(COLUMN_NAME); tree_proxyModel->sort(COLUMN_NAME);
tree_proxyModel->setFilterRole(RetroshareDirModel::FilterRole);
tree_proxyModel->setFilterRegExp(QRegExp(QString(RETROSHARE_DIR_MODEL_FILTER_STRING))) ;
flat_proxyModel = new SFDSortFilterProxyModel(flat_model, this); flat_proxyModel = new SFDSortFilterProxyModel(flat_model, this);
flat_proxyModel->setSourceModel(flat_model); flat_proxyModel->setSourceModel(flat_model);
flat_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); flat_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
flat_proxyModel->setSortRole(RetroshareDirModel::SortRole); flat_proxyModel->setSortRole(RetroshareDirModel::SortRole);
flat_proxyModel->sort(COLUMN_NAME); flat_proxyModel->sort(COLUMN_NAME);
flat_proxyModel->setFilterRole(RetroshareDirModel::FilterRole);
flat_proxyModel->setFilterRegExp(QRegExp(QString(RETROSHARE_DIR_MODEL_FILTER_STRING))) ;
// Mr.Alice: I removed this because it causes a crash for some obscur reason. Apparently when the model is changed, the proxy model cannot // Mr.Alice: I removed this because it causes a crash for some obscur reason. Apparently when the model is changed, the proxy model cannot
// deal with the change by itself. Should I call something specific? I've no idea. Removing this does not seem to cause any harm either. // deal with the change by itself. Should I call something specific? I've no idea. Removing this does not seem to cause any harm either.
@ -193,9 +202,9 @@ SharedFilesDialog::SharedFilesDialog(RetroshareDirModel *_tree_model,RetroshareD
ui.filterClearButton->hide(); ui.filterClearButton->hide();
ui.filterStartButton->hide(); ui.filterStartButton->hide();
mFilterTimer = new RsProtectedTimer( this ); // mFilterTimer = new RsProtectedTimer( this );
mFilterTimer->setSingleShot( true ); // Ensure the timer will fire only once after it was started // mFilterTimer->setSingleShot( true ); // Ensure the timer will fire only once after it was started
connect(mFilterTimer, SIGNAL(timeout()), this, SLOT(filterRegExpChanged())); // connect(mFilterTimer, SIGNAL(timeout()), this, SLOT(filterRegExpChanged()));
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * header = ui.dirTreeView->header () ; QHeaderView * header = ui.dirTreeView->header () ;
@ -932,6 +941,39 @@ void SharedFilesDialog::restoreExpandedPathsAndSelection(const std::set<std::str
ui.dirTreeView->blockSignals(false) ; ui.dirTreeView->blockSignals(false) ;
} }
void SharedFilesDialog::expandAll()
{
if(ui.dirTreeView->model() == NULL || ui.dirTreeView->model() == flat_proxyModel) // this method causes infinite loops on flat models
return ;
ui.dirTreeView->blockSignals(true) ;
#ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << "Restoring expanded items. " << std::endl;
#endif
for(int row = 0; row < ui.dirTreeView->model()->rowCount(); ++row)
{
std::string path = ui.dirTreeView->model()->index(row,0).data(Qt::DisplayRole).toString().toStdString();
recursExpandAll(ui.dirTreeView->model()->index(row,0));
}
ui.dirTreeView->blockSignals(false) ;
}
void SharedFilesDialog::recursExpandAll(const QModelIndex& index)
{
ui.dirTreeView->setExpanded(index,true) ;
for(int row=0;row<ui.dirTreeView->model()->rowCount(index);++row)
{
QModelIndex idx(index.child(row,0)) ;
if(ui.dirTreeView->model()->rowCount(idx) > 0)
recursExpandAll(idx) ;
}
}
void SharedFilesDialog::recursSaveExpandedItems(const QModelIndex& index,const std::string& path,std::set<std::string>& exp, void SharedFilesDialog::recursSaveExpandedItems(const QModelIndex& index,const std::string& path,std::set<std::string>& exp,
std::set<std::string>& vis, std::set<std::string>& vis,
std::set<std::string>& sel std::set<std::string>& sel
@ -983,8 +1025,8 @@ void SharedFilesDialog::recursRestoreExpandedItems(const QModelIndex& index, con
bool invisible = vis.find(local_path) != vis.end(); bool invisible = vis.find(local_path) != vis.end();
ui.dirTreeView->setRowHidden(index.row(),index.parent(),invisible ) ; ui.dirTreeView->setRowHidden(index.row(),index.parent(),invisible ) ;
if(invisible) // if(invisible)
mHiddenIndexes.push_back(proxyModel->mapToSource(index)); // mHiddenIndexes.push_back(proxyModel->mapToSource(index));
if(!invisible && exp.find(local_path) != exp.end()) if(!invisible && exp.find(local_path) != exp.end())
{ {
@ -1281,12 +1323,14 @@ void SharedFilesDialog::onFilterTextEdited()
ui.filterStartButton->setEnabled(true) ; ui.filterStartButton->setEnabled(true) ;
ui.filterPatternFrame->setToolTip(QString()); ui.filterPatternFrame->setToolTip(QString());
//FilterItems();
#ifndef DISABLE_SEARCH_WHILE_TYPING #ifndef DISABLE_SEARCH_WHILE_TYPING
mFilterTimer->start( 500 ); // This will fire filterRegExpChanged after 500 ms. mFilterTimer->start( 500 ); // This will fire filterRegExpChanged after 500 ms.
// If the user types something before it fires, the timer restarts counting // If the user types something before it fires, the timer restarts counting
#endif #endif
} }
#ifdef DEPRECATED_CODE
void SharedFilesDialog::filterRegExpChanged() void SharedFilesDialog::filterRegExpChanged()
{ {
QString text = ui.filterPatternLineEdit->text(); QString text = ui.filterPatternLineEdit->text();
@ -1323,17 +1367,8 @@ void SharedFilesDialog::filterRegExpChanged()
ui.filterStartButton->setEnabled(true) ; ui.filterStartButton->setEnabled(true) ;
ui.filterPatternFrame->setToolTip(QString()); ui.filterPatternFrame->setToolTip(QString());
/* unpolish widget to clear the stylesheet's palette cache */
// ui.filterPatternFrame->style()->unpolish(ui.filterPatternFrame);
// QPalette palette = ui.filterPatternLineEdit->palette();
// palette.setColor(ui.filterPatternLineEdit->backgroundRole(), color);
// ui.filterPatternLineEdit->setPalette(palette);
// //ui.searchLineFrame->setProperty("valid", valid);
// Rshare::refreshStyleSheet(ui.filterPatternFrame, false);
} }
#endif
/* clear Filter */ /* clear Filter */
void SharedFilesDialog::clearFilter() void SharedFilesDialog::clearFilter()
@ -1368,13 +1403,14 @@ void SharedFilesDialog::updateDirTreeView()
ui.dirTreeView->setToolTip(""); ui.dirTreeView->setToolTip("");
} }
//#define DEBUG_SHARED_FILES_DIALOG
#ifdef DEPRECATED_CODE
// This macro make the search expand all items that contain the searched text. // This macro make the search expand all items that contain the searched text.
// A bug however, makes RS expand everything when nothing is selected, which is a pain. // A bug however, makes RS expand everything when nothing is selected, which is a pain.
#define EXPAND_WHILE_SEARCHING 1 #define EXPAND_WHILE_SEARCHING 1
//#define DEBUG_SHARED_FILES_DIALOG
void recursMakeVisible(QTreeView *tree,const QSortFilterProxyModel *proxyModel,const QModelIndex& indx,uint32_t depth,const std::vector<std::set<void*> >& pointers,QList<QModelIndex>& hidden_list) void recursMakeVisible(QTreeView *tree,const QSortFilterProxyModel *proxyModel,const QModelIndex& indx,uint32_t depth,const std::vector<std::set<void*> >& pointers,QList<QModelIndex>& hidden_list)
{ {
#ifdef DEBUG_SHARED_FILES_DIALOG #ifdef DEBUG_SHARED_FILES_DIALOG
@ -1430,6 +1466,8 @@ void recursMakeVisible(QTreeView *tree,const QSortFilterProxyModel *proxyModel,c
void SharedFilesDialog::restoreInvisibleItems() void SharedFilesDialog::restoreInvisibleItems()
{ {
std::cerr << "Restoring " << mHiddenIndexes.size() << " invisible indexes" << std::endl;
for(QList<QModelIndex>::const_iterator it(mHiddenIndexes.begin());it!=mHiddenIndexes.end();++it) for(QList<QModelIndex>::const_iterator it(mHiddenIndexes.begin());it!=mHiddenIndexes.end();++it)
{ {
QModelIndex indx = proxyModel->mapFromSource(*it); QModelIndex indx = proxyModel->mapFromSource(*it);
@ -1440,6 +1478,7 @@ void SharedFilesDialog::restoreInvisibleItems()
mHiddenIndexes.clear(); mHiddenIndexes.clear();
} }
#endif
class QCursorContextBlocker class QCursorContextBlocker
{ {
@ -1472,126 +1511,60 @@ void SharedFilesDialog::FilterItems()
if(mLastFilterText == text) // do not filter again if we already did. This is an optimization if(mLastFilterText == text) // do not filter again if we already did. This is an optimization
{ {
#ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << "Last text is equal to text. skipping" << std::endl; std::cerr << "Last text is equal to text. skipping" << std::endl;
#endif
return ; return ;
} }
std::cerr << "New last text. Performing the filter" << std::endl; #ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << "New last text. Performing the filter on string \"" << text.toStdString() << "\"" << std::endl;
#endif
mLastFilterText = text ; mLastFilterText = text ;
model->update() ;
restoreInvisibleItems();
QCursorContextBlocker q(ui.dirTreeView) ; QCursorContextBlocker q(ui.dirTreeView) ;
if(proxyModel == tree_proxyModel)
{
QCoreApplication::processEvents() ; QCoreApplication::processEvents() ;
std::list<std::string> keywords ;
std::list<DirDetails> result_list ; std::list<DirDetails> result_list ;
uint32_t found = 0 ;
if(text == "") if(text == "")
{
model->filterItems(std::list<std::string>(),found) ;
model->update() ;
return ; return ;
}
if(text.length() < 3) if(text.length() < 3)
return ; return ;
FileSearchFlags flags = isRemote()?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL; FileSearchFlags flags = isRemote()?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL;
QStringList lst = text.split(" ",QString::SkipEmptyParts) ; QStringList lst = text.split(" ",QString::SkipEmptyParts) ;
std::list<std::string> keywords ;
for(auto it(lst.begin());it!=lst.end();++it) for(auto it(lst.begin());it!=lst.end();++it)
keywords.push_back((*it).toStdString()); keywords.push_back((*it).toStdString());
if(keywords.size() > 1) model->filterItems(keywords,found) ;
{ model->update() ;
RsRegularExpression::NameExpression exp(RsRegularExpression::ContainsAllStrings,keywords,true);
rsFiles->SearchBoolExp(&exp,result_list, flags) ;
}
else
rsFiles->SearchKeywords(keywords,result_list, flags) ;
#ifdef DEBUG_SHARED_FILES_DIALOG if(found > 0)
std::cerr << "Found " << result_list.size() << " results" << std::endl; expandAll();
#endif
size_t resSize = result_list.size(); if(found == 0)
if(resSize == 0)
{
ui.filterPatternFrame->setToolTip(tr("No result.")) ; ui.filterPatternFrame->setToolTip(tr("No result.")) ;
return ; else if(found > MAX_SEARCH_RESULTS)
}
if(resSize > MAX_SEARCH_RESULTS)
{
ui.filterPatternFrame->setToolTip(tr("More than %1 results. Add more/longer search words to select less.").arg(MAX_SEARCH_RESULTS)) ; ui.filterPatternFrame->setToolTip(tr("More than %1 results. Add more/longer search words to select less.").arg(MAX_SEARCH_RESULTS)) ;
return ;
}
ui.filterPatternFrame->setToolTip(tr("Found %1 results.").arg(resSize)) ;
#ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << "Found this result: " << std::endl;
#endif
std::vector<std::set<void*> > pointers(2,std::set<void*>()); // at least two levels need to be here.
// Then show only the ones we need
for(auto it(result_list.begin());it!=result_list.end();++it)
{
#ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << (void*)(*it).ref << " parents: " ;
#endif
DirDetails& det(*it) ;
void *p = NULL;
std::list<void*> lst ;
lst.push_back(det.ref) ;
while(det.type == DIR_TYPE_FILE || det.type == DIR_TYPE_DIR)
{
p = det.parent ;
rsFiles->RequestDirDetails( p, det, flags);
#ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << " " << (void*)p << "(" << (int)det.type << ")";
#endif
lst.push_front(p) ;
}
#ifdef DEBUG_SHARED_FILES_DIALOG
std::cerr << std::endl;
#endif
uint32_t u=0;
for(auto it2(lst.begin());it2!=lst.end();++it2,++u)
{
if(pointers.size() <= u)
pointers.resize(u+5) ;
pointers[u].insert(*it2) ;
}
}
int rowCount = ui.dirTreeView->model()->rowCount();
for (int row = 0; row < rowCount; ++row)
recursMakeVisible(ui.dirTreeView,proxyModel,ui.dirTreeView->model()->index(row, COLUMN_NAME),0,pointers,mHiddenIndexes);
}
else else
{ ui.filterPatternFrame->setToolTip(tr("Found %1 results.").arg(found)) ;
int rowCount = ui.dirTreeView->model()->rowCount();
for (int row = 0; row < rowCount; ++row) #ifdef DEBUG_SHARED_FILES_DIALOG
flat_FilterItem(ui.dirTreeView->model()->index(row, COLUMN_NAME), text, 0); std::cerr << found << " results found by search." << std::endl;
#endif
} }
#ifdef DEPRECATED_CODE #ifdef DEPRECATED_CODE
int rowCount = ui.dirTreeView->model()->rowCount();
for (int row = 0; row < rowCount; ++row)
if(proxyModel == tree_proxyModel)
tree_FilterItem(ui.dirTreeView->model()->index(row, COLUMN_NAME), text, 0);
else
flat_FilterItem(ui.dirTreeView->model()->index(row, COLUMN_NAME), text, 0);
#endif
}
bool SharedFilesDialog::flat_FilterItem(const QModelIndex &index, const QString &text, int /*level*/) bool SharedFilesDialog::flat_FilterItem(const QModelIndex &index, const QString &text, int /*level*/)
{ {
if(index.data(RetroshareDirModel::FileNameRole).toString().contains(text, Qt::CaseInsensitive)) if(index.data(RetroshareDirModel::FileNameRole).toString().contains(text, Qt::CaseInsensitive))
@ -1641,3 +1614,4 @@ bool SharedFilesDialog::tree_FilterItem(const QModelIndex &index, const QString
return (visible || visibleChildCount); return (visible || visibleChildCount);
} }
#endif

8
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h
View File

@ -77,7 +77,7 @@ private slots:
void indicatorChanged(int index); void indicatorChanged(int index);
void onFilterTextEdited(); void onFilterTextEdited();
void filterRegExpChanged(); //void filterRegExpChanged();
void clearFilter(); void clearFilter();
void startFilter(); void startFilter();
@ -97,6 +97,8 @@ protected:
void recursSaveExpandedItems(const QModelIndex& index, const std::string &path, std::set<std::string> &exp,std::set<std::string>& vis, std::set<std::string>& sel); void recursSaveExpandedItems(const QModelIndex& index, const std::string &path, std::set<std::string> &exp,std::set<std::string>& vis, std::set<std::string>& sel);
void saveExpandedPathsAndSelection(std::set<std::string>& paths,std::set<std::string>& visible_indexes, std::set<std::string>& selected_indexes) ; void saveExpandedPathsAndSelection(std::set<std::string>& paths,std::set<std::string>& visible_indexes, std::set<std::string>& selected_indexes) ;
void restoreExpandedPathsAndSelection(const std::set<std::string>& paths,const std::set<std::string>& visible_indexes, const std::set<std::string>& selected_indexes) ; void restoreExpandedPathsAndSelection(const std::set<std::string>& paths,const std::set<std::string>& visible_indexes, const std::set<std::string>& selected_indexes) ;
void recursExpandAll(const QModelIndex& index);
void expandAll();
protected: protected:
//now context menu are created again every time theu are called ( in some //now context menu are created again every time theu are called ( in some
@ -113,8 +115,6 @@ protected:
bool tree_FilterItem(const QModelIndex &index, const QString &text, int level); bool tree_FilterItem(const QModelIndex &index, const QString &text, int level);
bool flat_FilterItem(const QModelIndex &index, const QString &text, int level); bool flat_FilterItem(const QModelIndex &index, const QString &text, int level);
void restoreInvisibleItems();
QModelIndexList getSelected(); QModelIndexList getSelected();
/** Defines the actions for the context menu for QTreeWidget */ /** Defines the actions for the context menu for QTreeWidget */
@ -142,8 +142,6 @@ protected:
QString lastFilterString; QString lastFilterString;
QString mLastFilterText ; QString mLastFilterText ;
RsProtectedTimer* mFilterTimer; RsProtectedTimer* mFilterTimer;
QList<QModelIndex> mHiddenIndexes;
}; };
class LocalSharedFilesDialog : public SharedFilesDialog class LocalSharedFilesDialog : public SharedFilesDialog

105
retroshare-gui/src/gui/RemoteDirModel.cpp
View File

@ -30,6 +30,7 @@
#include "retroshare/rsfiles.h" #include "retroshare/rsfiles.h"
#include "retroshare/rspeers.h" #include "retroshare/rspeers.h"
#include "util/misc.h" #include "util/misc.h"
#include "retroshare/rsexpr.h"
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
@ -43,6 +44,7 @@
/***** /*****
* #define RDM_DEBUG * #define RDM_DEBUG
* #define RDM_SEARCH_DEBUG
****/ ****/
static const uint32_t FLAT_VIEW_MAX_REFS_PER_SECOND = 2000 ; static const uint32_t FLAT_VIEW_MAX_REFS_PER_SECOND = 2000 ;
@ -170,7 +172,7 @@ bool TreeStyle_RDM::hasChildren(const QModelIndex &parent) const
} }
/* PERSON/DIR*/ /* PERSON/DIR*/
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "lookup PER/DIR #" << details->count; std::cerr << "lookup PER/DIR #" << details.count;
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
return (details.count > 0); /* do we have children? */ return (details.count > 0); /* do we have children? */
@ -229,7 +231,7 @@ int TreeStyle_RDM::rowCount(const QModelIndex &parent) const
/* else PERSON/DIR*/ /* else PERSON/DIR*/
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "lookup PER/DIR #" << details->count; std::cerr << "lookup PER/DIR #" << details.count;
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
if ((details.type == DIR_TYPE_ROOT) && !_showEmpty && RemoteMode) if ((details.type == DIR_TYPE_ROOT) && !_showEmpty && RemoteMode)
@ -367,11 +369,19 @@ const QIcon& RetroshareDirModel::getFlagsIcon(FileStorageFlags flags)
static_icons[n] = new QIcon(pix); static_icons[n] = new QIcon(pix);
std::cerr << "Generated icon for flags " << std::hex << flags << std::endl; std::cerr << "Generated icon for flags " << std::hex << flags << std::dec << std::endl;
} }
return *static_icons[n] ; return *static_icons[n] ;
} }
QVariant RetroshareDirModel::filterRole(const DirDetails& details,int coln) const
{
if(mFilteredPointers.empty() || mFilteredPointers.find(details.ref) != mFilteredPointers.end())
return QString(RETROSHARE_DIR_MODEL_FILTER_STRING);
else
return QVariant();
}
QVariant RetroshareDirModel::decorationRole(const DirDetails& details,int coln) const QVariant RetroshareDirModel::decorationRole(const DirDetails& details,int coln) const
{ {
if(coln == COLUMN_FRIEND_ACCESS) if(coln == COLUMN_FRIEND_ACCESS)
@ -803,9 +813,14 @@ QVariant RetroshareDirModel::data(const QModelIndex &index, int role) const
if (role == SortRole) if (role == SortRole)
return sortRole(index,details,coln) ; return sortRole(index,details,coln) ;
if (role == FilterRole)
return filterRole(details,coln) ;
return QVariant(); return QVariant();
} }
/**** /****
//void RetroshareDirModel::getAgeIndicatorRec(const DirDetails &details, QString &ret) const { //void RetroshareDirModel::getAgeIndicatorRec(const DirDetails &details, QString &ret) const {
// if (details.type == DIR_TYPE_FILE) { // if (details.type == DIR_TYPE_FILE) {
@ -1026,7 +1041,7 @@ QModelIndex TreeStyle_RDM::parent( const QModelIndex & index ) const
} }
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "success index(" << details->prow << ",0," << details->parent << ")"; std::cerr << "success index(" << details.prow << ",0," << details.parent << ")";
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << "Creating index 3 row=" << details.prow << ", column=" << 0 << ", ref=" << (void*)details.parent << std::endl; std::cerr << "Creating index 3 row=" << details.prow << ", column=" << 0 << ", ref=" << (void*)details.parent << std::endl;
@ -1339,10 +1354,10 @@ void RetroshareDirModel::getFileInfoFromIndexList(const QModelIndexList& list, s
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "::::::::::::FileRecommend:::: " << std::endl; std::cerr << "::::::::::::FileRecommend:::: " << std::endl;
std::cerr << "Name: " << details->name << std::endl; std::cerr << "Name: " << details.name << std::endl;
std::cerr << "Hash: " << details->hash << std::endl; std::cerr << "Hash: " << details.hash << std::endl;
std::cerr << "Size: " << details->count << std::endl; std::cerr << "Size: " << details.count << std::endl;
std::cerr << "Path: " << details->path << std::endl; std::cerr << "Path: " << details.path << std::endl;
#endif #endif
// Note: for directories, the returned hash, is the peer id, so if we collect // Note: for directories, the returned hash, is the peer id, so if we collect
// dirs, we need to be a bit more conservative for the // dirs, we need to be a bit more conservative for the
@ -1449,6 +1464,72 @@ void RetroshareDirModel::getFilePaths(const QModelIndexList &list, std::list<std
#endif #endif
} }
void RetroshareDirModel::filterItems(const std::list<std::string>& keywords,uint32_t& found)
{
FileSearchFlags flags = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL;
std::list<DirDetails> result_list ;
found = 0 ;
if(keywords.empty())
{
mFilteredPointers.clear();
return ;
}
else if(keywords.size() > 1)
{
RsRegularExpression::NameExpression exp(RsRegularExpression::ContainsAllStrings,keywords,true);
rsFiles->SearchBoolExp(&exp,result_list, flags) ;
}
else
rsFiles->SearchKeywords(keywords,result_list, flags) ;
#ifdef RDM_SEARCH_DEBUG
std::cerr << "Found " << result_list.size() << " results" << std::endl;
#endif
if(result_list.empty()) // in this case we dont clear the list of filtered items, so that we can keep the old filter list
return ;
mFilteredPointers.clear();
#ifdef RDM_SEARCH_DEBUG
std::cerr << "Found this result: " << std::endl;
#endif
// Then show only the ones we need
for(auto it(result_list.begin());it!=result_list.end();++it)
{
DirDetails& det(*it) ;
#ifdef RDM_SEARCH_DEBUG
std::cerr << (void*)(*it).ref << " name=\"" << det.name << "\" parents: " ;
#endif
void *p = det.ref ;
mFilteredPointers.insert(p) ;
++found ;
while(det.type == DIR_TYPE_FILE || det.type == DIR_TYPE_DIR)
{
p = det.parent ;
rsFiles->RequestDirDetails( p, det, flags);
#ifdef RDM_SEARCH_DEBUG
std::cerr << " " << (void*)p << "(" << (int)det.type << ")";
#endif
mFilteredPointers.insert(p) ;
}
#ifdef RDM_SEARCH_DEBUG
std::cerr << std::endl;
#endif
}
#ifdef RDM_SEARCH_DEBUG
std::cerr << mFilteredPointers.size() << " pointers in filter set." << std::endl;
#endif
}
/* Drag and Drop Functionality */ /* Drag and Drop Functionality */
QMimeData * RetroshareDirModel::mimeData ( const QModelIndexList & indexes ) const QMimeData * RetroshareDirModel::mimeData ( const QModelIndexList & indexes ) const
{ {
@ -1468,10 +1549,10 @@ QMimeData * RetroshareDirModel::mimeData ( const QModelIndexList & indexes ) con
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "::::::::::::FileDrag:::: " << std::endl; std::cerr << "::::::::::::FileDrag:::: " << std::endl;
std::cerr << "Name: " << details->name << std::endl; std::cerr << "Name: " << details.name << std::endl;
std::cerr << "Hash: " << details->hash << std::endl; std::cerr << "Hash: " << details.hash << std::endl;
std::cerr << "Size: " << details->count << std::endl; std::cerr << "Size: " << details.count << std::endl;
std::cerr << "Path: " << details->path << std::endl; std::cerr << "Path: " << details.path << std::endl;
#endif #endif
if (details.type != DIR_TYPE_FILE) if (details.type != DIR_TYPE_FILE)

9
retroshare-gui/src/gui/RemoteDirModel.h
View File

@ -39,6 +39,7 @@
#define COLUMN_FRIEND_ACCESS 4 #define COLUMN_FRIEND_ACCESS 4
#define COLUMN_WN_VISU_DIR 5 #define COLUMN_WN_VISU_DIR 5
#define COLUMN_COUNT 6 #define COLUMN_COUNT 6
#define RETROSHARE_DIR_MODEL_FILTER_STRING "filtered"
class DirDetails; class DirDetails;
@ -60,7 +61,7 @@ class RetroshareDirModel : public QAbstractItemModel
Q_OBJECT Q_OBJECT
public: public:
enum Roles{ FileNameRole = Qt::UserRole+1, SortRole = Qt::UserRole+2 }; enum Roles{ FileNameRole = Qt::UserRole+1, SortRole = Qt::UserRole+2, FilterRole = Qt::UserRole+3 };
RetroshareDirModel(bool mode, QObject *parent = 0); RetroshareDirModel(bool mode, QObject *parent = 0);
virtual ~RetroshareDirModel() {} virtual ~RetroshareDirModel() {}
@ -94,7 +95,8 @@ class RetroshareDirModel : public QAbstractItemModel
virtual QMenu* getContextMenu(QMenu* contextMenu) {return contextMenu;} virtual QMenu* getContextMenu(QMenu* contextMenu) {return contextMenu;}
public: void filterItems(const std::list<std::string>& keywords, uint32_t& found) ;
//Overloaded from QAbstractItemModel //Overloaded from QAbstractItemModel
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
virtual QStringList mimeTypes () const; virtual QStringList mimeTypes () const;
@ -118,6 +120,7 @@ class RetroshareDirModel : public QAbstractItemModel
virtual QVariant sortRole(const QModelIndex&,const DirDetails&,int) const =0; virtual QVariant sortRole(const QModelIndex&,const DirDetails&,int) const =0;
QVariant decorationRole(const DirDetails&,int) const ; QVariant decorationRole(const DirDetails&,int) const ;
QVariant filterRole(const DirDetails& details,int coln) const;
uint32_t ageIndicator; uint32_t ageIndicator;
@ -172,6 +175,8 @@ class RetroshareDirModel : public QAbstractItemModel
mutable time_t mLastReq; mutable time_t mLastReq;
bool mUpdating ; bool mUpdating ;
std::set<void*> mFilteredPointers ;
}; };
// This class shows the classical hierarchical directory view of shared files // This class shows the classical hierarchical directory view of shared files