@@ -2315,7 +2315,7 @@ public EncodeJob EncodeJob
23152315 public void StartEncodeQueue ( )
23162316 {
23172317 this . EncodeProgressState = TaskbarItemProgressState . Normal ;
2318- this . logger . Log ( "## Starting queue" ) ;
2318+ this . logger . Log ( "Starting queue" ) ;
23192319
23202320 this . totalTasks = this . EncodeQueue . Count ;
23212321 this . taskNumber = 0 ;
@@ -2373,10 +2373,10 @@ private void StartEncode()
23732373 {
23742374 EncodeJob job = this . CurrentJob . Job ;
23752375
2376- this . logger . Log ( "## Starting job " + this . taskNumber + "/" + this . totalTasks ) ;
2377- this . logger . Log ( "## Path: " + job . SourcePath ) ;
2378- this . logger . Log ( "## Title: " + job . Title ) ;
2379- this . logger . Log ( "## Chapters: " + job . ChapterStart + "-" + job . ChapterEnd ) ;
2376+ this . logger . Log ( "Starting job " + this . taskNumber + "/" + this . totalTasks ) ;
2377+ this . logger . Log ( " Path: " + job . SourcePath ) ;
2378+ this . logger . Log ( " Title: " + job . Title ) ;
2379+ this . logger . Log ( " Chapters: " + job . ChapterStart + "-" + job . ChapterEnd ) ;
23802380 this . CurrentJob . HandBrakeInstance . EncodeProgress += this . OnEncodeProgress ;
23812381 this . CurrentJob . HandBrakeInstance . EncodeCompleted += this . OnEncodeCompleted ;
23822382
@@ -2507,18 +2507,36 @@ private void OnEncodeCompleted(object sender, EncodeCompletedEventArgs e)
25072507 this . EncodeQueue . Clear ( ) ;
25082508 }
25092509
2510- this . logger . Log ( "## Encoding stopped" ) ;
2510+ this . logger . Log ( "Encoding stopped" ) ;
25112511 }
25122512 else
25132513 {
25142514 // If the encode completed successfully
25152515 this . completedQueueWork += this . EncodeQueue [ 0 ] . Cost ;
25162516
2517+ var outputFileInfo = new FileInfo ( this . CurrentJob . Job . OutputPath ) ;
2518+ bool succeeded = true ;
2519+ if ( e . Error )
2520+ {
2521+ succeeded = false ;
2522+ this . logger . Log ( "Encode failed. HandBrake reported an error." ) ;
2523+ }
2524+ else if ( ! outputFileInfo . Exists )
2525+ {
2526+ succeeded = false ;
2527+ this . logger . Log ( "Encode failed. HandBrake reported no error but the expected output file was not found." ) ;
2528+ }
2529+ else if ( outputFileInfo . Length == 0 )
2530+ {
2531+ succeeded = false ;
2532+ this . logger . Log ( "Encode failed. HandBrake reported no error but the output file was empty." ) ;
2533+ }
2534+
25172535 this . CompletedJobs . Add ( new EncodeResultViewModel (
25182536 new EncodeResult
25192537 {
25202538 Destination = this . CurrentJob . Job . OutputPath ,
2521- Succeeded = ! e . Error ,
2539+ Succeeded = succeeded ,
25222540 EncodeTime = this . CurrentJob . EncodeTime
25232541 } ) ) ;
25242542 this . NotifyPropertyChanged ( "CompletedItemsCount" ) ;
@@ -2530,14 +2548,14 @@ private void OnEncodeCompleted(object sender, EncodeCompletedEventArgs e)
25302548
25312549 this . CleanupHandBrakeInstance ( finishedInstance ) ;
25322550
2533- this . logger . Log ( "## Job completed" ) ;
2551+ this . logger . Log ( "Job completed" ) ;
25342552
25352553 if ( this . EncodeQueue . Count == 0 )
25362554 {
25372555 this . SelectedTabIndex = CompletedTabIndex ;
25382556 this . StopEncodingAndReport ( ) ;
25392557
2540- this . logger . Log ( "## Queue completed" ) ;
2558+ this . logger . Log ( "Queue completed" ) ;
25412559 this . logger . Log ( "" ) ;
25422560 }
25432561 else
@@ -3005,7 +3023,7 @@ private void StartScan(string path)
30053023 this . CleanupHandBrakeInstance ( oldInstance ) ;
30063024 }
30073025
3008- this . logger . Log ( "## Starting scan: " + path ) ;
3026+ this . logger . Log ( "Starting scan: " + path ) ;
30093027
30103028 this . scanInstance = new HandBrakeInstance ( ) ;
30113029 this . scanInstance . Initialize ( Settings . Default . LogVerbosity ) ;
@@ -3026,12 +3044,12 @@ private void StartScan(string path)
30263044 this . ScanCancelled ( this , new EventArgs ( ) ) ;
30273045 }
30283046
3029- this . logger . Log ( "## Scan cancelled" ) ;
3047+ this . logger . Log ( "Scan cancelled" ) ;
30303048 }
30313049 else
30323050 {
30333051 this . SourceData = new VideoSource { Titles = this . scanInstance . Titles , FeatureTitle = this . scanInstance . FeatureTitle } ;
3034- this . logger . Log ( "## Scan completed" ) ;
3052+ this . logger . Log ( "Scan completed" ) ;
30353053 }
30363054
30373055 this . logger . Log ( "" ) ;
0 commit comments