Commit: 72c96cdd04ac2a6952f1c03beac5d06ffba4b817 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 72c96cdd04ac2a6952f1c03beac5d06ffba4b817 (tree)
• Time: 2011-02-20 15:47:14
• Author: h677 <h677>
• Commiter: h677

Log Message

冒険の書のエラーでもCookieを更新
冒険の書を設定画面で削除・設定できるようにした。

Change Summary

• modified: Editor.pas
• modified: GikoSystem.pas
• modified: Option.dfm
• modified: Option.pas
• modified: Setting.pas
• modified: gikoNavi.res

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -22,7 +22,7 @@ uses
 type
 //	TSetLayeredWindowAttributes = function(wnd: HWND; crKey: DWORD; bAlpha: BYTE; dwFlag: DWORD): Boolean; stdcall;
 	//‘‚«ž‚Ý–ß‚è’lƒ^ƒCƒv
-	TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtBouken);
+	TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtBouken, grtBoukenErr);
 
 	TEditorForm = class(TForm)
 		MainMenu: TMainMenu;
@@ -841,14 +841,6 @@ begin
 								MB_YESNO or MB_ICONQUESTION);
 
 				if MsgResult = IDYES then begin
-                {
-                    for count := 0 to Indy.CookieManager.CookieCollection.Count - 1 do begin
-                        cookie := Indy.CookieManager.CookieCollection.Items[count];
-                        if ( cookie.CookieName = 'HAP' ) then begin
-                            GikoSys.Setting.SetBoukenCookie(cookie.Value, cookie.Domain);
-                        end;
-                    end;
-                }
 					GetCookie(Indy.CookieManager, Board);
                     if (Board.Is2ch) then begin
                         GetHiddenParameter(ResponseText, Board);
@@ -879,15 +871,6 @@ begin
 						MB_YESNO or MB_ICONQUESTION);
 
 				if MsgResult = IDYES then begin
-                {
-                    for count := 0 to Indy.CookieManager.CookieCollection.Count - 1 do begin
-                        cookie := Indy.CookieManager.CookieCollection.Items[count];
-                        if ( cookie.CookieName = 'HAP' ) then begin
-                            GikoSys.Setting.SetBoukenCookie(cookie.Value, cookie.Domain);
-                        end;
-                    end;
-                }
-
 					GetCookie(Indy.CookieManager, Board);
                     if (Board.Is2ch) then begin
                         GetHiddenParameter(ResponseText, Board);
@@ -912,15 +895,16 @@ begin
                 Board.SPID := '';
                 Board.Cookie := '';
                 GetCookie(Indy.CookieManager, Board);
-                // –`Œ¯‚̏‘‚Ì•Û‘¶
-                GikoSys.Setting.WriteBoukenSettingFile;
 				Exit;
 			end else begin
 				if (GikoSys.Setting.UseSamba)  and  (FSambaTimer.Enabled) then
                 begin
 					FSambaTimer.WriteSambaTime(Now());
                 end;
-
+                // –`Œ¯‚̏‘ƒGƒ‰[‚ÍCookie‚ðXV‚·‚é
+                if ResultType = grtBoukenErr then begin
+                    GetCookie(Indy.CookieManager, Board);
+                end;
 				State := gdsError;
 				raise Exception.Create('');
 			end;
@@ -1002,7 +986,7 @@ begin
     else if ( (AnsiPos('‚d‚q‚q‚n‚qFCs‚ª‘«‚è‚Ü‚¹‚ñ', ResponseText) > 0) or   // ƒGƒ‰[ˆµ‚¢
               (AnsiPos('‚d‚q‚q‚n‚qFLv‚ª‘«‚è‚È‚­‚ăXƒŒƒbƒh—§‚Ä', ResponseText) > 0) ) // ƒGƒ‰[ˆµ‚¢
               and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0) 	then
-        Result := grtError
+        Result := grtBoukenErr
 	else if ( AnsiPos('ƒNƒbƒL[‚ª‚È‚¢‚©ŠúŒÀØ‚ê‚Å‚·', ResponseText) > 0) or
 					(AnsiPos('<title>ƒNƒbƒL[Šm”FI</title>', ResponseText) > 0)	or
 					(AnsiPos('<title>¡ƒNƒbƒL[Šm”FI¡</title>', ResponseText) > 0) or
@@ -1944,6 +1928,8 @@ begin
                 ABoard.Expires := GMTToLocalDateTime(Cookie.Expires);
             end else if ( Cookie.CookieName = VAL_HAP ) then begin
                 GikoSys.SetBoukenCookie(Cookie.Value, Cookie.Domain);
+                // –`Œ¯‚̏‘‚Ì•Û‘¶
+                GikoSys.Setting.WriteBoukenSettingFile;
             end else begin
                 if Length( curCookies.Values[ Cookie.CookieName ] ) > 0 then begin
                     // Šù‘¶’l‚Ì•t‚¯‘Ö‚¦

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -259,7 +259,10 @@ type
         function GetBoukenCookie(AURL: String): String;
         //! –`Œ¯‚̏‘CookieÝ’è
         procedure SetBoukenCookie(ACookieValue, ADomain: String);
-
+        //! –`Œ¯‚̏‘Cookieíœ
+        procedure DelBoukenCookie(ADomain: String);
+        //! –`Œ¯‚̏‘Domainˆê——Žæ“¾
+        procedure GetBoukenDomain(var ADomain: TStringList);
 	end;
 
 var
@@ -3464,8 +3467,34 @@ begin
 end;
 procedure TGikoSys.SetBoukenCookie(ACookieValue, ADomain: String);
 begin
-    Setting.SetBoukenCookie(ACookieValue, ADomain);
+    if ( Length(ADomain) > 0 ) then begin
+        Setting.SetBoukenCookie(ACookieValue, ADomain);
+    end;
+end;
+//! –`Œ¯‚̏‘Domainˆê——Žæ“¾
+procedure TGikoSys.GetBoukenDomain(var ADomain: TStringList);
+var
+    i : Integer;
+begin
+    ADomain.Clear;
+    for i := 0 to Setting.BoukenCookieList.Count - 1 do begin
+        ADomain.Add( Setting.BoukenCookieList.Names[i] );
+    end;
 end;
+//! –`Œ¯‚̏‘Cookieíœ
+procedure TGikoSys.DelBoukenCookie(ADomain: String);
+var
+    i : Integer;
+begin
+    for i := 0 to Setting.BoukenCookieList.Count - 1 do begin
+        if ( Setting.BoukenCookieList.Names[i] = ADomain ) then begin
+            Setting.BoukenCookieList.Delete(i);
+            Break;
+        end;
+    end;
+end;
+
+
 initialization
 	GikoSys := TGikoSys.Create;
 

--- a/Option.dfm
+++ b/Option.dfm
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = CSSTabSheet
+    ActivePage = UserIDSheet
     MultiLine = True
-    TabIndex = 2
+    TabIndex = 11
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog
           Top = 43
           Width = 417
           Height = 20
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 0
           Text = 'BoardURLComboBox'
         end
@@ -1558,7 +1558,7 @@ object OptionDialog: TOptionDialog
         Left = 12
         Top = 8
         Width = 477
-        Height = 153
+        Height = 145
         Caption = #35469#35388
         TabOrder = 0
         object Label9: TLabel
@@ -1579,14 +1579,14 @@ object OptionDialog: TOptionDialog
         end
         object ForcedLoginLabel: TLabel
           Left = 136
-          Top = 104
+          Top = 97
           Width = 89
           Height = 12
           Caption = 'ForcedLoginLabel'
         end
         object Tora3URLLabel: TLabel
           Left = 329
-          Top = 133
+          Top = 126
           Width = 104
           Height = 12
           Caption = 'http://2ch.tora3.net/'
@@ -1600,7 +1600,7 @@ object OptionDialog: TOptionDialog
         end
         object Label12: TLabel
           Left = 237
-          Top = 133
+          Top = 126
           Width = 83
           Height = 12
           Caption = #12518#12540#12470'ID'#12398#21462#24471
@@ -1622,7 +1622,7 @@ object OptionDialog: TOptionDialog
         end
         object AutoLoginCheckBox: TCheckBox
           Left = 12
-          Top = 80
+          Top = 73
           Width = 193
           Height = 17
           Caption = #36215#21205#26178#12395#33258#21205#12525#12464#12452#12531#12377#12427'(&S)'
@@ -1630,7 +1630,7 @@ object OptionDialog: TOptionDialog
         end
         object ForcedLoginCheckBox: TCheckBox
           Left = 12
-          Top = 102
+          Top = 95
           Width = 125
           Height = 19
           Caption = #24375#21046#12525#12464#12452#12531#12514#12540#12489
@@ -1638,10 +1638,10 @@ object OptionDialog: TOptionDialog
         end
       end
       object GroupBox11: TGroupBox
-        Left = 16
-        Top = 176
-        Width = 473
-        Height = 121
+        Left = 12
+        Top = 157
+        Width = 477
+        Height = 94
         Caption = 'Be 2ch'
         TabOrder = 1
         object Label7: TLabel
@@ -1653,7 +1653,7 @@ object OptionDialog: TOptionDialog
         end
         object Label8: TLabel
           Left = 18
-          Top = 59
+          Top = 48
           Width = 54
           Height = 12
           Caption = #35469#35388#12467#12540#12489
@@ -1667,7 +1667,7 @@ object OptionDialog: TOptionDialog
         end
         object BeCodeEdit: TEdit
           Left = 88
-          Top = 56
+          Top = 45
           Width = 369
           Height = 20
           PasswordChar = '*'
@@ -1675,13 +1675,63 @@ object OptionDialog: TOptionDialog
         end
         object BeAutoLoginCheckBox: TCheckBox
           Left = 12
-          Top = 88
+          Top = 71
           Width = 193
           Height = 17
           Caption = #36215#21205#26178#12395#33258#21205#12525#12464#12452#12531#12377#12427'(&S)'
           TabOrder = 2
         end
       end
+      object GroupBox25: TGroupBox
+        Left = 12
+        Top = 256
+        Width = 477
+        Height = 81
+        Caption = #20882#38522#12398#26360
+        TabOrder = 2
+        object Label25: TLabel
+          Left = 40
+          Top = 24
+          Width = 37
+          Height = 12
+          Caption = #12489#12513#12452#12531
+        end
+        object BoukenComboBox: TComboBox
+          Left = 88
+          Top = 20
+          Width = 140
+          Height = 20
+          ItemHeight = 12
+          TabOrder = 0
+          Text = 'BoukenComboBox'
+          OnChange = BoukenComboBoxChange
+        end
+        object BoukenModButton: TButton
+          Left = 231
+          Top = 42
+          Width = 50
+          Height = 25
+          Caption = #22793#26356
+          TabOrder = 3
+          OnClick = BoukenModButtonClick
+        end
+        object BoukenDelButton: TButton
+          Left = 88
+          Top = 43
+          Width = 50
+          Height = 25
+          Caption = #21066#38500
+          TabOrder = 2
+          OnClick = BoukenDelButtonClick
+        end
+        object BoukenEdit: TEdit
+          Left = 230
+          Top = 19
+          Width = 227
+          Height = 20
+          TabOrder = 1
+        end
+      end
     end
   end
   object OkBotton: TButton

--- a/Option.pas
+++ b/Option.pas
@@ -219,6 +219,12 @@ type
     gppRighBottomRB: TRadioButton;
     ResAnchorCheckBox: TCheckBox;
     IgnoreLimitResCountCheckBox: TCheckBox;
+    GroupBox25: TGroupBox;
+    Label25: TLabel;
+    BoukenComboBox: TComboBox;
+    BoukenModButton: TButton;
+    BoukenDelButton: TButton;
+    BoukenEdit: TEdit;
 		procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure ApplyButtonClick(Sender: TObject);
@@ -268,6 +274,9 @@ type
                 procedure ResRangeHoldCheckBoxClick(Sender: TObject);
                 procedure CroutOptionClick(Sender: TObject);
     procedure MaxRecordCountEditExit(Sender: TObject);
+    procedure BoukenDelButtonClick(Sender: TObject);
+    procedure BoukenComboBoxChange(Sender: TObject);
+    procedure BoukenModButtonClick(Sender: TObject);
 	private
 		{ Private éŒ¾ }
 		FClose: Boolean;
@@ -572,7 +581,8 @@ var
 	Item: TListItem;
 //	s: string;
 	idx: Integer;
-	FileList: TStringList;
+	FileList : TStringList;
+    DomainList : TStringList;
 begin
 
 	//“ǂݍž‚Ý—pƒvƒƒLƒV
@@ -886,6 +896,18 @@ begin
     LoopBrowserTabsCB.Checked := GikoSys.Setting.LoopBrowserTabs;
     //
     IgnoreContextCheckBox.Checked := GikoSys.Setting.GestureIgnoreContext;
+
+    // –`Œ¯‚̏‘ƒhƒƒCƒ“ˆê——Žæ“¾
+    BoukenComboBox.Text := '';
+    BoukenComboBox.Items.Clear;
+    DomainList := TStringList.Create;
+    GikoSys.GetBoukenDomain(DomainList);
+    for i := 0 to DomainList.Count - 1 do begin
+        BoukenComboBox.Items.Add( DomainList[i] ) ;
+    end;
+    DomainList.Free;
+    BoukenComboBox.ItemIndex := 0;
+    BoukenComboBox.OnChange(nil);
 end;
 
 procedure TOptionDialog.SaveSetting;
@@ -1175,6 +1197,7 @@ begin
     GikoSys.Setting.LoopBrowserTabs := LoopBrowserTabsCB.Checked;
 
     GikoSys.Setting.GestureIgnoreContext := IgnoreContextCheckBox.Checked;
+
 end;
 
 procedure TOptionDialog.SettingApply;
@@ -1698,5 +1721,58 @@ begin
         MaxRecordCountEdit.Text := '1';
 end;
 
+procedure TOptionDialog.BoukenDelButtonClick(Sender: TObject);
+begin
+    if ( BoukenComboBox.Items.IndexOf( BoukenComboBox.Text ) <> -1 ) then begin
+        if MsgBox(Self.Handle, BoukenComboBox.Text + ' ‚ðíœ‚µ‚Ü‚·B'#13#10 +
+            'íœ‚·‚é‚Æ•œŒ³‚Å‚«‚Ü‚¹‚ñB‚æ‚낵‚¢‚Å‚·‚©H', '–`Œ¯‚̏‘@ƒhƒƒCƒ“íœ', MB_YESNO or MB_ICONQUESTION) = IDYES	then begin
+            GikoSys.DelBoukenCookie(BoukenComboBox.Text);
+            GikoSys.Setting.WriteBoukenSettingFile;
+            BoukenComboBox.Items.Delete(BoukenComboBox.ItemIndex);
+            if ( BoukenComboBox.Items.Count = 0 ) then begin
+                 BoukenComboBox.Text := '';
+            end;
+            BoukenComboBox.OnChange(nil);
+        end
+    end else begin
+        BoukenComboBox.Text := '';
+    end;
+end;
+
+procedure TOptionDialog.BoukenComboBoxChange(Sender: TObject);
+begin
+    BoukenEdit.Text := GikoSys.GetBoukenCookie('http://*' +BoukenComboBox.Text);
+end;
+
+procedure TOptionDialog.BoukenModButtonClick(Sender: TObject);
+var
+    DomainList : TStringList;
+    i : Integer;
+    s : String;
+begin
+    if ( Length(BoukenComboBox.Text) > 0 ) then begin
+        s := BoukenComboBox.Text;
+        GikoSys.SetBoukenCookie(BoukenEdit.Text, s);
+        GikoSys.Setting.WriteBoukenSettingFile;
+        // –`Œ¯‚̏‘ƒhƒƒCƒ“ˆê——Žæ“¾
+        BoukenComboBox.Text := '';
+        BoukenComboBox.Items.Clear;
+        DomainList := TStringList.Create;
+        GikoSys.GetBoukenDomain(DomainList);
+        for i := 0 to DomainList.Count - 1 do begin
+            BoukenComboBox.Items.Add( DomainList[i] ) ;
+        end;
+        DomainList.Free;
+        BoukenComboBox.ItemIndex := 0;
+        for i := 0 to BoukenComboBox.Items.Count - 1 do begin
+            if ( BoukenComboBox.Items[i] = s) then begin
+                BoukenComboBox.ItemIndex := i;
+                Break;
+            end;
+        end;
+        BoukenComboBox.OnChange(nil);
+    end;
+end;
+
 end.
 

--- a/Setting.pas
+++ b/Setting.pas
@@ -844,7 +844,9 @@ type
         property RespopupWait: Integer read FRespopupWait write FRespopupWait;
         property RespopupMailTo: Boolean read FRespopupMailTo write FRespopupMailTo;
         //! Œë”šƒ`ƒFƒbƒN
-        property UseGobakuCheck: Boolean read FUseGobakuCheck write FUseGobakuCheck; 
+        property UseGobakuCheck: Boolean read FUseGobakuCheck write FUseGobakuCheck;
+        //! –`Œ¯‚̏‘
+        property BoukenCookieList: TStringList read FBoukenCookieList write FBoukenCookieList; 
 end;
 
 

Binary files a/gikoNavi.res and b/gikoNavi.res differ