Fixed service init order

Author: kapitanov

src/ITGlobal.MarkDocs.Blog/Impl/BlogEngineImpl.cs

@@ -8,36 +8,69 @@ namespace ITGlobal.MarkDocs.Blog.Impl
 {
     internal sealed class BlogEngineImpl : IBlogEngine
     {
+
         private readonly IMarkDocService _markDocs;
         private readonly IMarkDocsLog _log;
 
+        private readonly object _stateLock = new object();
         private BlogEngineState _state;
+        private bool _isDisposed;
 
         public BlogEngineImpl(IMarkDocService service, IMarkDocsLog log, EventConnector eventConnector)
         {
             _markDocs = service;
             _log = log;
             eventConnector.Engine = this;
 
-            Update(service.Documentations[0]);
+            if (service.Documentations.Count > 0)
+            {
+                if (service.Documentations.Count > 1)
+                {
+                    _log.Error($"More than one source found. Choosing \"{service.Documentations[0].Id}\" arbitrarily");
+                }
+
+                Update(service.Documentations[0]);
+            }
         }
 
         private BlogEngineState State
         {
             get
             {
-                return Interlocked.CompareExchange(ref _state, null, null);
+                lock (_stateLock)
+                {
+                    while (_state == null && !_isDisposed)
+                    {
+                        Monitor.Wait(_stateLock);
+                    }
+
+                    if (_isDisposed)
+                    {
+                        throw new ObjectDisposedException(nameof(BlogEngineImpl));
+                    }
+
+                    return _state;
+                }
             }
             set
             {
-                Interlocked.Exchange(ref _state, value);
+                lock (_stateLock)
+                {
+                    if (_isDisposed)
+                    {
+                        throw new ObjectDisposedException(nameof(BlogEngineImpl));
+                    }
+
+                    _state = value;
+                    Monitor.PulseAll(_stateLock);
+                }
 
                 _log.Info($"Blog data updated to version \"{value.SourceInfo.LastChangeId}\"");
             }
         }
 
         #region IBlogEngine
-        
+
         /// <summary>
         ///     Blog version
         /// </summary>
@@ -100,6 +133,12 @@ public void Synchronize()
         /// <inheritdoc />
         void IDisposable.Dispose()
         {
+            lock (_stateLock)
+            {
+                _isDisposed = true;
+                Monitor.PulseAll(_stateLock);
+            }
+
             _markDocs.Dispose();
         }
 
@@ -113,6 +152,7 @@ internal void Update(IMarkDocState state)
             if (state.List.Length > 1)
             {
                 report.Error($"More than one source found. Choosing \"{state.List[0].Id}\" arbitrarily");
+                _log.Error($"More than one source found. Choosing \"{state.List[0].Id}\" arbitrarily");
             }
 
             State = new BlogEngineState(this, state.List[0], report);
@@ -125,5 +165,6 @@ internal void Update(IDocumentation documentation)
         }
 
         #endregion
+
     }
-}
+}

src/ITGlobal.MarkDocs.Core/MarkDocsOptions.cs

@@ -1,4 +1,4 @@
-using ITGlobal.MarkDocs.Cache;
+using ITGlobal.MarkDocs.Cache;
 using ITGlobal.MarkDocs.Extensions;
 using ITGlobal.MarkDocs.Format;
 using ITGlobal.MarkDocs.Impl;
@@ -19,8 +19,12 @@ namespace ITGlobal.MarkDocs
     [PublicAPI]
     public sealed class MarkDocsOptions
     {
+
         private readonly IServiceCollection _services;
 
+        private readonly List<Action<IServiceCollection>> _configureServicesActions =
+            new List<Action<IServiceCollection>>();
+
         internal MarkDocsOptions(IServiceCollection services)
         {
             _services = services;
@@ -148,7 +152,7 @@ public MarkDocsOptions UseLog([NotNull] Func<IServiceProvider, IMarkDocsLog> log
         [NotNull]
         internal MarkDocsOptions ConfigureServices([NotNull] Action<IServiceCollection> action)
         {
-            action(_services);
+            _configureServicesActions.Add(action);
             return this;
         }
 
@@ -174,8 +178,13 @@ internal void Configure()
                 throw new Exception("No cache service has been configured");
             }
 
+            foreach (var action in _configureServicesActions)
+            {
+                action(_services);
+            }
+
             _services.AddSingleton<IMarkDocService, MarkDocService>();
-            if (ConfigureCustomAssetTreeReader!= null)
+            if (ConfigureCustomAssetTreeReader != null)
             {
                 ConfigureCustomAssetTreeReader(_services);
             }
@@ -210,5 +219,6 @@ IEnumerable<IExtensionFactory> CreateExtensionFactories()
                 }
             }
         }
+
     }
 }

src/ITGlobal.MarkDocs.DirectorySource/Source/Impl/StaticDirectorySourceTreeProvider.cs

@@ -22,7 +22,7 @@ public StaticDirectorySourceTreeProvider(StaticDirectorySourceTreeOptions option
             _options = options;
             _reader = reader;
 
-            Refresh();
+            Refresh(throwIfDirectoryIsMissing: true);
         }
 
         public string[] IgnorePatterns => null;
@@ -48,6 +48,11 @@ public ISourceTree GetSourceTree(string id)
         }
 
         public void Refresh()
+        {
+            Refresh(throwIfDirectoryIsMissing: false);
+        }
+
+        private void Refresh(bool throwIfDirectoryIsMissing)
         {
             var hasAnyChanges = false;
             ImmutableDictionary<string, StaticDirectorySourceTree> sourceTrees;
@@ -81,6 +86,13 @@ public void Refresh()
 
                     hasAnyChanges = true;
                 }
+                else
+                {
+                    if (throwIfDirectoryIsMissing)
+                    {
+                        throw new Exception($"Source directory \"{directory}\" doesn't exist");
+                    }
+                }
             }
 
             foreach (var id in toBeDeleted)

src/ITGlobal.MarkDocs.Markdown/Format/Impl/Extensions/HighlightJs/HighlightJsWorker.cs

@@ -38,7 +38,6 @@ public HighlightJsWorker(HighlightJsOptions options, IMarkDocsLog log)
 
             Task.Run(Initialize);
 
-
             void Initialize()
             {
                 try