Rename Master Branch DocTo (#131)

* rename inputfilesexcel to inputfilesxl * update testfiles * Output file list * debug log info and standardise logging of file conversion * Fix bug where XL files are not converted to pdf because of from and to not specified. * new test file
tobya · Jun 21, 2020 · 9025f82 · 9025f82
1 parent 2ccfb7e
commit 9025f82
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 8 deletions.
diff --git a/src/ExcelUtils.pas b/src/ExcelUtils.pas
@@ -87,6 +87,7 @@ function TExcelXLSConverter.DestroyOfficeApp: boolean;
 function TExcelXLSConverter.ExecuteConversion(fileToConvert: String; OutputFilename: String; OutputFileFormat : Integer): TConversionInfo;
 var
     NonsensePassword :OleVariant;
+    FromPage, ToPage : OleVariant;
     ExitAction :TExitAction;
 begin
       //Excel is particuarily sensitive to having \\ at end of filename, eg it won't create file.
@@ -153,17 +154,31 @@ function TExcelXLSConverter.ExecuteConversion(fileToConvert: String; OutputFilen
         end;
         aSave: // Go ahead and save
         begin
+
+            logdebug('PrintFromPage: ' + inttostr(pdfPrintFromPage),debug);
+            logdebug('PrintFromPage: ' + inttostr(pdfPrintToPage),debug);
             //Unlike Word, in Excel you must call a different function to save a pdf and XPS.
             if OutputFileFormat = xlTypePDF then
             begin
+
+                if pdfPrintToPage > 0 then
+                begin
+                  FromPage :=  pdfPrintFromPage;
+                  ToPage   :=  pdfPrintToPage;
+                end else
+                begin
+                  FromPage := EmptyParam;
+                  ToPage   := EmptyParam;
+                end ;
+
                 ExcelApp.Application.DisplayAlerts := False ;
                 ExcelApp.activeWorkbook.ExportAsFixedFormat(XlFixedFormatType_xlTypePDF,
                                                             OutputFilename,
                                                             EmptyParam, //Quality
                                                             EmptyParam, // IncludeDocProperties,
                                                             False,// IgnorePrintAreas,
-                                                            pdfPrintFromPage, // From,
-                                                            pdfPrintToPage, //  To,
+                                                            FromPage , // From,
+                                                            ToPage, //  To,
                                                             pdfOpenAfterExport, //   OpenAfterPublish,  (default false);
                                                             EmptyParam//    FixedFormatExtClassPtr
                                                             ) ;

diff --git a/src/MainUtils.pas b/src/MainUtils.pas
@@ -516,6 +516,8 @@ function TDocumentConverter.Execute: string;
             if ConversionInfo.Successful then
             begin
 
+              logInfo('File Converted: ' + ConversionInfo.OutputFile);
+
               // Check if file needs to be deleted.
               if RemoveFileOnConvert then
               begin
@@ -1133,8 +1135,11 @@ procedure TDocumentConverter.LoadConfig(Params: TStrings);
        DoSubDirs := true;
 
        ListFiles(finputfile, '*' + InputExtension,true,FInputFiles);
-
-       log('File List', FInputFiles,verbose);
+       if FInputFiles.Count = 0 then
+       begin
+         HaltWithError(204, 'No File Matches in Input Directory: ' + finputfile + '*' + InputExtension );
+       end;
+       log('File List', FInputFiles,STANDARD);
     end
     else
     begin

diff --git a/src/PowerPointUtils.pas b/src/PowerPointUtils.pas
@@ -68,6 +68,7 @@ function TPowerPointConverter.ExecuteConversion(
                                 OutputFilename: String;
                                 OutputFileFormat: Integer): TConversionInfo;
 begin
+        logDebug('Trying to Convert: ' + fileToConvert, Debug);
 
         Result.Successful := false;
         Result.InputFile := fileToConvert;

diff --git a/src/WordUtils.pas b/src/WordUtils.pas
@@ -280,7 +280,7 @@ function TWordDocConverter.ExecuteConversion(fileToConvert: String; OutputFilena
               Result.Successful := true;
               Result.OutputFile := OutputFilename;
               Result.Error := '';
-              loginfo('FileCreated: ' + OutputFilename, STANDARD);
+             // loginfo('FileCreated: ' + OutputFilename, STANDARD);
        finally
             // Close the document - do not save changes if doc has changed in any way.
             Wordapp.activedocument.Close(wdDoNotSaveChanges);

diff --git a/test/inputfilesexcel/Week 1 Test.xls b/test/inputfilesexcel/Week 1 Test.xls
diff --git a/test/inputfilespp/Presentation1.ppt b/test/inputfilespp/Presentation1.ppt
diff --git a/test/inputfilespp/Presentation2.ppt b/test/inputfilespp/Presentation2.ppt
diff --git a/test/inputfilespp/Presentation3.pptx b/test/inputfilespp/Presentation3.pptx
diff --git a/test/inputfilespp/campus map tower room.pptx b/test/inputfilespp/campus map tower room.pptx
diff --git a/test/inputfilesexcel/Book1 with password.xls → test/inputfilesxl/Book1 with password.xls b/test/inputfilesexcel/Book1 with password.xls → test/inputfilesxl/Book1 with password.xls
diff --git a/test/inputfilesexcel/Week 2 Test.xlsx → test/inputfilesxl/Week 1 Test.xls b/test/inputfilesexcel/Week 2 Test.xlsx → test/inputfilesxl/Week 1 Test.xls
diff --git a/test/inputfilesxl/Week 2 xlsx Test.xlsx b/test/inputfilesxl/Week 2 xlsx Test.xlsx
diff --git a/test/testDocTo_basic.bat b/test/testDocTo_basic.bat
@@ -0,0 +1,33 @@
+REM Explanation
+REM Test runs to check docto scenarios
+REM execute docto inserting variables 
+REM %~d0 and %~p0 together give the full directory this batch file is executing in.
+
+
+REM Remove all generated files from output directory that may exist.
+ del GeneratedFiles\*.* /q
+
+
+REM Output Help Text
+"../exe/docto.exe" -h
+
+
+REM Try on Single
+"../exe/docto.exe" -wd  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3Single.pdf"    -T  wdFormatPDF
+
+REM Try on Single no output file with Verbose Logging
+"../exe/docto.exe" -WD  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDir\"    -T  wdFormatText  
+
+
+REM try xl
+"../exe/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.pdf"    -T  XLPDF
+
+REM try xl
+"../exe/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.csv"    -T  XLcsv 
+
+REM try xl
+"../exe/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.pdf"    -T  ppSaveasPDF
+
+REM try xl
+"../exe/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.rtf"    -T  ppSaveasRTF  
+
diff --git a/test/testxls_relative.bat b/test/testxls_relative.bat
@@ -1,2 +1,2 @@
  REM Load xls from a relative path and convert to csv
-"../exe/docto.exe" -XL  -f "inputfilesexcel\Week 1 Test.xls"  -o "GeneratedFiles\Week1.csv"    -T  xlCSV -l 10
+"../exe/docto.exe" -XL  -f "inputfilesxl\Week 1 Test.xls"  -o "GeneratedFiles\Week1.csv"    -T  xlCSV -l 10
diff --git a/test/testxlsfile.bat b/test/testxlsfile.bat
@@ -1,2 +1,2 @@
  REM Load csv files convert to xls
-"../exe/docto.exe" -XL  -f "C:\dev\github\docto\test\inputfilesexcel\Week 1 Test.xls"  -o "C:\dev\github\docto\test\GeneratedFiles"    -T  xlPDF -l 10
+"../exe/docto.exe" -XL  -f "C:\dev\github\docto\test\inputfilesxl\Week 1 Test.xls"  -o "C:\dev\github\docto\test\GeneratedFiles"    -T  xlPDF -l 10
diff --git a/test/testxlspass.bat b/test/testxlspass.bat
@@ -1,2 +1,2 @@
  REM Load csv files convert to xls
-"../exe/docto.exe" -XL  -f "C:\dev\github\docto\test\inputfilesexcel\Book1 with password.xls"  -o "C:\dev\github\docto\test\GeneratedFiles"    -T  xlpdf -l 10
+"../exe/docto.exe" -XL  -f "C:\dev\github\docto\test\inputfilesxl\Book1 with password.xls"  -o "C:\dev\github\docto\test\GeneratedFiles"    -T  xlpdf -l 10