Merge pull request #120 from paweld/gus

added a parameter to change the end of the line `b` or `line-ending`

Author: gcarreno

generator/Common/generate.common.pas

@@ -22,13 +22,14 @@   TGenerator = class(TObject)
     FOutPutFile: String;
     FLineCount: Int64;
     FStationNames: TStringList;
+    FLineEnding: String;
 
     procedure BuildStationNames;
     function GenerateProgressBar(APBPosition, APBMax, APBWIdth: Integer;
       AFileSize: Int64; ATimeElapsed: TDateTime): String;
     function Rng1brc(Range: Integer): Integer;
   public
-    constructor Create(AInputFile, AOutputFile: String; ALineCount: Int64; AOnly400Stations: Boolean = False);
+    constructor Create(AInputFile, AOutputFile: String; ALineCount: Int64; AOnly400Stations: Boolean; ALineEnding: String);
     destructor Destroy; override;
 
     procedure Generate;
@@ -57,17 +58,17 @@ implementation
   stationsCapacity = 50000;
   chunkBatch = 10000;
   chunkCapacity = 20 * 1024 * 1024;
-  lineEnding = #13#10;
   lineBreak = #13;
 
 { TGenerator }
 
-constructor TGenerator.Create(AInputFile, AOutputFile: String; ALineCount: Int64; AOnly400Stations: Boolean);
+constructor TGenerator.Create(AInputFile, AOutputFile: String; ALineCount: Int64; AOnly400Stations: Boolean; ALineEnding: String);
 begin
   FInputFile := AInputFile;
   FOutPutFile := AOutputFile;
   FLineCount := ALineCount;
   FOnly400Stations := AOnly400Stations;
+  FLineEnding := ALineEnding;
 
   FStationNames := TStringList.Create;
   FStationNames.Capacity := stationsCapacity;
@@ -193,6 +194,10 @@ procedure TGenerator.Generate;
   // Build list of station names
   BuildStationNames;
 
+  //initialize line ending if not corrected
+  if FLineEnding <> #13#10 then
+    FLineEnding := #10;
+
   outputFileStream := TFileStream.Create(FOutPutFile, fmCreate);
 
   progressBatch := floor(FLineCount * (linesPercent / 100));
@@ -228,7 +233,7 @@ procedure TGenerator.Generate;
   for index := 0 to High(temperatureArray) do
   begin
     randomTempFinal := FormatFloat('0"."0', index - 999);
-    temperatureArray[index] := randomTempFinal + lineEnding;
+    temperatureArray[index] := randomTempFinal + FLineEnding;
     LenTemperatureArray[index] := Length(temperatureArray[index]);
   end;
 

generator/Common/generate.console.pas

@@ -24,10 +24,12 @@ interface
   cLongOptNumber          = 'line-count';
   cShortOptStations: Char = '4';
   cLongOptStations        = '400stations';
+  cShortOptLineEnd: Char  = 'b';
+  cLongOptLineEnd         = 'line-ending';
   {$IFNDEF FPC}
-  cShortOptions: array of char = ['h', 'v', 'i', 'o', 'n', '4'];
+  cShortOptions: array of char = ['h', 'v', 'i', 'o', 'n', '4', 'b'];
   cLongOptions: array of string = ['help', 'version', 'input-file', 'output-file',
-                                   'line-count', '400stations'];
+                                   'line-count', '400stations', 'line-ending'];
   {$ENDIF}
 
 resourcestring
@@ -42,12 +44,14 @@ interface
   rsInputFile = 'Input Filename: "%s"';
   rsOutputFile = 'Output Filename: "%s"';
   rsLineCount = 'Line Count: %.n';
+  rsInvalidLineEnd = 'Line ending should be a CRLF or LF';
 
 var
   inputFilename: String = '';
   outputFilename: String = '';
   lineCount: Integer = 0;  
   only400Stations: Boolean = False;
+  lineEnding: String = '';
 
 procedure WriteHelp;
 
@@ -68,6 +72,7 @@ procedure WriteHelp;
   WriteLn('  -o|--output-file <filename>    The file that will contain the generated lines');
   WriteLn('  -n|--line-count <number>       The amount of lines to be generated ( Can use 1_000_000_000 )');
   WriteLn('  -4|--400stations               Only 400 weather stations in output file');
+  WriteLn('  -b|--line-ending               Line ending: LF (default) or CRLF');
 end;
 
 end.

generator/Delphi/src/generator.dpr

@@ -42,7 +42,7 @@ begin
     WriteLn(Format(rsLineCount, [Double(lineCount)]));
     WriteLn;
 
-    FGenerator := TGenerator.Create(inputFilename, outputFilename, lineCount, only400Stations);
+    FGenerator := TGenerator.Create(inputFilename, outputFilename, lineCount, only400Stations, lineEnding);
     try
       try
         FGenerator.generate;
@@ -100,7 +100,7 @@ end;
 function TOneBRCGenerator.ParseConsoleParams: boolean;
 var
   I, J, invalid, valid: Integer;
-  tmpLineCount: String;
+  tmpLineCount, tmpLineEnd: String;
   ParamOK: Boolean;
   SkipNext: Boolean;
 begin
@@ -241,6 +241,27 @@ begin
   end;
 
   only400Stations := (FParams.IndexOf(cShortOptStations) >= 0) or (FParams.IndexOf(cLongOptStations) >= 0);
+  
+  // check line ending
+  J := FParams.IndexOfName(cShortOptLineEnd);
+  if J = -1 then
+    J := FParams.IndexOfName(cLongOptLineEnd);
+  if J >= 0 then
+  begin
+    tmpLineCount := FParams.ValueFromIndex[J];
+    
+    if (UpperCase(tmpLineEnd) <> 'CRLF') and (UpperCase(tmpLineEnd) <> 'LF') then
+    begin
+      WriteLn(rsInvalidLineEnd);
+      inc(invalid);
+    end
+    else 
+    begin
+      if UpperCase(tmpLineEnd) = 'CRLF' then
+        lineEnding := #13#10;  
+      inc(valid);
+    end;    
+  end;
 
   writeln(only400Stations);
   writeln(fparams.Text);

generator/Lazarus/src/generator.lpr

@@ -34,24 +34,26 @@   TOneBRCGenerator = class(TCustomApplication)
 procedure TOneBRCGenerator.DoRun;
 var
   ErrorMsg: String;
-  tmpLineCount: String;
+  tmpLineCount, tmpLineEnd: String;
 begin
   // quick check parameters
-  ErrorMsg:= CheckOptions(Format('%s%s%s:%s:%s:%s',[
+  ErrorMsg:= CheckOptions(Format('%s%s%s:%s:%s:%s:%s',[
       cShortOptHelp,
       cShortOptVersion,
       cShortOptInput,
       cShortOptOutput,
       cShortOptNumber,
-      cShortOptStations
+      cShortOptStations,
+      cShortOptLineEnd
     ]),
     [
       cLongOptHelp,
       cLongOptVersion,
       cLongOptInput+':',
       cLongOptOutput+':',
       cLongOptNumber+':',
-      cLongOptStations+':'
+      cLongOptStations+':',
+      cLongOptLineEnd+':'
     ]
   );
   if ErrorMsg<>'' then
@@ -134,6 +136,22 @@ procedure TOneBRCGenerator.DoRun;
 
   only400stations := HasOption(cShortOptStations, cLongOptStations);
 
+  if HasOption(cShortOptLineEnd, cLongOptLineEnd) then
+  begin
+    tmpLineEnd:=GetOptionValue(
+      cShortOptLineEnd,
+      cLongOptLineEnd
+    );
+    if (UpperCase(tmpLineEnd) <> 'CRLF') and (UpperCase(tmpLineEnd) <> 'LF') then
+    begin
+      WriteLn(rsInvalidLineEnd);
+      Terminate;
+      Exit;
+    end
+    else if UpperCase(tmpLineEnd) = 'CRLF' then
+      lineEnding := #13#10;
+  end;
+
   inputFilename:= ExpandFileName(inputFilename);
   outputFilename:= ExpandFileName(outputFilename);
 
@@ -142,7 +160,7 @@ procedure TOneBRCGenerator.DoRun;
   WriteLn(Format(rsLineCount, [ Double(lineCount) ]));
   WriteLn;
 
-  FGenerator:= TGenerator.Create(inputFilename, outputFilename, lineCount, only400stations);
+  FGenerator:= TGenerator.Create(inputFilename, outputFilename, lineCount, only400stations, lineEnding);
   try
     try
       FGenerator.Generate;