svnno****@sourc*****
svnno****@sourc*****
2010年 1月 1日 (金) 00:42:37 JST
Revision: 754
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=754
Author: rsk
Date: 2010-01-01 00:42:37 +0900 (Fri, 01 Jan 2010)
Log Message:
-----------
expack:
- P2Client::downloadDat() ã§ãƒ¢ãƒªã‚¿ãƒã‚’消費ã—ã¦ç”Ÿdatã‚’
å–å¾—ã§ãるよã†ã«ã—ãŸã€‚(rep2ã‹ã‚‰ã¯ã¾ã 利用ã§ããªã„)
Modified Paths:
--------------
p2ex/trunk/lib/P2Client.php
-------------- next part --------------
Modified: p2ex/trunk/lib/P2Client.php
===================================================================
--- p2ex/trunk/lib/P2Client.php 2009-12-31 13:39:08 UTC (rev 753)
+++ p2ex/trunk/lib/P2Client.php 2009-12-31 15:42:37 UTC (rev 754)
@@ -7,10 +7,6 @@
/**
* p2.2ch.net ƒNƒ‰ƒCƒAƒ“ƒg
- *
- * ƒvƒƒoƒCƒ_‹K§Žž‚É‘‚«ž‚Þ‚½‚ß‚ÉÝŒv‚µ‚½B
- * ƒ‚ƒŠƒ^ƒ|‚ðÁ”‚ÄdatŽæ“¾Œ ŒÀ‚Ì–³‚¢dat—Ž‚¿ƒXƒŒƒbƒh‚Ì
- * ¶dat‚ðŽæ“¾‚Å‚«‚é‚悤‚É‚È‚Á‚½‚È‚çA‘¦‘Ήž‚·‚éB
*/
class P2Client
{
@@ -27,6 +23,8 @@
const P2_ROOT_URI = 'http://p2.2ch.net/p2/';
const SCRIPT_NAME_READ = 'read.php';
const SCRIPT_NAME_POST = 'post.php';
+ const SCRIPT_NAME_INFO = 'info.php';
+ const SCRIPT_NAME_DAT = 'dat.php';
/**
* User-Agent
@@ -34,21 +32,31 @@
const HTTP_USER_AGENT = 'Monazilla/1.0 (rep2-expack-p2client)';
/**
- * ƒtƒH[ƒ€‚̃pƒ‰ƒ[ƒ^–¼
+ * HTTPƒŠƒNƒGƒXƒg‚̃pƒ‰ƒ[ƒ^–¼
*/
- const FIELD_NAME_LOGIN_ID = 'form_login_id';
- const FIELD_NAME_LOGIN_PASS = 'form_login_pass';
- const FIELD_NAME_POPUP = 'popup';
- const FIELD_NAME_FROM = 'FROM';
- const FIELD_NAME_MAIL = 'mail';
- const FIELD_NAME_MESSAGE = 'MESSAGE';
- const FIELD_NAME_BERES = 'submit_beres';
+ const REQUEST_PARAMETER_LOGIN_ID = 'form_login_id';
+ const REQUEST_PARAMETER_LOGIN_PASS = 'form_login_pass';
+ const REQUEST_PARAMETER_HOST = 'host';
+ const REQUEST_PARAMETER_BBS = 'bbs';
+ const REQUEST_PARAMETER_KEY = 'key';
+ const REQUEST_PARAMETER_LS = 'ls';
+ const REQUEST_PARAMETER_FROM = 'FROM';
+ const REQUEST_PARAMETER_MAIL = 'mail';
+ const REQUEST_PARAMETER_MESSAGE = 'MESSAGE';
+ const REQUEST_PARAMETER_POPUP = 'popup';
+ const REQUEST_PARAMETER_BERES = 'submit_beres';
/**
+ * “Ç‚Ýž‚ݳ”Û”»’è‚Ì‚½‚ß‚Ì•¶Žš—ñ
+ */
+ const NEEDLE_READ_NO_THREAD = '<b>p2 info - ”ƒT[ƒo‚©‚çÅV‚̃XƒŒƒbƒhî•ñ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B</b>';
+ const NEEDLE_DAT_NO_DAT = '<h4>p2 error: ‚²Žw’è‚ÌDAT‚Í‚ ‚è‚Ü‚¹‚ñ‚Å‚µ‚½</h4>';
+
+ /**
* ‘‚«ž‚ݳ”Û”»’è‚Ì‚½‚߂̳‹K•\Œ»
*/
- const REGEX_SUCCESS = '{<title>.*(?:‘‚«(?:ž|‚±)‚Ý‚Ü‚µ‚½|‘‚«ž‚ÝI—¹ - SubAll BBS).*</title>}is';
- const REGEX_COOKIE = '{<!-- 2ch_X:cookie -->|<title>¡ ‘‚«ž‚ÝŠm”F ¡</title>|>‘‚«ž‚ÝŠm”FB<}';
+ const REGEX_POST_SUCCESS = '{<title>.*(?:‘‚«(?:ž|‚±)‚Ý‚Ü‚µ‚½|‘‚«ž‚ÝI—¹ - SubAll BBS).*</title>}is';
+ const REGEX_POST_COOKIE = '{<!-- 2ch_X:cookie -->|<title>¡ ‘‚«ž‚ÝŠm”F ¡</title>|>‘‚«ž‚ÝŠm”FB<}';
// }}}
// {{{ properties
@@ -177,8 +185,8 @@
$postData[$name] = rawurlencode($value);
}
$postData = $this->getFormValues($dom, $form, $postData);
- $postData[self::FIELD_NAME_LOGIN_ID] = rawurlencode($this->_loginId);
- $postData[self::FIELD_NAME_LOGIN_PASS] = rawurlencode($this->_loginPass);
+ $postData[self::REQUEST_PARAMETER_LOGIN_ID] = rawurlencode($this->_loginId);
+ $postData[self::REQUEST_PARAMETER_LOGIN_PASS] = rawurlencode($this->_loginPass);
return $this->httpPost($uri, $postData, true);
}
@@ -192,20 +200,19 @@
* @param string $host
* @param string $bbs
* @param string $key
- * @param string|integer $ls
+ * @param string $ls
* @param mixed &$response
* @return string HTTPƒŒƒXƒ|ƒ“ƒXƒ{ƒfƒB
* @throws P2Exception
*/
- public function readThread($host, $bbs, $key, $ls = 1, &$response = null)
+ public function readThread($host, $bbs, $key, $ls = '1', &$response = null)
{
$getData = array(
- 'host' => (string)$host,
- 'bbs' => (string)$bbs,
- 'key' => (string)$key,
- 'ls' => (string)$ls,
+ self::REQUEST_PARAMETER_HOST => (string)$host,
+ self::REQUEST_PARAMETER_BBS => (string)$bbs,
+ self::REQUEST_PARAMETER_KEY => (string)$key,
+ self::REQUEST_PARAMETER_LS => (string)$ls,
);
-
$uri = self::P2_ROOT_URI . self::SCRIPT_NAME_READ;
$response = $this->httpGet($uri, $getData);
$dom = new P2DOM($response['body']);
@@ -218,20 +225,75 @@
}
}
+ if (strpos($response['body'], self::NEEDLE_READ_NO_THREAD) !== false) {
+ return null;
+ }
+
return $response['body'];
}
// }}}
+ // {{{ downloadDat()
+
+ /**
+ * dat‚ðŽæ‚èž‚Þ
+ *
+ * datŽæ“¾Œ ŒÀ‚ª–³‚¢ê‡‚ÍŽ©“®‚Ń‚ƒŠƒ^ƒ|‚ðÁ”‚Ädat‚ðŽæ“¾‚·‚éB
+ * Ž¸”s‚µ‚Ä‚à‹ƒ‚©‚È‚¢B
+ *
+ * @param string $host
+ * @param string $bbs
+ * @param string $key
+ * @param mixed &$response
+ * @return string ¶dat
+ * @throws P2Exception
+ */
+ public function downloadDat($host, $bbs, $key, &$response = null)
+ {
+ // ƒXƒŒƒbƒh‚Ì—L–³‚ðŠm‚©‚߂邽‚ßA‚Ü‚¸ read.php ‚ð’@‚B
+ // dat—Ž‚¿Œã‚ɃzƒXƒg‚ªˆÚ“]‚µ‚½ê‡AˆÚ“]Œã‚̃zƒXƒg–¼‚ŃAƒNƒZƒX‚µ‚Ä‚à
+ // ƒXƒŒƒbƒhî•ñ‚ðŽæ“¾‚Å‚«‚È‚©‚Á‚½‚Ƃ̃ƒbƒZ[ƒW‚ª•\Ž¦‚³‚ê‚éB
+ $html = $this->readThread($host, $bbs, $key, 'l1n', $response);
+ if ($html === null) {
+ return null;
+ }
+
+ // uƒ‚ƒŠƒ^ƒ|‚Åp2‚ÉŽæ‚èž‚ÞvƒŠƒ“ƒN‚Ì—L–³‚𒲂ׂéB
+ // –³‚¢ê‡‚ÍdatŽæ“¾Œ ŒÀ‚ª‚ ‚é‚à‚Ì‚Æ‚·‚éB
+ $dom = new P2DOM($html);
+ $expression = './/a[contains(@href, "' . self::SCRIPT_NAME_READ . '")'
+ . ' and contains(@href, "&moritapodat=")]';
+ $result = $dom->query($expression);
+ if ($result instanceof DOMNodeList && $result->length > 0) {
+ $anchor = $result->item(0);
+ $uri = self::P2_ROOT_URI
+ . substr($anchor->getAttribute('href'), self::SCRIPT_NAME_READ);
+ $response = $this->httpGet($uri);
+ }
+
+ // dat‚ðŽæ“¾‚·‚éB
+ // datŽæ“¾Œ ŒÀ‚ª‚È‚¢ê‡‚⃂ƒŠƒ^ƒ|’Ê’ ‚ÌŽc‚‚ª‘«‚è‚È‚¢ê‡‚̈—‚Í’[Ü‚éB
+ $getData = array(
+ self::REQUEST_PARAMETER_HOST => (string)$host,
+ self::REQUEST_PARAMETER_BBS => (string)$bbs,
+ self::REQUEST_PARAMETER_KEY => (string)$key,
+ );
+ $uri = self::P2_ROOT_URI . self::SCRIPT_NAME_DAT;
+ $response = $this->httpGet($uri, $getData);
+
+ if (strpos($response['body'], self::NEEDLE_DAT_NO_DAT) !== false) {
+ return null;
+ }
+
+ return $response['body'];
+ }
+
+ // }}}
// {{{ post()
/**
* ƒXƒŒƒbƒh‚É‘‚«ž‚Þ
*
- * csrfId‚ðŽæ“¾‚µA‚©‚ÂŒöŽ®p2‚ÌŠù“Ç‚ðÅV‚Ìó‘Ô‚É‚·‚邽‚ßA
- * ‚Ü‚¸ read.php ‚ð’@‚B
- * ’ÊM—Ê‚ðß–ñ‚Å‚«‚é‚悤‚É ls=l1n ‚Æ‚µ‚Ä‚¢‚éB
- * popup=1 ‚Í‘‚«ž‚ÝŒã‚̃y[ƒW‚ɃŠƒ_ƒCƒŒƒNƒg‚³‚¹‚È‚¢‚½‚ßB
- *
* @param string $host
* @param string $bbs
* @param string $key
@@ -246,24 +308,32 @@
public function post($host, $bbs, $key, $from, $mail, $message,
$beRes = false, &$response = null)
{
- $dom = new P2DOM($this->readThread($host, $bbs, $key, 'l1n', $response));
+ // csrfId‚ðŽæ“¾‚µA‚©‚ÂŒöŽ®p2‚ÌŠù“Ç‚ðÅV‚Ìó‘Ô‚É‚·‚邽‚ßA‚Ü‚¸ read.php ‚ð’@‚B
+ // ’ÊM—Ê‚ðß–ñ‚Å‚«‚é‚悤‚É ls=l1n ‚Æ‚µ‚Ä‚¢‚éB
+ // popup=1 ‚Í‘‚«ž‚ÝŒã‚̃y[ƒW‚ɃŠƒ_ƒCƒŒƒNƒg‚³‚¹‚È‚¢‚½‚ßB
+ $html = $this->readThread($host, $bbs, $key, 'l1n', $response);
+ if ($html === null) {
+ return false;
+ }
+
+ $dom = new P2DOM($html);
if ($form = $this->getPostForm($dom)) {
$uri = self::P2_ROOT_URI . self::SCRIPT_NAME_POST;
$postData = $this->getFormValues($dom, $form);
- $postData[self::FIELD_NAME_POPUP] = '1';
- $postData[self::FIELD_NAME_FROM] = rawurlencode($from);
- $postData[self::FIELD_NAME_MAIL] = rawurlencode($mail);
- $postData[self::FIELD_NAME_MESSAGE] = rawurlencode($message);
+ $postData[self::REQUEST_PARAMETER_POPUP] = '1';
+ $postData[self::REQUEST_PARAMETER_FROM] = rawurlencode($from);
+ $postData[self::REQUEST_PARAMETER_MAIL] = rawurlencode($mail);
+ $postData[self::REQUEST_PARAMETER_MESSAGE] = rawurlencode($message);
if ($beRes) {
- $postData[self::FIELD_NAME_BERES] = '1';
- } elseif (array_key_exists(self::FIELD_NAME_BERES, $postData)) {
- unset($postData[self::FIELD_NAME_BERES]);
+ $postData[self::REQUEST_PARAMETER_BERES] = '1';
+ } elseif (array_key_exists(self::REQUEST_PARAMETER_BERES, $postData)) {
+ unset($postData[self::REQUEST_PARAMETER_BERES]);
}
$response = $this->httpPost($uri, $postData, true);
- if (preg_match(self::REGEX_COOKIE, $response['body'])) {
+ if (preg_match(self::REGEX_POST_COOKIE, $response['body'])) {
$dom = new P2DOM($response['body']);
$expression = './/form[contains(@action, "' . self::SCRIPT_NAME_POST . '")]';
$result = $dom->query($expression);
@@ -273,7 +343,7 @@
}
}
- return (bool)preg_match(self::REGEX_SUCCESS, $response['body']);
+ return (bool)preg_match(self::REGEX_POST_SUCCESS, $response['body']);
} else {
throw new P2Exception('Post form not found.');
}