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 131 by alloc, Wed Mar 28 01:20:26 2007 UTC

#	Line 151 | Line 151 | begin
151		begin
152		ShowMessage('Couldn''t delete file. Aborting');
153		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;
154		end;
155	+	if FileExists(AnsiReplaceStr(Target, '.dat', '.raw')) then
156	+	if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
157	+	begin
158	+	ShowMessage('Couldn''t delete file. Aborting');
159	+	Exit;
160	+	end;
161	+	if FileExists(AnsiReplaceStr(Target, '.dat', '.sep')) then
162	+	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
163	+	if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
164	+	begin
165	+	ShowMessage('Couldn''t delete file. Aborting');
166	+	Exit;
167	+	end;
168		end else begin
169		ShowMessage('Aborting');
170		Exit;
#	Line 323 | Line 328 | begin
328		end;
329		end else
330		RawLinks[i].RawAddr := 0;
331	+	DatFileStream.Seek(RawLinks[i].SrcOffset, soFromBeginning);
332	+	DatFileStream.Write(RawLinks[i].RawAddr, 4);
333		end;
334		end;
335	<
336	<	{
330	<	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	<	//
335	>	DatFileStream.Seek(0, soFromBeginning);
336	>	Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
337		end
338		else
339		FilesHeader[i].DataAddr := 0;
#	Line 348 | Line 348 | begin
348		FilesHeader[i].FileSize := fileinfo.Size;
349		FilesHeader[i].FileType := fileinfo.FileType;
350
351	<	if ((i mod 10) = 0) and (i >= 100) then
351	>	if ((FileID mod 10) = 0) and (FileID >= 100) then
352		lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
353	<	(Time - FileTime) / i * (progress.Max - i + 1) * 1.1, TimeFormat );
354	<	progress.Position := i + 1;
355	<	lbl_progress.Caption := 'Files done: ' + IntToStr(i + 1) + '/' + IntToStr(progress.Max);
353	>	(Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, TimeFormat );
354	>	progress.Position := FileID + 1;
355	>	lbl_progress.Caption := 'Files done: ' + IntToStr(FileID + 1) + '/' + IntToStr(progress.Max);
356		Application.ProcessMessages;
357		end;
358
#	Line 380 | Line 380 | begin
380		Stream_Body.Free;
381		Stream_Names.Free;
382		Stream_Raw.Free;
383	<	if OniDataConnection.OSisMac then
383	>
384	>	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
385		Stream_Sep.Free;
386
387		progress.Position      := progress.Max;
#	Line 396 | Line 397 | begin
397
398		converting := False;
399
400	<	CloseDataConnection(DataConnections[conIndex]);
400	>	//  CloseDataConnection(DataConnections[conIndex]);
401		end;
402
403
#	Line 406 | Line 407 | procedure TForm_LevelDB.HandleFile;
407		var
408		i: Byte;
409		begin
410	<	for i := 1 to Length(ConvertHandlers) do
410	>	{  for i := 1 to Length(ConvertHandlers) do
411		if UpperCase(ConvertHandlers[i].Ext) = UpperCase(ext) then
412		if ConvertHandlers[i].needed then
413		begin
#	Line 415 | Line 416 | begin
416		end
417		else
418		Break;
419	<	end;
419	>	}end;
420
421
422
423
424		procedure TForm_LevelDB.CreateDatabase(Source, target: String);
425	+	{
426		var
427		DataBase:    TABSDatabase;
428		Query:       TABSQuery;
#	Line 452 | Line 454 | const
454		else
455		group_progress.Caption := 'Creating DB (FINISHED)';
456		end;
457	+	}
458
459		begin
460	<	if CreateDataConnection(Source, ODB_Dat) = nil then
460	>	{  if CreateDataConnection(Source, ODB_Dat) = nil then
461		begin
462		ShowMessage('Could not connect to .dat-file');
463		Exit;
#	Line 657 | Line 660 | begin
660		database.Free;
661
662		CloseDataConnection(DataConnections[conIndex]);
663	+	}
664		end;
665
666
667
668
669	<	procedure TForm_LevelDB.stop_convert;
669	>	procedure TForm_LevelDB.StopConvert;
670		begin
671	<	btn_abortok.Caption := '&Close';
671	>	{  btn_abortok.Caption := '&Close';
672		btn_abortok.Default := True;
673		converting := False;
674		lbl_estimation.Caption := 'ABORTED';
#	Line 675 | Line 679 | begin
679		begin
680		DeleteFile(loaded_filename);
681		end;
682	<	end;
682	>	}end;
683
684
685
#	Line 698 | Line 702 | end;
702
703
704
705	<
705	>	{
706		procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord);
707		var
708		link: LongWord;
#	Line 1730 | Line 1734 | begin
1734		begin
1735		end;
1736		end;
1737	+	}
1738
1739
1740	<
1736	<
1740	>	{
1741		procedure InsertHandler(ext: String; needed: Boolean; handler: THandler);
1742		begin
1743		SetLength(ConvertHandlers, Length(ConvertHandlers) + 1);
#	Line 1741 | Line 1745 | begin
1745		ConvertHandlers[High(ConvertHandlers)].needed  := needed;
1746		ConvertHandlers[High(ConvertHandlers)].handler := handler;
1747		end;
1748	<
1748	>	}
1749		begin
1750	<	InsertHandler('ABNA', False, nil);
1750	>	{  InsertHandler('ABNA', False, nil);
1751		//  InsertHandler('AGDB',True,AGDB);
1752		InsertHandler('AGDB', False, nil);
1753		InsertHandler('AGQC', False, nil);
#	Line 1841 | Line 1845 | begin
1845		InsertHandler('WMM_', False, nil);
1846		InsertHandler('WMMB', True, WMMB);
1847		InsertHandler('WPGE', True, WPGE);
1848	<	end.
1848	>	}end.

Diff Legend

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