OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

stable: Commit

安定版


Commit MetaInfo

Revisione7be2014aa808a7af2504c4cd994739c008c813c (tree)
Zeit2013-09-12 19:23:59
Autorakira001 <akohta001@gmai...>
Commiterakira001

Log Message

release 2.3.6.4
deal with new 2chviewer protocol.

Ändern Zusammenfassung

Diff

--- a/NT2chCtrl245/Properties/AssemblyInfo.cs
+++ b/NT2chCtrl245/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
3232 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
3333 // 既定値にすることができます:
3434 // [assembly: AssemblyVersion("1.0.*")]
35-[assembly: AssemblyVersion("2.3.6.3")]
35+[assembly: AssemblyVersion("2.3.6.4")]
3636 [assembly: AssemblyFileVersion("2.3.6.0")]
--- a/NT2chCtrl45/Properties/AssemblyInfo.cs
+++ b/NT2chCtrl45/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
5151 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
5252 // 既定値にすることができます:
5353 // [assembly: AssemblyVersion("1.0.*")]
54-[assembly: AssemblyVersion("2.3.6.3")]
54+[assembly: AssemblyVersion("2.3.6.4")]
5555 [assembly: AssemblyFileVersion("2.3.6.2")]
--- a/NT2chObject45/Properties/AssemblyInfo.cs
+++ b/NT2chObject45/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
3232 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
3333 // 既定値にすることができます:
3434 // [assembly: AssemblyVersion("1.0.*")]
35-[assembly: AssemblyVersion("2.3.6.3")]
35+[assembly: AssemblyVersion("2.3.6.4")]
3636 [assembly: AssemblyFileVersion("2.3.6.0")]
--- a/NT2chStyle45/Properties/AssemblyInfo.cs
+++ b/NT2chStyle45/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
5151 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
5252 // 既定値にすることができます:
5353 // [assembly: AssemblyVersion("1.0.*")]
54-[assembly: AssemblyVersion("2.3.6.3")]
54+[assembly: AssemblyVersion("2.3.6.4")]
5555 [assembly: AssemblyFileVersion("2.3.6.0")]
--- a/NT2chView45/NTExportUtil.cs
+++ b/NT2chView45/NTExportUtil.cs
@@ -182,7 +182,14 @@ namespace NT2chView
182182 NTThreadTitle tt = board.findThreadTitleByDatName(
183183 threadDesc.getDatName());
184184 if (tt == null)
185- return;
185+ {
186+ if (NTUserPreference.MaruIsEnabled)
187+ {
188+ tt = board.addExtraThread(threadDesc.getDatName(), null);
189+ }
190+ if (tt == null)
191+ return;
192+ }
186193
187194 NTAppState.getMainWindow().OpenNewThread(tt);
188195 }
--- a/NT2chView45/NTFavoriteThread.cs
+++ b/NT2chView45/NTFavoriteThread.cs
@@ -294,6 +294,13 @@ namespace NT2chView
294294 if (NTAppState.getMainWindow().OpenNewBoard(board))
295295 {
296296 NTThreadTitle tt = board.findThreadTitleByDatName(mAddress);
297+ if (tt == null)
298+ {
299+ if (NTUserPreference.MaruIsEnabled)
300+ {
301+ tt = board.addExtraThread(mAddress, null);
302+ }
303+ }
297304 if (tt != null)
298305 {
299306 NTAppState.getMainWindow().OpenNewThread(tt);
--- a/NT2chView45/NtNet/NTHttpAccess.cs
+++ b/NT2chView45/NtNet/NTHttpAccess.cs
@@ -517,9 +517,15 @@ namespace NT2chView.NtNet
517517 dat = NTHttpUtils.ridSuffixFromDatName(datName);
518518 if (!NTHttpUtils.parseHostAddress(address, out host, out board))
519519 return false;
520+ string subDomain, parentDomain;
521+ if (!NTHttpUtils.parseSubDomain(host, out subDomain, out parentDomain))
522+ return false;
520523
521- string url = NTHttpUtils.HTTP_PROTOCOL + host
522- + "/test/offlaw.cgi/" + board + "/" + dat + "/?raw=0.0&sid=" + sid;
524+ string url = NTHttpUtils.HTTP_PROTOCOL + NTHttpUtils.KAKO_SITE +
525+ parentDomain + NTHttpUtils.HTTP_SLASH + subDomain +NTHttpUtils.HTTP_SLASH +
526+ board + "/" + dat + "/?raw=0.0&sid=" + sid;
527+ //string url = NTHttpUtils.HTTP_PROTOCOL + host
528+ // + "/test/offlaw.cgi/" + board + "/" + dat + "/?raw=0.0&sid=" + sid;
523529
524530 NTHttpGetClient httpClient = new NTHttpGetClient(url);
525531
--- a/NT2chView45/NtNet/NTHttpUtils.cs
+++ b/NT2chView45/NtNet/NTHttpUtils.cs
@@ -13,6 +13,7 @@ namespace NT2chView.NtNet
1313 public const string HTTP_WRITE_CGI_PATH = @"/test/bbs.cgi";
1414 public const string HTTP_READ_CGI_PATH = @"/test/read.cgi/";
1515 public const string HTTP_SLASH = @"/";
16+ public const string HTTP_DOT = ".";
1617 public const string DAT_SUFFIX = ".dat";
1718 public const string CGI_SUFFIX = ".cgi";
1819 public const string DEFAULT_SUBMIT = "書き込む";
@@ -20,6 +21,7 @@ namespace NT2chView.NtNet
2021 public const string HOST_2CH = ".2ch.net";
2122 public const string MARU_HOST = "2chv.tora3.net";
2223 public const string MARU_LOGIN_PATH = "/futen.cgi";
24+ public const string KAKO_SITE = "rokka.";
2325 public const string LOCAL_DAT_TITEL_PREFIX = "[DAT落]";
2426
2527
@@ -144,6 +146,20 @@ namespace NT2chView.NtNet
144146 return true;
145147 }
146148
149+ public static bool parseSubDomain(string host, out string subDomain, out string parentDomain)
150+ {
151+ subDomain = null;
152+ parentDomain = null;
153+ if (host == null)
154+ return false;
155+
156+ int idx = host.IndexOf(HTTP_DOT);
157+ if (idx < 0)
158+ return false;
159+ subDomain = host.Substring(0, idx);
160+ parentDomain = host.Substring(idx + 1);
161+ return true;
162+ }
147163 public static bool parseHostAddress(string source, out string hostName, out string boardName)
148164 {
149165 hostName = string.Empty;
--- a/NT2chView45/Properties/AssemblyInfo.cs
+++ b/NT2chView45/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
5151 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
5252 // 既定値にすることができます:
5353 // [assembly: AssemblyVersion("1.0.*")]
54-[assembly: AssemblyVersion("2.3.6.3")]
55-[assembly: AssemblyFileVersion("2.3.6.3")]
54+[assembly: AssemblyVersion("2.3.6.4")]
55+[assembly: AssemblyFileVersion("2.3.6.4")]
Show on old repository browser