Changeset 6199 for lang/vim

Timestamp:

02/05/08 04:31:52 (10 months ago)

Author:

todesking

Message:

lang/vim/hatena: エントリのパース機能を追加、ログイン/更新関数の公開、win環境において取得エントリにごみがまざるのを抑制。

Location:

lang/vim/hatena

Files:

• . (modified) (1 prop)
• plugin/hatena.vim (modified) (11 diffs)

lang/vim/hatena/plugin/hatena.vim

@@ -102 +102 @@
 let g:hatena_edit_command = 'edit!'
 
-let s:curl_cmd = 'curl -k'
+let s:curl_cmd = 'curl -k --silent'
 if exists('g:chalice_curl_options') " http://d.hatena.ne.jp/smeghead/20070709/hatenavim
   let s:curl_cmd = s:curl_cmd . ' ' . g:chalice_curl_options
@@ -128 +128 @@
         let hatena_user = g:hatena_user
     endif
-
+        return HatenaLogin(hatena_user)
+endfunction
+
+"TODO: この関数をグローバルにするセキュリティリスクについて考察
+function! HatenaLogin(user)
+        let hatena_user=a:user
     let [base_url, user] = s:GetBaseURLAndUser(hatena_user)
 
@@ -149 +154 @@
                 endif
                 if reply_header !~? 'Location:'
-                        echo 'ログインしてます'
-                        return [base_url, user, cookie_file]
-                else
-                        call delete(cookie_file)
-                endif
+            echo 'ログインしてます'
+            return [base_url, user, cookie_file]
+        else
+            call delete(cookie_file)
+        endif
     endif
 
@@ -197 +202 @@
     endif
 
+        if !len(date)
+                echo 'キャンセルしました'
+                return
+        endif
+
     " 20051124, 2005-11-24, 11/24, 24 といった日付を認識
     let pat = '\%(\%(\(\d\d\d\d\)[/-]\=\)\=\(\d\d\)[/-]\=\)\=\(\d\d\)'
@@ -215 +225 @@
     if !strlen(month) | let month = strftime('%m') | endif
 
-    " 編集ページを取得
-    let content = system(s:curl_cmd . ' "' . base_url . user . '/edit?date=' . year . month . day . '" -b "' . cookie_file . '"')
-    if base_url =~ 'g.hatena'
-        let content = iconv(content, 'utf-8', &enc)
-        let fenc = 'utf-8'
-    else
-        let content = iconv(content, 'euc-jp', &enc)
-        let fenc = 'euc-jp'
-    endif
+        let content = HatenaLoadContent(base_url,user,year,month,day,cookie_file)
 
     " セッション(編集バッファ)を作成
@@ -230 +232 @@
     set filetype=hatena
     setlocal noswapfile
-    let &fileencoding = fenc
-    let b:rkm = matchstr(content, 'name="rkm"\s*value="\zs[^"]*\ze"')
+    let &fileencoding = content['fenc']
+    let b:rkm = content['rkm']
 
     if !strlen(b:rkm)
@@ -245 +247 @@
     let b:month = month
     let b:day   = day
-    let diary_title = matchstr(content, '<title>\zs.\{-}\ze</title>')
-    let day_title   = matchstr(content, '<input .\{-}name="title" .\{-}value="\zs.\{-}\ze"')
-    let timestamp   = matchstr(content, 'name="timestamp"\s*value="\zs[^"]*\ze"')
-    let body        = s:HtmlUnescape(matchstr(content, '<textarea.\{-}name="body"[^>]*>\zs.\{-}\ze</textarea>'))
     let b:trivial   = g:hatena_always_trivial
-    let b:diary_title   = diary_title
-    let b:day_title     = day_title
-    let b:timestamp     = timestamp
+    let b:diary_title   = content['diary_title']
+    let b:day_title     = content['day_title']
+    let b:timestamp     = content['timestamp']
     let b:prev_titlestring = &titlestring
 
-    autocmd BufWritePost <buffer> call s:HatenaUpdate() | autocmd! BufWritePost <buffer>
+    autocmd BufWritePost <buffer> call s:HatenaUpdate() | set readonly |let &titlestring = b:prev_titlestring | bdelete
     autocmd WinLeave <buffer> let &titlestring = b:prev_titlestring
     autocmd WinEnter <buffer> let &titlestring = b:diary_title . ' ' . b:year . '-' . b:month . '-' . b:day . ' [' . b:hatena_login_info[1] . ']'
@@ -262 +260 @@
     let nopaste = !&paste   
     set paste
-    execute 'normal i' . body
+    execute 'normal i' . content['body']
     if nopaste
         set nopaste
     endif
-
+        set nomodified
+endfunction
+
+"指定先から一日分のエントリを取得。
+"return: dictionary {
+"       diary_title, day_title, timestamp, rkm, body, fenc
+"}
+function! HatenaLoadContent(base_url,user,year,month,day,cookie_file)
+    " 編集ページを取得
+    let content = system(s:curl_cmd . ' "' . a:base_url . a:user . '/edit?date=' . a:year.a:month.a:day . '" -b "' . a:cookie_file . '"')
+    if a:base_url =~ 'g.hatena'
+        let content = iconv(content, 'utf-8', &enc)
+        let fenc = 'utf-8'
+    else
+        let content = iconv(content, 'euc-jp', &enc)
+        let fenc = 'euc-jp'
+    endif
+        let result=s:HatenaParseContent(content)
+        let result['fenc']=fenc
+        let result['year']=a:year
+        let result['month']=a:month
+        let result['day']=a:day
+        return result
+endfunction
+
+function! s:HatenaParseContent(content)
+    let diary_title = matchstr(a:content, '<title>\zs.\{-}\ze</title>')
+    let day_title   = matchstr(a:content, '<input .\{-}name="title" .\{-}value="\zs.\{-}\ze"')
+    let timestamp   = matchstr(a:content, 'name="timestamp"\s*value="\zs[^"]*\ze"')
+    let rkm         = matchstr(a:content, 'name="rkm"\s*value="\zs[^"]*\ze"')
+    let body        = s:HtmlUnescape(matchstr(a:content, '<textarea.\{-}name="body"[^>]*>\zs.\{-}\ze</textarea>'))
+        let result={}
+        let result['diary_title']=diary_title
+        let result['day_title']=day_title
+        let result['timestamp']=timestamp
+        let result['rkm']=rkm
+        let result['body']=body
+        return result
 endfunction
 
@@ -286 +321 @@
     let [base_url, user, cookie_file] = b:hatena_login_info
 
-    " まずは全消去
-    let post_data = ' -F mode=enter'
-                    \ . ' -F year=' . b:year . ' -F month=' . b:month . ' -F day=' . b:day
-                    \ . ' -F rkm=' . b:rkm
-                    \ . ' -F body= -F title='
-    call system(s:curl_cmd . ' ' . base_url . user . '/edit -b "' . cookie_file . '"' . post_data)
-
     if a:0 > 0
         let b:day_title = a:1
@@ -302 +330 @@
         write
     endif
+
     let body_file = expand('%')
-
+        let diary={'timestamp':b:timestamp, 'rkm':b:rkm, 'year':b:year, 'month':b:month, 'day':b:day, 'day_title':b:day_title}
+
+        let result=HatenaPost(base_url,user,cookie_file,diary,body_file)
+
+    echo '更新しました'
+endfunction
+
+function! HatenaPost(base_url,user,cookie_file,diary,body_file)
+        if a:body_file == ""
+                let body_file=tempname()
+                execute 'new '.body_file
+                call append(0,a:diary['body'])
+                write
+                hide
+                let &modified=0
+                "bdelete
+        else
+                let body_file=a:body_file
+        endif
+    " まずは全消去
     let post_data = ' -F mode=enter'
-                    \ . ' -F timestamp=' . b:timestamp . ' -F rkm=' . b:rkm
-                    \ . ' -F year=' . b:year . ' -F month=' . b:month . ' -F day=' . b:day
-                    \ . ' -F date=' . b:year . b:month . b:day
+                    \ . ' -F year=' . a:diary.year . ' -F month=' . a:diary.month . ' -F day=' . a:diary.day
+                    \ . ' -F rkm=' . a:diary.rkm
+                    \ . ' -F body= -F title='
+    call system(s:curl_cmd . ' ' . a:base_url . a:user . '/edit -b "' . a:cookie_file . '"' . post_data)
+
+    " ポスト
+    let post_data = ' -F mode=enter'
+                    \ . ' -F timestamp=' . a:diary['timestamp'] . ' -F rkm=' . a:diary['rkm']
+                    \ . ' -F year=' . a:diary['year'] . ' -F month=' . a:diary['month'] . ' -F day=' . a:diary['day']
+                    \ . ' -F date=' . a:diary['year'].a:diary['month'].a:diary['day']
                     \ . ' -F "body=<' . body_file . '"'
-                    \ . ' -F image= -F title=' . b:day_title
-
-    " ポスト
-    let result = system(s:curl_cmd . ' ' . base_url . user . '/edit -b "' . cookie_file . '"' . post_data . ' -D -')
-
-    echo '更新しました'
+                    \ . ' -F image= -F title=' . a:diary['day_title']
+    return system(s:curl_cmd . ' ' . a:base_url . a:user . '/edit -b "' . a:cookie_file . '"' . post_data . ' -D -')
 endfunction
 
@@ -350 +401 @@
 endfunction
 
+"returns array of dictionaries.
+"[entry1,entry2,...]
+"each item is
+"{ 'eid':entry-id, 'title':title, 'body':body }
+" TODO: タイトルのない冒頭部
+function! HatenaParseEntries(body)
+        new
+        if type(a:body)==type('')
+                let body=split(a:body,"",1)
+        else "expect is list
+                let body=a:body
+        endif
+        call append(0,body)
+        call cursor(1,1)
+        let l:es=[]
+        let l:e=s:FindNextEntry()
+        while l:e
+                let l:next_e=s:FindNextEntry()
+                call add(l:es,[l:e,next_e?next_e-1:line('$')])
+                let l:e=l:next_e
+        endwhile
+        let l:result=[]
+        for [l:st,l:ed] in l:es
+                call add(result,HatenaParseEnrty(getline(l:st),getline(l:st+1,l:ed)))
+        endfor
+        let &modified=0
+        close
+        return l:result
+endfunction     
+
+function! HatenaParseEnrty(title,body)
+        let [eid,title]=matchlist(a:title,'^\*\%(\(\%(\w\|-\)\+\)\*\)\?\(.*\)$')[1:2]
+        let body=a:body
+        return {'eid':eid, 'title':title, 'body':body}
+endfunction
+
+"エントリのリストを文字列に直す HatenaParseEntriesの逆
+"諸般の事情(appendの仕様?)により、各行を要素に持つリストを返す。
+function! HatenaExpandEntries(entries)
+        new
+        for e in a:entries
+                call append(line('$'),'*'.e['eid'].'*'.e['title'])
+                call append(line('$'),e['body'])
+        endfor
+        execute '1delete'
+        let result=getline(1,'$')
+        let &modified=0
+        bdelete
+        return result
+endfunction
+
+"カーソル位置以降のエントリを探す
+function! s:FindNextEntry()
+        while 1
+                "skip super pre
+                if search('^>|\w*|$','ce',line('.'))
+                        if !search('^||<$','ce') "broken spre
+                                return 0
+                        endif
+                endif
+                "find next entry
+                let entry=search('^\*\(\%(\w\|-\)\+\)\*\(.*\)$','ce',line('.'))
+                if entry || line('.') >= line('$')
+                        call cursor(line('.')+1,1)
+                        return entry
+                endif
+                call cursor(line('.')+1,1)
+        endwhile
+endfunction
+
 " }}}
 " ===========================