• R/O
  • SSH
  • HTTPS

nicorank: Commit


Commit MetaInfo

Revision231 (tree)
Zeit2010-10-31 12:33:46
Autorrankingloid

Log Message

Add the option of IsSendingUserSession (for searchtag)

Ändern Zusammenfassung

Diff

--- trunk/nicorank/nicorank/UtilityFormMain.cs (revision 230)
+++ trunk/nicorank/nicorank/UtilityFormMain.cs (revision 231)
@@ -680,10 +680,10 @@
680680 {
681681 if (textBoxTagSearchInterval.Text == "")
682682 {
683- textBoxTagSearchInterval.Text = "12";
683+ textBoxTagSearchInterval.Text = "8";
684684 }
685- double interval_min = 10.0;
686- double interval_max = 12.0;
685+ double interval_min = 8.0;
686+ double interval_max = 10.0;
687687 try
688688 {
689689 IJStringUtil.ParseDlInterval(textBoxTagSearchInterval.Text, ref interval_min, ref interval_max);
@@ -693,9 +693,9 @@
693693 textBoxInfo.AppendText("タグ検索の間隔の指定が正しくありません。\r\n");
694694 return false;
695695 }
696- if (interval_min < 5.0)
696+ if (interval_min < 3.0)
697697 {
698- textBoxInfo.AppendText("タグ検索の間隔は5秒未満にはできません。\r\n");
698+ textBoxInfo.AppendText("タグ検索の間隔は3秒未満にはできません。\r\n");
699699 return false;
700700 }
701701 return true;
--- trunk/nicorank/nicorank/FormMain.Designer.cs (revision 230)
+++ trunk/nicorank/nicorank/FormMain.Designer.cs (revision 231)
@@ -77,6 +77,7 @@
7777 this.checkBoxIsNoCache = new System.Windows.Forms.CheckBox();
7878 this.errorProvider1 = new System.Windows.Forms.ErrorProvider(this.components);
7979 this.tabPageOther2 = new System.Windows.Forms.TabPage();
80+ this.buttonGetMyMylistList = new System.Windows.Forms.Button();
8081 this.labelCopyRight = new System.Windows.Forms.Label();
8182 this.label26 = new System.Windows.Forms.Label();
8283 this.label15 = new System.Windows.Forms.Label();
@@ -471,7 +472,8 @@
471472 this.radioButtonMakeUserIdFromDir = new System.Windows.Forms.RadioButton();
472473 this.radioButtonMakeUserIdFromFile = new System.Windows.Forms.RadioButton();
473474 this.label45 = new System.Windows.Forms.Label();
474- this.buttonGetMyMylistList = new System.Windows.Forms.Button();
475+ this.checkBoxIsSendingUserSession = new System.Windows.Forms.CheckBox();
476+ this.label52 = new System.Windows.Forms.Label();
475477 this.selectFileBoxMakeUserIdFromFile = new nicorank.SelectFileBox();
476478 this.selectFileBoxMakeUserIdFromDir = new nicorank.SelectFileBox();
477479 this.splitContainer1.Panel1.SuspendLayout();
@@ -1023,9 +1025,9 @@
10231025 this.checkBoxIsNoCache.CheckState = System.Windows.Forms.CheckState.Checked;
10241026 this.checkBoxIsNoCache.Location = new System.Drawing.Point(17, 180);
10251027 this.checkBoxIsNoCache.Name = "checkBoxIsNoCache";
1026- this.checkBoxIsNoCache.Size = new System.Drawing.Size(312, 16);
1028+ this.checkBoxIsNoCache.Size = new System.Drawing.Size(316, 16);
10271029 this.checkBoxIsNoCache.TabIndex = 36;
1028- this.checkBoxIsNoCache.Text = "HTTP通信時にヘッダにCache-Control: max-age=0 をつける";
1030+ this.checkBoxIsNoCache.Text = "HTTP通信時にヘッダに Cache-Control: max-age=0 をつける";
10291031 this.toolTip1.SetToolTip(this.checkBoxIsNoCache, "チェックをONにすると、データがキャッシュされないようになります");
10301032 this.checkBoxIsNoCache.UseVisualStyleBackColor = true;
10311033 this.checkBoxIsNoCache.CheckedChanged += new System.EventHandler(this.checkBoxIsNoCache_CheckedChanged);
@@ -1047,14 +1049,24 @@
10471049 this.tabPageOther2.Controls.Add(this.textBoxFont);
10481050 this.tabPageOther2.Controls.Add(this.label58);
10491051 this.tabPageOther2.Controls.Add(this.buttonFont);
1050- this.tabPageOther2.Location = new System.Drawing.Point(4, 38);
1052+ this.tabPageOther2.Location = new System.Drawing.Point(4, 40);
10511053 this.tabPageOther2.Name = "tabPageOther2";
10521054 this.tabPageOther2.Padding = new System.Windows.Forms.Padding(3);
1053- this.tabPageOther2.Size = new System.Drawing.Size(552, 338);
1055+ this.tabPageOther2.Size = new System.Drawing.Size(552, 336);
10541056 this.tabPageOther2.TabIndex = 14;
10551057 this.tabPageOther2.Text = "おまけ";
10561058 this.tabPageOther2.UseVisualStyleBackColor = true;
10571059 //
1060+ // buttonGetMyMylistList
1061+ //
1062+ this.buttonGetMyMylistList.Location = new System.Drawing.Point(308, 226);
1063+ this.buttonGetMyMylistList.Name = "buttonGetMyMylistList";
1064+ this.buttonGetMyMylistList.Size = new System.Drawing.Size(146, 23);
1065+ this.buttonGetMyMylistList.TabIndex = 9;
1066+ this.buttonGetMyMylistList.Text = "自分のマイリスト番号取得";
1067+ this.buttonGetMyMylistList.UseVisualStyleBackColor = true;
1068+ this.buttonGetMyMylistList.Click += new System.EventHandler(this.buttonGetMyMylistList_Click);
1069+ //
10581070 // labelCopyRight
10591071 //
10601072 this.labelCopyRight.AutoSize = true;
@@ -1197,6 +1209,7 @@
11971209 //
11981210 // tabPage2
11991211 //
1212+ this.tabPage2.Controls.Add(this.label52);
12001213 this.tabPage2.Controls.Add(this.groupBox35);
12011214 this.tabPage2.Controls.Add(this.groupBox34);
12021215 this.tabPage2.Controls.Add(this.buttonCustomRankFileOutputDefault);
@@ -1218,10 +1231,10 @@
12181231 this.tabPage2.Controls.Add(this.label65);
12191232 this.tabPage2.Controls.Add(this.label22);
12201233 this.tabPage2.Controls.Add(this.label23);
1221- this.tabPage2.Location = new System.Drawing.Point(4, 38);
1234+ this.tabPage2.Location = new System.Drawing.Point(4, 40);
12221235 this.tabPage2.Name = "tabPage2";
12231236 this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
1224- this.tabPage2.Size = new System.Drawing.Size(552, 338);
1237+ this.tabPage2.Size = new System.Drawing.Size(552, 336);
12251238 this.tabPage2.TabIndex = 20;
12261239 this.tabPage2.Text = "上級者向け";
12271240 this.tabPage2.UseVisualStyleBackColor = true;
@@ -1412,7 +1425,7 @@
14121425 this.textBoxTagSearchInterval.Name = "textBoxTagSearchInterval";
14131426 this.textBoxTagSearchInterval.Size = new System.Drawing.Size(55, 19);
14141427 this.textBoxTagSearchInterval.TabIndex = 21;
1415- this.textBoxTagSearchInterval.Text = "12";
1428+ this.textBoxTagSearchInterval.Text = "8";
14161429 //
14171430 // textBoxDlInterval
14181431 //
@@ -1440,8 +1453,8 @@
14401453 this.checkBoxIsRankFileCustomize.Size = new System.Drawing.Size(165, 16);
14411454 this.checkBoxIsRankFileCustomize.TabIndex = 26;
14421455 this.checkBoxIsRankFileCustomize.Text = "ランクファイルをカスタマイズする";
1456+ this.toolTip1.SetToolTip(this.checkBoxIsRankFileCustomize, "ランクファイルのカスタマイズ機能はβ版であり、誤りを含む可能性があります。\r\n結果が正しいことを十分確認した上でご使用ください。");
14431457 this.checkBoxIsRankFileCustomize.UseVisualStyleBackColor = true;
1444- this.checkBoxIsRankFileCustomize.Click += new System.EventHandler(this.checkBoxIsRankFileCustomize_Click);
14451458 this.checkBoxIsRankFileCustomize.CheckedChanged += new System.EventHandler(this.checkBoxIsRankFileCustomize_CheckedChanged);
14461459 //
14471460 // label71
@@ -1519,6 +1532,7 @@
15191532 //
15201533 // tabPage7
15211534 //
1535+ this.tabPage7.Controls.Add(this.checkBoxIsSendingUserSession);
15221536 this.tabPage7.Controls.Add(this.buttonSelectVideocutPath);
15231537 this.tabPage7.Controls.Add(this.textBoxVideocutPath);
15241538 this.tabPage7.Controls.Add(this.label44);
@@ -1537,9 +1551,9 @@
15371551 this.tabPage7.Controls.Add(this.label19);
15381552 this.tabPage7.Controls.Add(this.label18);
15391553 this.tabPage7.Controls.Add(this.label16);
1540- this.tabPage7.Location = new System.Drawing.Point(4, 38);
1554+ this.tabPage7.Location = new System.Drawing.Point(4, 40);
15411555 this.tabPage7.Name = "tabPage7";
1542- this.tabPage7.Size = new System.Drawing.Size(552, 338);
1556+ this.tabPage7.Size = new System.Drawing.Size(552, 336);
15431557 this.tabPage7.TabIndex = 6;
15441558 this.tabPage7.Text = "設定";
15451559 this.tabPage7.UseVisualStyleBackColor = true;
@@ -1602,7 +1616,7 @@
16021616 //
16031617 // buttonLoadConfig
16041618 //
1605- this.buttonLoadConfig.Location = new System.Drawing.Point(16, 231);
1619+ this.buttonLoadConfig.Location = new System.Drawing.Point(17, 253);
16061620 this.buttonLoadConfig.Name = "buttonLoadConfig";
16071621 this.buttonLoadConfig.Size = new System.Drawing.Size(127, 23);
16081622 this.buttonLoadConfig.TabIndex = 15;
@@ -1612,7 +1626,7 @@
16121626 //
16131627 // buttonSaveConfig
16141628 //
1615- this.buttonSaveConfig.Location = new System.Drawing.Point(16, 202);
1629+ this.buttonSaveConfig.Location = new System.Drawing.Point(17, 224);
16161630 this.buttonSaveConfig.Name = "buttonSaveConfig";
16171631 this.buttonSaveConfig.Size = new System.Drawing.Size(127, 23);
16181632 this.buttonSaveConfig.TabIndex = 14;
@@ -1729,10 +1743,10 @@
17291743 this.tabPageTimer.Controls.Add(this.comboBoxTimer1);
17301744 this.tabPageTimer.Controls.Add(this.label3);
17311745 this.tabPageTimer.Controls.Add(this.checkBoxTimer1);
1732- this.tabPageTimer.Location = new System.Drawing.Point(4, 38);
1746+ this.tabPageTimer.Location = new System.Drawing.Point(4, 40);
17331747 this.tabPageTimer.Name = "tabPageTimer";
17341748 this.tabPageTimer.Padding = new System.Windows.Forms.Padding(3);
1735- this.tabPageTimer.Size = new System.Drawing.Size(552, 338);
1749+ this.tabPageTimer.Size = new System.Drawing.Size(552, 336);
17361750 this.tabPageTimer.TabIndex = 12;
17371751 this.tabPageTimer.Text = "タイマー";
17381752 this.tabPageTimer.UseVisualStyleBackColor = true;
@@ -1873,9 +1887,9 @@
18731887 this.tabPageMylist.Controls.Add(this.groupBox23);
18741888 this.tabPageMylist.Controls.Add(this.groupBox14);
18751889 this.tabPageMylist.Controls.Add(this.label33);
1876- this.tabPageMylist.Location = new System.Drawing.Point(4, 38);
1890+ this.tabPageMylist.Location = new System.Drawing.Point(4, 40);
18771891 this.tabPageMylist.Name = "tabPageMylist";
1878- this.tabPageMylist.Size = new System.Drawing.Size(552, 338);
1892+ this.tabPageMylist.Size = new System.Drawing.Size(552, 336);
18791893 this.tabPageMylist.TabIndex = 11;
18801894 this.tabPageMylist.Text = "マイリスト";
18811895 this.tabPageMylist.UseVisualStyleBackColor = true;
@@ -2229,8 +2243,8 @@
22292243 this.textBoxCommentTime.Name = "textBoxCommentTime";
22302244 this.textBoxCommentTime.Size = new System.Drawing.Size(36, 19);
22312245 this.textBoxCommentTime.TabIndex = 1;
2246+ this.textBoxCommentTime.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
22322247 this.textBoxCommentTime.Validated += new System.EventHandler(this.textBox_Validated);
2233- this.textBoxCommentTime.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
22342248 //
22352249 // buttonComment
22362250 //
@@ -2394,9 +2408,9 @@
23942408 //
23952409 this.tabPage5.Controls.Add(this.groupBox33);
23962410 this.tabPage5.Controls.Add(this.groupBox22);
2397- this.tabPage5.Location = new System.Drawing.Point(4, 38);
2411+ this.tabPage5.Location = new System.Drawing.Point(4, 40);
23982412 this.tabPage5.Name = "tabPage5";
2399- this.tabPage5.Size = new System.Drawing.Size(552, 338);
2413+ this.tabPage5.Size = new System.Drawing.Size(552, 336);
24002414 this.tabPage5.TabIndex = 4;
24012415 this.tabPage5.Text = "画像・動画作成";
24022416 this.tabPage5.UseVisualStyleBackColor = true;
@@ -2673,10 +2687,10 @@
26732687 this.tabPage14.Controls.Add(this.checkBoxIsOverwrite);
26742688 this.tabPage14.Controls.Add(this.groupBoxTransIncludeWav);
26752689 this.tabPage14.Controls.Add(this.checkBoxIsFlvToMp3);
2676- this.tabPage14.Location = new System.Drawing.Point(4, 38);
2690+ this.tabPage14.Location = new System.Drawing.Point(4, 40);
26772691 this.tabPage14.Name = "tabPage14";
26782692 this.tabPage14.Padding = new System.Windows.Forms.Padding(3);
2679- this.tabPage14.Size = new System.Drawing.Size(552, 338);
2693+ this.tabPage14.Size = new System.Drawing.Size(552, 336);
26802694 this.tabPage14.TabIndex = 17;
26812695 this.tabPage14.Text = "動画変換";
26822696 this.tabPage14.UseVisualStyleBackColor = true;
@@ -2887,8 +2901,8 @@
28872901 this.textBoxTransCutStart.Name = "textBoxTransCutStart";
28882902 this.textBoxTransCutStart.Size = new System.Drawing.Size(41, 19);
28892903 this.textBoxTransCutStart.TabIndex = 1;
2904+ this.textBoxTransCutStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
28902905 this.textBoxTransCutStart.Validated += new System.EventHandler(this.textBox_Validated);
2891- this.textBoxTransCutStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
28922906 //
28932907 // textBoxCutListPath
28942908 //
@@ -2908,8 +2922,8 @@
29082922 this.textBoxTransCutEnd.Name = "textBoxTransCutEnd";
29092923 this.textBoxTransCutEnd.Size = new System.Drawing.Size(40, 19);
29102924 this.textBoxTransCutEnd.TabIndex = 2;
2925+ this.textBoxTransCutEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
29112926 this.textBoxTransCutEnd.Validated += new System.EventHandler(this.textBox_Validated);
2912- this.textBoxTransCutEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
29132927 //
29142928 // labelTransCut1
29152929 //
@@ -2965,8 +2979,8 @@
29652979 this.textBoxTransFadeIn.Name = "textBoxTransFadeIn";
29662980 this.textBoxTransFadeIn.Size = new System.Drawing.Size(35, 19);
29672981 this.textBoxTransFadeIn.TabIndex = 1;
2982+ this.textBoxTransFadeIn.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
29682983 this.textBoxTransFadeIn.Validated += new System.EventHandler(this.textBox_Validated);
2969- this.textBoxTransFadeIn.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
29702984 //
29712985 // checkBoxTransIsFadeOut
29722986 //
@@ -2986,8 +3000,8 @@
29863000 this.textBoxTransFadeOut.Name = "textBoxTransFadeOut";
29873001 this.textBoxTransFadeOut.Size = new System.Drawing.Size(35, 19);
29883002 this.textBoxTransFadeOut.TabIndex = 3;
3003+ this.textBoxTransFadeOut.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
29893004 this.textBoxTransFadeOut.Validated += new System.EventHandler(this.textBox_Validated);
2990- this.textBoxTransFadeOut.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForDouble_Validating);
29913005 //
29923006 // labelTransFadeIn
29933007 //
@@ -3125,9 +3139,9 @@
31253139 this.tabPage9.Controls.Add(this.label46);
31263140 this.tabPage9.Controls.Add(this.groupBox4);
31273141 this.tabPage9.Controls.Add(this.groupBox3);
3128- this.tabPage9.Location = new System.Drawing.Point(4, 38);
3142+ this.tabPage9.Location = new System.Drawing.Point(4, 40);
31293143 this.tabPage9.Name = "tabPage9";
3130- this.tabPage9.Size = new System.Drawing.Size(552, 338);
3144+ this.tabPage9.Size = new System.Drawing.Size(552, 336);
31313145 this.tabPage9.TabIndex = 8;
31323146 this.tabPage9.Text = "リスト作成・更新";
31333147 this.tabPage9.UseVisualStyleBackColor = true;
@@ -3242,10 +3256,10 @@
32423256 this.tabPage8.Controls.Add(this.checkBoxIsGettingDetailNew);
32433257 this.tabPage8.Controls.Add(this.label87);
32443258 this.tabPage8.Controls.Add(this.panel1);
3245- this.tabPage8.Location = new System.Drawing.Point(4, 21);
3259+ this.tabPage8.Location = new System.Drawing.Point(4, 22);
32463260 this.tabPage8.Name = "tabPage8";
32473261 this.tabPage8.Padding = new System.Windows.Forms.Padding(3);
3248- this.tabPage8.Size = new System.Drawing.Size(499, 225);
3262+ this.tabPage8.Size = new System.Drawing.Size(499, 224);
32493263 this.tabPage8.TabIndex = 6;
32503264 this.tabPage8.Text = "タグ検索";
32513265 this.tabPage8.UseVisualStyleBackColor = true;
@@ -3309,8 +3323,8 @@
33093323 this.textBoxTagSearchPageEnd.Name = "textBoxTagSearchPageEnd";
33103324 this.textBoxTagSearchPageEnd.Size = new System.Drawing.Size(42, 19);
33113325 this.textBoxTagSearchPageEnd.TabIndex = 8;
3326+ this.textBoxTagSearchPageEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating);
33123327 this.textBoxTagSearchPageEnd.Validated += new System.EventHandler(this.textBox_Validated);
3313- this.textBoxTagSearchPageEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating);
33143328 //
33153329 // textBoxTagSearchPageStart
33163330 //
@@ -3318,8 +3332,8 @@
33183332 this.textBoxTagSearchPageStart.Name = "textBoxTagSearchPageStart";
33193333 this.textBoxTagSearchPageStart.Size = new System.Drawing.Size(37, 19);
33203334 this.textBoxTagSearchPageStart.TabIndex = 7;
3335+ this.textBoxTagSearchPageStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating);
33213336 this.textBoxTagSearchPageStart.Validated += new System.EventHandler(this.textBox_Validated);
3322- this.textBoxTagSearchPageStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating);
33233337 //
33243338 // numericUpDownConditionMylistNew
33253339 //
@@ -3356,8 +3370,8 @@
33563370 this.textBoxTagSearchUpper.Size = new System.Drawing.Size(55, 19);
33573371 this.textBoxTagSearchUpper.TabIndex = 13;
33583372 this.textBoxTagSearchUpper.Visible = false;
3373+ this.textBoxTagSearchUpper.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber0_Validating);
33593374 this.textBoxTagSearchUpper.Validated += new System.EventHandler(this.textBox_Validated);
3360- this.textBoxTagSearchUpper.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber0_Validating);
33613375 //
33623376 // textBoxTagSearchLower
33633377 //
@@ -3366,8 +3380,8 @@
33663380 this.textBoxTagSearchLower.Size = new System.Drawing.Size(55, 19);
33673381 this.textBoxTagSearchLower.TabIndex = 11;
33683382 this.textBoxTagSearchLower.Visible = false;
3383+ this.textBoxTagSearchLower.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber0_Validating);
33693384 this.textBoxTagSearchLower.Validated += new System.EventHandler(this.textBox_Validated);
3370- this.textBoxTagSearchLower.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber0_Validating);
33713385 //
33723386 // labelTagSearchTo
33733387 //
@@ -3598,10 +3612,10 @@
35983612 this.tabPage4.Controls.Add(this.buttonAnalyzeRanking);
35993613 this.tabPage4.Controls.Add(this.label5);
36003614 this.tabPage4.Controls.Add(this.textBoxSavedRankDir);
3601- this.tabPage4.Location = new System.Drawing.Point(4, 21);
3615+ this.tabPage4.Location = new System.Drawing.Point(4, 22);
36023616 this.tabPage4.Name = "tabPage4";
36033617 this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
3604- this.tabPage4.Size = new System.Drawing.Size(499, 225);
3618+ this.tabPage4.Size = new System.Drawing.Size(499, 224);
36053619 this.tabPage4.TabIndex = 0;
36063620 this.tabPage4.Text = "ランキング解析";
36073621 this.tabPage4.UseVisualStyleBackColor = true;
@@ -3694,10 +3708,10 @@
36943708 //
36953709 this.tabPage1.Controls.Add(this.groupBox28);
36963710 this.tabPage1.Controls.Add(this.groupBox27);
3697- this.tabPage1.Location = new System.Drawing.Point(4, 21);
3711+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
36983712 this.tabPage1.Name = "tabPage1";
36993713 this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
3700- this.tabPage1.Size = new System.Drawing.Size(499, 225);
3714+ this.tabPage1.Size = new System.Drawing.Size(499, 224);
37013715 this.tabPage1.TabIndex = 7;
37023716 this.tabPage1.Text = "マイリスト・新着";
37033717 this.tabPage1.UseVisualStyleBackColor = true;
@@ -3742,8 +3756,8 @@
37423756 this.textBoxNewArrivalStart.Size = new System.Drawing.Size(46, 19);
37433757 this.textBoxNewArrivalStart.TabIndex = 0;
37443758 this.textBoxNewArrivalStart.Text = "1";
3759+ this.textBoxNewArrivalStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating);
37453760 this.textBoxNewArrivalStart.Validated += new System.EventHandler(this.textBox_Validated);
3746- this.textBoxNewArrivalStart.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating);
37473761 //
37483762 // textBoxNewArrivalEnd
37493763 //
@@ -3752,8 +3766,8 @@
37523766 this.textBoxNewArrivalEnd.Size = new System.Drawing.Size(46, 19);
37533767 this.textBoxNewArrivalEnd.TabIndex = 1;
37543768 this.textBoxNewArrivalEnd.Text = "10";
3769+ this.textBoxNewArrivalEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating);
37553770 this.textBoxNewArrivalEnd.Validated += new System.EventHandler(this.textBox_Validated);
3756- this.textBoxNewArrivalEnd.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxForNumber1_Validating);
37573771 //
37583772 // label17
37593773 //
@@ -3815,10 +3829,10 @@
38153829 this.tabPage16.Controls.Add(this.label104);
38163830 this.tabPage16.Controls.Add(this.label102);
38173831 this.tabPage16.Controls.Add(this.textBoxSavedRankNicoChartDir);
3818- this.tabPage16.Location = new System.Drawing.Point(4, 21);
3832+ this.tabPage16.Location = new System.Drawing.Point(4, 22);
38193833 this.tabPage16.Name = "tabPage16";
38203834 this.tabPage16.Padding = new System.Windows.Forms.Padding(3);
3821- this.tabPage16.Size = new System.Drawing.Size(499, 225);
3835+ this.tabPage16.Size = new System.Drawing.Size(499, 224);
38223836 this.tabPage16.TabIndex = 5;
38233837 this.tabPage16.Text = "ニコチャート";
38243838 this.tabPage16.UseVisualStyleBackColor = true;
@@ -3903,10 +3917,10 @@
39033917 this.tabPage12.Controls.Add(this.groupBox5);
39043918 this.tabPage12.Controls.Add(this.buttonSort);
39053919 this.tabPage12.Controls.Add(this.groupBox1);
3906- this.tabPage12.Location = new System.Drawing.Point(4, 21);
3920+ this.tabPage12.Location = new System.Drawing.Point(4, 22);
39073921 this.tabPage12.Name = "tabPage12";
39083922 this.tabPage12.Padding = new System.Windows.Forms.Padding(3);
3909- this.tabPage12.Size = new System.Drawing.Size(499, 225);
3923+ this.tabPage12.Size = new System.Drawing.Size(499, 224);
39103924 this.tabPage12.TabIndex = 2;
39113925 this.tabPage12.Text = "情報取得・更新";
39123926 this.tabPage12.UseVisualStyleBackColor = true;
@@ -4014,10 +4028,10 @@
40144028 this.tabPage15.Controls.Add(this.label98);
40154029 this.tabPage15.Controls.Add(this.textBoxDiff2Path);
40164030 this.tabPage15.Controls.Add(this.textBoxDiff1Path);
4017- this.tabPage15.Location = new System.Drawing.Point(4, 21);
4031+ this.tabPage15.Location = new System.Drawing.Point(4, 22);
40184032 this.tabPage15.Name = "tabPage15";
40194033 this.tabPage15.Padding = new System.Windows.Forms.Padding(3);
4020- this.tabPage15.Size = new System.Drawing.Size(499, 225);
4034+ this.tabPage15.Size = new System.Drawing.Size(499, 224);
40214035 this.tabPage15.TabIndex = 4;
40224036 this.tabPage15.Text = "差分作成";
40234037 this.tabPage15.UseVisualStyleBackColor = true;
@@ -4283,10 +4297,10 @@
42834297 //
42844298 this.tabPage6.Controls.Add(this.buttonShowFilterTester);
42854299 this.tabPage6.Controls.Add(this.buttonCalculateSum);
4286- this.tabPage6.Location = new System.Drawing.Point(4, 21);
4300+ this.tabPage6.Location = new System.Drawing.Point(4, 22);
42874301 this.tabPage6.Name = "tabPage6";
42884302 this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
4289- this.tabPage6.Size = new System.Drawing.Size(499, 225);
4303+ this.tabPage6.Size = new System.Drawing.Size(499, 224);
42904304 this.tabPage6.TabIndex = 8;
42914305 this.tabPage6.Text = "ツール";
42924306 this.tabPage6.UseVisualStyleBackColor = true;
@@ -4422,10 +4436,10 @@
44224436 this.tabPageFileDl.Controls.Add(this.groupBox32);
44234437 this.tabPageFileDl.Controls.Add(this.groupBox31);
44244438 this.tabPageFileDl.Controls.Add(this.groupBox18);
4425- this.tabPageFileDl.Location = new System.Drawing.Point(4, 38);
4439+ this.tabPageFileDl.Location = new System.Drawing.Point(4, 40);
44264440 this.tabPageFileDl.Name = "tabPageFileDl";
44274441 this.tabPageFileDl.Padding = new System.Windows.Forms.Padding(3);
4428- this.tabPageFileDl.Size = new System.Drawing.Size(552, 338);
4442+ this.tabPageFileDl.Size = new System.Drawing.Size(552, 336);
44294443 this.tabPageFileDl.TabIndex = 1;
44304444 this.tabPageFileDl.Text = "ファイルDL";
44314445 this.tabPageFileDl.UseVisualStyleBackColor = true;
@@ -4638,10 +4652,10 @@
46384652 this.tabPageLogin.Controls.Add(this.groupBox25);
46394653 this.tabPageLogin.Controls.Add(this.groupBox26);
46404654 this.tabPageLogin.Controls.Add(this.buttonCheckLogin);
4641- this.tabPageLogin.Location = new System.Drawing.Point(4, 38);
4655+ this.tabPageLogin.Location = new System.Drawing.Point(4, 40);
46424656 this.tabPageLogin.Name = "tabPageLogin";
46434657 this.tabPageLogin.Padding = new System.Windows.Forms.Padding(3);
4644- this.tabPageLogin.Size = new System.Drawing.Size(552, 338);
4658+ this.tabPageLogin.Size = new System.Drawing.Size(552, 336);
46454659 this.tabPageLogin.TabIndex = 19;
46464660 this.tabPageLogin.Text = "ログイン";
46474661 this.tabPageLogin.UseVisualStyleBackColor = true;
@@ -4932,10 +4946,10 @@
49324946 this.tabPageDlRank.Controls.Add(this.textBoxRankingDlHour);
49334947 this.tabPageDlRank.Controls.Add(this.groupBox17);
49344948 this.tabPageDlRank.Controls.Add(this.buttonDlRank);
4935- this.tabPageDlRank.Location = new System.Drawing.Point(4, 38);
4949+ this.tabPageDlRank.Location = new System.Drawing.Point(4, 40);
49364950 this.tabPageDlRank.Name = "tabPageDlRank";
49374951 this.tabPageDlRank.Padding = new System.Windows.Forms.Padding(3);
4938- this.tabPageDlRank.Size = new System.Drawing.Size(552, 338);
4952+ this.tabPageDlRank.Size = new System.Drawing.Size(552, 336);
49394953 this.tabPageDlRank.TabIndex = 21;
49404954 this.tabPageDlRank.Text = "ランキングDL";
49414955 this.tabPageDlRank.UseVisualStyleBackColor = true;
@@ -5261,9 +5275,9 @@
52615275 this.tabPageTagComment.Controls.Add(this.textBoxTagVideoId);
52625276 this.tabPageTagComment.Controls.Add(this.groupBox24);
52635277 this.tabPageTagComment.Controls.Add(this.groupBox16);
5264- this.tabPageTagComment.Location = new System.Drawing.Point(4, 38);
5278+ this.tabPageTagComment.Location = new System.Drawing.Point(4, 40);
52655279 this.tabPageTagComment.Name = "tabPageTagComment";
5266- this.tabPageTagComment.Size = new System.Drawing.Size(552, 338);
5280+ this.tabPageTagComment.Size = new System.Drawing.Size(552, 336);
52675281 this.tabPageTagComment.TabIndex = 22;
52685282 this.tabPageTagComment.Text = "タグ・コメント";
52695283 this.tabPageTagComment.UseVisualStyleBackColor = true;
@@ -5289,10 +5303,10 @@
52895303 this.tabPage3.Controls.Add(this.label45);
52905304 this.tabPage3.Controls.Add(this.selectFileBoxMakeUserIdFromFile);
52915305 this.tabPage3.Controls.Add(this.selectFileBoxMakeUserIdFromDir);
5292- this.tabPage3.Location = new System.Drawing.Point(4, 38);
5306+ this.tabPage3.Location = new System.Drawing.Point(4, 40);
52935307 this.tabPage3.Name = "tabPage3";
52945308 this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
5295- this.tabPage3.Size = new System.Drawing.Size(552, 338);
5309+ this.tabPage3.Size = new System.Drawing.Size(552, 336);
52965310 this.tabPage3.TabIndex = 23;
52975311 this.tabPage3.Text = "おまけ2";
52985312 this.tabPage3.UseVisualStyleBackColor = true;
@@ -5379,16 +5393,28 @@
53795393 this.label45.TabIndex = 0;
53805394 this.label45.Text = "投稿者情報作成";
53815395 //
5382- // buttonGetMyMylistList
5396+ // checkBoxIsSendingUserSession
53835397 //
5384- this.buttonGetMyMylistList.Location = new System.Drawing.Point(308, 226);
5385- this.buttonGetMyMylistList.Name = "buttonGetMyMylistList";
5386- this.buttonGetMyMylistList.Size = new System.Drawing.Size(146, 23);
5387- this.buttonGetMyMylistList.TabIndex = 9;
5388- this.buttonGetMyMylistList.Text = "自分のマイリスト番号取得";
5389- this.buttonGetMyMylistList.UseVisualStyleBackColor = true;
5390- this.buttonGetMyMylistList.Click += new System.EventHandler(this.buttonGetMyMylistList_Click);
5398+ this.checkBoxIsSendingUserSession.AutoSize = true;
5399+ this.checkBoxIsSendingUserSession.Location = new System.Drawing.Point(17, 202);
5400+ this.checkBoxIsSendingUserSession.Name = "checkBoxIsSendingUserSession";
5401+ this.checkBoxIsSendingUserSession.Size = new System.Drawing.Size(392, 16);
5402+ this.checkBoxIsSendingUserSession.TabIndex = 40;
5403+ this.checkBoxIsSendingUserSession.Text = "タグ・キーワード検索時に user_session を送る(通常はチェックしないでください)";
5404+ this.toolTip1.SetToolTip(this.checkBoxIsSendingUserSession, "チェックをONにすると、データがキャッシュされないようになります");
5405+ this.checkBoxIsSendingUserSession.UseVisualStyleBackColor = true;
53915406 //
5407+ // label52
5408+ //
5409+ this.label52.AutoSize = true;
5410+ this.label52.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
5411+ this.label52.ForeColor = System.Drawing.Color.Red;
5412+ this.label52.Location = new System.Drawing.Point(129, 169);
5413+ this.label52.Name = "label52";
5414+ this.label52.Size = new System.Drawing.Size(138, 12);
5415+ this.label52.TabIndex = 40;
5416+ this.label52.Text = "β版機能のため、使用注意";
5417+ //
53925418 // selectFileBoxMakeUserIdFromFile
53935419 //
53945420 this.selectFileBoxMakeUserIdFromFile.FileDialog = this.openFileDialog1;
@@ -5420,8 +5446,8 @@
54205446 this.Controls.Add(this.tabControl1);
54215447 this.Name = "FormMain";
54225448 this.Text = "ニコニコランキングメーカー";
5449+ this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormMain_FormClosed);
54235450 this.Load += new System.EventHandler(this.FormMain_Load);
5424- this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormMain_FormClosed);
54255451 this.splitContainer1.Panel1.ResumeLayout(false);
54265452 this.splitContainer1.Panel1.PerformLayout();
54275453 this.splitContainer1.Panel2.ResumeLayout(false);
@@ -5999,6 +6025,8 @@
59996025 private System.Windows.Forms.Button buttonMakeUserId;
60006026 private System.Windows.Forms.LinkLabel linkLabelMakuUserId;
60016027 private System.Windows.Forms.Button buttonGetMyMylistList;
6028+ private System.Windows.Forms.CheckBox checkBoxIsSendingUserSession;
6029+ private System.Windows.Forms.Label label52;
60026030 }
60036031 }
60046032
--- trunk/nicorank/nicorank/FormMain.cs (revision 230)
+++ trunk/nicorank/nicorank/FormMain.cs (revision 231)
@@ -395,6 +395,7 @@
395395 searching_tag_option.getting_detail_interval = textBoxGettingDetailInterval.Text;
396396 searching_tag_option.is_create_ticket = checkBoxSaveSearch.Checked;
397397 searching_tag_option.redundant_seatching_method = GetRedundantSeatchingMethod();
398+ searching_tag_option.is_sending_user_session = checkBoxIsSendingUserSession.Checked;
398399
399400 // 処理の最初にボタンのテキストを「中止」にする
400401 NicoRankManager.ThreadStarterDelegate ts_delegate = delegate {
@@ -1144,14 +1145,6 @@
11441145 StartThread(nicorank_mgr_.MakeAviFromScript, null, false);
11451146 }
11461147
1147- private void checkBoxIsRankFileCustomize_Click(object sender, EventArgs e)
1148- {
1149- if (checkBoxIsRankFileCustomize.Checked)
1150- {
1151- MessageBox.Show("ランクファイルのカスタマイズ機能はβ版であり、\r\n誤りを含む可能性があります。\r\n結果が正しいことを十分確認した上でご使用ください。");
1152- }
1153- }
1154-
11551148 private void listBoxSortNew_SelectedIndexChanged(object sender, EventArgs e)
11561149 {
11571150 string[] condition_label_text = { "", "再生数が", "", "コメント数が", "マイリスト数が" };
--- trunk/nicorank/nicorank/NicoTools/RankFile.cs (revision 230)
+++ trunk/nicorank/nicorank/NicoTools/RankFile.cs (revision 231)
@@ -593,6 +593,8 @@
593593
594594 public string save_html_dir;
595595
596+ public bool is_sending_user_session;
597+
596598 // 検索チケットID
597599 public string ticket_id;
598600 // 検索チケット作成フラグ
--- trunk/nicorank/nicorank/NicoTools/NicoNetworkManager.cs (revision 230)
+++ trunk/nicorank/nicorank/NicoTools/NicoNetworkManager.cs (revision 231)
@@ -13,6 +13,7 @@
1313 public class NicoNetworkManager
1414 {
1515 private NicoNetwork niconico_network_;
16+ private NicoNetwork niconico_no_user_session_network_ = new NicoNetwork();
1617 private MessageOut msgout_;
1718 private CancelObject cancel_object_;
1819
@@ -28,6 +29,8 @@
2829 niconico_network_ = network;
2930 msgout_ = msgout;
3031 cancel_object_ = cancel_object;
32+
33+ niconico_no_user_session_network_.ReloadCookie(NicoNetwork.CookieKind.None);
3134 }
3235
3336 public void SetDelegateSetDonwloadInfo(StringDelegate dlg)
@@ -203,6 +206,9 @@
203206 }
204207 else
205208 {
209+ // ニコニコ動画では、タグ(キーワード)検索の際、なぜかログインしているとアクセス制限がきつく、していないと弱い。
210+ // そのため、タグ検索のときだけログインしないというオプションを用意している。
211+ NicoNetwork network = (option.is_sending_user_session ? niconico_network_ : niconico_no_user_session_network_);
206212 wait_required = true;
207213 while (true)
208214 {
@@ -210,11 +216,11 @@
210216 {
211217 if (is_searching_kind_tag)
212218 {
213- str = niconico_network_.GetSearchTag(tag_word, page, option.GetSortMethod(), option.GetSearchOrder());
219+ str = network.GetSearchTag(tag_word, page, option.GetSortMethod(), option.GetSearchOrder());
214220 }
215221 else
216222 {
217- str = niconico_network_.GetSearchKeyword(tag_word, page, option.GetSortMethod(), option.GetSearchOrder());
223+ str = network.GetSearchKeyword(tag_word, page, option.GetSortMethod(), option.GetSearchOrder());
218224 }
219225 if (str.IndexOf("ここから先をご利用いただくにはログインしてください") >= 0)
220226 {
--- trunk/nicorank/nicorank/NicoTools/SearchingTicketManager.cs (revision 230)
+++ trunk/nicorank/nicorank/NicoTools/SearchingTicketManager.cs (revision 231)
@@ -232,6 +232,9 @@
232232 writer.WriteLine("getting_detail_interval={0}", option.getting_detail_interval ?? string.Empty);
233233
234234 writer.WriteLine("redundant_seatching_method={0}", option.redundant_seatching_method.ToString());
235+
236+ writer.WriteLine("save_html_dir={0}", option.save_html_dir);
237+ writer.WriteLine("is_sending_user_session={0}", option.is_sending_user_session);
235238 }
236239
237240 return option_text.ToString();
@@ -331,6 +334,12 @@
331334 case "redundant_seatching_method":
332335 option.redundant_seatching_method = (RedundantSearchingMethod)Enum.Parse(typeof(RedundantSearchingMethod), value);
333336 break;
337+ case "save_html_dir":
338+ option.save_html_dir = value;
339+ break;
340+ case "is_sending_user_session":
341+ option.is_sending_user_session = bool.Parse(value);
342+ break;
334343 default:
335344 break;
336345 }
Show on old repository browser