Navi2ch for Emacs (Part 22)

Navi2ch for Emacs (Part 22) (390ﾚｽ)
上下前次 1-新
通常表示 512ﾊﾞｲﾄ分割ﾚｽ栞

171: sage [] 2023/07/15(土) 12:34:17.12

その1
diff --git a/navi2ch-list.el b/navi2ch-list.el
index 4188735..a2e8cad 100644
--- a/navi2ch-list.el
+++ b/navi2ch-list.el
@@ -567,7 +567,7 @@ changed-list は '((board-id old-board new-board) ...) な alist。
(let ((board-id (cdr (assoc url navi2ch-list-board-id-alist))))
(or board-id
(save-match-data
-   (if (string-match "\\`http://.+/\$[^/]+\$/\\'" url)
+   (if (string-match "\\`https?://.+/\$[^/]+\$/\\'" url)
(match-string 1 url))))))

(defun navi2ch-list-make-board-txt ()
@@ -590,7 +590,7 @@ changed-list は '((board-id old-board new-board) ...) な alist。
(if (string-match "a" tag)
(let (url board-id id u)
(when (and (not ignore)
-      (string-match "href=\$.+/\\([^/]+\$/\\)" attr))
+      (string-match "href=\"?\$.+/\\([^/]+\$/\\)" attr))
(setq url (match-string 1 attr))
(setq url (or (cdr (assoc
url
@@ -624,7 +624,7 @@ changed-list は '((board-id old-board new-board) ...) な alist。

(defun navi2ch-list-valid-board (uri)
(save-match-data
-    (when (string-match "http://\$[^/]+\$/\$[^/]+\$/" uri)
+    (when (string-match "https?://\$[^/]+\$/\$[^/]+\$/" uri)
(let ((host (match-string 1 uri)))
(and (not (string-match navi2ch-list-invalid-host-regexp host))
(string-match navi2ch-list-valid-host-regexp host))))))

http://mevius.5ch.net/test/read.cgi/unix/1575011531/171

173: sage [] 2023/07/15(土) 12:40:59.47

その3の1

diff --git a/navi2ch-net.el b/navi2ch-net.el
index dc11ec5..972c97f 100644
--- a/navi2ch-net.el
+++ b/navi2ch-net.el
@@ -228,7 +228,8 @@ nil なら常に再接続する。")
host (cdr (assq 'host list))
file (cdr (assq 'file list))
port (cdr (assq 'port list))
-            host2ch (cdr (assq 'host2ch list))))
+            host2ch (cdr (assq 'host2ch list))
+     rest (cdr (assq 'rest list))))
(when navi2ch-net-http-proxy
(setq credentials (navi2ch-net-http-basic-credentials
navi2ch-net-http-proxy-userid
@@ -257,11 +258,8 @@ nil なら常に再接続する。")
(setq proc nil)
(unless (navi2ch-net-down-p host)
(condition-case nil
-              (if (string-match "^https://" url)
-                  (setq proc (funcall 'open-tls-stream
-                                      navi2ch-net-connection-name buf host "443"))
-                (setq proc (funcall navi2ch-open-network-stream-function
-                                    navi2ch-net-connection-name buf host port)))
+       (setq proc (apply navi2ch-open-network-stream-function
+    navi2ch-net-connection-name buf host port rest))
(error (navi2ch-net-add-down-host host)))))
(when proc
(with-current-buffer buf

http://mevius.5ch.net/test/read.cgi/unix/1575011531/173

174: sage [] 2023/07/15(土) 12:44:09.11

その3の2
@@ -304,6 +302,10 @@ nil なら常に再接続する。")
(navi2ch-net-cleanup-vars)
(setq navi2ch-net-process proc))))

+(defun navi2ch-net-split-url-scheme-to-rest (scheme)
+  (if (string-prefix-p "https:" scheme)
+        '(:type tls)))
+
(defun navi2ch-net-split-url (url &optional proxy)
(let (host2ch authinfo user pass)
(string-match "https?://\$[^@/]+@\$?\$[^/]+\$" url)
@@ -324,16 +326,21 @@ nil なら常に再接続する。")
(cons 'host (match-string 2 proxy))
(cons 'file url)
(cons 'port (string-to-number (match-string 3 proxy)))
-           (cons 'host2ch host2ch)))
-      (string-match "https?://\$?:[^@/]+@\$?\$[^/:]+\$\$?::\\([0-9]+\$\\)?\$.*\$" url)
+           (cons 'host2ch host2ch)
+    (cons 'rest (navi2ch-net-split-url-scheme-to-rest (match-string 1 proxy)))))
+      (string-match "\$https?://\$\$?:[^@/]+@\$?\$[^/:]+\$\$?::\\([0-9]+\$\\)?\$.*\$" url)
(list
(cons 'user user)
(cons 'pass pass)

http://mevius.5ch.net/test/read.cgi/unix/1575011531/174

175: sage [その3の3 最後] 2023/07/15(土) 12:44:44.17

-       (cons 'host (match-string 1 url))
-       (cons 'port (string-to-number (or (match-string 2 url)
-      "80")))
-       (cons 'file (match-string 3 url))
-       (cons 'host2ch host2ch)))))
+       (cons 'host (match-string 2 url))
+       (cons 'port
+      (if (match-string 3 url)
+   (string-to-number (match-string 3 url))
+        (if (string-prefix-p "https:" (match-string 1 url))
+     443 80)))
+       (cons 'file (match-string 4 url))
+       (cons 'host2ch host2ch)
+       (cons 'rest (navi2ch-net-split-url-scheme-to-rest (match-string 1 url)))))))

(defun navi2ch-net-http-basic-credentials (user pass)
"USER と PASS から Basic 認証の証明書 (?) 部分を返す。"
@@ -999,7 +1006,7 @@ This is taken from RFC 2396.")
"BBS_\$TITLE_PICTURE\\|FIGUREHEAD\$=\$.+\$" content))
(setq src (match-string 2 content))
(let (url file)
- (setq url (if (string-match "http://" src)
+ (setq url (if (string-match "https?://" src)
src
(navi2ch-board-get-url board src)))
(string-match "/\$[^/]+\$$" url)

http://mevius.5ch.net/test/read.cgi/unix/1575011531/175

176: sage [その1] 2023/07/15(土) 12:50:19.62

なんかタブが潰れたり文字参照になってたりなので、gzip + base64

H4sICC0QsmQAA2RpZmYtMjAyMzA3MTYudHh0ALVYbXPaOBD+DH+hX3Qcc9gHIkBIAum0SdMmbXqd
ppOkNzct1zthC3BjbGKLJp25H3+7K9v4DUKmUyatQdpd7WqffbSy7UwmjPOpo5jY8cQ3p2fNuOuE
qi1dNs6PVB3Plves3x0MDnb32m3RkwNL2Kzb6ez3+1XOedFKtdlsllg6PmZ8b/+gdcCa+gED1kx4
U2mTDHtSP6lfPDFOWMMwxr4IbO7YzHdtTj+YJ+/0N5O1222TxN+iuEBt+PXLr0+qjDHDlYqlLBiW
HTBDhKFvsWXgsrRfPJbiZMSED5oAI37A4rkqqxih+Cb5XCjQs4USVV4BGWfCjFAFjjfVU6w2Gv07
U2pxuLPTbu6MRsbnLzt/N0cjE743ari6WW1u1AyPNumyCtPeaU+0BdalSVM7X2WGLSdLLxvmXNzI
KFZ1D7tj6mwMO5QNevyUbJTHKmpMiWkqHMoY5iZZCP6WKFAx7mbSg/R5kEjPV8yZen4gTUhABbVz
lmeBnDyDvSvsoFljQqnAxP1fr1g72qzLUNUIpbolJOXTsEYKoJTCIE5XosBhmhKx3+tjIvTjpySi
HBbfQCa2A/vvEPiLWKcc6Tzkdk1jPbtdq++IWrDZ3KhPiH/AAkvjxJj5sCvFEnAI/5UVVLKLZQJ3
PB06muKBnMr7BcPvZgLKDcrrVKkA7TJ6nS9d5YzHYZZiU6MRzQ5kfzjpDdptuysng91uOc2m9bJU
m55BXO329xBX+gEDV9cvLq9b7PT9qxZ7f3F2fnl1TXh5/eaic1EPnv716mt9WL8B9NQQMk+fPuWP
+4AWR6CFyzHkKHYL/8HIV2kpbgnXHQvrBjmoua3ob/5COb4nXCaCaahRSniK1XRdLEOJyqjDZ2ru
RlSeFSIqjJcAMtSsSXTYo93Sj8fuVlzUDXm7FG5yjqSWt4Q1k3wqVTwDrOB7ISKXTRxXck/MkdhS
kwDktRV3dPj5yzGUyTHUiaYtYqpVxW20EVfdJisJPccRANShuHjibCJBC1mivCo1H9JnFea6SvFk

http://mevius.5ch.net/test/read.cgi/unix/1575011531/176

上下前次 1-新書関写板覧索設栞歴

あと 193 ﾚｽあります
ｽﾚ情報赤ﾚｽ抽出画像ﾚｽ抽出歴の未読ｽﾚ AAｻﾑﾈｲﾙ

ぬこの手ぬこTOP 0.026s