mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-14 17:47:32 -05:00
Update to Revision #140 to resolve issue with log file creation resulting from illegal filename characters in the channel name
This commit is contained in:
@@ -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,9 +69,9 @@ 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 );
|
||||||
|
|
||||||
@@ -96,7 +92,7 @@ public abstract class EventLogger
|
|||||||
{
|
{
|
||||||
for( String illegalCharacter: mIllegalCharacters )
|
for( String illegalCharacter: mIllegalCharacters )
|
||||||
{
|
{
|
||||||
filename.replace( illegalCharacter, "_" );
|
filename = filename.replace( illegalCharacter, "_" );
|
||||||
}
|
}
|
||||||
|
|
||||||
return filename;
|
return filename;
|
||||||
|
|||||||
Reference in New Issue
Block a user