Changeset 7888

Timestamp:

03/13/08 16:52:30 (5 years ago)

Author:

motemen

Message:

• HatenaGetEntry?() を追加
  
• HatenaPostEntry?() の文字化け修正
  
• HatenaPostEntry?() もエントリ情報を返す
  

Files:

• lang/vim/hatena/plugin/hatena.vim (modified) (4 diffs)

lang/vim/hatena/plugin/hatena.vim

@@ -385 +385 @@
     let [base_url, user, cookie_file] = a:login_info
 
-    if base_url =~ 'g[.]hatena'
-        let fenc = 'utf-8'
-    else
-        let fenc = 'euc-jp'
-    endif
+    "if base_url =~ 'g[.]hatena'
+    "    let fenc = 'utf-8'
+    "else
+    "    let fenc = 'utf-8'
+    "endif
+    let fenc = 'utf-8'
+
+    let paste_save = &paste
 
     if has_key(a:entry, 'body_file')
@@ -400 +403 @@
         let body_file = tempname()
         execute 'new ' . body_file
-        call append(0, a:entry.body)
+        set paste
+        normal! C=a:entry.body
         let &fileencoding = fenc
         write
@@ -408 +412 @@
     let title_file = tempname()
     execute 'new ' . title_file
+    set paste
     normal! C=a:entry.title
     let &fileencoding = fenc
     write
+    bdelete
+
+    let &paste = paste_save
 
     let post_url = base_url . user . '/'
     if has_key(a:entry, 'date') && has_key(a:entry, 'timestamp')
-        let post_url += a:entry.date . '/' . a:entry.timestamp . '/'
-    endif
-
-    return system(printf('%s %s -b "%s" -F "rkm=%s" -F "title=<%s" -F "body=<%s" -D -',
+        let post_url .= a:entry.date . '/' . a:entry.timestamp
+    endif
+
+    let g:post_files = [title_file, body_file]
+
+    let json = system(printf('%s %s -b "%s" -F "rkm=%s" -F "title=<%s" -F "body=<%s" -D -',
                 \ s:curl_cmd,
                 \ post_url,
@@ -425 +435 @@
                 \ body_file
                 \ ))
+
+    let m = matchlist(json, '\v''path'':''/[^/]+/([^/]{-})/([^/]{-})''')
+    return { 'date': m[1], 'timestamp': m[2] }
+endfunction
+
+" はてなダイアリー/グループに新しいエントリを投稿する
+" login_info: HatenaLogin() で得られるもの
+" rkm: HatenaGetRKM() などで得られるもの
+" entry: エントリの情報、以下のキーを持つ
+"  * date
+"  * timestamp
+function! HatenaGetEntry(login_info, rkm, entry)
+    let [base_url, user, cookie_file] = a:login_info
+
+    if base_url =~ 'g[.]hatena'
+        let fenc = 'utf-8'
+    else
+        let fenc = 'euc-jp'
+    endif
+
+    let get_url = base_url . user . '/' . a:entry.date . '/' . a:entry.timestamp . '?mode=json'
+    let json = system(printf('%s %s -b "%s"',
+                \ s:curl_cmd,
+                \ get_url,
+                \ cookie_file,
+                \ ))
+
+    let json = iconv(json, fenc, &encoding)
+
+    let m = matchlist(json, '\v.*''body'':''(.{-})''&.*''title'':''(.{-})''')
+
+    if len(m)
+        let [body, title] = m[1:2]
+        let body = substitute(body, '\\n', "\n", 'g')
+        return { 'date': a:entry.date, 'timestamp': a:entry.timestamp, 'body': body, 'title': title }
+    else
+        return { }
+    endif
 endfunction