Commit: 7b3a37b98cd1964059f9b2bad6af96fd05dbc0fb - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 7b3a37b98cd1964059f9b2bad6af96fd05dbc0fb (tree)
• Time: 2006-12-31 10:29:28
• Author: h677 <h677>
• Commiter: h677

Log Message

履歴を別クラス(THistoryList)に分離

Change Summary

• modified: Giko.pas
• modified: GikoDataModule.pas
• add: HistoryList.pas
• modified: gikoNavi.dpr

Incremental Difference

--- a/Giko.pas
+++ b/Giko.pas
@@ -19,14 +19,14 @@ uses
 	HintWindow, GikoCoolBar, GikoListView, Search, ExternalBoardManager,
 	ExternalBoardPlugInMain, StdActns, Variants, ExtActns,IdTCPConnection,
 	IdBaseComponent, IdTCPClient, AppEvnts, BrowserRecord, MoveHistoryItem,
-    ShellAPI,Preview;
+    ShellAPI,Preview, HistoryList;
 
 const
 	NGWORDNAME_PANEL = 3;
 	THREADSIZE_PANEL = 2;
 	
 type
-	TGikoTreeType = (gttNone, gtt2ch, gttHistory, gttFavorite);
+
 	TToolBarSettingSenderType = (tssNone, tssMain, tssList, tssBrowser);
 	TMinimizeType = (mtNone, mtMinimizing, mtMinimized);
 	TResizeType = (rtNone, rtResizing);
@@ -569,7 +569,7 @@ type
 		FActiveList: TObject;
 		FActiveContent: TBrowserRecord;	//
 		FActiveBBS : TBBS;
-		FHistoryList: TList;					//ƒqƒXƒgƒŠƒŠƒXƒg
+		FHistoryList: THistoryList;					//ƒqƒXƒgƒŠƒŠƒXƒg
 		FTreeType: TGikoTreeType;
 		FWorkCount: Integer;
 		FNameCookie: string;
@@ -722,10 +722,6 @@ type
 		procedure SetListViewType(AViewType: TGikoViewType); overload;
 		procedure SetListViewType(AViewType: TGikoViewType; SelectText: string; KubetsuChk: Boolean); overload;
 		procedure PlaySound(SoundEventName: string);
-		function AddHistory( FavItem: TFavoriteThreadItem ): Boolean;
-		procedure ClearHistory;
-		procedure	SaveHistory;
-		procedure	LoadHistory;
 		procedure ShowBBSTree( inBBS : TBBS );
 		procedure ShowBBSTreeOld( inBBS : TBBS );
 		procedure ShowHistoryTree;
@@ -1138,10 +1134,11 @@ begin
 
 
 	// ƒqƒXƒgƒŠƒŠƒXƒg(LoadHistory ‚æ‚è‚àæ‚ɍs‚¤‚±‚Æ)
-	FHistoryList := TList.Create;
+	FHistoryList := THistoryList.Create;
 
 	// —š—ð“ǂݍž‚Ý
-	LoadHistory;
+	FHistoryList.LoadFromFile(GikoSys.GetConfigDir + 'History.xml',
+        TreeView, FTreeType);
 
 	//‚¨‹C‚É“ü‚è“ǂݍž‚Ý
 	FavoriteDM.SetFavTreeView(FavoriteTreeView);
@@ -1616,12 +1613,12 @@ begin
 
 	//ƒqƒXƒgƒŠƒŠƒXƒg•Û‘¶
 	try
-		SaveHistory;
+		FHistoryList.SaveToFile(GikoSys.GetConfigDir + 'History.xml');
 	except
 	end;
 	try
 		try
-			ClearHistory;
+			FHistoryList.Clear;
 		except
 		end;
 	finally
@@ -1767,8 +1764,8 @@ begin
 
 	//—š—ð‚Ì•Û‘¶‚Æ”jŠü
 	try
-		SaveHistory;
-		ClearHistory;
+		FHistoryList.SaveToFile(GikoSys.GetConfigDir + 'History.xml');
+		FHistoryList.Clear;
 	except
 	end;
 
@@ -1819,7 +1816,8 @@ begin
 	ShowBBSTree( BBSs[ 0 ] );
 
 	// —š—ð“ǂݍž‚Ý
-	LoadHistory;
+    FHistoryList.LoadFromFile(GikoSys.GetConfigDir + 'History.xml',
+        TreeView, FTreeType);
 
 	//‚¨‹C‚É“ü‚è“ǂݍž‚Ý
 	FavoriteDM.ReadFavorite;
@@ -2539,7 +2537,7 @@ begin
 				FBrowsers.Move(BROWSER_COUNT - 1, 0);
 		end;
 		favItem := TFavoriteThreadItem.Create(ThreadItem.URL, ThreadItem.Title );
-		if not AddHistory( favItem ) then
+		if not FHistoryList.AddHistory( favItem, TreeView, FTreeType ) then
 			favItem.Free;
 
 		for i := 0 to BrowserTab.Tabs.Count - 1 do begin
@@ -3019,209 +3017,10 @@ begin
 	end;
 end;
 
-function TGikoForm.AddHistory( favItem : TFavoriteThreadItem ): Boolean;
-var
-	i: Integer;
-	Item: TFavoriteThreadItem;
-	Node: TTreeNode;
-begin
-//	Result := False;
-//	if (GetActiveContent = ThreadItem) and
-//			(ThreadItem.Count <= ThreadItem.Kokomade) then
-//		Exit;
-//	if GetActiveContent = ThreadItem then
-//		Exit;
-
-	Result := True;
-	if FTreeType = gttHistory then
-  	TreeView.Selected := nil;
-
-	for i := 0 to FHistoryList.Count - 1 do begin
-		if TObject(FHistoryList[i]) is TFavoriteThreadItem then begin
-			Item := TFavoriteThreadItem(FHistoryList[i]);
-			if Item.URL = favItem.URL then begin
-//				SetContent(ThreadItem);
-				FHistoryList.Move(i, 0);
-				if FTreeType = gttHistory then
-					if TreeView.Items.GetFirstNode <> TreeView.Items[ i ] then
-						TreeView.Items[ i ].MoveTo( TreeView.Items.GetFirstNode, naInsert );
-								Result := false;
-				Exit;
-			end;
-		end;
-	end;
-
-	if FHistoryList.Count > 0 then
-		FHistoryList.Insert( 0, favItem )
-	else
-		FHistoryList.Add( favItem );
-//	SetContent(ThreadItem);
-//	while GikoSys.Setting.AddressHistoryCount < FHistoryList.Count do begin
-	while GikoSys.Setting.MaxRecordCount < FHistoryList.Count do begin
-		i := FHistoryList.Count - 1;
-		TObject( FHistoryList.Items[ i ] ).Free;
-		FHistoryList.Delete( i );
-	end;
-
-	if FTreeType = gttHistory then begin
-		Node := TreeView.Items.Add( nil, favItem.Title );
-		Node.MoveTo( TreeView.Items.GetFirstNode, naInsert );
-		{
-		if favItem.NewArrival then begin
-			Node.ImageIndex := ITEM_ICON_THREADNEW1;
-			Node.SelectedIndex := ITEM_ICON_THREADNEW2;
-		end else begin
-			Node.ImageIndex := ITEM_ICON_THREADLOG1;
-			Node.SelectedIndex := ITEM_ICON_THREADLOG2;
-		end;
-		}
-		// •‰‰×‚ð‚©‚¯‚½‚­‚È‚¢‚Ì‚Å NewArrival ‚̃`ƒFƒbƒN‚ðs‚í‚È‚¢
-		// ¦favItem.Item ƒvƒƒpƒeƒB‚Í dat ‚̓ǂݍž‚Ý‚ð•K—v‚Æ‚·‚é
-		Node.ImageIndex := ITEM_ICON_THREADLOG1;
-		Node.SelectedIndex := ITEM_ICON_THREADLOG2;
-		Node.Data := favItem;
-		//while GikoSys.Setting.AddressHistoryCount < TreeView.Items.Count do begin
-		while GikoSys.Setting.MaxRecordCount < TreeView.Items.Count do begin
-			i := TreeView.Items.Count - 1;
-			TreeView.Items.Item[ i ].Delete;
-		end;
-	end;
-end;
-
+//—š—ð‚©‚çíœ
 procedure TGikoForm.DeleteHistory( threadItem: TThreadItem );
-var
-	i: Integer;
-	node: TTreeNode;
-begin
-	// ƒLƒƒƒrƒlƒbƒg‚É—š—ð‚ª•\Ž¦‚³‚ê‚Ä‚¢‚½‚çA
-	// ƒLƒƒƒrƒlƒbƒg“à‚̃AƒCƒeƒ€‚àíœ‚·‚éB
-	if (FTreeType = gttHistory) then begin
-		node := TreeView.Items.GetFirstNode;
-		while (node <> nil) do begin
-			if ( TFavoriteThreadItem(node.Data).Item  = threadItem ) then begin
-				TreeView.Items.Delete(node);
-				TreeView.Refresh;
-				node := nil;
-			end else begin
-				node := node.GetNext;
-			end;
-		end;
-	end;
-	for i := 0 to FHistoryList.Count - 1 do begin
-		if threadItem = TFavoriteThreadItem( FHistoryList.Items[i] ).Item then begin
-			TFavoriteThreadItem( FHistoryList.Items[ i ] ).Free;
-			FHistoryList.Delete(i);
-			FHistoryList.Capacity := FHistoryList.Count;
-			Break;
-		end;
-	end;
-end;
-
-procedure TGikoForm.ClearHistory;
-var
-	i : Integer;
 begin
-	//FHistoryList.Clear;
-
-	try
-		for i := FHistoryList.Count - 1 downto 0 do begin
-			if TObject(FHistoryList[ i ]) is TFavoriteThreadItem then
-            	TFavoriteThreadItem(FHistoryList[ i ]).Free
-            else if TObject(FHistoryList[ i ]) is TFavoriteBoardItem then
-                TFavoriteBoardItem(FHistoryList[ i ]).Free;
-
-			//FHistoryList.Delete(i);
-        end;
-	except
-	end;
-
-	FHistoryList.Clear;
-    FHistoryList.Capacity := FHistoryList.Count;
-
-end;
-
-procedure TGikoForm.SaveHistory;
-var
-	i, bound	: Integer;
-	saveList	: TstringList;
-begin
-
-	saveList := TStringList.Create;
-	try
-		FHistoryList.Pack;
-        FHistoryList.Capacity := FHistoryList.Count;
-		saveList.Add('<?xml version="1.0" encoding="Shift_JIS" standalone="yes"?>');
-		saveList.Add('<address>');
-		bound := FHistoryList.Count - 1;
-		for i := bound downto 0 do begin
-			// title ‚͍¡‚Ì‚Æ‚±‚ëŽg‚Á‚Ä‚¢‚È‚¢
-			saveList.Add(
-				'<history url="' + HtmlEncode( TFavoriteThreadItem( FHistoryList[ i ] ).URL ) + '"' +
-				' title="' + HtmlEncode( MojuUtils.Sanitize(TFavoriteThreadItem( FHistoryList[ i ] ).Title )) + '"/>');
-		end;
-		saveList.Add('</address>');
-		saveList.SaveToFile( GikoSys.GetConfigDir + 'History.xml' );
-	finally
-		saveList.Free;
-	end;
-
-end;
-
-procedure TGikoForm.LoadHistory;
-var
-	i, bound		: Integer;
-	fileName		: string;
-	XMLDoc			: IXMLDocument;
-	XMLNode			: IXMLNode;
-	HistoryNode	: IXMLNode;
-	s						: string;
-	favItem			: TFavoriteThreadItem;
-{$IFDEF DEBUG}
-	st, rt : Cardinal;
-{$ENDIF}
-begin
-{$IFDEF DEBUG}
-	st := GetTickCount;
-{$ENDIF}
-
-	fileName := GikoSys.GetConfigDir + 'History.xml';
-
-	if FileExists( fileName ) then begin
-		try
-			XMLDoc := IXMLDocument.Create;
-			//XMLDoc := LoadXMLDocument(FileName);
-			LoadXMLDocument(FileName, XMLDoc);
-			try
-				XMLNode := XMLDoc.DocumentElement;
-
-				if XMLNode.NodeName = 'address' then begin
-					bound := XMLNode.ChildNodes.Count - 1;
-					for i := 0 to bound do begin
-						HistoryNode := XMLNode.ChildNodes[i];
-						if HistoryNode.NodeName = 'history' then begin
-							//if FReadCount >= sl.Count then begin
-								s := Trim(HistoryNode.Attributes['url']);
-								if s <> '' then begin
-									favItem := TFavoriteThreadItem.Create(
-										s, MojuUtils.UnSanitize(HistoryNode.Attributes[ 'title' ]) );
-									if not AddHistory( favItem ) then
-										favItem.Free;
-								end;
-							//end;
-						end;
-					end;
-				end;
-			finally
-				XMLDoc.Free;
-			end;
-		except
-		end;
-	end;
-{$IFDEF DEBUG}
-	rt := GetTickCount - st;
-	Writeln('Runtime(Load Histroy) : ' + IntToStr(rt) + ' ms');
-{$ENDIF}
-
+    FHistoryList.DeleteHistory( threadItem, TreeView, TreeType );
 end;
 
 procedure TGikoForm.ShowBBSTreeOld(
@@ -5071,7 +4870,6 @@ begin
 		if (GetKeyState( VK_SHIFT ) and $80000000) = 0 then
 			if MsgBox(Handle, DEL_MSG, DEL_TITLE, MB_YESNO or MB_ICONWARNING or MB_DEFBUTTON2) <> ID_YES then
 				Exit;
-		ClearHistory;
 		FHistoryList.Clear;
 		TreeView.Items.Clear;
 	end;

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -12,7 +12,7 @@ uses
 	MSHTML_TLB,
 {$IFEND}
   ComCtrls, BrowserRecord, Graphics, Messages, Setting, Dialogs,
-  ActiveX, MoveHistoryItem;
+  ActiveX, MoveHistoryItem, HistoryList;
 
 const
 	CAPTION_NAME: string = 'ƒMƒRƒiƒr';

--- /dev/null
+++ b/HistoryList.pas
@@ -0,0 +1,227 @@
+unit HistoryList;
+
+interface
+
+uses
+	Windows, Messages, SysUtils, Classes, Graphics, Controls,
+    BoardGroup, Favorite, ComCtrls, GikoXMLDoc;
+
+type
+	TGikoTreeType = (gttNone, gtt2ch, gttHistory, gttFavorite);
+
+	THistoryList = class(TList)
+    public
+        function AddHistory( favItem : TFavoriteThreadItem; TreeView : TTreeView;
+            TreeType: TGikoTreeType): Boolean;
+        procedure DeleteHistory( threadItem: TThreadItem; TreeView : TTreeView;
+            TreeType: TGikoTreeType );
+        procedure Clear; override;
+        procedure SaveToFile(const FileName: String);
+        procedure LoadFromFile(const FileName: String;
+            TreeView : TTreeView; TreeType: TGikoTreeType);
+    end;
+
+
+implementation
+
+uses
+    Giko, GikoSystem, Setting, YofUtils, MojuUtils;
+
+const
+	ITEM_ICON_THREADLOG1		= 6;		//ƒXƒŒƒAƒCƒRƒ“iƒƒO‚ ‚èj
+	ITEM_ICON_THREADLOG2		= 7;		//ƒXƒŒƒAƒCƒRƒ“iƒƒO‚ ‚èj
+
+
+function THistoryList.AddHistory(
+    favItem : TFavoriteThreadItem; TreeView : TTreeView;
+    TreeType: TGikoTreeType ): Boolean;
+var
+	i: Integer;
+	Item: TFavoriteThreadItem;
+	Node: TTreeNode;
+begin
+	Result := True;
+	if TreeType = gttHistory then
+  	TreeView.Selected := nil;
+
+	for i := 0 to Self.Count - 1 do begin
+		if TObject(Self[i]) is TFavoriteThreadItem then begin
+			Item := TFavoriteThreadItem(Self[i]);
+			if Item.URL = favItem.URL then begin
+				Self.Move(i, 0);
+				if TreeType = gttHistory then
+					if TreeView.Items.GetFirstNode <> TreeView.Items[ i ] then
+						TreeView.Items[ i ].MoveTo( TreeView.Items.GetFirstNode, naInsert );
+								Result := false;
+				Exit;
+			end;
+		end;
+	end;
+
+	if Self.Count > 0 then
+		Self.Insert( 0, favItem )
+	else
+		Self.Add( favItem );
+
+	while GikoSys.Setting.MaxRecordCount < Self.Count do begin
+		i := Self.Count - 1;
+		TObject( Self.Items[ i ] ).Free;
+		Self.Delete( i );
+	end;
+
+	if TreeType = gttHistory then begin
+		Node := TreeView.Items.Add( nil, favItem.Title );
+		Node.MoveTo( TreeView.Items.GetFirstNode, naInsert );
+		{
+		if favItem.NewArrival then begin
+			Node.ImageIndex := ITEM_ICON_THREADNEW1;
+			Node.SelectedIndex := ITEM_ICON_THREADNEW2;
+		end else begin
+			Node.ImageIndex := ITEM_ICON_THREADLOG1;
+			Node.SelectedIndex := ITEM_ICON_THREADLOG2;
+		end;
+		}
+		// •‰‰×‚ð‚©‚¯‚½‚­‚È‚¢‚Ì‚Å NewArrival ‚̃`ƒFƒbƒN‚ðs‚í‚È‚¢
+		// ¦favItem.Item ƒvƒƒpƒeƒB‚Í dat ‚̓ǂݍž‚Ý‚ð•K—v‚Æ‚·‚é
+		Node.ImageIndex := ITEM_ICON_THREADLOG1;
+		Node.SelectedIndex := ITEM_ICON_THREADLOG2;
+		Node.Data := favItem;
+		//while GikoSys.Setting.AddressHistoryCount < TreeView.Items.Count do begin
+		while GikoSys.Setting.MaxRecordCount < TreeView.Items.Count do begin
+			i := TreeView.Items.Count - 1;
+			TreeView.Items.Item[ i ].Delete;
+		end;
+	end;
+end;
+
+procedure THistoryList.DeleteHistory( threadItem: TThreadItem;
+    TreeView : TTreeView; TreeType: TGikoTreeType );
+var
+	i: Integer;
+	node: TTreeNode;
+begin
+	// ƒLƒƒƒrƒlƒbƒg‚É—š—ð‚ª•\Ž¦‚³‚ê‚Ä‚¢‚½‚çA
+	// ƒLƒƒƒrƒlƒbƒg“à‚̃AƒCƒeƒ€‚àíœ‚·‚éB
+	if (TreeType = gttHistory) then begin
+		node := TreeView.Items.GetFirstNode;
+		while (node <> nil) do begin
+			if ( TFavoriteThreadItem(node.Data).Item  = threadItem ) then begin
+				TreeView.Items.Delete(node);
+				TreeView.Refresh;
+				node := nil;
+			end else begin
+				node := node.GetNext;
+			end;
+		end;
+	end;
+	for i := 0 to Self.Count - 1 do begin
+		if threadItem = TFavoriteThreadItem( Self.Items[i] ).Item then begin
+			TFavoriteThreadItem( Self.Items[ i ] ).Free;
+			Self.Delete(i);
+			Self.Capacity := Self.Count;
+			Break;
+		end;
+	end;
+end;
+
+procedure THistoryList.Clear;
+var
+	i : Integer;
+begin
+	try
+		for i := Self.Count - 1 downto 0 do begin
+			if TObject(Self[ i ]) is TFavoriteThreadItem then
+            	TFavoriteThreadItem(Self[ i ]).Free
+            else if TObject(Self[ i ]) is TFavoriteBoardItem then
+                TFavoriteBoardItem(Self[ i ]).Free;
+        end;
+	except
+	end;
+
+	inherited Clear;
+    Self.Capacity := Self.Count;
+
+end;
+
+procedure THistoryList.SaveToFile(const FileName: String);
+var
+	i, bound	: Integer;
+	saveList	: TstringList;
+begin
+
+	saveList := TStringList.Create;
+	try
+		Self.Pack;
+        Self.Capacity := Self.Count;
+		saveList.Add('<?xml version="1.0" encoding="Shift_JIS" standalone="yes"?>');
+		saveList.Add('<address>');
+		bound := Self.Count - 1;
+		for i := bound downto 0 do begin
+			// title ‚͍¡‚Ì‚Æ‚±‚ëŽg‚Á‚Ä‚¢‚È‚¢
+			saveList.Add(
+				'<history url="' + HtmlEncode( TFavoriteThreadItem( Self[ i ] ).URL ) + '"' +
+				' title="' + HtmlEncode( MojuUtils.Sanitize(TFavoriteThreadItem( Self[ i ] ).Title )) + '"/>');
+		end;
+		saveList.Add('</address>');
+		saveList.SaveToFile( FileName );
+	finally
+		saveList.Free;
+	end;
+
+end;
+
+procedure THistoryList.LoadFromFile(const FileName: String;
+    TreeView : TTreeView; TreeType: TGikoTreeType);
+var
+	i, bound		: Integer;
+	XMLDoc			: IXMLDocument;
+	XMLNode			: IXMLNode;
+	HistoryNode	: IXMLNode;
+	s						: string;
+	favItem			: TFavoriteThreadItem;
+{$IFDEF DEBUG}
+	st, rt : Cardinal;
+{$ENDIF}
+begin
+{$IFDEF DEBUG}
+	st := GetTickCount;
+{$ENDIF}
+	if FileExists( FileName ) then begin
+		try
+			XMLDoc := IXMLDocument.Create;
+			//XMLDoc := LoadXMLDocument(FileName);
+			LoadXMLDocument(FileName, XMLDoc);
+			try
+				XMLNode := XMLDoc.DocumentElement;
+
+				if XMLNode.NodeName = 'address' then begin
+					bound := XMLNode.ChildNodes.Count - 1;
+					for i := 0 to bound do begin
+						HistoryNode := XMLNode.ChildNodes[i];
+						if HistoryNode.NodeName = 'history' then begin
+							//if FReadCount >= sl.Count then begin
+								s := Trim(HistoryNode.Attributes['url']);
+								if s <> '' then begin
+									favItem := TFavoriteThreadItem.Create(
+										s, MojuUtils.UnSanitize(HistoryNode.Attributes[ 'title' ]) );
+									if not AddHistory( favItem, TreeView, TreeType ) then
+										favItem.Free;
+								end;
+							//end;
+						end;
+					end;
+				end;
+			finally
+				XMLDoc.Free;
+			end;
+		except
+		end;
+	end;
+{$IFDEF DEBUG}
+	rt := GetTickCount - st;
+	Writeln('Runtime(Load Histroy) : ' + IntToStr(rt) + ' ms');
+{$ENDIF}
+
+end;
+
+end.

--- a/gikoNavi.dpr
+++ b/gikoNavi.dpr
@@ -74,7 +74,8 @@ uses
   InputAssistDataModule in 'InputAssistDataModule.pas' {InputAssistDM: TDataModule},
   DefaultFileManager in 'DefaultFileManager.pas',
   MoveHistoryItem in 'MoveHistoryItem.pas',
-  SambaTimer in 'SambaTimer.pas';
+  SambaTimer in 'SambaTimer.pas',
+  HistoryList in 'HistoryList.pas';
 
 {$R *.RES}
 {$R gikoResource.res}