Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 21:34:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug that caused user to lose own channel if they unsubscribed it

Browse Source 
removed channel file copying 
added tool tip for key sharing 
and tool tip for read status 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2010-10-10 15:20:28 +00:00
parent 0be24268f7
commit e187204437
3 changed files with 6 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
libretroshare/src/services/p3channels.cc
View File

@ -77,8 +77,7 @@ p3Channels::p3Channels(uint16_t type, CacheStrapper *cs,
mRsFiles(files), mRsFiles(files),
mChannelsDir(chanDir) mChannelsDir(chanDir)
{ {
//loadDummyData();
/* create chanDir */ /* create chanDir */
if (!RsDirUtil::checkCreateDirectory(mChannelsDir)) { if (!RsDirUtil::checkCreateDirectory(mChannelsDir)) {
std::cerr << "p3Channels() Failed to create Channels Directory: " << mChannelsDir << std::endl; std::cerr << "p3Channels() Failed to create Channels Directory: " << mChannelsDir << std::endl;
@ -474,111 +473,22 @@ bool p3Channels::channelExtraFileHash(std::string path, std::string chId, FileIn
// reverse string buff for correct file name // reverse string buff for correct file name
fname.append(fnameBuff.rbegin(), fnameBuff.rend()); fname.append(fnameBuff.rbegin(), fnameBuff.rend());
bool fileTooLarge = false;
// first copy file into channel directory
if(!cpyMsgFileToChFldr(path, fname, chId, fileTooLarge)){
if(!fileTooLarge)
return false;
}
uint32_t flags = RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_EXTRA; uint32_t flags = RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_EXTRA;
// then hash file, but hash file at original location if its too large // then hash file, but hash file at original location if its too large
// and get file info too // and get file info too
if(fileTooLarge){
if(!mRsFiles->ExtraFileHash(path, CHANNEL_STOREPERIOD, flags)) if(!mRsFiles->ExtraFileHash(path, CHANNEL_STOREPERIOD, flags))
return false; return false;
fInfo.path = path;
}else{
std::string localpath = mChannelsDir + "/" + chId + "/" + fname;
if(!mRsFiles->ExtraFileHash(localpath, CHANNEL_STOREPERIOD, flags))
return false;
fInfo.path = localpath;
}
fInfo.path = path;
fInfo.fname = fname; fInfo.fname = fname;
return true; return true;
} }
bool p3Channels::cpyMsgFileToChFldr(std::string path, std::string fname, std::string chId, bool& fileTooLarge){
FILE *outFile = NULL, *inFile;
#ifdef WINDOWS_SYS
std::wstring wpath;
librs::util::ConvertUtf8ToUtf16(path, wpath);
inFile = _wfopen(wpath.c_str(), L"rb");
#else
inFile = fopen(path.c_str(), "rb");
#endif
long buffSize = 0;
char* buffer = NULL;
if(inFile){
// obtain file size:
fseek (inFile , 0 , SEEK_END);
buffSize = ftell (inFile);
rewind (inFile);
// don't copy if file over 100mb
if(buffSize > (MAX_AUTO_DL / 10) ){
fileTooLarge = true;
fclose(inFile);
return false;
}
// allocate memory to contain the whole file:
buffer = (char*) malloc (sizeof(char)*buffSize);
if(!buffer){
fclose(inFile);
return false;
}
fread (buffer,1,buffSize,inFile);
fclose(inFile);
std::string localpath = mChannelsDir + "/" + chId + "/" + fname;
#ifdef WINDOWS_SYS
std::wstring wlocalpath;
librs::util::ConvertUtf8ToUtf16(localpath, wlocalpath);
outFile = _wfopen(wlocalpath.c_str(), L"wb");
#else
outFile = fopen(localpath.c_str(), "wb");
#endif
}
if(outFile){
fwrite(buffer, 1, buffSize, outFile);
fclose(outFile);
}else{
std::cerr << "p3Channels::cpyMsgFiletoFldr(): Failed to copy Channel Msg file to its channel folder"
<< std::endl;
if((buffSize > 0) && (buffer != NULL))
free(buffer);
return false;
}
if((buffSize > 0) && (buffer != NULL))
free(buffer);
return true;
}
bool p3Channels::channelExtraFileRemove(std::string hash, std::string chId){ bool p3Channels::channelExtraFileRemove(std::string hash, std::string chId){

2
libretroshare/src/services/p3channels.h
View File

@ -104,8 +104,6 @@ virtual std::list<RsItem *> childSaveList();
private: private:
bool cpyMsgFileToChFldr(std::string path, std::string fname, std::string chId, bool& fileTooLarge);
RsFiles *mRsFiles; RsFiles *mRsFiles;
std::string mChannelsDir; std::string mChannelsDir;
std::list<RsItem *> saveList; std::list<RsItem *> saveList;

4
libretroshare/src/services/p3distrib.cc
View File

@ -930,8 +930,8 @@ void p3GroupDistrib::publishDistribGroups()
std::map<std::string, GroupInfo>::iterator it; std::map<std::string, GroupInfo>::iterator it;
for(it = mGroups.begin(); it != mGroups.end(); it++) for(it = mGroups.begin(); it != mGroups.end(); it++)
{ {
/* if subscribed or listener -> do stuff */ /* if subscribed or listener or admin -> then send it to be published by cache */
if (it->second.flags & (RS_DISTRIB_SUBSCRIBED)) if ((it->second.flags & RS_DISTRIB_SUBSCRIBED) || (it->second.flags & RS_DISTRIB_ADMIN))
{ {
#ifdef DISTRIB_DEBUG #ifdef DISTRIB_DEBUG
std::cerr << "p3GroupDistrib::publishDistribGroups() Saving Group: " << it->first; std::cerr << "p3GroupDistrib::publishDistribGroups() Saving Group: " << it->first;