修改获取输出文件名

Author: zhaoqingqing

TableML/TableMLCompiler/BatchCompilerInSingleFile.cs

@@ -89,7 +89,7 @@ in className.Split(new[] { '_' }, StringSplitOptions.RemoveEmptyEntries)
         /// <param name="forceAll"></param>
         /// <param name="genManagerClass"></param>
         /// <param name="templateVars">如果是生成Manager Class 一定要在外部初始化此字段</param>
-        void GenSingleClass(TableCompileResult compileResult, string genCodeTemplateString, string genCodeFilePath,
+        void GenCodeFile(TableCompileResult compileResult, string genCodeTemplateString, string genCodeFilePath,
             string nameSpace = "AppSettings", string changeExtension = ".tml", string settingCodeIgnorePattern = null, bool forceAll = false, bool genManagerClass = false, Dictionary<string, TableTemplateVars> templateVars = null)
         {
             // 根据编译结果，构建vars，同class名字的，进行合并
@@ -183,7 +183,7 @@ void GenManagerClass(List<TableCompileResult> results, string genCodeTemplateStr
             var templateVars = new Dictionary<string, TableTemplateVars>();
             foreach (var compileResult in results)
             {
-                GenSingleClass(compileResult, genCodeTemplateString, genCodeFilePath, nameSpace, changeExtension, settingCodeIgnorePattern, forceAll, true, templateVars);
+                GenCodeFile(compileResult, genCodeTemplateString, genCodeFilePath, nameSpace, changeExtension, settingCodeIgnorePattern, forceAll, true, templateVars);
             }
         }
 
@@ -235,9 +235,8 @@ public List<TableCompileResult> CompileTableMLAllInSingleFile(string sourcePath,
                          * NOTE 开始编译Excel 成 tml文件
                          * 每编译一个Excel就生成一个代码文件
                         */
-                        //NOTE 设置编译出的文件名
-                        SimpleExcelFile excelFile = new SimpleExcelFile(excelPath);
-                        relativePath = excelFile.GetOutFileName();
+                        //NOTE 设置编译后文件的文件名(tml文件名)
+                        relativePath = SimpleExcelFile.GetOutFileName(excelPath);
                         var compileToPath = string.Format("{0}/{1}", compileBaseDir,
                             Path.ChangeExtension(relativePath, changeExtension));
                         var srcFileInfo = new FileInfo(excelPath);
@@ -269,7 +268,7 @@ public List<TableCompileResult> CompileTableMLAllInSingleFile(string sourcePath,
                             var compiledFileInfo = new FileInfo(compileToPath);
                             compiledFileInfo.LastWriteTime = srcFileInfo.LastWriteTime;
                             //仅仅是生成单个Class，只需要当前的CompileResult
-                            GenSingleClass(compileResult, genCodeTemplateString, genCodeFilePath, nameSpace, changeExtension, settingCodeIgnorePattern, forceAll);
+                            GenCodeFile(compileResult, genCodeTemplateString, genCodeFilePath, nameSpace, changeExtension, settingCodeIgnorePattern, forceAll);
 
                         }
                     }

TableML/TableMLCompiler/Compiler.cs

@@ -64,7 +64,15 @@ public Compiler(CompilerConfig cfg)
             _config = cfg;
         }
 
-
+        /// <summary>
+        /// 生成tml文件内容
+        /// </summary>
+        /// <param name="path">源excel的相对路径</param>
+        /// <param name="excelFile"></param>
+        /// <param name="compileToFilePath">编译后的tml文件路径</param>
+        /// <param name="compileBaseDir"></param>
+        /// <param name="doCompile"></param>
+        /// <returns></returns>
         private TableCompileResult DoCompilerExcelReader(string path, ITableSourceFile excelFile, string compileToFilePath = null, string compileBaseDir = null, bool doCompile = true)
         {
             var renderVars = new TableCompileResult();

TableML/TableMLCompiler/SimpleExcelFile.cs

@@ -372,11 +372,33 @@ public int GetColumnCount()
 
         /// <summary>
         /// 读表中的字段获取输出文件名
+        /// 做好约定输出tml文件名在指定的单元格，不用遍历整表让解析更快
         /// </summary>
         /// <returns></returns>
-        public string GetOutFileName()
+        public static string GetOutFileName(string filePath)
         {
-            var outFileName = Worksheet.GetRow(1).Cells[2].StringCellValue;
+            IWorkbook workbook;
+            using (var file = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) // no isolation
+            {
+                try
+                {
+                    workbook = WorkbookFactory.Create(file);
+                }
+                catch (Exception e)
+                {
+                    throw new Exception(string.Format("无法打开Excel: {0}, 可能原因：正在打开？或是Office2007格式（尝试另存为）？ {1}", filePath,
+                        e.Message));
+                }
+            }
+            var worksheet = workbook.GetSheetAt(0);
+            if (worksheet == null)
+                throw new Exception("Null Worksheet");
+            var row = worksheet.GetRow(1);
+            if (row == null || row.Cells.Count < 2)
+            {
+                throw new Exception("第二行至少需要3列");
+            }
+            var outFileName = row.Cells[2].StringCellValue;
             return outFileName;
         }
     }

TableML/TableMLCompilerConsole/LocalDebug.cs

@@ -29,7 +29,7 @@ public static void CompileOne()
         {
             var startPath = Environment.CurrentDirectory;
             //源excel文件路径
-            var srcFile = Path.Combine(startPath, "settingsrc", "Test.xlsx");
+            var srcFile = Path.Combine(startPath, "src", "Test.xlsx");
             //输出tml文件路径
             var OutputDirectory = Path.Combine(startPath, "setting", "Test.tml");
             //生成的代码路径
@@ -57,7 +57,7 @@ public static void CompileAll()
             Console.WriteLine("当前目录：{0}", startPath);
             //源excel文件路径
             //var srcDirectory = "settingsrc";
-            var srcDirectory = "ConfigTable";
+            var srcDirectory = "src";
             //输出tml文件路径
             var OutputDirectory = "setting";
             //生成的代码路径
@@ -68,9 +68,10 @@ public static void CompileAll()
             string templateString = DefaultTemplate.GenSingleClassCodeTemplate;
 
             var results = batchCompiler.CompileTableMLAllInSingleFile(srcDirectory, OutputDirectory, CodeFilePath,
-               templateString, "AppSettings", ".k",settingCodeIgnorePattern, !string.IsNullOrEmpty(CodeFilePath));
+               templateString, "AppSettings", ".tml",settingCodeIgnorePattern, !string.IsNullOrEmpty(CodeFilePath));
 
             Console.WriteLine("Done!");
+            
         }
 
         public static void UpdateTableAll()