uses
Windows, SysUtils, Classes, ComCtrls, Controls, Forms, IdHTTP,
{HTTPApp,} YofUtils, IdGlobal, IdException, IdComponent, IniFiles, {DateUtils,}
- GikoSystem, BoardGroup, MonaUtils, ExternalBoardManager, ExternalBoardPlugInMain,
- Sort;
+ GikoSystem, BoardGroup, ExternalBoardManager, ExternalBoardPlugInMain,
+ Sort, SyncObjs, bmRegExp;
type
TDownloadItem = class;
FErrText: string;
end;
-
+ TWorkData = record
+ //FWorkCS: TCriticalSection;
+ //IdHttp\82ÌOnWork\81AOnWorkBegin,OnWorkEnd\82Í\95Ê\82Ì\83X\83\8c\83b\83h\82©\82ç
+ //\8cÄ\82Î\82ê\82é\88×\81ASynchronize\82Å\93¯\8aú\82·\82é\95K\97v\82ª\82 \82é\81B
+ //\83N\83\8a\83e\83B\83J\83\8b\83Z\83N\83V\83\87\83\93\82Í\96³\82\82Ä\82à\82½\82Ô\82ñ\95½\8bC\82¾\82¯\82Ç\97p\90S\82Ì\88×\81B by eggcake
+ FWorkCS: TCriticalSection;
+ FSender: TObject;
+ FAWorkMode: TWorkMode;
+ FAWorkCount: Integer;
+ FAWorkCountMax: Integer
+ end;
TDownloadThread = class(TThread)
private
FIndy: TIdHttp;
FOnDownloadEnd: TDownloadEndEvent;
FOnDownloadMsg: TDownloadMsgEvent;
FDownloadTitle: string;
+ FWorkData: TWorkData;
procedure FireDownloadEnd;
procedure FireDownloadMsg;
procedure WorkEnd(Sender: TObject; AWorkMode: TWorkMode);
procedure Work(Sender: TObject; AWorkMode: TWorkMode; const AWorkCount: Integer);
function ParseCgiStatus(Content: string): TCgiStatus;
+ function ParseRokkaStatus(Content: string): TCgiStatus;
function CgiDownload(ItemType: TGikoDownloadType; URL: string; Modified: TDateTime): Boolean;
function DatDownload(ItemType: TGikoDownloadType; URL: string; Modified: TDateTime; RangeStart: Integer; AdjustLen: Integer): Boolean;
- function DeleteStatusLine(Content: string): string;
- protected
+ procedure DeleteStatusLine(Item: TDownloadItem);
+ procedure InitHttpClient(client: TIdHttp);
+ procedure ClearHttpClient(client: TIdHttp);
+ procedure FireWork;
+ procedure FireWorkBegin;
+ procedure FireWorkEnd;
+ procedure GetLastModified;
+ protected
procedure Execute; override;
public
property Item: TDownloadItem read FItem write FItem;
implementation
+uses
+ Y_TextConverter, MojuUtils, HTMLCreate, ReplaceDataModule;
+
constructor TDownloadThread.Create(CreateSuspended: Boolean);
begin
inherited Create(CreateSuspended);
+ FWorkData.FWorkCS := TCriticalSection.Create;
+
FIndy := TIdHttp.Create(nil);
FIndy.OnWorkBegin := WorkBegin;
destructor TDownloadThread.Destroy;
begin
- FIndy.Request.CustomHeaders.Clear;
- FIndy.Request.RawHeaders.Clear;
- FIndy.Request.Clear;
- FIndy.Response.CustomHeaders.Clear;
- FIndy.Response.RawHeaders.Clear;
- FIndy.Response.Clear;
- FIndy.ProxyParams.Clear;
+ ClearHttpClient(FIndy);
FIndy.Free;
+ FWorkData.FWorkCS.Free;
inherited;
end;
[Day, Copy(StrMonth, 1 + 3 * (Month - 1), 3),
Year, Hour, Min, Sec]);
end;
-
+// ******************************************************************
+// HTTPClient\82Ì\8f\89\8aú\89»
+// ******************************************************************
+procedure TDownloadThread.InitHttpClient(client: TIdHttp);
+begin
+ ClearHttpClient(client);
+ client.Disconnect;
+ client.Request.UserAgent := GikoSys.GetUserAgent;
+ client.RecvBufferSize := Gikosys.Setting.RecvBufferSize;
+ client.ProxyParams.BasicAuthentication := False;
+ client.ReadTimeout := GikoSys.Setting.ReadTimeOut;
+ client.ConnectTimeout := GikoSys.Setting.ReadTimeOut;
+ {$IFDEF DEBUG}
+ Writeln('------------------------------------------------------------');
+ {$ENDIF}
+ //FIndy.AllowCookies := False;
+ if GikoSys.Setting.ReadProxy then begin
+ if GikoSys.Setting.ProxyProtocol then
+ client.ProtocolVersion := pv1_1
+ else
+ client.ProtocolVersion := pv1_0;
+ client.ProxyParams.ProxyServer := GikoSys.Setting.ReadProxyAddress;
+ client.ProxyParams.ProxyPort := GikoSys.Setting.ReadProxyPort;
+ client.ProxyParams.ProxyUsername := GikoSys.Setting.ReadProxyUserID;
+ client.ProxyParams.ProxyPassword := GikoSys.Setting.ReadProxyPassword;
+ if GikoSys.Setting.ReadProxyUserID <> '' then
+ client.ProxyParams.BasicAuthentication := True;
+ {$IFDEF DEBUG}
+ Writeln('\83v\83\8d\83L\83V\90Ý\92è\82 \82è');
+ Writeln('\83z\83X\83g: ' + GikoSys.Setting.ReadProxyAddress);
+ Writeln('\83|\81[\83g: ' + IntToStr(GikoSys.Setting.ReadProxyPort));
+ {$ENDIF}
+ end else begin
+ if GikoSys.Setting.Protocol then
+ client.ProtocolVersion := pv1_1
+ else
+ client.ProtocolVersion := pv1_0;
+ client.ProxyParams.ProxyServer := '';
+ client.ProxyParams.ProxyPort := 80;
+ client.ProxyParams.ProxyUsername := '';
+ client.ProxyParams.ProxyPassword := '';
+ {$IFDEF DEBUG}
+ Writeln('\83v\83\8d\83L\83V\90Ý\92è\82È\82µ');
+ {$ENDIF}
+ end;
+end;
+// ******************************************************************
+// HTTPClient\82Ì\83\8a\83N\83G\83X\83g\82Æ\83\8c\83X\83|\83\93\83X\82Ì\83f\81[\83^\82Ì\8fÁ\8b\8e
+// ******************************************************************
+procedure TDownloadThread.ClearHttpClient(client: TIdHttp);
+begin
+ client.Request.CustomHeaders.Clear;
+ client.Request.RawHeaders.Clear;
+ client.Request.Clear;
+ client.Response.CustomHeaders.Clear;
+ client.Response.RawHeaders.Clear;
+ client.Response.Clear;
+
+ client.ProxyParams.Clear;
+end;
procedure TDownloadThread.Execute;
var
ResStream: TMemoryStream;
lastContent : string;
logFile : TFileStream;
adjustMargin : Integer;
+ Host: String;
+ Sep: Integer;
const
ADJUST_MARGIN = 16;
begin
begin
FDownloadTitle := FItem.FThreadItem.Title;
if FItem.FThreadItem <> nil then begin
- if FItem.FThreadItem.IsBoardPlugInAvailable then begin
- boardPlugIn := FItem.FThreadItem.BoardPlugIn;
+ if FItem.FThreadItem.ParentBoard.IsBoardPlugInAvailable then begin
+ boardPlugIn := FItem.FThreadItem.ParentBoard.BoardPlugIn;
Item.State := TGikoDownloadState( boardPlugIn.DownloadThread( DWORD( FItem.FThreadItem ) ) );
end;
+ //if FItem.FThreadItem.IsBoardPlugInAvailable then begin
+ // boardPlugIn := FItem.FThreadItem.BoardPlugIn;
+ // Item.State := TGikoDownloadState( boardPlugIn.DownloadThread( DWORD( FItem.FThreadItem ) ) );
+ //end;
end;
end;
end;
Continue;
end;
- //===== \83v\83\89\83O\83C\83\93\82ð\8eg\97p\82µ\82È\82¢\8fê\8d\87
FAbort := False;
- FIndy.Request.CustomHeaders.Clear;
- FIndy.Response.Clear;
- FIndy.Request.Clear;
- FIndy.ProxyParams.Clear;
- FIndy.Disconnect;
- FIndy.Request.UserAgent := GikoSys.GetUserAgent;
- FIndy.RecvBufferSize := Gikosys.Setting.RecvBufferSize;
- FIndy.ProxyParams.BasicAuthentication := False;
- FIndy.ReadTimeout := GikoSys.Setting.ReadTimeOut;
- {$IFDEF DEBUG}
- Writeln('------------------------------------------------------------');
- {$ENDIF}
- //FIndy.AllowCookies := False;
- if GikoSys.Setting.ReadProxy then begin
- if GikoSys.Setting.ProxyProtocol then
- FIndy.ProtocolVersion := pv1_1
- else
- FIndy.ProtocolVersion := pv1_0;
- FIndy.ProxyParams.ProxyServer := GikoSys.Setting.ReadProxyAddress;
- FIndy.ProxyParams.ProxyPort := GikoSys.Setting.ReadProxyPort;
- FIndy.ProxyParams.ProxyUsername := GikoSys.Setting.ReadProxyUserID;
- FIndy.ProxyParams.ProxyPassword := GikoSys.Setting.ReadProxyPassword;
- if GikoSys.Setting.ReadProxyUserID <> '' then
- FIndy.ProxyParams.BasicAuthentication := True;
- {$IFDEF DEBUG}
- Writeln('\83v\83\8d\83L\83V\90Ý\92è\82 \82è');
- Writeln('\83z\83X\83g: ' + GikoSys.Setting.ReadProxyAddress);
- Writeln('\83|\81[\83g: ' + IntToStr(GikoSys.Setting.ReadProxyPort));
- {$ENDIF}
- end else begin
- if GikoSys.Setting.Protocol then
- FIndy.ProtocolVersion := pv1_1
- else
- FIndy.ProtocolVersion := pv1_0;
- FIndy.ProxyParams.ProxyServer := '';
- FIndy.ProxyParams.ProxyPort := 80;
- FIndy.ProxyParams.ProxyUsername := '';
- FIndy.ProxyParams.ProxyPassword := '';
- {$IFDEF DEBUG}
- Writeln('\83v\83\8d\83L\83V\90Ý\92è\82È\82µ');
- {$ENDIF}
- end;
-
+ //===== \83v\83\89\83O\83C\83\93\82ð\8eg\97p\82µ\82È\82¢\8fê\8d\87
+ InitHttpClient(FIndy);
adjustMargin := 0;
if Item.DownType = gdtThread then begin
if FileExists( Item.ThreadItem.GetThreadFileName ) then begin
if Trim(FIndy.Response.RawHeaders.Values['Date']) <> '' then begin
if Item.DownType = gdtBoard then
- Item.Board.LastGetTime := MonaUtils.DateStrToDateTime(FIndy.Response.RawHeaders.Values['Date'])
+ Item.Board.LastGetTime := GikoSys.DateStrToDateTime(FIndy.Response.RawHeaders.Values['Date'])
else
- Item.ThreadItem.ParentBoard.LastGetTime := MonaUtils.DateStrToDateTime(FIndy.Response.RawHeaders.Values['Date']);
+ Item.ThreadItem.ParentBoard.LastGetTime := GikoSys.DateStrToDateTime(FIndy.Response.RawHeaders.Values['Date']);
end;
if DownloadResult then begin
end;
//********************
+ //dat.gz\81@\81¨\81@dat\82Ì\8eæ\93¾\81@2005\94N6\8c\8e\92Ç\89Á\81@by\82à\82¶\82ã
+ //********************
+ if (Item.DownType = gdtThread) and (Item.ResponseCode = 302) then begin
+ {$IFDEF DEBUG}
+ Writeln('dat\8eæ\93¾');
+ {$ENDIF}
+ FMsg := '\89ß\8b\8e\83\8d\83O(dat.gz)\82ª\91¶\8dÝ\82µ\82È\82¢\82½\82ß\89ß\8b\8e\83\8d\83O(dat)\82ð\92T\82µ\82Ü\82· - [' + ATitle + ']';
+ FIcon := gmiWhat;
+ if Assigned(OnDownloadMsg) then
+ Synchronize(FireDownloadMsg);
+ URL := ChangeFileExt(URL, '');
+ Modified := Item.ThreadItem.LastModified;
+ RangeStart := 0;
+ AdjustLen := 0;
+ if not DatDownload(Item.DownType, URL, Modified, RangeStart, AdjustLen) then
+ Item.State := gdsError;
+ {$IFDEF DEBUG}
+ Writeln('ResponseCode: ' + IntToStr(Item.ResponseCode));
+ {$ENDIF}
+ end;
+
+ //********************
//dat.gz\8eæ\93¾(2)
//********************
{
end;
}
+ if (Item.DownType = gdtThread) and (Item.ResponseCode = 302) then begin
+ {$IFDEF DEBUG}
+ Writeln('offlaw2.so\82Å\8eæ\93¾');
+ {$ENDIF}
+ ATitle := Item.ThreadItem.Title;
+ if ATitle = '' then
+ ATitle := '\81i\96¼\8fÌ\95s\96¾\81j';
+ FMsg := '\81\9adat.gz\82ª\91¶\8dÝ\82µ\82È\82¢\82½\82ßofflaw2.so\82ð\97\98\97p\82µ\82Ü\82· - [' + ATitle + ']';
+ FIcon := gmiWhat;
+ if Assigned(OnDownloadMsg) then
+ Synchronize(FireDownloadMsg);
+ URL := Item.ThreadItem.GetOfflaw2SoURL;
+ Modified := Item.ThreadItem.LastModified;
+ RangeStart := 0;
+ AdjustLen := 0;
+ if not DatDownload(Item.DownType, URL, Modified, RangeStart, AdjustLen) then begin
+ {$IFDEF DEBUG}
+ Writeln('ResponseCode: ' + IntToStr(Item.ResponseCode));
+ {$ENDIF}
+ Item.State := gdsError;
+
+ if (Item.DownType = gdtThread) and (Item.ResponseCode = 302) then begin
+ FMsg := '\94Â\82ª\88Ú\93]\82µ\82½\82©\82à\82µ\82ê\82È\82¢\82Ì\82Å\94Â\8dX\90V\82ð\8ds\82Á\82Ä\82\82¾\82³\82¢\81B';
+ FIcon := gmiNG;
+ if Assigned(OnDownloadMsg) then
+ Synchronize(FireDownloadMsg);
+ end;
+
+ end else begin
+ {$IFDEF DEBUG}
+ Writeln('ResponseCode: ' + IntToStr(Item.ResponseCode));
+ {$ENDIF}
+ if Item.ResponseCode = 200 then begin
+ {$IFDEF DEBUG}
+ Writeln('CGIStatus: OK');
+ {$ENDIF}
+ if Copy(Item.Content, 1, 5) = 'ERROR' then begin
+ {$IFDEF DEBUG}
+ Writeln('Offlow2Error');
+ {$ENDIF}
+ Item.ResponseCode := 404;
+ Item.State := gdsError;
+ Item.ErrText := '\83X\83\8c\82Í\91¶\8dÝ\82µ\82È\82¢\82æ\82¤\82Å\82·\81B' + Item.Content;
+ end else begin
+ GetLastModified;
+ end;
+ end else begin
+ {$IFDEF DEBUG}
+ Writeln('CGIStatus: 404(ERROR)');
+ {$ENDIF}
+ Item.ResponseCode := 404;
+ Item.State := gdsError;
+ Item.ErrText := CgiStatus.FErrText;
+ end;
+ end;
+ end;
+
+ if (Item.DownType = gdtThread) and ((Item.ResponseCode = 302) or (Item.ResponseCode = 404)) then begin
+ FSessionID := '';
+ Synchronize(GetSessionID);
+ if (FSessionID <> '') then begin
+ {$IFDEF DEBUG}
+ Writeln('Rokka\82Å\8eæ\93¾');
+ {$ENDIF}
+ ATitle := Item.ThreadItem.Title;
+ if ATitle = '' then
+ ATitle := '\81i\96¼\8fÌ\95s\96¾\81j';
+ FMsg := '\81\9aofflow2.so\82É\91¶\8dÝ\82µ\82È\82¢\82½\82ßRokka\82ð\97\98\97p\82µ\82Ü\82· - [' + ATitle + ']';
+ FIcon := gmiWhat;
+ if Assigned(OnDownloadMsg) then
+ Synchronize(FireDownloadMsg);
+ URL := Item.ThreadItem.GetRokkaURL(FSessionID);
+ Modified := Item.ThreadItem.LastModified;
+ RangeStart := 0;
+ AdjustLen := 0;
+
+ if not DatDownload(Item.DownType, URL, Modified, RangeStart, AdjustLen) then begin
+ {$IFDEF DEBUG}
+ Writeln('ResponseCode: ' + IntToStr(Item.ResponseCode));
+ {$ENDIF}
+ Item.State := gdsError;
+ end else begin
+ CgiStatus := ParseRokkaStatus(Item.Content);
+ {$IFDEF DEBUG}
+ Writeln('ResponseCode: ' + IntToStr(Item.ResponseCode));
+ {$ENDIF}
+ case CgiStatus.FStatus of
+ gcsOK: begin
+ {$IFDEF DEBUG}
+ Writeln('CGIStatus: OK');
+ {$ENDIF}
+ Item.ResponseCode := 200;
+ DeleteStatusLine(Item);
+ end;
+ gcsERR: begin
+ {$IFDEF DEBUG}
+ Writeln('CGIStatus: 404(ERROR)');
+ {$ENDIF}
+ Item.ResponseCode := 404;
+ Item.State := gdsError;
+ Item.ErrText := CgiStatus.FErrText;
+ end;
+ end;
+ end;
+ end;
+ end;
+
+ //********************
+ // 2ch\8aO\95\94\94Â
+ //********************
+// if not GikoSys.Is2chHost(GikoSys.UrlToServer(URL)) then begin
+ Host := URL;
+ Sep := Pos('://', Host);
+ if (Sep > 0) then
+ Delete(Host, 1, Sep + 2);
+ Sep := Pos('/', Host);
+ if (Sep > 0) then
+ SetLength(Host, Sep - 1);
+ if not GikoSys.Is2chHost(Host) then begin
+ if (Item.DownType = gdtThread) and (Item.ResponseCode = 404) then begin
+ {$IFDEF DEBUG}
+ Writeln('\8aO\95\94\94Â\89ß\8b\8e\83\8d\83O\8eæ\93¾');
+ {$ENDIF}
+ ATitle := Item.ThreadItem.Title;
+ if ATitle = '' then
+ ATitle := '\81i\96¼\8fÌ\95s\96¾\81j';
+ FMsg := '\81\9a\82Q\82¿\82á\82ñ\82Ë\82é\8aO\95\94\94Â\82Ì\89ß\8b\8e\83\8d\83O\8eæ\93¾\82ð\8ds\82¢\82Ü\82· - [' + ATitle + ']';
+ FIcon := gmiWhat;
+ if Assigned(OnDownloadMsg) then
+ Synchronize(FireDownloadMsg);
+ URL := Item.ThreadItem.GetExternalBoardKakoDatURL;
+ Modified := Item.ThreadItem.LastModified;
+ RangeStart := 0;
+ AdjustLen := 0;
+ if not DatDownload(Item.DownType, URL, Modified, RangeStart, AdjustLen) then
+ Item.State := gdsError;
+ {$IFDEF DEBUG}
+ Writeln('ResponseCode: ' + IntToStr(Item.ResponseCode));
+ {$ENDIF}
+ end;
+ end;
+(*
//********************
//offlaw.cgi\82Å\8eæ\93¾
//********************
Writeln('CGIStatus: OK');
{$ENDIF}
Item.ResponseCode := 200;
- Item.Content := DeleteStatusLine(Item.Content);
- Item.ContentLength := CgiStatus.FSize;
+ DeleteStatusLine(Item);
end;
gcsINCR: begin
//\8d¡\82Í\82 \82è\82¦\82È\82¢
Writeln('CGIStatus: 206');
{$ENDIF}
Item.ResponseCode := 206;
- Item.Content := DeleteStatusLine(Item.Content);
- Item.ContentLength := CgiStatus.FSize;
+ DeleteStatusLine(Item);
end;
gcsERR: begin
{$IFDEF DEBUG}
Synchronize(FireDownloadMsg);
end;
end;
-
+*)
case Item.ResponseCode of
200: Item.State := gdsComplete;
206: Item.State := gdsDiffComplete;
else
Item.State := gdsError;
end;
-{
- //\96³\82¢\82Æ\8ev\82¤\82¯\82Ç\81B\81B\81B
- if (Item.ResponseCode in [200, 206]) and (Item.Content = '') then
- Item.State := gdsError;
- Item.LastModified := FIndy.Response.LastModified;
- //\8d·\95ª\8eæ\93¾\82Å\82P\83o\83C\83g\91O\82©\82ç\82Æ\82Á\82Ä\82«\82½\82Æ\82«\82Í\83}\83C\83i\83X\82·\82é
- Item.ContentLength := FIndy.Response.ContentLength + AdjustLen;
- try
- ResStream.Clear;
- FIndy.Get(URL, ResStream);
- Item.Content := GikoSys.GzipDecompress(ResStream, FIndy.Response.ContentEncoding);
- if (Item.DownType = gdtThread) and (AdjustLen = -1) and (Item.Content[1] <> #10) then begin
- //\8d·\95ª\8eæ\93¾\82©\82Â\82P\83o\83C\83g\96Ú\82ªLF\82Å\82È\82¢\8fê\8d\87\82Í\81u\82 \82Ú\81[\82ñ\81v\82³\82ê\82Ä\82¢\82é\82©\82à\82µ\82ê\82ñ\82Ì\82Å\8dÄ\8eæ\93¾
- //\82±\82±\82Å\83\81\83b\83Z\81[\83W\95\\8e¦\83C\83x\83\93\83g
- //event
- FMsg := '\81u\82 \82Ú\81[\82ñ\81v\82ð\8c\9f\8fo\82µ\82½\82Ì\82Å\8dÄ\8eæ\93¾\82ð\8ds\82¢\82Ü\82·';
- if Assigned(OnDownloadMsg) then
- Synchronize(FireDownloadMsg);
- FIndy.Request.ContentRangeStart := 0;
- FIndy.Request.ContentRangeEnd := 0;
- AdjustLen := 0;
- ResStream.Clear;
- FIndy.Get(URL, ResStream);
- Item.Content := GikoSys.GzipDecompress(ResStream, FIndy.Response.ContentEncoding);
- end else if (Item.DownType = gdtThread) and (AdjustLen = -1) and (Item.Content[1] = #10) then begin
- //\8d·\95ª\8eæ\93¾\82©\82Â\82P\83o\83C\83g\96Ú\82ªLF\82Ì\8fê\8d\87\81i\90³\8fí\8eæ\93¾\81j\82Í\93ª\82ÌLF\82ð\8dí\8f\9c
- Item.Content := Copy(Item.Content, 2, Length(Item.Content));
- end;
- except
- Item.State := gdsError;
- end;
- Item.ResponseCode := FIndy.ResponseCode;
-}
-{
- try
- ResStream.Clear;
- FIndy.Get(URL, ResStream);
- Item.Content := GikoSys.GzipDecompress(ResStream, FIndy.Response.ContentEncoding);
- except
- Item.State := gdsError;
- end;
-
- CgiStatus := ParseCgiStatus(Item.Content);
- if CgiStatus.FStatus = gcsOK then begin
- if CgiStatus.FSize = 0 then
- Item.State := gdsNotModify
- else if Item.DownType = gdtBoard then
- Item.State := gdsComplete
- else
- Item.State := gdsDiffComplete;
- end else if CgiStatus.FStatus = gcsINCR then begin
- Item.State := gdsComplete;
- end else if CgiStatus.FStatus = gcsERR then begin
- Item.State := gdsError;
- Item.ErrText := CgiStatus.FErrText;
- end;
- Item.ContentLength := CgiStatus.FSize;
- }
except
Item.State := gdsError;
end;
- //Item.ResponseCode := FIndy.ResponseCode;
if FAbort then
Item.State := gdsAbort;
finally
ResStream.Free;
end;
- FIndy.Request.CustomHeaders.Clear;
- FIndy.Request.RawHeaders.Clear;
- FIndy.Request.Clear;
- FIndy.Response.CustomHeaders.Clear;
- FIndy.Response.RawHeaders.Clear;
- FIndy.Response.Clear;
- FIndy.ProxyParams.Clear;
+ ClearHttpClient(FIndy);
if Terminated then Break;
Suspend;
begin
ResponseCode := -1;
if (ItemType = gdtThread) and (RangeStart > 0) then begin
-// if (ItemType = gdtThread) and (Item.ThreadItem.Size > 0) then begin
-// FIndy.Request.ContentRangeStart := Item.ThreadItem.Size + AdjustLen;
FIndy.Request.ContentRangeStart := RangeStart + AdjustLen;
FIndy.Request.ContentRangeEnd := 0;
end else begin
FIndy.Request.CustomHeaders.Add('Pragma: no-cache');
if (Modified <> 0) and (Modified <> ZERO_DATE) then begin
FIndy.Request.LastModified := modified - OffsetFromUTC;
- //FIndy.Request.CustomHeaders.Add('If-Modified-Since: ' + RFC1123_Date(modified - OffsetFromUTC) + ' GMT');
end;
-// FIndy.Request.AcceptEncoding := 'gzip';
if RangeStart = 0 then
FIndy.Request.AcceptEncoding := 'gzip'
else
Writeln('URL: ' + URL);
{$ENDIF}
FIndy.Get(URL, ResStream);
- Item.Content := GikoSys.GzipDecompress(ResStream, FIndy.Response.ContentEncoding);
- Item.LastModified := FIndy.Response.LastModified;
- //\8d·\95ª\8eæ\93¾\82Å\82P\83o\83C\83g\91O\82©\82ç\82Æ\82Á\82Ä\82«\82½\82Æ\82«\82Í\83}\83C\83i\83X\82·\82é
-// Item.ContentLength := FIndy.Response.ContentLength + AdjustLen;
+ Item.Content := GikoSys.GzipDecompress(ResStream, FIndy.Response.ContentEncoding);
Item.ContentLength := Length(Item.Content) + AdjustLen;
- //\96³\82¢\82Æ\8ev\82¤\82¯\82Ç\81B\81B\81B
-// if (FIndy.ResponseCode in [200, 206]) and (Item.Content = '') then
-// Result := False
+ // \92u\8a·\82·\82é
+ if GikoSys.Setting.ReplaceDat then begin
+ Item.Content := ReplaceDM.Replace(Item.Content);
+ end;
+ Item.LastModified := FIndy.Response.LastModified;
if Item.Content = '' then
Result := False
else
end;
end;
-procedure TDownloadThread.WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer);
+procedure TDownloadThread.WorkBegin(Sender: TObject;
+AWorkMode: TWorkMode; const AWorkCountMax: Integer);
begin
- if Assigned(OnWorkBegin) then
- OnWorkBegin(Sender, AWorkMode, AWorkCountMax, FNumber, FDownloadTitle);
+ if Assigned(OnWorkBegin) then begin
+ FWorkData.FWorkCS.Acquire;
+ try
+ FWorkData.FSender := Sender;
+ FWorkData.FAWorkMode := AWorkMode;
+ FWorkData.FAWorkCountMax := AWorkCountMax;
+ Synchronize(FireWorkBegin);
+ finally
+ FWorkData.FWorkCS.Release;
+ end;
+ end;
end;
-procedure TDownloadThread.WorkEnd(Sender: TObject; AWorkMode: TWorkMode);
+procedure TDownloadThread.WorkEnd(Sender: TObject;
+AWorkMode: TWorkMode);
begin
- if Assigned(OnWorkEnd) then
- OnWorkEnd(Sender, AWorkMode, FNumber);
+ if Assigned(OnWorkEnd) then begin;
+ FWorkData.FWorkCS.Acquire;
+ try
+ FWorkData.FSender := Sender;
+ FWorkData.FAWorkMode := AWorkMode;
+ Synchronize(FireWorkEnd);
+ finally
+ FWorkData.FWorkCS.Release;
+ end;
+ end;
+end;
+
+procedure TDownloadThread.Work(Sender: TObject; AWorkMode:
+TWorkMode; const AWorkCount: Integer);
+begin
+ if Assigned(OnWork) then begin
+ FWorkData.FWorkCS.Acquire;
+ try
+ FWorkData.FSender := Sender;
+ FWorkData.FAWorkMode := AWorkMode;
+ FWorkData.FAWorkCount := AWorkCount;
+ Synchronize(FireWork);
+ finally
+ FWorkData.FWorkCS.Release;
+ end;
+ end;
end;
-procedure TDownloadThread.Work(Sender: TObject; AWorkMode: TWorkMode; const AWorkCount: Integer);
+//\82±\82±\82©\82ç\90V\8bK\83\81\83\\83b\83h
+procedure TDownloadThread.FireWorkBegin;
begin
- if Assigned(OnWork) then
- OnWork(Sender, AWorkMode, AWorkCount, FNumber);
+ OnWorkBegin(FWorkData.FSender, FWorkData.FAWorkMode,
+ FWorkData.FAWorkCountMax,
+ FNumber, FDownloadTitle);
+end;
+
+procedure TDownloadThread.FireWorkEnd;
+begin
+ OnWorkEnd(FWorkData.FSender, FWorkData.FAWorkMode,
+ FNumber);
+end;
+
+procedure TDownloadThread.FireWork;
+begin
+ OnWork(FWorkData.FSender, FWorkData.FAWorkMode,
+ FWorkData.FAWorkCount,
+ FNumber);
end;
function TDownloadThread.ParseCgiStatus(Content: string): TCgiStatus;
end;
end;
-//\8eè\94²\82«\82È\8f\88\97\9d\82Å1\8ds\96Ú\82ð\8fÁ\82·
-function TDownloadThread.DeleteStatusLine(Content: string): string;
+function TDownloadThread.ParseRokkaStatus(Content: string): TCgiStatus;
+var
+ StatusLine: string;
+ Idx: Integer;
+ Status: string;
+begin
+// \81@\83\8c\83X\83|\83\93\83X : 1\8ds\96Ú\82Érokka\82Ì\8f\88\97\9d\8c\8b\89Ê\82ª\8bL\8fq\82³\82ê\82Ü\82·
+// \81@\81@"Success XXX"\81@- \90¬\8c÷\81@XXX\82Édat\82Ì\8fó\91Ô\81i\8eæ\93¾\8c³\81j\82ª\8bL\8fq\82³\82ê\82Ü\82·
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@Live\81@\81@\81@\81@\83\89\83C\83u\83X\83\8c\83b\83h
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@Pool\81@\81@\81@\81@dat\97\8e\82¿\83X\83\8c\83b\83h
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@Archive \81@\81@\89ß\8b\8e\83\8d\83O
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@ \88È\8d~\82Ì\8ds\82ÉDAT\8c`\8e®(name<>email<>datetime<>body<>[title])\82Å\83\8d\83O\82ª\8bL\8fq\82³\82ê\82Ä\82¢\82Ü\82·
+// \81@\81@"Error XXX"\81@\81@- \89½\82ç\82©\82Ì\83G\83\89\81[\82Å\82·\81@XXX \82ª\83G\83\89\81[\83R\81[\83h\82Å\82·\81B
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@13 \81@\81@\81@not found\81@\81@\81@\81@\81@\81@\97v\8b\81\82³\82ê\82½dat\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\82Å\82µ\82½
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@8008135\81@inputError \81@\81@\81@\81@\81@\83\8a\83N\83G\83X\83gURL\82ÌSERVER\82©BOARD\82ª\90³\82µ\82\82È\82¢\82Å\82·
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@666\81@\81@\81@urlError \81@\81@\81@\81@\81@\81@OPTIONS\82Ü\82½\82ÍQueryString\82ª\90³\82µ\82\82È\82¢\82Å\82·
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@69 \81@\81@\81@authenticationError\81@KAGI\82ª\95s\90³\81i\97L\8cø\8aú\8cÀ\90Ø\82ê\82»\82Ì\91¼\81j
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@420\81@\81@\81@timeLimitError \81@\81@\81@\83A\83N\83Z\83X\8aÔ\8au\82ª\92Z\82·\82¬\82Ü\82·
+// \81@\81@\81@\81@\81@\81@\81@\81@\81@\81@\81@42 \81@\81@\81@methodError\81@\81@\81@\81@\81@\82»\82ÌHTTP\83\81\83\\83b\83h\82Í\8b\96\89Â\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ
+ Idx := AnsiPos(#10, Content);
+ if (Idx > 0) then
+ StatusLine := Copy(Content, 0, Idx)
+ else
+ StatusLine := Content;
+
+ if (AnsiPos('Success', StatusLine) = 1) then begin
+ Result.FStatus := gcsOK;
+ Delete(StatusLine, 1, 7);
+ Status := Trim(StatusLine);
+ if (Status = 'Live') then // \91½\95ª\82±\82ê\82Í\97\88\82È\82¢
+ Result.FErrText := '\8eæ\93¾\90¬\8c÷\81i\83\89\83C\83u\83X\83\8c\83b\83h\81j'
+ else if (Status = 'Pool') then
+ Result.FErrText := '\8eæ\93¾\90¬\8c÷\81idat\97\8e\82¿\83X\83\8c\83b\83h\81j'
+ else if (Status = 'Archive') then
+ Result.FErrText := '\8eæ\93¾\90¬\8c÷\81i\89ß\8b\8e\83\8d\83O\81j'
+ else // ???
+ Result.FErrText := '\8eæ\93¾\90¬\8c÷';
+ end
+ else if (AnsiPos('Error', StatusLine) = 1) then begin
+ Result.FStatus := gcsERR;
+ Delete(StatusLine, 1, 5);
+ Status := Trim(StatusLine);
+ if (Status = '13') then
+ Result.FErrText := '\97v\8b\81\82³\82ê\82½dat\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\82Å\82µ\82½'
+ else if (Status = '8008135') then
+ Result.FErrText := '\83\8a\83N\83G\83X\83gURL\82ÌSERVER\82©BOARD\82ª\90³\82µ\82\82È\82¢\82Å\82·'
+ else if (Status = '666') then
+ Result.FErrText := 'OPTIONS\82Ü\82½\82ÍQueryString\82ª\90³\82µ\82\82È\82¢\82Å\82·'
+ else if (Status = '69') then
+ Result.FErrText := 'KAGI\82ª\95s\90³\81i\97L\8cø\8aú\8cÀ\90Ø\82ê\82»\82Ì\91¼\81j'
+ else if (Status = '20') then
+ Result.FErrText := '\83A\83N\83Z\83X\8aÔ\8au\82ª\92Z\82·\82¬\82Ü\82·'
+ else if (Status = '42') then
+ Result.FErrText := '\82»\82ÌHTTP\83\81\83\\83b\83h\82Í\8b\96\89Â\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ'
+ else // ???
+ Result.FErrText := '\8eæ\93¾\83G\83\89\81[[' + Status + ']';
+ end
+ else begin
+ Result.FStatus := gcsERR;
+ Result.FErrText := '\83X\83e\81[\83^\83X\89ð\90Í\8e¸\94s[' + StatusLine + ']';
+ end;
+ Result.FSize := 0;
+end;
+
+//\82P\8ds\96Ú\82ð\8fÁ\82µ\82Ä\81A\83R\83\93\83e\83\93\83c\83T\83C\83Y\82ð\90Ý\92è\82·\82é
+procedure TDownloadThread.DeleteStatusLine(Item: TDownloadItem);
var
SList: TStringList;
begin
SList := TStringList.Create;
try
- SList.Text := Content;
+ SList.Text := Item.Content;
+ //1\8ds\96Ú\82ð\8dí\8f\9c
if SList.Count > 1 then
SList.Delete(0);
- Result := SList.Text;
+ Item.Content := SList.Text;
+ //\89ü\8ds\83R\81[\83h\82ðCRLF -> LF\82Æ\8dl\82¦\82Ä\81A\8ds\90\94\95ª\82¾\82¯\83}\83C\83i\83X
+ Item.ContentLength := Length(SList.Text) - SList.Count;
finally
SList.Free;
end;
NumCount: Integer;
Body: TStringList;
Rec: TSubjectRec;
+ {$IFDEF DEBUG}
+ st, rt : Cardinal;
+ {$ENDIF}
function MakeThreadCallBack(
inInstance : DWORD; // TBoardItem \82Ì\83C\83\93\83X\83^\83\93\83X
inURL : PChar; // \83X\83\8c\83b\83h\82Ì URL
boardItem := TBoard( inInstance );
boardItem.IntData := boardItem.IntData + 1;
- index := boardItem.GetIndexFromURL( string( inURL ) );
+ if boardItem.IntData < (boardItem.Count shr 2) then
+ index := boardItem.GetIndexFromURL( string( inURL ) )
+ else
+ index := boardItem.GetIndexFromURL( string( inURL ), True );
if index = -1 then begin
//\90V\82µ\82¢\83X\83\8c\83b\83h
- _ThreadItem := TThreadItem.Create( boardItem.BoardPlugIn, string( inURL ) );
+ _ThreadItem := TThreadItem.Create( boardItem.BoardPlugIn, boardItem, string( inURL ) );
_ThreadItem.Title := string( inTitle );
_ThreadItem.AllResCount := inCount;
_ThreadItem.AgeSage := gasNew;
boardItem.Add(_ThreadItem);
end else begin
+ //\8f\87\88Ê\82ª\8fã\82ª\82Á\82Ä\82¢\82ê\82ÎAge\82É\82·\82é
if boardItem.Items[index].No > boardItem.IntData then
boardItem.Items[index].AgeSage := gasAge
- else if boardItem.Items[index].AllResCount < inCount then
+ //\8f\87\88Ê\82ª\8fã\82ª\82Á\82Ä\82È\82¢\82¯\82Ç\81A\83\8c\83X\82ª\82Â\82¢\82Ä\82½\82ç\81ASage\82É
+ else if boardItem.Items[index].AllResCount <> inCount then
boardItem.Items[index].AgeSage := gasSage
+ //\8f\87\88Ê\8fã\82ª\82Á\82Ä\82È\82¢\82µ\81A\83\8c\83X\82Ì\91\9d\8c¸\82à\96³\82¯\82ê\82Î\81ANone
else
boardItem.Items[index].AgeSage := gasNone;
boardItem.Items[index].No := boardItem.IntData;
boardItem.Items[index].AllResCount := inCount;
end;
+
end;
begin
+{$IFDEF DEBUG}
+ st := GetTickCount;
+ Writeln('SAVELIST');
+{$ENDIF}
//Board.ListData := TList.Create;
Body := TStringList.Create;
try
//\83T\81[\83o\8fã\83t\83@\83C\83\8b\82Ì\8dX\90V\8e\9e\8d\8f\90Ý\92è
Board.LastModified := LastModified;
+
//dat\97\8e\82¿\83X\83\8c\82Ì\83\\81[\83g\8f\87\82ð\8c\88\92è\82·\82é\82½\82ß\82É\83\\81[\83g\82·\82é
if GikoSys.Setting.DatOchiSortIndex >= 0 then begin
- Sort.SortNoFlag := true;
- Sort.SortOrder := GikoSys.Setting.DatOchiSortOrder;
- Sort.SortIndex := GikoSys.Setting.DatOchiSortIndex;
+ Sort.SetSortNoFlag(true);
+ Sort.SetSortOrder(GikoSys.Setting.DatOchiSortOrder);
+ Sort.SetSortIndex(GikoSys.Setting.DatOchiSortIndex);
//Sort.SortNonAcquiredCountFlag := GikoSys.Setting.NonAcquiredCount;
Board.CustomSort(ThreadItemSortProc);
end;
+{$IFDEF DEBUG}
+ rt := GetTickCount - st;
+ Writeln('END Sortd' + IntToStr(rt) + ' ms');
+{$ENDIF}
+
for i := Board.Count - 1 downto 0 do
Board.Items[i].AgeSage := gasNull;
// \90V\82µ\82¢\83\8a\83X\83g\82É\8cÃ\82¢\83\8a\83X\83g\82Ì\83\8d\83O\82ª\82 \82é\82È\82ç\82»\82ê\82ð\90V\82µ\82¢\83\8a\83X\83g\82É\92Ç\89Á
// \8cÃ\82¢\83\8d\83O\82ª\82È\82¯\82ê\82Î\81A\90V\82½\82É\83X\83\8c\83I\83u\83W\83F\83N\83g\82ð\8dì\90¬
Board.IntData := 0;
+{$IFDEF DEBUG}
+ rt := GetTickCount - st;
+ Writeln('Start Enum' + IntToStr(rt) + ' ms');
+{$ENDIF}
+
+ //\82±\82ê\82ª\92x\82¢\81@\97v\89ü\91P
+ Board.BeginUpdate;
Board.BoardPlugIn.EnumThread( DWORD( Board ), @MakeThreadCallBack );
+ Board.EndUpdate;
- //\8cÃ\82¢\83\8a\83X\83g\82É\82µ\82©\82È\82¢\82â\82Â\82ç\82ð\8dí\8f\9c
+{$IFDEF DEBUG}
+ rt := GetTickCount - st;
+ Writeln('End Enum' + IntToStr(rt) + ' ms');
+{$ENDIF}
+
+ //\8cÃ\82¢\83\8a\83X\83g\82É\82µ\82©\82È\82¢\82â\82Â\82ç\82ð\8dí\8f\9c
for i := Board.Count - 1 downto 0 do begin
if( Board.Items[i].AgeSage = gasNull )and not (Board.Items[i].IsLogFile) then
Board.Delete(i);
Board.Items[i].No := Board.IntData;
Board.Items[i].AllResCount := Board.Items[i].Count;
Board.Items[i].NewResCount := 0;
- Board.Items[i].AgeSage := gasNone;
+ Board.Items[i].AgeSage := gasArch;
end;
end;
+
end else begin
//\90V\82µ\82¢\83\8a\83X\83g\82ð\8dì\90¬\82·\82é
//\90V\82µ\82¢\83\8a\83X\83g\82É\8cÃ\82¢\83\8a\83X\83g\82Ì\83\8d\83O\82ª\82 \82é\82È\82ç\82»\82ê\82ð\90V\82µ\82¢\83\8a\83X\83g\82É\92Ç\89Á
if index = -1 then begin
//\90V\82µ\82¢\83X\83\8c\83b\83h
NewItem := TThreadItem.Create(
- nil, GikoSys.Get2chBoard2ThreadURL( Board, ChangeFileExt( Rec.FFileName, '' ) ) );
+ nil,
+ Board,
+ GikoSys.Get2chBoard2ThreadURL( Board, ChangeFileExt( Rec.FFileName, '' ) ) );
NewItem.Title := Rec.FTitle;
NewItem.AllResCount := Rec.FCount;
NewItem.ParentBoard := Board;
Board.Items[i].No := NumCount;
Board.Items[i].AllResCount := Board.Items[i].Count;
Board.Items[i].NewResCount := 0;
- Board.Items[i].AgeSage := gasNone;
+ Board.Items[i].AgeSage := gasArch;
end;
end;
//\83\8a\83X\83g(subject.txt)\82ð\95Û\91¶
GikoSys.ForceDirectoriesEx(ExtractFilePath(Board.GetSubjectFileName));
+ Body.Text := MojuUtils.Sanitize(Body.Text);
Body.SaveToFile(Board.GetSubjectFileName);
end;
finally
NewRes: Integer;
finish : Boolean;
loopCnt : Integer;
-// KokoTxt : string;
-// KokoIdx : Integer;
-// NewTxt : string;
-// NewIdx : Integer;
-// LastTxt : string;
LastIdx : Integer;
begin
FileName := ThreadItem.GetThreadFileName;
- if not ThreadItem.IsBoardPlugInAvailable then begin
+ //if not ThreadItem.IsBoardPlugInAvailable then begin
+ if not ThreadItem.ParentBoard.IsBoardPlugInAvailable then begin
if Trim(Content) = '' then
Exit;
Body.SaveToFile(FileName);
if ThreadItem.Title = '' then begin
- Res := GikoSys.DivideStrLine(Body[0]);
+ THTMLCreate.DivideStrLine(Body[0], @Res);
ThreadItem.Title := Res.FTitle;
end;
ThreadItem.Size := 0;
ThreadItem.RoundDate := Now;
if not ThreadItem.UnRead then begin
ThreadItem.UnRead := True;
- ThreadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead + 1;
end;
// if ThreadItem.RoundNo = 6 then
// ThreadItem.RoundNo := 0;
ini.WriteInteger('Setting', 'NewResCount', ThreadItem.NewResCount);
ini.WriteInteger('Setting', 'NewReceive', ThreadItem.NewReceive);
// ini.WriteInteger('Setting', 'RoundNo', ThreadItem.RoundNo);
- ini.WriteBool('Setting', 'Round', ThreadItem.Round);
+// ini.WriteBool('Setting', 'Round', ThreadItem.Round);
ini.WriteBool('Setting', 'UnRead', ThreadItem.UnRead);
ini.UpdateFile;
finally
end;
end;
+procedure TDownloadThread.GetLastModified;
+var
+ ResultDate: TDateTime;
+ ResList: TStringList;
+ LastRes: String;
+ KwPos: Integer;
+ ResRow: Integer;
+ DTIdx: Integer;
+ Ok: Boolean;
+ AWKStr: TAWKStr;
+ RStart: Integer;
+ RLength: Integer;
+begin
+ AWKStr := TAWKStr.Create(nil);
+ Ok := False;
+ ResultDate := Item.LastModified;
+ ResList := TStringList.Create;
+ try
+ ResList.Text := Item.Content;
+ for ResRow := ResList.Count - 1 downto 0 do begin
+ if (ResRow > 999) then
+ continue;
+ LastRes := ResList.Strings[ResRow];
+ KwPos := Pos('<>', LastRes);
+ if (KwPos < 1) then
+ continue;
+ Delete(LastRes, 1, KwPos + 1);
+ KwPos := Pos('<>', LastRes);
+ if (KwPos < 1) then
+ continue;
+ Delete(LastRes, 1, KwPos + 1);
+ // '2013/04/22(\8c\8e) 02:32:36'
+ SetLength(LastRes, 23);
+ Delete(LastRes, 11, 4); // \97j\93ú\8dí\8f\9c
+
+ // \93ú\95t\8am\94F
+// AWKStr.RegExp := '(\d{4})/(0[1-9]|1[0-2])/(0[1-9]|[12][0-9]|3[01])';
+ AWKStr.RegExp := '(19|20)([0-9][0-9])/(0[1-9]|1[0-2])/(0[1-9]|[12][0-9]|3[01])';
+ if (AWKStr.Match(AWKStr.ProcessEscSeq(LastRes), RStart, RLength) = 1) then begin
+
+ AWKStr.RegExp := '([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])';
+ if (AWKStr.Match(AWKStr.ProcessEscSeq(LastRes), RStart, RLength) < 1) then begin
+ SetLength(LastRes, 10);
+ LastRes := LastRes + ' 00:00:00';
+ end;
+
+ try
+ ResultDate := StrToDateTime(LastRes);
+ Ok := True;
+ except
+ end;
+ end;
+ if (Ok = True) then
+ break;
+ end;
+ finally
+ ResList.Free;
+ end;
+ Item.LastModified :=ResultDate;
+ FreeAndNil(AWKStr);
+end;
+
end.
OSDN Git Service
