Attachment #58715 for bug #60392

Lines 150-155 class File { Link Here

(-)MUTE_fileSharing-0.4.1_UnixSource/minorGems/io/file/File.h (-2 / +24 lines)
150	*/	150	*/
151	char makeDirectory();	151	char makeDirectory();
152		152
		153	/* merely a combination from exists and makedirectory */
		154	int checkDirectory(bool create);
153		155
154		156
155	/**	157	/**
Lines 418-426 inline char File::isDirectory() { Link Here
418	return S_ISDIR( fileInfo.st_mode );	420	return S_ISDIR( fileInfo.st_mode );
419	}	421	}
420	}	422	}
		423	/* returns 0 if exists
		424	* 1 if successfully created
		425	* -1 on error
		426	*/
		427	inline int File::checkDirectory( bool create )
		428	{
		429	if(!exists()) {
		430	if(!create) return -1;
		431	if(!makeDirectory()) {
		432	printf("error creating %s\n", getFullFileName());
		433	perror("");
		434	return -1;
		435	}
		436	return 1;
		437	}
		438	else if(!isDirectory()) {
		439	printf("%s exists but is not a directory\n",
		440	getFullFileName());
		441	return -1;
		442	}
421		443
422		444	return 0;
423		445	}
424	inline File *File::getChildFiles( int outNumFiles ) {	446	inline File *File::getChildFiles( int outNumFiles ) {
425		447
426	int length;	448	int length;




#include "minorGems/util/stringUtils.h"
#include "minorGems/io/file/File.h"
#include "minorGems/io/file/FileInputStream.h"
#include "minorGems/util/SettingsManager.h"


#include <string.h>


    File *configFile;

    char **pathSteps = new char*[1];
    pathSteps[0] = "settings";
    
    
    if( inConfigFileName == NULL ) {
        configFile = new File( new Path( SettingsManager::getDirectoryName() ),
						"mime.ini" );
        }
    else {
        configFile = new File( new Path( SettingsManager::getDirectoryName() ),
                               inConfigFileName );
        }

    delete [] pathSteps;
    
    
    if( !configFile->exists() ) {
        char *name = configFile->getFullFileName();
        
        printf( "Error:  MIME config file %s does not exist.\n",
                name );

Lines 18-24 Link Here

(-)MUTE_fileSharing-0.4.1_UnixSource/minorGems/util/SettingsManager.cpp (-6 / +91 lines)
18	* Fixed to remove 499-character limit for a setting value.	18	* Fixed to remove 499-character limit for a setting value.
19	*/	19	*/
20		20
21		21	#include <stdlib.h>
22		22
23	#include "SettingsManager.h"	23	#include "SettingsManager.h"
24		24
Lines 45-51 char *SettingsManager::getDirectoryName( Link Here
45	return stringDuplicate( mStaticMembers.mDirectoryName );	45	return stringDuplicate( mStaticMembers.mDirectoryName );
46	}	46	}
47		47
48		48	char *SettingsManager::getSharedDirectory() {
		49	return stringDuplicate( mStaticMembers.mSharedDirectory );
		50	}
		51
		52	bool SettingsManager::settings_ok() {
		53	return mStaticMembers.mSettingsOK;
		54	}
49		55
50	SimpleVector<char > SettingsManager::getSetting( char *inSettingName ) {	56	SimpleVector<char > SettingsManager::getSetting( char *inSettingName ) {
51		57
Lines 257-268 char *SettingsManager::getSettingsFileNa Link Here
257	return fullFileName;	263	return fullFileName;
258	}	264	}
259		265
260		266	void SettingsManager::dump_default_settings()
		267	{
		268	setSetting("broadcastProbability", 0);
		269	setSetting("continueForwardProbability", 0.66f);
		270	setSetting("downloadChunkRetries", 10);
		271	setSetting("downloadFileInfoRetries", 5);
		272	setSetting("downloadRetryFreshRouteProbability",0.25f);
		273	setSetting("downloadTimeoutCurrentTimeoutWeight", 2);
		274	setSetting("downloadTimeoutMilliseconds", 60000);
		275	setSetting("downloadTimeoutRecentChunkWeight", 1);
		276	setSetting("inboundMessageLimit", -1);
		277	setSetting("language", "English");
		278	setSetting("logConnectionContents", 0);
		279	setSetting("logConnections", 0);
		280	setSetting("logDownloadTimeoutChanges", 0);
		281	setSetting("logLevel", "INFO_LEVEL");
		282	setSetting("logMessageHistory", 0);
		283	setSetting("logRolloverInSeconds", 3600);
		284	setSetting("logRoutingHistory", 0);
		285	setSetting("maxConnectionCount", 6);
		286	setSetting("maxDroppedMessageFraction", 0.1f);
		287	setSetting("maxMessageUtility", 35);
		288	setSetting("maxSubfolderDepth", 10);
		289	setSetting("muteVersion", "0.4.1");
		290	setSetting("outboundMessageLimit", -1);
		291	setSetting("port", 4900);
		292	setSetting("printSearchSyncTrace", 0);
		293	setSetting("sendQueueSizePerConnection", 300);
		294	setSetting("showNiceQuit", 0);
		295	setSetting("targetConnectionCount", 4);
		296	setSetting("useMajorityRouting", 0);
		297	setSetting("utilityAlpha", 0);
		298	setSetting("utilityBeta", 0);
		299	setSetting("utilityGamma", 7);
		300	setSetting("webHostCachePostIntervalSeconds", 3660);
		301	}
261		302
262	SettingsManagerStaticMembers::SettingsManagerStaticMembers()	303	SettingsManagerStaticMembers::SettingsManagerStaticMembers()
263	: mDirectoryName( stringDuplicate( "settings" ) ) {	304	{
264		305	int ret;
265	}	306	mSettingsOK = false;
		307	// assemble directory strings
		308	//
		309	// global mute directory
		310	File *shared_dir = new File(new Path("/usr/share/"), "MUTE",-1);
		311	if(shared_dir->checkDirectory(false) == -1)
		312	return;
		313	mSharedDirectory = shared_dir->getFullFileName();
		314	delete shared_dir;
		315
		316	// per user mute directory
		317	char *home = getenv("HOME");
		318	File *user_dir = new File( new Path(home), ".MUTE", -1);
		319	mDirectoryName = user_dir->getFullFileName();
		320	ret = user_dir->checkDirectory(true);
		321	if(ret == -1)
		322	return;
		323	else if(ret == 1) {
		324	File src, dest;
		325	/* make sure settings dir is populated with stuff
		326	* we need to get MUTE running */
		327	SettingsManager::dump_default_settings();
		328	// copy mime file from shared dir
		329	src = new File( new Path(mSharedDirectory),
		330	"mime.ini", -1);
		331	dest = new File( new Path(mDirectoryName),
		332	"mime.ini", -1);
		333	src->copy( dest );
		334	delete src;
		335	delete dest;
		336	// copy webhost caches from shared dir
		337	src = new File( new Path(mSharedDirectory),
		338	"webHostCaches.ini", -1);
		339	dest = new File( new Path(mDirectoryName),
		340	"webHostCaches.ini", -1);
		341	src->copy( dest );
		342	delete src;
		343	delete dest;
		344	}
		345	delete user_dir;
		346	delete home;
		347
		348	mSettingsOK = true;
		349
		350	}
266		351
267		352
268		353

Lines 180-186 class SettingsManager { Link Here

(-)MUTE_fileSharing-0.4.1_UnixSource/minorGems/util/SettingsManager.h (-1 / +8 lines)
180	static void setSetting( char *inSettingName,	180	static void setSetting( char *inSettingName,
181	char *inSettingValue );	181	char *inSettingValue );
182		182
183		183	static char* getSharedDirectory();
		184
		185	static bool settings_ok();
		186
		187	static void dump_default_settings();
184		188
185	protected:	189	protected:
186		190
Lines 241-246 class SettingsManagerStaticMembers { Link Here
241	~SettingsManagerStaticMembers();	245	~SettingsManagerStaticMembers();
242		246
243	char *mDirectoryName;	247	char *mDirectoryName;
		248	char *mSharedDirectory;
		249
		250	bool mSettingsOK;
244		251
245		252
246		253

Lines 109-115 Link Here

(-)MUTE_fileSharing-0.4.1_UnixSource/MUTE/layers/messageRouting/messageRouter.cpp (-2 / +6 lines)
109		109
110	#include "minorGems/util/log/AppLog.h"	110	#include "minorGems/util/log/AppLog.h"
111	#include "minorGems/util/log/FileLog.h"	111	#include "minorGems/util/log/FileLog.h"
112		112	#include "minorGems/io/file/File.h"
113		113
114	#include <stdio.h>	114	#include <stdio.h>
115		115
Lines 158-166 void muteStart( unsigned int inPort ) { Link Here
158	// defaults to one hour	158	// defaults to one hour
159	logRolloverTime = 3600;	159	logRolloverTime = 3600;
160	}	160	}
		161
		162	File *log = new File( new Path(SettingsManager::getDirectoryName()),
		163	"MUTE.log",-1);
161		164
162	AppLog::setLog( new FileLog( "MUTE.log",	165	AppLog::setLog( new FileLog( log->getFullFileName(),
163	(unsigned long)logRolloverTime ) );	166	(unsigned long)logRolloverTime ) );
		167	delete log;
164		168
165	AppLog::setLoggingLevel( Log::TRACE_LEVEL );	169	AppLog::setLoggingLevel( Log::TRACE_LEVEL );
166		170

Lines 460-466 int main() { Link Here

(-)MUTE_fileSharing-0.4.1_UnixSource/MUTE/otherApps/fileSharing/userInterface/textBased/textFileSharingMUTE.cpp (-1 / +5 lines)
460		460
461	printf( "http://mute-net.sourceforge.net\n\n" );	461	printf( "http://mute-net.sourceforge.net\n\n" );
462		462
463		463	if(!SettingsManager::settings_ok()) {
		464	printf("init failed.exit\n");
		465	return 1;
		466	}
		467
464	// check if firewall setting exists	468	// check if firewall setting exists
465	char valueFound;	469	char valueFound;
466	SettingsManager::getIntSetting( "behindFirewall",	470	SettingsManager::getIntSetting( "behindFirewall",




#include "minorGems/util/stringUtils.h"
#include "minorGems/system/Thread.h"
#include "minorGems/util/log/AppLog.h"
#include "minorGems/io/file/File.h"


#include <unistd.h>

        
    #endif

    if(!SettingsManager::settings_ok()) {
	    printf("init failed. exit\n");
	    return false;
    }
    File *lang_dir = new File( new Path(SettingsManager::getSharedDirectory()),
		    		"language", -1);
    if(!lang_dir->exists()) {
	    printf("cant find translation files: %s\n",
			    lang_dir->getFullFileName());
	    return false;
    }
    TranslationManager::setDirectoryName(lang_dir->getFullFileName());
    
    char *languageName = SettingsManager::getStringSetting( "language" );

    if( languageName == NULL ) {

Return to bug 60392

Lines 124-130 Link Here

(-)MUTE_fileSharing-0.4.1_UnixSource/MUTE/otherApps/fileSharing/userInterface/wxWindows/GuiApp.cpp (-2 / +14 lines)
124	#include "minorGems/util/stringUtils.h"	124	#include "minorGems/util/stringUtils.h"
125	#include "minorGems/system/Thread.h"	125	#include "minorGems/system/Thread.h"
126	#include "minorGems/util/log/AppLog.h"	126	#include "minorGems/util/log/AppLog.h"
127		127	#include "minorGems/io/file/File.h"
128		128
129		129
130	#include <unistd.h>	130	#include <unistd.h>
Lines 471-477 bool GuiApp::OnInit() { Link Here
471		471
472	#endif	472	#endif
473		473
474		474	if(!SettingsManager::settings_ok()) {
		475	printf("init failed. exit\n");
		476	return false;
		477	}
		478	File *lang_dir = new File( new Path(SettingsManager::getSharedDirectory()),
		479	"language", -1);
		480	if(!lang_dir->exists()) {
		481	printf("cant find translation files: %s\n",
		482	lang_dir->getFullFileName());
		483	return false;
		484	}
		485	TranslationManager::setDirectoryName(lang_dir->getFullFileName());
		486
475	char *languageName = SettingsManager::getStringSetting( "language" );	487	char *languageName = SettingsManager::getStringSetting( "language" );
476		488
477	if( languageName == NULL ) {	489	if( languageName == NULL ) {