1919 */
2020#endregion
2121
22- using Enbrea . Progress ;
22+ using Enbrea . Konsoli ;
2323using NGettext ;
2424using SqlDocs . DatabaseProvider ;
2525using SqlDocs . DataModel ;
@@ -39,40 +39,40 @@ public static async Task BuildJson(DatabaseEngine dbEngine, string dbConnection,
3939 {
4040 await Execute ( async ( cancellationToken , cancellationEvent ) =>
4141 {
42- var progressReport = ProgressReportFactory . CreateProgressReport ( ProgressUnit . Count ) ;
42+ var consoleWriter = ConsoleWriterFactory . CreateConsoleWriter ( ProgressUnit . Count ) ;
4343 try
4444 {
45- progressReport . Start ( "Generate database schema" ) ;
45+ consoleWriter . StartProgress ( "Generate database schema" ) ;
4646
4747 var provider = DatabaseProviderFactory . CreateDatabaseProvider ( dbEngine , dbConnection ) ;
4848 var dbSchema = await DbSchemaFactory . CreateDbSchemaAsync ( provider , cancellationToken ) ;
4949
50- progressReport . Finish ( ) ;
50+ consoleWriter . FinishProgress ( ) ;
5151
5252 if ( dbSchemaFile . Exists )
5353 {
54- progressReport . Start ( "Merge and update database schema file" ) ;
54+ consoleWriter . StartProgress ( "Merge and update database schema file" ) ;
5555
5656 dbSchema = await DbSchemaFactory . LoadAndMergeDbSchemaAsync ( dbSchemaFile , dbSchema , cancellationToken ) ;
5757 await dbSchema . SaveAsync ( dbSchemaFile , cancellationToken ) ;
5858
59- progressReport . Finish ( ) ;
59+ consoleWriter . FinishProgress ( ) ;
6060 }
6161 else
6262 {
63- progressReport . Start ( "Save database schema file" ) ;
63+ consoleWriter . StartProgress ( "Save database schema file" ) ;
6464
6565 await dbSchema . SaveAsync ( dbSchemaFile , cancellationToken ) ;
6666
67- progressReport . Finish ( ) ;
67+ consoleWriter . FinishProgress ( ) ;
6868 }
6969
70- progressReport . Success ( $ "Schema file { dbSchemaFile . Name } successfully generated or updated") ;
70+ consoleWriter . Success ( $ "Schema file { dbSchemaFile . Name } successfully generated or updated") ;
7171 }
7272 catch ( Exception ex )
7373 {
74- progressReport . NewLine ( ) ;
75- progressReport . Error ( $ "Build failed. { ex . Message } ") ;
74+ consoleWriter . NewLine ( ) ;
75+ consoleWriter . Error ( $ "Build failed. { ex . Message } ") ;
7676 Environment . ExitCode = 1 ;
7777 }
7878 } ) ;
@@ -82,51 +82,51 @@ public static async Task BuildJsonAndMkDocs(DatabaseEngine dbEngine, string dbCo
8282 {
8383 await Execute ( async ( cancellationToken , cancellationEvent ) =>
8484 {
85- var progressReport = ProgressReportFactory . CreateProgressReport ( ProgressUnit . Count ) ;
85+ var consoleWriter = ConsoleWriterFactory . CreateConsoleWriter ( ProgressUnit . Count ) ;
8686 var catalog = new Catalog ( "SqlDocs" , Path . Combine ( GetAppFolder ( ) , "./L11n" ) , new CultureInfo ( language ) ) ;
8787 try
8888 {
89- progressReport . Start ( "Generate database schema" ) ;
89+ consoleWriter . StartProgress ( "Generate database schema" ) ;
9090
9191 var provider = DatabaseProviderFactory . CreateDatabaseProvider ( dbEngine , dbConnection ) ;
9292 var dbSchema = await DbSchemaFactory . CreateDbSchemaAsync ( provider , cancellationToken ) ;
9393
94- progressReport . Finish ( ) ;
94+ consoleWriter . FinishProgress ( ) ;
9595
9696 if ( dbSchemaFile . Exists )
9797 {
98- progressReport . Start ( "Merge and update database schema file" ) ;
98+ consoleWriter . StartProgress ( "Merge and update database schema file" ) ;
9999
100100 dbSchema = await DbSchemaFactory . LoadAndMergeDbSchemaAsync ( dbSchemaFile , dbSchema , cancellationToken ) ;
101101 await dbSchema . SaveAsync ( dbSchemaFile , cancellationToken ) ;
102102
103- progressReport . Finish ( ) ;
103+ consoleWriter . FinishProgress ( ) ;
104104 }
105105 else
106106 {
107- progressReport . Start ( "Save database schema file" ) ;
107+ consoleWriter . StartProgress ( "Save database schema file" ) ;
108108
109109 await dbSchema . SaveAsync ( dbSchemaFile , cancellationToken ) ;
110110
111- progressReport . Finish ( ) ;
111+ consoleWriter . FinishProgress ( ) ;
112112 }
113113
114- progressReport . Success ( $ "Schema file { dbSchemaFile . Name } successfully generated or updated") ;
114+ consoleWriter . Success ( $ "Schema file { dbSchemaFile . Name } successfully generated or updated") ;
115115
116- progressReport . Start ( "Generate MkDocs project" ) ;
116+ consoleWriter . StartProgress ( "Generate MkDocs project" ) ;
117117
118118 var docsGenerator = DocsGeneratorFactory . CreateMkDocsGenerator ( dbEngine , catalog ) ;
119119
120120 await docsGenerator . GenerateAsync ( dbSchema , outputFolder ) ;
121121
122- progressReport . Finish ( ) ;
123- progressReport . Success ( $ "MkDocs project successfully generated or updated") ;
122+ consoleWriter . FinishProgress ( ) ;
123+ consoleWriter . Success ( $ "MkDocs project successfully generated or updated") ;
124124
125125 }
126126 catch ( Exception ex )
127127 {
128- progressReport . NewLine ( ) ;
129- progressReport . Error ( $ "Build failed. { ex . Message } ") ;
128+ consoleWriter . NewLine ( ) ;
129+ consoleWriter . Error ( $ "Build failed. { ex . Message } ") ;
130130 Environment . ExitCode = 1 ;
131131 }
132132 } ) ;
@@ -136,33 +136,33 @@ public static async Task BuildMkDocs(DatabaseEngine dbEngine, FileInfo dbSchemaF
136136 {
137137 await Execute ( async ( cancellationToken , cancellationEvent ) =>
138138 {
139- var progressReport = ProgressReportFactory . CreateProgressReport ( ProgressUnit . Count ) ;
139+ var ConsoleWriter = ConsoleWriterFactory . CreateConsoleWriter ( ProgressUnit . Count ) ;
140140 var catalog = new Catalog ( "SqlDocs" , Path . Combine ( GetAppFolder ( ) , "./L11n" ) , new CultureInfo ( language ) ) ;
141141 try
142142 {
143- progressReport . Start ( "Load database schema file" ) ;
143+ ConsoleWriter . StartProgress ( "Load database schema file" ) ;
144144
145145 var dbSchema = await DbSchemaFactory . LoadDbSchemaAsync ( dbSchemaFile , cancellationToken ) ;
146146 await dbSchema . SaveAsync ( dbSchemaFile , cancellationToken ) ;
147147
148- progressReport . Finish ( ) ;
148+ ConsoleWriter . FinishProgress ( ) ;
149149
150- progressReport . Success ( $ "Schema file { dbSchemaFile . Name } successfully loaded") ;
150+ ConsoleWriter . Success ( $ "Schema file { dbSchemaFile . Name } successfully loaded") ;
151151
152- progressReport . Start ( "Generate MkDocs project" ) ;
152+ ConsoleWriter . StartProgress ( "Generate MkDocs project" ) ;
153153
154154 var docsGenerator = DocsGeneratorFactory . CreateMkDocsGenerator ( dbEngine , catalog ) ;
155155
156156 await docsGenerator . GenerateAsync ( dbSchema , outputFolder ) ;
157157
158- progressReport . Finish ( ) ;
159- progressReport . Success ( $ "MkDocs project successfully generated or updated") ;
158+ ConsoleWriter . FinishProgress ( ) ;
159+ ConsoleWriter . Success ( $ "MkDocs project successfully generated or updated") ;
160160
161161 }
162162 catch ( Exception ex )
163163 {
164- progressReport . NewLine ( ) ;
165- progressReport . Error ( $ "Build failed. { ex . Message } ") ;
164+ ConsoleWriter . NewLine ( ) ;
165+ ConsoleWriter . Error ( $ "Build failed. { ex . Message } ") ;
166166 Environment . ExitCode = 1 ;
167167 }
168168 } ) ;
0 commit comments