X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsfs%2Fwadcvt.dpr;h=4d2acf17658edf9911d8276e31a08625fa369d79;hb=e21c5a3813c8eac0b705cc6fe36fca3e0086d869;hp=34ffcfbbb74f84bc68fb2c6b86aff164aca10a9f;hpb=03ec2f1d27fdcff9a5a8785806fcd8449f2537a9;p=d2df-sdl.git

diff --git a/src/sfs/wadcvt.dpr b/src/sfs/wadcvt.dpr
index 34ffcfb..4d2acf1 100644
--- a/src/sfs/wadcvt.dpr
+++ b/src/sfs/wadcvt.dpr
@@ -1,7 +1,7 @@
-{$IFDEF WIN32}
+{$MODE OBJFPC}
+{$IFDEF WINDOWS}
   {$APPTYPE CONSOLE}
 {$ENDIF}
-{$MODE DELPHI}
 program __wadcvt__;
 
 uses
@@ -9,25 +9,123 @@ uses
   Classes,
   utils in '../shared/utils.pas',
   xstreams in '../shared/xstreams.pas',
+  crc,
   sfs,
   sfsPlainFS,
   sfsZipFS,
-  zipper;
+  paszlib;
 
 
-type
-  TProg = class(TObject)
-    lastname: string;
-    lastlen: Integer;
+procedure processed (count: Cardinal);
+begin
+  //writeln('  read ', count, ' bytes');
+end;
 
-    procedure putStr (const s: string; newline: Boolean=false);
 
-    procedure onProgress (sender: TObject; const percent: double);
-    procedure onFileStart (sender: TObject; const fileName: string);
-    procedure onFileEnd (sender: TObject; const ratio: double);
+// returs crc
+function zpack (ds: TStream; ss: TStream): LongWord;
+const
+  IBSize = 65536;
+  OBSize = 65536;
+var
+  zst: TZStream;
+  ib, ob: PByte;
+  ibpos: Cardinal;
+  err: Integer;
+  rd, f: Integer;
+  eof: Boolean;
+  crc: LongWord;
+begin
+  result := 0;
+  crc := crc32(0, nil, 0);
+  GetMem(ib, IBSize);
+  GetMem(ob, OBSize);
+  try
+    zst.next_out := ob;
+    zst.avail_out := OBSize;
+    err := deflateInit2(zst, Z_BEST_COMPRESSION, Z_DEFLATED, -15, 9, 0);
+    if err <> Z_OK then raise Exception.Create(zerror(err));
+    try
+      ibpos := 0;
+      zst.next_out := ob;
+      zst.avail_out := OBSize;
+      eof := false;
+      while true do
+      begin
+        while not eof and (ibpos < IBSize) do
+        begin
+          rd := ss.read((ib+ibpos)^, IBSize-ibpos);
+          if rd < 0 then raise Exception.Create('reading error');
+          eof := (rd <> IBSize-ibpos);
+          if rd <> 0 then begin crc := crc32(crc, Pointer(ib+ibpos), rd); result := crc; end;
+          Inc(ibpos, rd);
+          if rd <> 0 then processed(rd);
+        end;
+        zst.next_in := ib;
+        zst.avail_in := ibpos;
+        if eof then break;
+        err := deflate(zst, Z_NO_FLUSH);
+        if (err <> Z_OK) and (err <> Z_STREAM_END) then raise Exception.Create(zerror(err));
+        if zst.avail_out < OBSize then
+        begin
+          //writeln('  written ', OBSize-zst.avail_out, ' bytes');
+          ds.writeBuffer(ob^, OBSize-zst.avail_out);
+          zst.next_out := ob;
+          zst.avail_out := OBSize;
+        end;
+        // shift input buffer
+        if zst.avail_in < ibpos then
+        begin
+          rd := 0;
+          for f := ibpos-zst.avail_in to ibpos-1 do
+          begin
+            ib[rd] := ib[f];
+            Inc(rd);
+          end;
+          ibpos := rd;
+          //writeln(' rd: ', zst.avail_in);
+        end;
+      end;
+      // pack leftovers
+      while zst.avail_in > 0 do
+      begin
+        err := deflate(zst, Z_NO_FLUSH);
+        if (err <> Z_OK) and (err <> Z_STREAM_END) then raise Exception.Create(zerror(err));
+        if zst.avail_out < OBSize then
+        begin
+          //writeln('  written ', OBSize-zst.avail_out, ' bytes');
+          ds.writeBuffer(ob^, OBSize-zst.avail_out);
+          zst.next_out := ob;
+          zst.avail_out := OBSize;
+        end;
+      end;
+      // stream compressed, flush zstream
+      while true do
+      begin
+        zst.avail_in := 0;
+        zst.next_out := ob;
+        zst.avail_out := OBSize;
+        err := deflate(zst, Z_FINISH);
+        if zst.avail_out < OBSize then
+        begin
+          //writeln('  written ', OBSize-zst.avail_out, ' bytes');
+          ds.writeBuffer(ob^, OBSize-zst.avail_out);
+        end;
+        if err <> Z_OK then break;
+      end;
+      // succesfully flushed?
+      if (err <> Z_STREAM_END) then raise Exception.Create(zerror(err));
+    finally
+      deflateEnd(zst);
+    end;
+  finally
+    FreeMem(ob);
+    FreeMem(ib);
   end;
+end;
 
 
+{
 procedure TProg.putStr (const s: string; newline: Boolean=false);
 begin
   write(#13, s);
@@ -65,6 +163,7 @@ procedure TProg.onFileEnd (sender: TObject; const ratio: double);
 begin
   putStr(Format('compressed  %-33s  %f', [lastname, ratio]), true);
 end;
+}
 
 
 // returns new file name
@@ -154,17 +253,202 @@ begin
 end;
 
 
+type
+  TFileInfo = class
+  public
+    name: AnsiString;
+    pkofs: Int64; // offset of file header
+    size: Int64;
+    pksize: Int64;
+    crc: LongWord;
+    method: Word;
+
+    constructor Create ();
+  end;
+
+constructor TFileInfo.Create ();
+begin
+  name := '';
+  pkofs := 0;
+  size := 0;
+  pksize := 0;
+  crc := crc32(0, nil, 0);
+  method := 0;
+end;
+
+
+const
+  uni2wint: array [128..255] of Word = (
+    $0402,$0403,$201A,$0453,$201E,$2026,$2020,$2021,$20AC,$2030,$0409,$2039,$040A,$040C,$040B,$040F,
+    $0452,$2018,$2019,$201C,$201D,$2022,$2013,$2014,$003F,$2122,$0459,$203A,$045A,$045C,$045B,$045F,
+    $00A0,$040E,$045E,$0408,$00A4,$0490,$00A6,$00A7,$0401,$00A9,$0404,$00AB,$00AC,$00AD,$00AE,$0407,
+    $00B0,$00B1,$0406,$0456,$0491,$00B5,$00B6,$00B7,$0451,$2116,$0454,$00BB,$0458,$0405,$0455,$0457,
+    $0410,$0411,$0412,$0413,$0414,$0415,$0416,$0417,$0418,$0419,$041A,$041B,$041C,$041D,$041E,$041F,
+    $0420,$0421,$0422,$0423,$0424,$0425,$0426,$0427,$0428,$0429,$042A,$042B,$042C,$042D,$042E,$042F,
+    $0430,$0431,$0432,$0433,$0434,$0435,$0436,$0437,$0438,$0439,$043A,$043B,$043C,$043D,$043E,$043F,
+    $0440,$0441,$0442,$0443,$0444,$0445,$0446,$0447,$0448,$0449,$044A,$044B,$044C,$044D,$044E,$044F
+  );
+
+
+// this will write "extra field length" and extra field itself
+type
+  TByteArray = array of Byte;
+
+function buildUtfExtra (fname: string): TByteArray;
 var
-  fs: TStream;
+  crc: LongWord;
+  fu: string;
+  sz: Word;
+  uc: PUnicodeChar;
+  xdc: PChar;
+  pos, f: Integer;
+begin
+  GetMem(uc, length(fname)*8);
+  GetMem(xdc, length(fname)*8);
+  try
+    FillChar(uc^, length(fname)*8, 0);
+    FillChar(xdc^, length(fname)*8, 0);
+    pos := 0;
+    for f := 1 to length(fname) do
+    begin
+      if ord(fname[f]) < 128 then
+        uc[pos] := UnicodeChar(ord(fname[f]))
+      else
+        uc[pos] := UnicodeChar(uni2wint[ord(fname[f])]);
+      Inc(pos);
+    end;
+    FillChar(xdc^, length(fname)*8, 0);
+    f := UnicodeToUtf8(xdc, length(fname)*8, uc, pos);
+    while (f > 0) and (xdc[f-1] = #0) do Dec(f);
+    SetLength(fu, f);
+    Move(xdc^, fu[1], f);
+    //writeln('[', fu, ']');
+  finally
+    FreeMem(xdc);
+    FreeMem(uc);
+  end;
+
+  crc := crc32(0, @fname[1], length(fname));
+  sz := 2+2+1+4+length(fu);
+  SetLength(result, sz);
+  result[0] := ord('u');
+  result[1] := ord('p');
+  Dec(sz, 4);
+  result[2] := sz and $ff;
+  result[3] := (sz shr 8) and $ff;
+  result[4] := 1;
+  result[5] := crc and $ff;
+  result[6] := (crc shr 8) and $ff;
+  result[7] := (crc shr 16) and $ff;
+  result[8] := (crc shr 24) and $ff;
+  Move(fu[1], result[9], length(fu));
+  //result := nil;
+end;
+
+
+function ZipOne (ds: TStream; fname: string; st: TStream): TFileInfo;
+var
+  oldofs, nfoofs, pkdpos: Int64;
+  sign: packed array [0..3] of Char;
+  ef: TByteArray;
+begin
+  result := TFileInfo.Create();
+  result.pkofs := ds.position;
+  result.size := st.size;
+  result.name := fname;
+  if result.size > 0 then result.method := 8 else result.method := 0;
+  ef := buildUtfExtra(result.name);
+  // write local header
+  sign := 'PK'#3#4;
+  ds.writeBuffer(sign, 4);
+  writeInt(ds, Word($0A10)); // version to extract
+  //writeInt(ds, Word(1 shl 11)); // flags: utf-8 name
+  writeInt(ds, Word(0)); // flags
+  writeInt(ds, Word(result.method)); // compression method
+  writeInt(ds, Word(0)); // file time
+  writeInt(ds, Word(0)); // file date
+  nfoofs := ds.position;
+  writeInt(ds, LongWord(result.crc)); // crc32
+  writeInt(ds, LongWord(result.pksize)); // packed size
+  writeInt(ds, LongWord(result.size)); // unpacked size
+  writeInt(ds, Word(length(fname))); // name length
+  writeInt(ds, Word(length(ef))); // extra field length
+  ds.writeBuffer(fname[1], length(fname));
+  if length(ef) > 0 then ds.writeBuffer(ef[0], length(ef));
+  // now write packed data
+  if result.size > 0 then
+  begin
+    pkdpos := ds.position;
+    st.position := 0;
+    result.crc := zpack(ds, st);
+    result.pksize := ds.position-pkdpos;
+    // fix header
+    oldofs := ds.position;
+    ds.position := nfoofs;
+    writeInt(ds, LongWord(result.crc)); // crc32
+    writeInt(ds, LongWord(result.pksize)); // crc32
+    ds.position := oldofs;
+  end;
+end;
+
+
+procedure writeCentralDir (ds: TStream; files: array of TFileInfo);
+var
+  cdofs, cdend: Int64;
+  sign: packed array [0..3] of Char;
+  f: Integer;
+  ef: TByteArray;
+begin
+  cdofs := ds.position;
+  for f := 0 to high(files) do
+  begin
+    ef := buildUtfExtra(files[f].name);
+    sign := 'PK'#1#2;
+    ds.writeBuffer(sign, 4);
+    writeInt(ds, Word($0A10)); // version made by
+    writeInt(ds, Word($0010)); // version to extract
+    //writeInt(ds, Word(1 shl 11)); // flags: utf-8 name
+    writeInt(ds, Word(0)); // flags
+    writeInt(ds, Word(files[f].method)); // compression method
+    writeInt(ds, Word(0)); // file time
+    writeInt(ds, Word(0)); // file date
+    writeInt(ds, LongWord(files[f].crc));
+    writeInt(ds, LongWord(files[f].pksize));
+    writeInt(ds, LongWord(files[f].size));
+    writeInt(ds, Word(length(files[f].name))); // name length
+    writeInt(ds, Word(length(ef))); // extra field length
+    writeInt(ds, Word(0)); // comment length
+    writeInt(ds, Word(0)); // disk start
+    writeInt(ds, Word(0)); // internal attributes
+    writeInt(ds, LongWord(0)); // external attributes
+    writeInt(ds, LongWord(files[f].pkofs)); // header offset
+    ds.writeBuffer(files[f].name[1], length(files[f].name));
+    if length(ef) > 0 then ds.writeBuffer(ef[0], length(ef));
+  end;
+  cdend := ds.position;
+  // write end of central dir
+  sign := 'PK'#5#6;
+  ds.writeBuffer(sign, 4);
+  writeInt(ds, Word(0)); // disk number
+  writeInt(ds, Word(0)); // disk with central dir
+  writeInt(ds, Word(length(files))); // number of files on this dist
+  writeInt(ds, Word(length(files))); // number of files total
+  writeInt(ds, LongWord(cdend-cdofs)); // size of central directory
+  writeInt(ds, LongWord(cdofs)); // central directory offset
+  writeInt(ds, Word(0)); // archive comment length
+end;
+
+
+var
+  fs, fo: TStream;
   fl: TSFSFileList;
   f: Integer;
   infname: string;
   outfname: string;
-  zip: TZipper;
   dvfn: string;
-  ZEntries: TZipFileEntries;
   newname: string;
-  prg: TProg;
+  files: array of TFileInfo;
+  nfo: TFileInfo;
 begin
   if ParamCount() < 1 then
   begin
@@ -191,56 +475,33 @@ begin
   if not SFSAddDataFile(infname) then begin WriteLn('shit!'); Halt(1); end;
   dvfn := SFSGetLastVirtualName(infname);
 
-  {
-  tot := 0;
-  fl := SFSFileList(ParamStr(1));
-  if fl <> nil then
-  begin
-    for f := 0 to fl.Count-1 do
-    begin
-      WriteLn(f:4, ': ', fl[f].fSize:10, ' "', fl[f].fPath, fl[f].fName, '"');
-      Inc(tot, fl[f].fSize);
-    end;
-    WriteLn('===================================================');
-    WriteLn(fl.Count, ' files; ', Int64ToStrComma(tot), ' bytes.');
-    fl.Free();
-  end;
-  }
-
-  zip := TZipper.Create;
-  zip.Filename := outfname;
+  files := nil;
 
   fl := SFSFileList(dvfn);
-  if fl <> nil then
+  if fl = nil then
   begin
-    ZEntries := TZipFileEntries.Create(TZipFileEntry);
+    writeln('wtf?!');
+    Halt(1);
+  end;
+
+  fo := TFileStream.Create(outfname, fmCreate);
+  try
     for f := 0 to fl.Count-1 do
     begin
       if length(fl[f].fName) = 0 then continue;
       fs := SFSFileOpen(dvfn+'::'+fl[f].fPath+fl[f].fName);
       newname := detectExt(fl[f].fPath, fl[f].fName, fs);
-      fs.Free;
-      fs := SFSFileOpen(dvfn+'::'+fl[f].fPath+fl[f].fName);
-      writeln('[', f+1, '/', fl.Count, ']: ', fl[f].fPath+newname, '  ', fs.size);
-      ZEntries.AddFileEntry(fs, fl[f].fPath+newname);
+      fs.position := 0;
+      writeln('[', f+1, '/', fl.Count, ']: ', fl[f].fPath, newname, '  ', fs.size);
+      nfo := ZipOne(fo, fl[f].fPath+newname, fs);
+      SetLength(files, length(files)+1);
+      files[high(files)] := nfo;
     end;
-    try
-      if ZEntries.Count > 0 then
-      begin
-        writeln('creating ''', outfname, '''');
-        prg := TProg.Create();
-        zip.OnProgress := prg.onProgress;
-        zip.OnStartFile := prg.onFileStart;
-        zip.OnEndFile := prg.onFileEnd;
-        zip.ZipFiles(ZEntries);
-        prg.Free;
-      end;
-    except
-      on E: EZipError do E.CreateFmt('Zipfile could not be created%sReason: %s', [LineEnding, E.Message])
-    end;
-  end
-  else
-  begin
-    writeln('SFSFileList(): faled!');
+    writeCentralDir(fo, files);
+  except
+    fo.Free();
+    fo := nil;
+    DeleteFile(outfname);
   end;
+  if fo <> nil then fo.Free();
 end.