mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 19:12:28 -04:00
ChannelFeed:
- Sort the ChanMsgItems of the channel by date ChanMsgItem: - Fixed adding all files (SubFileItem) again by pressing the unsubscribe button (only in Friend Storm) - Enable unsubscribe button only when channel is subscribed (only in Friend Storm) - Fixed adding files with umlauts (utf8) on Windows - Enabled Download and Play button in ChanMsgItem, when they are enabled in the SubFileItems ftServer: - Added the method alreadyHaveFile for use in the GUI - recompile of GUI needed SubFileItem: - Added state strings like LOCAL, REMOTE, ERROR, ... for translating git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3614 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
3c29434007
commit
d31cef0f11
14 changed files with 290 additions and 120 deletions
|
@ -994,12 +994,10 @@ bool ftController::handleAPendingRequest()
|
|||
return true ;
|
||||
}
|
||||
|
||||
bool ftController::alreadyHaveFile(const std::string& hash)
|
||||
bool ftController::alreadyHaveFile(const std::string& hash, FileInfo &info)
|
||||
{
|
||||
FileInfo info ;
|
||||
|
||||
// check for downloads
|
||||
if(FileDetails(hash, info) && (info.downloadStatus == FT_STATE_COMPLETE))
|
||||
if (FileDetails(hash, info) && (info.downloadStatus == FT_STATE_COMPLETE))
|
||||
return true ;
|
||||
|
||||
// check for file lists
|
||||
|
@ -1017,7 +1015,8 @@ bool ftController::FileRequest(const std::string& fname, const std::string& has
|
|||
|
||||
/* check if we have the file */
|
||||
|
||||
if(alreadyHaveFile(hash))
|
||||
FileInfo info;
|
||||
if(alreadyHaveFile(hash, info))
|
||||
return false ;
|
||||
|
||||
if(size == 0) // we treat this special case because
|
||||
|
@ -1077,7 +1076,6 @@ bool ftController::FileRequest(const std::string& fname, const std::string& has
|
|||
}
|
||||
}
|
||||
|
||||
FileInfo info;
|
||||
std::list<std::string>::const_iterator it;
|
||||
std::list<TransferInfo>::const_iterator pit;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue