@ -36,12 +36,12 @@ namespace MediaBrowser.Server.Implementations.IO
/// <summary>
/// <summary>
/// A dynamic list of paths that should be ignored. Added to during our own file sytem modifications.
/// A dynamic list of paths that should be ignored. Added to during our own file sytem modifications.
/// </summary>
/// </summary>
private readonly ConcurrentDictionary < string , string > _tempIgnoredPaths = new ConcurrentDictionary < string , string > ( StringComparer . OrdinalIgnoreCase ) ;
private readonly ConcurrentDictionary < string , string > _tempIgnoredPaths = new ConcurrentDictionary < string , string > ( StringComparer . OrdinalIgnoreCase ) ;
/// <summary>
/// <summary>
/// Any file name ending in any of these will be ignored by the watchers
/// Any file name ending in any of these will be ignored by the watchers
/// </summary>
/// </summary>
private readonly List < string > _alwaysIgnoreFiles = new List < string > { "thumbs.db" , "small.jpg" , "albumart.jpg" } ;
private readonly List < string > _alwaysIgnoreFiles = new List < string > { "thumbs.db" , "small.jpg" , "albumart.jpg" } ;
/// <summary>
/// <summary>
/// The timer lock
/// The timer lock
@ -117,7 +117,7 @@ namespace MediaBrowser.Server.Implementations.IO
}
}
catch ( IOException )
catch ( IOException )
{
{
return new string [ ] { } ;
return new string [ ] { } ;
}
}
} )
} )
@ -265,49 +265,33 @@ namespace MediaBrowser.Server.Implementations.IO
async void watcher_Error ( object sender , ErrorEventArgs e )
async void watcher_Error ( object sender , ErrorEventArgs e )
{
{
var ex = e . GetException ( ) ;
var ex = e . GetException ( ) ;
var dw = ( FileSystemWatcher ) sender ;
var dw = ( FileSystemWatcher ) sender ;
Logger . ErrorException ( "Error in Directory watcher for: " + dw . Path , ex ) ;
Logger . ErrorException ( "Error in Directory watcher for: " + dw . Path , ex ) ;
if ( ex . Message . Contains ( "network name is no longer available" ) )
//Network either dropped or, we are coming out of sleep and it hasn't reconnected yet - wait and retry
var retries = 0 ;
var success = false ;
while ( ! success & & retries < 10 )
{
{
//Network either dropped or, we are coming out of sleep and it hasn't reconnected yet - wait and retry
await Task . Delay ( 500 ) . ConfigureAwait ( false ) ;
Logger . Warn ( "Network connection lost - will retry..." ) ;
var retries = 0 ;
var success = false ;
while ( ! success & & retries < 10 )
{
await Task . Delay ( 500 ) . ConfigureAwait ( false ) ;
try
try
{
{
dw . EnableRaisingEvents = false ;
dw . EnableRaisingEvents = false ;
dw . EnableRaisingEvents = true ;
dw . EnableRaisingEvents = true ;
success = true ;
success = true ;
}
catch ( IOException )
{
Logger . Warn ( "Network still unavailable..." ) ;
retries + + ;
}
}
}
if ( ! success )
catch ( IOException )
{
{
Logger . Warn ( " Unable to access network. Giving up .") ;
Logger . Warn ( "Network still unavailable..." ) ;
DisposeWatcher( dw ) ;
retries + + ;
}
}
}
}
else
if ( ! success )
{
{
if ( ! ex . Message . Contains ( "BIOS command limit" ) )
Logger . Warn ( "Unable to access network. Giving up." ) ;
{
DisposeWatcher ( dw ) ;
Logger . Info ( "Attempting to re-start watcher." ) ;
dw . EnableRaisingEvents = false ;
dw . EnableRaisingEvents = true ;
}
}
}
}
}
Luke Pulverenti
12 years ago