ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Helper/LevelDB.pas

Comparing oup/current/Helper/LevelDB.pas (file contents):
Revision 127 by alloc, Fri Mar 23 17:14:40 2007 UTC vs.
Revision 132 by alloc, Wed Mar 28 01:41:10 2007 UTC

#	Line 65 | Line 65 | var
65		Stream_Body, Stream_Names:          TMemoryStream;
66		Stream_Dat, Stream_Raw, Stream_Sep: TFileStream;
67
68	–	//  Data, rawdata: Tdata;
68		BeginTime, FileTime: Double;
69		Step:     Integer;
71	–	//  rawlist:  TRawDataList;
72	–	//  datlinks: TDatLinks;
70		OniImage:   TOniImage;
71		LevelID:    Integer;
72		TimeFormat: TFormatSettings;
#	Line 90 | Line 87 | var
87		RawLinks:   TRawDataList;
88
89		DatFileStream, RawFileStream: TMemoryStream;
90	+
91	+	// ###########################
92	+	datsum, linksum, rawsum: Int64;
93	+	freq: Int64;
94	+	tempticks1, tempticks2: Int64;
95	+	// ###########################
96		const
97		Steps: Byte = 3;
98
#	Line 151 | Line 154 | begin
154		begin
155		ShowMessage('Couldn''t delete file. Aborting');
156		Exit;
154	–	end else if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
155	–	begin
156	–	ShowMessage('Couldn''t delete file. Aborting');
157	–	Exit;
158	–	end else if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
159	–	begin
160	–	ShowMessage('Couldn''t delete file. Aborting');
161	–	Exit;
157		end;
158	+	if FileExists(AnsiReplaceStr(Target, '.dat', '.raw')) then
159	+	if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
160	+	begin
161	+	ShowMessage('Couldn''t delete file. Aborting');
162	+	Exit;
163	+	end;
164	+	if FileExists(AnsiReplaceStr(Target, '.dat', '.sep')) then
165	+	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
166	+	if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
167	+	begin
168	+	ShowMessage('Couldn''t delete file. Aborting');
169	+	Exit;
170	+	end;
171		end else begin
172		ShowMessage('Aborting');
173		Exit;
#	Line 275 | Line 283 | begin
283		lbl_estimation.Caption := 'Estimated finishing time: unknown';
284		Application.ProcessMessages;
285
286	+	QueryPerformanceFrequency(freq);
287	+	datsum := 0;
288	+	linksum := 0;
289	+	rawsum := 0;
290	+
291		FileTime := Time;
292		for FileID := 0 to DatHeader.Files - 1 do
293		begin
#	Line 283 | Line 296 | begin
296		FilesHeader[FileID].Extension[j] := FileInfo.Extension[4 - j];
297		if FileInfo.Size > 0 then
298		begin
299	+	QueryPerformanceCounter(tempticks1);
300	+
301		FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
302		DatFileStream := TMemoryStream.Create;
303		Connection.LoadDatFile(FileID, TStream(DatFileStream));
304		DatFileStream.Seek(4, soFromBeginning);
305		DatFileStream.Write(LevelID, 4);
306
307	+	QueryPerformanceCounter(tempticks2);
308	+	datsum := datsum + (tempticks2 - tempticks1);
309	+
310		DatLinks := Connection.GetDatLinks(FileID);
311		if Length(DatLinks) > 0 then
312		begin
#	Line 303 | Line 321 | begin
321		end;
322		end;
323
324	+	QueryPerformanceCounter(tempticks1);
325	+	linksum := linksum + (tempticks1 - tempticks2);
326	+
327		RawLinks := Connection.GetRawList(FileID);
328		if Length(RawLinks) > 0 then
329		begin
#	Line 323 | Line 344 | begin
344		end;
345		end else
346		RawLinks[i].RawAddr := 0;
347	+	DatFileStream.Seek(RawLinks[i].SrcOffset, soFromBeginning);
348	+	DatFileStream.Write(RawLinks[i].RawAddr, 4);
349		end;
350		end;
351	+	DatFileStream.Seek(0, soFromBeginning);
352	+	Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
353
354	<	{
355	<	Data[rawlist[j].src_offset + 0] := (rawlist[j].raw_addr) and $FF;
331	<	Data[rawlist[j].src_offset + 1] := (rawlist[j].raw_addr shr 8) and $FF;
332	<	Data[rawlist[j].src_offset + 2] := (rawlist[j].raw_addr shr 16) and $FF;
333	<	Data[rawlist[j].src_offset + 3] := (rawlist[j].raw_addr shr 24) and $FF;
334	<	}
335	<	Stream_Body.Write(Data[0], Length(Data));
336	<	//
354	>	QueryPerformanceCounter(tempticks2);
355	>	rawsum := rawsum + (tempticks2 - tempticks1);
356		end
357		else
358		FilesHeader[i].DataAddr := 0;
#	Line 348 | Line 367 | begin
367		FilesHeader[i].FileSize := fileinfo.Size;
368		FilesHeader[i].FileType := fileinfo.FileType;
369
370	<	if ((i mod 10) = 0) and (i >= 100) then
370	>	if ((FileID mod 10) = 0) and (FileID >= 100) then
371		lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
372	<	(Time - FileTime) / i * (progress.Max - i + 1) * 1.1, TimeFormat );
373	<	progress.Position := i + 1;
374	<	lbl_progress.Caption := 'Files done: ' + IntToStr(i + 1) + '/' + IntToStr(progress.Max);
372	>	(Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, TimeFormat );
373	>	progress.Position := FileID + 1;
374	>	lbl_progress.Caption := 'Files done: ' + IntToStr(FileID + 1) + '/' + IntToStr(progress.Max);
375		Application.ProcessMessages;
376		end;
377
378	+	ShowMessage('AvgDats: ' + FloatToStr((datsum / progress.Max) / freq) + #13#10 +
379	+	'AvgLinks: ' + FloatToStr((linksum / progress.Max) / freq) + #13#10 +
380	+	'AvgRaws: ' + FloatToStr((rawsum / progress.Max) / freq)
381	+	);
382	+
383		Stream_Dat.Write(DatHeader, SizeOf(DatHeader));
384		for i := 0 to High(FilesHeader) do
385		Stream_Dat.Write(FilesHeader[i], SizeOf(FilesHeader[i]));
#	Line 380 | Line 404 | begin
404		Stream_Body.Free;
405		Stream_Names.Free;
406		Stream_Raw.Free;
407	<	if OniDataConnection.OSisMac then
407	>
408	>	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
409		Stream_Sep.Free;
410
411		progress.Position      := progress.Max;
#	Line 396 | Line 421 | begin
421
422		converting := False;
423
424	<	CloseDataConnection(DataConnections[conIndex]);
424	>	//  CloseDataConnection(DataConnections[conIndex]);
425		end;
426
427
#	Line 406 | Line 431 | procedure TForm_LevelDB.HandleFile;
431		var
432		i: Byte;
433		begin
434	<	for i := 1 to Length(ConvertHandlers) do
434	>	{  for i := 1 to Length(ConvertHandlers) do
435		if UpperCase(ConvertHandlers[i].Ext) = UpperCase(ext) then
436		if ConvertHandlers[i].needed then
437		begin
#	Line 415 | Line 440 | begin
440		end
441		else
442		Break;
443	<	end;
443	>	}end;
444
445
446
447
448		procedure TForm_LevelDB.CreateDatabase(Source, target: String);
449	+	{
450		var
451		DataBase:    TABSDatabase;
452		Query:       TABSQuery;
#	Line 452 | Line 478 | const
478		else
479		group_progress.Caption := 'Creating DB (FINISHED)';
480		end;
481	+	}
482
483		begin
484	<	if CreateDataConnection(Source, ODB_Dat) = nil then
484	>	{  if CreateDataConnection(Source, ODB_Dat) = nil then
485		begin
486		ShowMessage('Could not connect to .dat-file');
487		Exit;
#	Line 657 | Line 684 | begin
684		database.Free;
685
686		CloseDataConnection(DataConnections[conIndex]);
687	+	}
688		end;
689
690
691
692
693	<	procedure TForm_LevelDB.stop_convert;
693	>	procedure TForm_LevelDB.StopConvert;
694		begin
695	<	btn_abortok.Caption := '&Close';
695	>	{  btn_abortok.Caption := '&Close';
696		btn_abortok.Default := True;
697		converting := False;
698		lbl_estimation.Caption := 'ABORTED';
#	Line 675 | Line 703 | begin
703		begin
704		DeleteFile(loaded_filename);
705		end;
706	<	end;
706	>	}end;
707
708
709
#	Line 698 | Line 726 | end;
726
727
728
729	<
729	>	{
730		procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord);
731		var
732		link: LongWord;
#	Line 1730 | Line 1758 | begin
1758		begin
1759		end;
1760		end;
1761	+	}
1762
1763
1764	<
1736	<
1764	>	{
1765		procedure InsertHandler(ext: String; needed: Boolean; handler: THandler);
1766		begin
1767		SetLength(ConvertHandlers, Length(ConvertHandlers) + 1);
#	Line 1741 | Line 1769 | begin
1769		ConvertHandlers[High(ConvertHandlers)].needed  := needed;
1770		ConvertHandlers[High(ConvertHandlers)].handler := handler;
1771		end;
1772	<
1772	>	}
1773		begin
1774	<	InsertHandler('ABNA', False, nil);
1774	>	{  InsertHandler('ABNA', False, nil);
1775		//  InsertHandler('AGDB',True,AGDB);
1776		InsertHandler('AGDB', False, nil);
1777		InsertHandler('AGQC', False, nil);
#	Line 1841 | Line 1869 | begin
1869		InsertHandler('WMM_', False, nil);
1870		InsertHandler('WMMB', True, WMMB);
1871		InsertHandler('WPGE', True, WPGE);
1872	<	end.
1872	>	}end.

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)