diff --git a/MapExporter/KP_MapExporter_Main.pas b/MapExporter/KP_MapExporter_Main.pas index 4dbbc92..f4c782b 100644 --- a/MapExporter/KP_MapExporter_Main.pas +++ b/MapExporter/KP_MapExporter_Main.pas @@ -52,14 +52,13 @@ if GetFiles(fMapPath, FileList, DirList) then // Put all files into a stringList and check if result is true Begin Try - // As Pascal hates to create directories by itself, check if it is there, if not make it. if not SysUtils.DirectoryExists(ExtractFilePath(Application.ExeName) + PathDelim + 'Exported maps') then mkDir(ExtractFilePath(Application.ExeName) + PathDelim + 'Exported maps'); // Create .kpmap tarball in write-mode. TarFileWriter := TTarWriter.Create(ExtractFilePath(Application.ExeName) + PathDelim + 'Exported maps' + PathDelim + fMapName + '.kpmap'); For i := 0 to DirList.Count - 1 do - if DirList[i] = '.' then // Also a Unix character, means current Directory. Change it to MapName. + if DirList[i] = '.' then // A Unix character, means current Directory. Change it to MapName. TarFileWriter.AddDir(AnsiString(fMapName), Now) else TarFileWriter.AddDir(AnsiString(fMapName + '/' + DirList[i]), Now); @@ -81,11 +80,14 @@ OutPutList: TStringList; Begin OutPutList := TStringList.Create; + OutPutList.Clear; + OutPutList.Delimiter := PathDelim; + OutPutList.StrictDelimiter := True; // Requires Delphi 2006 or newer. if SelectDirectory('Select a directory', ExtractFilePath(Application.ExeName), fMapPath) then Begin fMapPath := fMapPath + PathDelim; edtMapFolderPath.Text := fMapPath; - Split(PathDelim, ExcludeTrailingPathDelimiter(fMapPath), OutPutList); + OutPutList.DelimitedText := ExcludeTrailingPathDelimiter(fMapPath); fMapName := OutPutList[OutPutList.Count - 1]; lblFileName.Caption := fMapName; end; diff --git a/MapExporter/MapExporter.dproj.local b/MapExporter/MapExporter.dproj.local index fa38aeb..1f99024 100644 --- a/MapExporter/MapExporter.dproj.local +++ b/MapExporter/MapExporter.dproj.local @@ -1,23 +1,23 @@  - 1899-12-30 00:00:00.000.164,C:\Users\Thimo\Desktop\KMR en KP\Delphi\KP_MapTools.inc= - 1899-12-30 00:00:00.000.898,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\KP_MapTools.inc + 1899-12-30 00:00:00.000.616,C:\Users\Thimo\Desktop\KMR en KP\Delphi\src\KP_ToolCommonTypes.pas= + 1899-12-30 00:00:00.000.546,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\src\KP_ToolUtils.pas 1899-12-30 00:00:00.000.963,C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\MapExporter.dproj=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KPMapCompress.dproj + 1899-12-30 00:00:00.000.147,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\src\KP_ToolCommonTypes.pas + 1899-12-30 00:00:00.000.164,C:\Users\Thimo\Desktop\KMR en KP\Delphi\KP_MapTools.inc= 1899-12-30 00:00:00.000.266,C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\MapExporter.manifest=C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\New1.manifest - 1899-12-30 00:00:00.000.546,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\src\KP_ToolUtils.pas 1899-12-30 00:00:00.000.521,C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KP_MapExporter_Main.pas=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\Unit3.pas - 1899-12-30 00:00:00.000.147,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\src\KP_ToolCommonTypes.pas - 1899-12-30 00:00:00.000.616,C:\Users\Thimo\Desktop\KMR en KP\Delphi\src\KP_ToolCommonTypes.pas= - 1899-12-30 00:00:00.000.639,C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\KP_MapExporter_Main.dfm=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KP_MapExporter_Main.dfm - 1899-12-30 00:00:00.000.280,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\New1.manifest - 1899-12-30 00:00:00.000.197,C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KPMapCompress.dproj=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\Project4.dproj - 1899-12-30 00:00:00.000.073,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\src\LibTar.pas + 1899-12-30 00:00:00.000.898,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\KP_MapTools.inc + 1899-12-30 00:00:00.000.851,C:\Users\Thimo\Desktop\KMR en KP\Delphi\KP_MapTools.inc=C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\New1.inc 1899-12-30 00:00:00.000.521,C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KP_MapExporter_Main.dfm=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\Unit3.dfm + 1899-12-30 00:00:00.000.639,C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\KP_MapExporter_Main.pas=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KP_MapExporter_Main.pas + 1899-12-30 00:00:00.000.073,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\src\LibTar.pas + 1899-12-30 00:00:00.000.197,C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KPMapCompress.dproj=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\Project4.dproj + 1899-12-30 00:00:00.000.280,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\New1.manifest 1899-12-30 00:00:00.000.225,=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\Unit3.pas + 1899-12-30 00:00:00.000.639,C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\KP_MapExporter_Main.dfm=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KP_MapExporter_Main.dfm 1899-12-30 00:00:00.000.989,C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\MapExporter.dproj=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\MapExporter.dproj - 1899-12-30 00:00:00.000.639,C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\KP_MapExporter_Main.pas=C:\Users\Thimo\Documents\Embarcadero\Studio\Projects\KP_MapExporter_Main.pas - 2015-08-18 12:08:07.542,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\New1.inc - 2015-08-18 12:15:31.851,C:\Users\Thimo\Desktop\KMR en KP\Delphi\KP_MapTools.inc=C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\New1.inc + 1899-12-30 00:00:00.000.542,=C:\Users\Thimo\Desktop\KMR en KP\Delphi\MapExporter\New1.inc diff --git a/src/KP_ToolUtils.pas b/src/KP_ToolUtils.pas index 53acf56..ccedcbd 100644 --- a/src/KP_ToolUtils.pas +++ b/src/KP_ToolUtils.pas @@ -10,9 +10,7 @@ UNITSUFFIX: Array[0..7] of String = ( '', 'K', 'M', 'G', 'T', 'E', 'Z', 'Y' ); CONVERTBYTEVAL: Word = 1024; - Procedure RegisterFileType; -Procedure Split(Delimiter: Char; Str: String; ListOfStrings: TStrings) ; Function GetFiles(Const StartDir: String; Const FileList, DirList: TStrings): Boolean; Function convertUnits(aValueToConvert: Int64; aBaseValue: Integer): String; @@ -47,15 +45,6 @@ end; end; -// Split text to string list -Procedure Split(Delimiter: Char; Str: String; ListOfStrings: TStrings) ; -Begin - ListOfStrings.Clear; - ListOfStrings.Delimiter := Delimiter; - ListOfStrings.StrictDelimiter := True; // Requires Delphi 2006 or newer. - ListOfStrings.DelimitedText := Str; -end; - Function GetFiles(Const StartDir: String; Const FileList, DirList: TStrings): Boolean; Var SRec, SubDirSRec: TSearchRec;