GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 17:47:32 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Update to Revision #140 to resolve issue with log file creation resulting from illegal filename characters in the channel name

Browse Source
This commit is contained in:
dennis.sheirer
2014-06-15 13:03:16 +00:00
parent 3deca10f10
commit 80b1b8c553
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/eventlog/EventLogger.java
View File

@@ -31,12 +31,9 @@ import util.TimeStamp;
public abstract class EventLogger public abstract class EventLogger
{ {
/* Illegal filename characters */ /* Illegal filename characters */
private static final String[] mIllegalCharacters = { "#", "%", "&", "{", private static final String[] mIllegalCharacters =
"}", "\\", "<", ">", { "#", "%", "&", "{", "}", "\\", "<", ">", "*", "?", "/",
"*", "?", "/", " ", " ", "$", "!", "'", "\"", ":", "@", "+", "`", "|", "=" };
"$", "!", "'", "\"",
":", "@", "+", "`",
"|", "=" };
private Path mLogDirectory; private Path mLogDirectory;
private String mFileNameSuffix; private String mFileNameSuffix;
@@ -65,7 +62,6 @@ public abstract class EventLogger
public void start() public void start()
{ {
try try
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -73,10 +69,10 @@ public abstract class EventLogger
sb.append( File.separator ); sb.append( File.separator );
sb.append( TimeStamp.getTimeStamp( "_" ) ); sb.append( TimeStamp.getTimeStamp( "_" ) );
sb.append( "_" ); sb.append( "_" );
sb.append( mFileNameSuffix ); sb.append( replaceIllegalCharacters( mFileNameSuffix ) );
mLogFileName = replaceIllegalCharacters( sb.toString() );
mLogFileName = sb.toString();
Log.info( "Creating log file:" + mLogFileName ); Log.info( "Creating log file:" + mLogFileName );
mLogFile = new OutputStreamWriter(new FileOutputStream( mLogFileName ) ); mLogFile = new OutputStreamWriter(new FileOutputStream( mLogFileName ) );
@@ -96,9 +92,9 @@ public abstract class EventLogger
{ {
for( String illegalCharacter: mIllegalCharacters ) for( String illegalCharacter: mIllegalCharacters )
{ {
filename.replace( illegalCharacter, "_" ); filename = filename.replace( illegalCharacter, "_" );
} }
return filename; return filename;
} }