mirror of
https://github.com/dazedcat19/FMD2.git
synced 2024-10-07 01:03:37 +00:00
replace utf8 calls. already handled by lazfileutils
This commit is contained in:
dazedcat19
parent
52fd2db36a
commit
9d45c3bcd3
@ -199,7 +199,7 @@ end;
|
||||
|
||||
function DBDataFileExist(const AModuleID: String): Boolean;
|
||||
begin
|
||||
Result := FileExistsUTF8(DATA_FOLDER + AModuleID + DBDATA_EXT);
|
||||
Result := FileExists(DATA_FOLDER + AModuleID + DBDATA_EXT);
|
||||
end;
|
||||
|
||||
procedure CopyDBDataProcess(const AWebsite, NWebsite: String);
|
||||
@ -223,27 +223,27 @@ function DeleteDBDataProcess(const AWebsite: String): Boolean;
|
||||
var
|
||||
tryc: Integer;
|
||||
begin
|
||||
Result := not FileExistsUTF8(DATA_FOLDER + AWebsite + DBDATA_EXT);
|
||||
Result := not FileExists(DATA_FOLDER + AWebsite + DBDATA_EXT);
|
||||
if Result = False then
|
||||
begin
|
||||
tryc := 0;
|
||||
while not DeleteFileUTF8(DATA_FOLDER + AWebsite + DBDATA_EXT) do
|
||||
while not DeleteFile(DATA_FOLDER + AWebsite + DBDATA_EXT) do
|
||||
begin
|
||||
if tryc > 3 then
|
||||
Break;
|
||||
Inc(tryc);
|
||||
Sleep(250);
|
||||
end;
|
||||
Result := not FileExistsUTF8(DATA_FOLDER + AWebsite + DBDATA_EXT);
|
||||
Result := not FileExists(DATA_FOLDER + AWebsite + DBDATA_EXT);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure OverwriteDBDataProcess(const AWebsite, NWebsite: String);
|
||||
begin
|
||||
if FileExistsUTF8(DATA_FOLDER + NWebsite + DBDATA_EXT) then
|
||||
if FileExists(DATA_FOLDER + NWebsite + DBDATA_EXT) then
|
||||
begin
|
||||
if DeleteDBDataProcess(AWebsite) then
|
||||
RenameFileUTF8(DATA_FOLDER + NWebsite + DBDATA_EXT,
|
||||
RenameFile(DATA_FOLDER + NWebsite + DBDATA_EXT,
|
||||
DATA_FOLDER + AWebsite + DBDATA_EXT);
|
||||
end;
|
||||
end;
|
||||
@ -471,7 +471,7 @@ begin
|
||||
// use custom build attached database with max 125
|
||||
// if FAttachedSites.Count=7 then Break;
|
||||
m := TModuleContainer(FSitesList.Objects[i]);
|
||||
if (FAttachedSites.IndexOf(m.ID) = -1) and (FileExistsUTF8(DBDataFilePath(m.ID))) then
|
||||
if (FAttachedSites.IndexOf(m.ID) = -1) and (FileExists(DBDataFilePath(m.ID))) then
|
||||
begin
|
||||
FConn.ExecuteDirect('ATTACH ' + QuotedStr(DBDataFilePath(m.ID)) + ' AS "' + m.ID + '"');
|
||||
FAttachedSites.AddObject(m.ID, m);
|
||||
@ -532,7 +532,7 @@ begin
|
||||
begin
|
||||
FModule := Modules.LocateModule(AWebsite);
|
||||
AFilePath := DATA_FOLDER + FWebsite + DBDATA_EXT;
|
||||
Result := FileExistsUTF8(AFilePath);
|
||||
Result := FileExists(AFilePath);
|
||||
end
|
||||
else
|
||||
begin
|
||||
@ -1053,8 +1053,8 @@ var
|
||||
begin
|
||||
Close;
|
||||
if CheckWebsiteAndFilePath(AWebsite, filepath) then
|
||||
DeleteFileUTF8(filepath);
|
||||
if ForceDirectoriesUTF8(DATA_FOLDER) then
|
||||
DeleteFile(filepath);
|
||||
if ForceDirectories(DATA_FOLDER) then
|
||||
begin
|
||||
InternalOpen(filepath);
|
||||
CreateTable;
|
||||
|
||||
@ -126,7 +126,7 @@ begin
|
||||
begin
|
||||
cont := True;
|
||||
// save to data folder
|
||||
ForceDirectoriesUTF8(DATA_FOLDER);
|
||||
ForceDirectories(DATA_FOLDER);
|
||||
currentfilename := DATA_FOLDER + FModule.ID + DBDATA_SERVER_EXT;
|
||||
if FileExists(currentfilename) then
|
||||
DeleteFile(currentfilename);
|
||||
|
||||
@ -6,7 +6,7 @@ interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, fileinfo, jsonini, FileUtil, Forms, Graphics,
|
||||
LazFileUtils, LazUTF8;
|
||||
LazFileUtils;
|
||||
|
||||
type
|
||||
|
||||
@ -217,7 +217,7 @@ end;
|
||||
|
||||
procedure ReadConfigFile;
|
||||
begin
|
||||
if not FileExistsUTF8(CONFIG_FILE) then Exit;
|
||||
if not FileExists(CONFIG_FILE) then Exit;
|
||||
with TJSONIniFile.Create(CONFIG_FILE) do
|
||||
try
|
||||
DEFAULT_SELECTED_WEBSITES:=ReadString('config','default_selected_websites',DEFAULT_SELECTED_WEBSITES);
|
||||
|
||||
@ -34,7 +34,7 @@ unit Img2Pdf;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, LazFileUtils, LazUTF8Classes, FPimage, ImgInfos, MemBitmap,
|
||||
Classes, SysUtils, LazFileUtils, FPimage, ImgInfos, MemBitmap,
|
||||
FPReadJPEG, FPWriteJPEG, FPReadPNG, JPEGLib, JdAPImin, JDataSrc, Jerror,
|
||||
zstream, AnimatedGif, MultiLog;
|
||||
|
||||
@ -58,7 +58,7 @@ type
|
||||
BitsPerComponent: Integer;
|
||||
ColorSpace: String;
|
||||
Filter: String;
|
||||
Stream: TMemoryStreamUTF8;
|
||||
Stream: TMemoryStream;
|
||||
public
|
||||
procedure GetImageInfos;
|
||||
procedure LoadImageData;
|
||||
@ -166,12 +166,12 @@ end;
|
||||
|
||||
procedure JPEGToPageInfo(const PageInfo: TPageInfo);
|
||||
var
|
||||
AFS: TFileStreamUTF8;
|
||||
AFS: TFileStream;
|
||||
JDS: jpeg_decompress_struct;
|
||||
begin
|
||||
PageInfo.Filter := 'DCTDecode';
|
||||
try
|
||||
AFS := TFileStreamUTF8.Create(PageInfo.FileName, fmOpenRead or fmShareDenyWrite);
|
||||
AFS := TFileStream.Create(PageInfo.FileName, fmOpenRead or fmShareDenyWrite);
|
||||
FillChar(JDS{%H-}, SizeOf(JDS), 0);
|
||||
JDS.err := @JPEGError;
|
||||
jpeg_CreateDecompress(@JDS, JPEG_LIB_VERSION, SizeOf(JDS));
|
||||
@ -198,7 +198,7 @@ procedure JPEGCompressToPageInfo(const PageInfo: TPageInfo);
|
||||
var
|
||||
IMG: TFPMemoryImage;
|
||||
RDR: TFPCustomImageReader;
|
||||
AFS: TFileStreamUTF8;
|
||||
AFS: TFileStream;
|
||||
WRT: TFPWriterJPEG;
|
||||
begin
|
||||
PageInfo.Filter := 'DCTDecode';
|
||||
@ -206,7 +206,7 @@ begin
|
||||
try
|
||||
try
|
||||
RDR := GetImageExtReaderClass(PageInfo.Ext).Create;
|
||||
AFS := TFileStreamUTF8.Create(PageInfo.FileName, fmOpenRead or fmShareDenyWrite);
|
||||
AFS := TFileStream.Create(PageInfo.FileName, fmOpenRead or fmShareDenyWrite);
|
||||
IMG.LoadFromStream(AFS, RDR);
|
||||
if (RDR is TFPReaderJPEG) and TFPReaderJPEG(RDR).GrayScale then
|
||||
PageInfo.ColorSpace := 'DeviceGray'
|
||||
@ -236,7 +236,7 @@ var
|
||||
AFS: TStream;
|
||||
IMG: TFPCustomImage;
|
||||
RDR: TFPReaderPNGInfo;
|
||||
AMS: TMemoryStreamUTF8;
|
||||
AMS: TMemoryStream;
|
||||
X, Y: Integer;
|
||||
CLW, C: TFPColor;
|
||||
isGrayScale: Boolean;
|
||||
@ -245,7 +245,7 @@ begin
|
||||
try
|
||||
try
|
||||
if AStream = nil then
|
||||
AFS := TFileStreamUTF8.Create(PageInfo.FileName, fmOpenRead or fmShareDenyWrite)
|
||||
AFS := TFileStream.Create(PageInfo.FileName, fmOpenRead or fmShareDenyWrite)
|
||||
else
|
||||
AFS := AStream;
|
||||
RDR := TFPReaderPNGInfo.Create;
|
||||
@ -263,7 +263,7 @@ begin
|
||||
PageInfo.Filter := 'FlateDecode';
|
||||
PageInfo.BitsPerComponent := 8;
|
||||
|
||||
AMS := TMemoryStreamUTF8.Create;
|
||||
AMS := TMemoryStream.Create;
|
||||
try
|
||||
case RDR.Header.ColorType of
|
||||
0, 4:
|
||||
@ -347,11 +347,11 @@ end;
|
||||
|
||||
procedure WEBPToPageInfo(const PageInfo: TPageInfo);
|
||||
var
|
||||
AMS: TMemoryStreamUTF8;
|
||||
AMS: TMemoryStream;
|
||||
MBM: TMemBitmap;
|
||||
WRT: TFPWriterPNG;
|
||||
begin
|
||||
AMS := TMemoryStreamUTF8.Create;
|
||||
AMS := TMemoryStream.Create;
|
||||
try
|
||||
AMS.LoadFromFile(PageInfo.FileName);
|
||||
MBM := nil;
|
||||
@ -381,11 +381,11 @@ end;
|
||||
|
||||
{ procedure GIFToPageInfo(const PageInfo: TPageInfo); }
|
||||
{ var }
|
||||
{ AMS: TMemoryStreamUTF8; }
|
||||
{ AMS: TMemoryStream; }
|
||||
{ MBM: TAnimatedGif; }
|
||||
{ WRT: TFPWriterPNG; }
|
||||
{ begin }
|
||||
{ AMS := TMemoryStreamUTF8.Create; }
|
||||
{ AMS := TMemoryStream.Create; }
|
||||
{ try }
|
||||
{ MBM := TAnimatedGif.Create(PageInfo.FileName); }
|
||||
{ MBM.CurrentImage := 0; }
|
||||
@ -413,8 +413,8 @@ procedure ImageToPageInfo(const PageInfo: TPageInfo);
|
||||
var
|
||||
IMG: TFPCustomImage;
|
||||
RDR: TFPCustomImageReader;
|
||||
AFS: TFileStreamUTF8;
|
||||
AMS: TMemoryStreamUTF8;
|
||||
AFS: TFileStream;
|
||||
AMS: TMemoryStream;
|
||||
CLW, C: TFPColor;
|
||||
X, Y: Integer;
|
||||
begin
|
||||
@ -424,13 +424,13 @@ begin
|
||||
try
|
||||
try
|
||||
RDR := GetImageExtReaderClass(PageInfo.Ext).Create;
|
||||
AFS := TFileStreamUTF8.Create(PageInfo.FileName, fmOpenRead or fmShareDenyWrite);
|
||||
AFS := TFileStream.Create(PageInfo.FileName, fmOpenRead or fmShareDenyWrite);
|
||||
IMG.LoadFromStream(AFS, RDR);
|
||||
finally
|
||||
RDR.Free;
|
||||
AFS.Free;
|
||||
end;
|
||||
AMS := TMemoryStreamUTF8.Create;
|
||||
AMS := TMemoryStream.Create;
|
||||
try
|
||||
FillChar(CLW{%H-}, SizeOf(CLW), $FF);
|
||||
for Y := 0 to IMG.Height - 1 do
|
||||
@ -463,7 +463,7 @@ procedure TPageInfo.LoadImageData;
|
||||
begin
|
||||
if Assigned(Stream) then Exit;
|
||||
if Ext = '' then Exit;
|
||||
Stream := TMemoryStreamUTF8.Create;
|
||||
Stream := TMemoryStream.Create;
|
||||
try
|
||||
if (Ext = 'jpg') and (Owner.CompressionQuality >= 75) then
|
||||
JPEGToPageInfo(Self)
|
||||
@ -525,7 +525,7 @@ var
|
||||
P: TPageInfo;
|
||||
begin
|
||||
Result := -1;
|
||||
if not FileExistsUTF8(AFileName) then Exit;
|
||||
if not FileExists(AFileName) then Exit;
|
||||
P := TPageInfo.Create(Self);
|
||||
P.FileName := AFileName;
|
||||
P.GetImageInfos;
|
||||
@ -716,10 +716,10 @@ end;
|
||||
|
||||
procedure TImg2PDF.SaveToFile(const AFileName: String);
|
||||
var
|
||||
fs: TFileStreamUTF8;
|
||||
fs: TFileStream;
|
||||
begin
|
||||
if FPageInfos.Count = 0 then Exit;
|
||||
fs := TFileStreamUTF8.Create(AFileName, fmCreate);
|
||||
fs := TFileStream.Create(AFileName, fmCreate);
|
||||
try
|
||||
SaveToStream(fs);
|
||||
finally
|
||||
|
||||
@ -34,7 +34,7 @@ unit ImgInfos;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, LazUTF8Classes, LazFileUtils, FPimage,
|
||||
Classes, SysUtils, LazFileUtils, FPimage,
|
||||
FPReadJPEG, FPReadPNG, FPReadGif, FPReadBMP, FPReadTiff,
|
||||
FPWriteJPEG, FPWritePNG, FPWriteBMP, FPWriteTiff;
|
||||
|
||||
@ -241,12 +241,12 @@ end;
|
||||
|
||||
function TimageHandlerMgr.GetImageHandlerByFile(const FileName: String): PImageHandlerRec;
|
||||
var
|
||||
FS: TFileStreamUTF8;
|
||||
FS: TFileStream;
|
||||
begin
|
||||
Result := @FEmptyHandlerRec;
|
||||
if not FileExistsUTF8(FileName) then Exit;
|
||||
if not FileExists(FileName) then Exit;
|
||||
try
|
||||
FS := TFileStreamUTF8.Create(FileName, fmOpenRead or fmShareDenyWrite);
|
||||
FS := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite);
|
||||
Result := GetImageHandlerByStream(FS);
|
||||
finally
|
||||
FS.Free;
|
||||
@ -292,14 +292,14 @@ end;
|
||||
function TimageHandlerMgr.GetImageFileSize(const FileName: String; out Width,
|
||||
Height: Integer): String;
|
||||
var
|
||||
FS: TFileStreamUTF8;
|
||||
FS: TFileStream;
|
||||
begin
|
||||
Result := '';
|
||||
Width := 0;
|
||||
Height := 0;
|
||||
if not FileExistsUTF8(FileName) then Exit;
|
||||
if not FileExists(FileName) then Exit;
|
||||
try
|
||||
FS := TFileStreamUTF8.Create(FileName, fmOpenRead or fmShareDenyWrite);
|
||||
FS := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite);
|
||||
Result := GetImageStreamSize(FS, Width, Height);
|
||||
finally
|
||||
FS.Free;
|
||||
|
||||
@ -338,7 +338,7 @@ function TSQliteData.Open(const AOpenTable: Boolean;
|
||||
begin
|
||||
Result := False;
|
||||
if (FFileName = '') or (FCreateParams = '') then Exit;
|
||||
if FileExistsUTF8(FFileName) then
|
||||
if FileExists(FFileName) then
|
||||
Result := OpenDB
|
||||
else
|
||||
Result := CreateDB;
|
||||
|
||||
@ -36,7 +36,7 @@ unit SimpleException;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, LazFileUtils, LazUTF8, Forms, Controls, SimpleExceptionForm
|
||||
Classes, SysUtils, LazFileUtils, Forms, Controls, SimpleExceptionForm
|
||||
{$IFDEF WINDOWS}
|
||||
, Windows, win32proc
|
||||
{$ENDIF}
|
||||
@ -389,7 +389,7 @@ begin
|
||||
// always check for log file in case something changed at runtime (permission/disk removed)
|
||||
FLogFileName := AValue;
|
||||
AssignFile(FLogFileHandle, FLogFileName);
|
||||
fe := FileExistsUTF8(FLogFileName);
|
||||
fe := FileExists(FLogFileName);
|
||||
if fe then
|
||||
{$I-}
|
||||
Append(FLogFileHandle)
|
||||
@ -550,7 +550,7 @@ var
|
||||
ir: Word;
|
||||
begin
|
||||
if FLogFileName = '' then Exit;
|
||||
if FileExistsUTF8(FLogFileName) then
|
||||
if FileExists(FLogFileName) then
|
||||
{$I-}
|
||||
Append(FLogFileHandle)
|
||||
else
|
||||
@ -645,7 +645,7 @@ begin
|
||||
FMaxStackCount := 20;
|
||||
with TFileVersionInfo.Create(nil) do
|
||||
try
|
||||
FileName := ParamStrUTF8(0);
|
||||
FileName := ParamStr(0);
|
||||
if FileName = '' then
|
||||
FileName := Application.ExeName;
|
||||
try
|
||||
@ -675,7 +675,7 @@ begin
|
||||
'WidgetSet : ' + GetWidgetSetName + LineEnding +
|
||||
'Target CPU-OS : ' + GetTargetCPU_OS + LineEnding +
|
||||
'Build Time : ' + GetBuildTime + LineEnding +
|
||||
'Path : ' + ParamStrUTF8(0) + LineEnding +
|
||||
'Path : ' + ParamStr(0) + LineEnding +
|
||||
'Process ID : ' + IntToStr(GetProcessID) + LineEnding +
|
||||
'MainThread ID : ' + IntToStr(MainThreadID);
|
||||
if Assigned(Application) then
|
||||
|
||||
@ -25,7 +25,7 @@ unit SimpleTranslator;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, strutils, gettext, LazFileUtils, LazUTF8, LCLTranslator,
|
||||
Classes, SysUtils, strutils, gettext, LazFileUtils, LCLTranslator,
|
||||
Translations, LResources, Forms, LCLVersion;
|
||||
|
||||
type
|
||||
@ -521,9 +521,9 @@ procedure CollectLanguagesFiles(const appname: string; const dir: string;
|
||||
lname := LowerCase(aname);
|
||||
if RightStr(ldir, 1) <> PathDelim then
|
||||
ldir := ldir + PathDelim;
|
||||
if DirectoryExistsUTF8(ldir) then
|
||||
if DirectoryExists(ldir) then
|
||||
begin
|
||||
if FindFirstUTF8(ldir + '*', faAnyFile, SR) = 0 then
|
||||
if FindFirst(ldir + '*', faAnyFile, SR) = 0 then
|
||||
repeat
|
||||
s := LowerCase(SR.Name);
|
||||
if (Pos(lname + '.', s) = 1) and
|
||||
@ -539,8 +539,8 @@ procedure CollectLanguagesFiles(const appname: string; const dir: string;
|
||||
AvailableLanguages.Values[id] := GetLangName(id, useNativeName);
|
||||
end;
|
||||
end;
|
||||
until FindNextUTF8(SR) <> 0;
|
||||
FindCloseUTF8(SR);
|
||||
until FindNext(SR) <> 0;
|
||||
FindClose(SR);
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -566,7 +566,7 @@ begin
|
||||
if LangAppName <> '' then
|
||||
tappname := LangAppName
|
||||
else
|
||||
tappname := ExtractFileNameOnly(ParamStrUTF8(0));
|
||||
tappname := ExtractFileNameOnly(ParamStr(0));
|
||||
end;
|
||||
AvailableLanguages.Clear;
|
||||
|
||||
@ -655,9 +655,9 @@ var
|
||||
if RightStr(lcllangdir, 1) <> PathDelim then
|
||||
lcllangdir := lcllangdir + PathDelim;
|
||||
s := lcllangdir + 'lclstrconsts.' + lcllang;
|
||||
if FileExistsUTF8(s + '.po') then
|
||||
if FileExists(s + '.po') then
|
||||
lcllangpath := s + '.po'
|
||||
else if FileExistsUTF8(s + '.mo') then
|
||||
else if FileExists(s + '.mo') then
|
||||
begin
|
||||
lcllangpath := s + '.mo';
|
||||
mofile := True;
|
||||
@ -670,12 +670,12 @@ var
|
||||
begin
|
||||
lcllangdir := l + ldir[i];
|
||||
s := lcllangdir + 'lclstrconsts.' + lcllang;
|
||||
if FileExistsUTF8(s + '.po') then
|
||||
if FileExists(s + '.po') then
|
||||
begin
|
||||
lcllangpath := s + '.po';
|
||||
Break;
|
||||
end
|
||||
else if FileExistsUTF8(s + '.mo') then
|
||||
else if FileExists(s + '.mo') then
|
||||
begin
|
||||
lcllangpath := s + '.mo';
|
||||
mofile := True;
|
||||
@ -723,18 +723,18 @@ begin
|
||||
if LangAppName <> '' then
|
||||
appname := LangAppName
|
||||
else
|
||||
appname := ExtractFileNameOnly(ParamStrUTF8(0));
|
||||
appname := ExtractFileNameOnly(ParamStr(0));
|
||||
end;
|
||||
lfile := LangDir + PathDelim + appname + '.' + lang;
|
||||
|
||||
if FileExistsUTF8(lfile + '.po') then //po file
|
||||
if FileExists(lfile + '.po') then //po file
|
||||
begin
|
||||
lfile := lfile + '.po';
|
||||
Translations.TranslateResourceStrings(lfile);
|
||||
ltrans := TPOTranslator.Create(lfile);
|
||||
end
|
||||
else
|
||||
if FileExistsUTF8(lfile + '.mo') then //mo file
|
||||
if FileExists(lfile + '.mo') then //mo file
|
||||
begin
|
||||
lfile := lfile + '.mo';
|
||||
gettext.TranslateResourceStrings(lfile);
|
||||
|
||||
@ -35,7 +35,7 @@ unit MangaFoxWatermark;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, FileUtil, LazFileUtils, LazUTF8Classes, Math, FPimage, FPReadJPEG, FPWriteJPEG,
|
||||
Classes, SysUtils, FileUtil, LazFileUtils, Math, FPimage, FPReadJPEG, FPWriteJPEG,
|
||||
FPWritePNG, ImgInfos;
|
||||
|
||||
procedure SetTemplateDirectory(const ADirectory: String);
|
||||
@ -246,7 +246,7 @@ end;
|
||||
|
||||
function TWatermarkRemover.AddFileToTemplates(const FileName: String): Boolean;
|
||||
var
|
||||
FS: TFileStreamUTF8;
|
||||
FS: TFileStream;
|
||||
IMG: TFPCustomImage;
|
||||
H: TFPCustomImageReaderClass;
|
||||
R: TFPCustomImageReader;
|
||||
@ -259,7 +259,7 @@ begin
|
||||
try
|
||||
try
|
||||
R := H.Create;
|
||||
FS := TFileStreamUTF8.Create(FileName, fmOpenRead or fmShareDenyWrite);
|
||||
FS := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite);
|
||||
IMG.LoadFromStream(FS, R);
|
||||
finally
|
||||
R.Free;
|
||||
@ -302,7 +302,7 @@ begin
|
||||
FTemplateDirectory := ADirectory;
|
||||
if FTemplateDirectory = '' then Exit;
|
||||
D := CleanAndExpandDirectory(FTemplateDirectory);
|
||||
if not DirectoryExistsUTF8(D) then Exit;
|
||||
if not DirectoryExists(D) then Exit;
|
||||
if TryEnterCriticalsection(FCS_Templates) <> 0 then
|
||||
try
|
||||
Files := TStringList.Create;
|
||||
@ -362,7 +362,7 @@ var
|
||||
Reader: TFPCustomImageReader;
|
||||
Writer: TFPCustomImageWriter;
|
||||
Image, ImageTemp: TFPCustomImage;
|
||||
FileStream: TFileStreamUTF8;
|
||||
FileStream: TFileStream;
|
||||
BestIndex, I, L, T, R, B: Integer;
|
||||
BestValue, PSNR: Single;
|
||||
TIMG: TOneBitImage;
|
||||
@ -387,7 +387,7 @@ begin
|
||||
GrayScale := False;
|
||||
try
|
||||
Reader := Handler.ReaderClass.Create;
|
||||
FileStream := TFileStreamUTF8.Create(AFileName, fmOpenRead or fmShareDenyWrite);
|
||||
FileStream := TFileStream.Create(AFileName, fmOpenRead or fmShareDenyWrite);
|
||||
Image.LoadFromStream(FileStream, Reader);
|
||||
if Reader is TFPReaderJPEG then
|
||||
GrayScale := TFPReaderJPEG(Reader).GrayScale;
|
||||
@ -451,15 +451,15 @@ begin
|
||||
Handler.WExt := 'png';
|
||||
end;
|
||||
NewFileName := ExtractFileNameWithoutExt(AFileName) + '.' + Handler.WExt;
|
||||
if FileExistsUTF8(AFileName) then
|
||||
DeleteFileUTF8(AFileName);
|
||||
if FileExistsUTF8(NewFileName) then
|
||||
DeleteFileUTF8(NewFileName);
|
||||
if not FileExistsUTF8(NewFileName) then
|
||||
if FileExists(AFileName) then
|
||||
DeleteFile(AFileName);
|
||||
if FileExists(NewFileName) then
|
||||
DeleteFile(NewFileName);
|
||||
if not FileExists(NewFileName) then
|
||||
begin
|
||||
try
|
||||
Writer := Handler.WriterClass.Create;
|
||||
FileStream := TFileStreamUTF8.Create(NewFileName, fmCreate);
|
||||
FileStream := TFileStream.Create(NewFileName, fmCreate);
|
||||
{$IF (FPC_FULLVERSION >= 30101)}
|
||||
if Writer is TFPWriterJPEG then
|
||||
TFPWriterJPEG(Writer).GrayScale := GrayScale
|
||||
@ -475,7 +475,7 @@ begin
|
||||
Writer.Free;
|
||||
FileStream.Free;
|
||||
end;
|
||||
Result := FileExistsUTF8(NewFileName);
|
||||
Result := FileExists(NewFileName);
|
||||
end;
|
||||
finally
|
||||
ImageTemp.Free;
|
||||
|
||||
@ -18,7 +18,7 @@ uses
|
||||
{$else}
|
||||
UTF8Process,
|
||||
{$endif}
|
||||
SysUtils, Classes, Graphics, lazutf8classes, LazFileUtils, LConvEncoding,
|
||||
SysUtils, Classes, Graphics, LazFileUtils, LConvEncoding,
|
||||
strutils, dateutils, variants, base64, fpjson, jsonparser, jsonscanner,
|
||||
fgl, RegExpr, synautil, httpsend, blcksock,
|
||||
synacode, MultiLog, FPimage, GZIPUtils, uMisc, httpsendthread, FMDOptions,
|
||||
@ -895,12 +895,12 @@ var
|
||||
searchRec: TSearchRec;
|
||||
begin
|
||||
try
|
||||
Result := (FindFirstUTF8(CorrectPathSys(ADir) + '*.*',
|
||||
Result := (FindFirst(CorrectPathSys(ADir) + '*.*',
|
||||
faAnyFile{$ifdef unix} or faSymLink{$endif unix}, searchRec) = 0) and
|
||||
(FindNextUTF8(searchRec) = 0) and
|
||||
(FindNextUTF8(searchRec) <> 0);
|
||||
(FindNext(searchRec) = 0) and
|
||||
(FindNext(searchRec) <> 0);
|
||||
finally
|
||||
FindCloseUTF8(searchRec);
|
||||
FindClose(searchRec);
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -961,7 +961,7 @@ begin
|
||||
Break;
|
||||
Inc(j);
|
||||
until wS[j] = '/';
|
||||
if not DirectoryExistsUTF8(lcS2 + lcS) then
|
||||
if not DirectoryExists(lcS2 + lcS) then
|
||||
begin
|
||||
CreateDirUTF8(lcS2 + lcS);
|
||||
end;
|
||||
@ -3131,13 +3131,13 @@ end;
|
||||
function SaveImageStreamToFile(Stream: TMemoryStream; Path, FileName: String; Age: LongInt): String;
|
||||
var
|
||||
p, f: String;
|
||||
fs: TFileStreamUTF8;
|
||||
fs: TFileStream;
|
||||
begin
|
||||
Result := '';
|
||||
if Stream = nil then Exit;
|
||||
if Stream.Size = 0 then Exit;
|
||||
p := CorrectPathSys(Path);
|
||||
if ForceDirectoriesUTF8(p) then begin
|
||||
if ForceDirectories(p) then begin
|
||||
f := GetImageStreamExt(Stream);
|
||||
if f = 'png' then
|
||||
begin
|
||||
@ -3155,9 +3155,9 @@ begin
|
||||
|
||||
if f = '' then Exit;
|
||||
f := p + FileName + '.' + f;
|
||||
if FileExistsUTF8(f) then DeleteFileUTF8(f);
|
||||
if FileExists(f) then DeleteFile(f);
|
||||
try
|
||||
fs := TFileStreamUTF8.Create(f, fmCreate);
|
||||
fs := TFileStream.Create(f, fmCreate);
|
||||
try
|
||||
Stream.Position := 0;
|
||||
fs.CopyFrom(Stream, Stream.Size);
|
||||
@ -3168,7 +3168,7 @@ begin
|
||||
on E: Exception do
|
||||
Logger.SendException('SaveImageStreamToFile.WriteToFile Failed! ' + f, E);
|
||||
end;
|
||||
if FileExistsUTF8(f) then
|
||||
if FileExists(f) then
|
||||
begin
|
||||
Result := f;
|
||||
if Age > 0 then
|
||||
@ -3249,7 +3249,7 @@ begin
|
||||
for i in ImageHandlerMgr.List do
|
||||
begin
|
||||
s := AFileName + '.' + i.Ext;
|
||||
if FileExistsUTF8(s) then
|
||||
if FileExists(s) then
|
||||
Exit(s);
|
||||
end;
|
||||
Result := '';
|
||||
@ -3257,16 +3257,16 @@ end;
|
||||
|
||||
function LoadImageFromFileUTF8(const FileName: String; var Image: TFPCustomImage): Boolean;
|
||||
var
|
||||
fs: TFileStreamUTF8;
|
||||
fs: TFileStream;
|
||||
h: TFPCustomImageReaderClass;
|
||||
r: TFPCustomImageReader;
|
||||
begin
|
||||
Result := False;
|
||||
if not FileExistsUTF8(FileName) then Exit;
|
||||
if not FileExists(FileName) then Exit;
|
||||
h := GetImageFileReaderClass(FileName);
|
||||
if h = nil then Exit;
|
||||
r := h.Create;
|
||||
fs := TFileStreamUTF8.Create(FileName, fmOpenRead or fmShareDenyWrite);
|
||||
fs := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite);
|
||||
try
|
||||
Image.LoadFromStream(fs, r);
|
||||
Result := True;
|
||||
@ -3301,14 +3301,14 @@ var
|
||||
newHeigth: LongInt;
|
||||
h: TFPCustomImageWriterClass;
|
||||
w: TFPCustomImageWriter;
|
||||
fs: TFileStreamUTF8;
|
||||
fs: TFileStream;
|
||||
begin
|
||||
Result := False;
|
||||
if not DirectoryExistsUTF8(Directory) then Exit;
|
||||
if not DirectoryExists(Directory) then Exit;
|
||||
D := CorrectPathSys(Directory);
|
||||
AImgName1 := D + ImgName1;
|
||||
AImgName2 := D + ImgName2;
|
||||
if not (FileExistsUTF8(AImgName1) and FileExistsUTF8(AImgName2)) then Exit;
|
||||
if not (FileExists(AImgName1) and FileExists(AImgName2)) then Exit;
|
||||
Img1 := TFPMemoryImage.create(0,0);
|
||||
Img2 := TFPMemoryImage.create(0,0);
|
||||
try
|
||||
@ -3332,15 +3332,15 @@ begin
|
||||
else
|
||||
CopyImageRect(Img2, ImgNew, 0, Img1.Height + 1, Rect(0, 0, Img2.Width, Img2.Height));
|
||||
AFinalName := D + FinalName;
|
||||
if FileExistsUTF8(AFinalName) then
|
||||
DeleteFileUTF8(AFinalName);
|
||||
if not FileExistsUTF8(AFinalName) then
|
||||
if FileExists(AFinalName) then
|
||||
DeleteFile(AFinalName);
|
||||
if not FileExists(AFinalName) then
|
||||
begin
|
||||
h := {%H-}GetImageFileWriterClass(AImgName1);
|
||||
if h = nil then Exit;
|
||||
try
|
||||
w := h.Create;
|
||||
fs := TFileStreamUTF8.Create(AFinalName, fmCreate);
|
||||
fs := TFileStream.Create(AFinalName, fmCreate);
|
||||
ImgNew.SaveToStream(fs, w);
|
||||
Result := True;
|
||||
finally
|
||||
@ -3349,8 +3349,8 @@ begin
|
||||
end;
|
||||
if Result then
|
||||
begin
|
||||
DeleteFileUTF8(AImgName1);
|
||||
DeleteFileUTF8(AImgName2);
|
||||
DeleteFile(AImgName1);
|
||||
DeleteFile(AImgName2);
|
||||
end;
|
||||
end;
|
||||
finally
|
||||
|
||||
@ -585,7 +585,7 @@ begin
|
||||
Result := True;
|
||||
|
||||
// check download path
|
||||
if not ForceDirectoriesUTF8(Task.CurrentWorkingDir) then
|
||||
if not ForceDirectories(Task.CurrentWorkingDir) then
|
||||
begin
|
||||
Task.StatusFailedToCreateDir;
|
||||
Result := False;
|
||||
@ -640,7 +640,7 @@ begin
|
||||
end;
|
||||
|
||||
if Result then
|
||||
Result := FileExistsUTF8(savedFilename);
|
||||
Result := FileExists(savedFilename);
|
||||
|
||||
if Terminated then Exit(False);
|
||||
if Result then
|
||||
@ -899,7 +899,7 @@ begin
|
||||
Container.ChapterNames[Container.CurrentDownloadChapterPtr]
|
||||
else
|
||||
CurrentWorkingDir := Container.DownloadInfo.SaveTo;
|
||||
if not ForceDirectoriesUTF8(CurrentWorkingDir) then
|
||||
if not ForceDirectories(CurrentWorkingDir) then
|
||||
begin
|
||||
StatusFailedToCreateDir;
|
||||
ShowBalloonHint;
|
||||
@ -1300,7 +1300,7 @@ begin
|
||||
inherited Create;
|
||||
InitCriticalSection(CS_Task);
|
||||
InitCriticalSection(CS_ItemsActiveTask);
|
||||
ForceDirectoriesUTF8(USERDATA_FOLDER);
|
||||
ForceDirectories(USERDATA_FOLDER);
|
||||
DownloadedChapters := TDownloadedChaptersDB.Create;
|
||||
DownloadedChapters.Filename := DOWNLOADEDCHAPTERSDB_FILE;
|
||||
DownloadedChapters.OnError := @MainForm.ExceptionHandler;
|
||||
|
||||
@ -11,7 +11,7 @@ unit uFavoritesManager;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, fgl, Dialogs, ExtCtrls, lazutf8classes,
|
||||
Classes, SysUtils, fgl, Dialogs, ExtCtrls,
|
||||
LazFileUtils, uBaseUnit, uData, uDownloadsManager, WebsiteModules, FMDOptions,
|
||||
httpsendthread, FavoritesDB, BaseThread, SimpleException, VirtualTrees;
|
||||
|
||||
@ -670,7 +670,7 @@ end;
|
||||
constructor TFavoriteManager.Create;
|
||||
begin
|
||||
inherited Create;
|
||||
ForceDirectoriesUTF8(USERDATA_FOLDER);
|
||||
ForceDirectories(USERDATA_FOLDER);
|
||||
InitCriticalSection(CS_Favorites);
|
||||
isRunning := False;
|
||||
Items := TFavoriteContainers.Create;;
|
||||
|
||||
@ -11,7 +11,7 @@ unit uPacker;
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, Zipper, zstream, SysUtils, uBaseUnit, Img2Pdf, FileUtil, lazutf8classes,
|
||||
Classes, Zipper, zstream, SysUtils, uBaseUnit, Img2Pdf, FileUtil,
|
||||
LazFileUtils, SimpleException, uEpub;
|
||||
|
||||
type
|
||||
@ -79,7 +79,7 @@ procedure TPacker.DoPdf;
|
||||
var
|
||||
pdf: TImg2Pdf;
|
||||
i: Cardinal;
|
||||
fstream: TFileStreamUTF8;
|
||||
fstream: TFileStream;
|
||||
begin
|
||||
try
|
||||
pdf := TImg2Pdf.Create;
|
||||
@ -95,7 +95,7 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
fstream := TFileStreamUTF8.Create(FSavedFileName, fmCreate);
|
||||
fstream := TFileStream.Create(FSavedFileName, fmCreate);
|
||||
try
|
||||
pdf.SaveToStream(fstream);
|
||||
finally
|
||||
@ -117,7 +117,7 @@ procedure TPacker.DoEpub;
|
||||
var
|
||||
epub: TEpubBuilder;
|
||||
i: Integer;
|
||||
fstream: TFileStreamUTF8;
|
||||
fstream: TFileStream;
|
||||
begin
|
||||
try
|
||||
epub := TEpubBuilder.Create;
|
||||
@ -131,7 +131,7 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
fstream := TFileStreamUTF8.Create(FSavedFileName, fmCreate);
|
||||
fstream := TFileStream.Create(FSavedFileName, fmCreate);
|
||||
try
|
||||
epub.SaveToStream(fstream);
|
||||
finally
|
||||
@ -158,7 +158,7 @@ begin
|
||||
|
||||
if FFileList.Count = 0 then
|
||||
begin
|
||||
if DirectoryExistsUTF8(Path) = False then Exit;
|
||||
if DirectoryExists(Path) = False then Exit;
|
||||
with TFileSearcher.Create do
|
||||
try
|
||||
OnFileFound := FileFound;
|
||||
@ -181,21 +181,21 @@ begin
|
||||
FSavedFileName := FileName + FExt
|
||||
else
|
||||
FSavedFileName := TrimAndExpandFilename(Path) + FExt;
|
||||
if FileExistsUTF8(FSavedFileName) then
|
||||
if DeleteFileUTF8(FSavedFileName) = False then
|
||||
if FileExists(FSavedFileName) then
|
||||
if DeleteFile(FSavedFileName) = False then
|
||||
Exit;
|
||||
case Format of
|
||||
pfZIP, pfCBZ: DoZipCbz;
|
||||
pfPDF: DoPdf;
|
||||
pfEPUB: DoEpub;
|
||||
end;
|
||||
Result := FileExistsUTF8(FSavedFileName);
|
||||
Result := FileExists(FSavedFileName);
|
||||
if Result then
|
||||
begin
|
||||
for i := 0 to FFileList.Count - 1 do
|
||||
DeleteFileUTF8(FFileList[i]);
|
||||
DeleteFile(FFileList[i]);
|
||||
if IsDirectoryEmpty(Path) then
|
||||
RemoveDirUTF8(Path);
|
||||
RemoveDir(Path);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
@ -262,25 +262,25 @@ var
|
||||
Sza, datapath, filepath: String;
|
||||
begin
|
||||
Sza := FMD_DIRECTORY + ZIP_EXE;
|
||||
if not FileExistsUTF8(Sza) then Exit;
|
||||
if not FileExists(Sza) then Exit;
|
||||
|
||||
datapath := DATA_FOLDER;
|
||||
filepath := datapath + website;
|
||||
if FileExistsUTF8(filepath + '.7z') then
|
||||
if FileExists(filepath + '.7z') then
|
||||
filepath += '.7z'
|
||||
else
|
||||
if FileExistsUTF8(filepath + '.zip') then
|
||||
if FileExists(filepath + '.zip') then
|
||||
filepath += '.zip';
|
||||
|
||||
if FileExistsUTF8(filepath) then
|
||||
if FileExists(filepath) then
|
||||
begin
|
||||
if FileExistsUTF8(datapath + website + DBDATA_EXT) then
|
||||
DeleteFileUTF8(datapath + website + DBDATA_EXT);
|
||||
if FileExistsUTF8(datapath + website + DATA_EXT) then
|
||||
DeleteFileUTF8(datapath + website + DATA_EXT);
|
||||
if FileExists(datapath + website + DBDATA_EXT) then
|
||||
DeleteFile(datapath + website + DBDATA_EXT);
|
||||
if FileExists(datapath + website + DATA_EXT) then
|
||||
DeleteFile(datapath + website + DATA_EXT);
|
||||
RunExternalProcess(Sza, ['x', filepath, '-o' +
|
||||
AnsiQuotedStr(datapath, '"'), '-aoa'], False, True);
|
||||
DeleteFileUTF8(filepath);
|
||||
DeleteFile(filepath);
|
||||
end
|
||||
end;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user