終了時に、ログ検索ダイアログが非表示になっているとリリースされない不具合の修正

[gikonavigoeson/gikonavi.git] / ItemDownload.pas

diff --git a/ItemDownload.pas b/ItemDownload.pas
index c229d17..10027ad 100644 (file)
--- a/ItemDownload.pas
+++ b/ItemDownload.pas
@@ -5,7 +5,7 @@ interface
 uses
        Windows, SysUtils, Classes, ComCtrls, Controls, Forms, IdHTTP,
        {HTTPApp,} YofUtils, IdGlobal, IdException, IdComponent, IniFiles, {DateUtils,}
-       GikoSystem, BoardGroup, MonaUtils, ExternalBoardManager, ExternalBoardPlugInMain,
+       GikoSystem, BoardGroup, ExternalBoardManager, ExternalBoardPlugInMain,
        Sort;
 
 type
@@ -106,7 +106,7 @@ type
 implementation
 
 uses
-       Y_TextConverter, MojuUtils, HTMLCreate;
+       Y_TextConverter, MojuUtils, HTMLCreate, ReplaceDataModule;
 
 constructor TDownloadThread.Create(CreateSuspended: Boolean);
 begin
@@ -375,9 +375,9 @@ 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
@@ -734,13 +734,12 @@ begin
                        {$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.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
@@ -1089,6 +1088,7 @@ begin
                        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