diff --git a/DISTRIBUTION.md b/DISTRIBUTION.md index 0d57bf5..e992e21 100644 --- a/DISTRIBUTION.md +++ b/DISTRIBUTION.md @@ -18,8 +18,8 @@ rpm/debは初期配布の必須条件にせず、LinuxはELFを提供する。Py ```sh # ダウンロード先で実行。手元にあるファイルをチェックする。 -sha256sum --ignore-missing -c pages-cli-v0.4.0-linux-amd64-SHA256SUMS -tar -xzf pages-cli-v0.4.0-linux-amd64.tar.gz +sha256sum --ignore-missing -c pages-cli-v0.4.1-linux-amd64-SHA256SUMS +tar -xzf pages-cli-v0.4.1-linux-amd64.tar.gz mkdir -p ~/.local/bin install -m 755 pages ~/.local/bin/pages pages --version diff --git a/VERSION b/VERSION index 1d0ba9e..267577d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.0 +0.4.1 diff --git a/docs/neomutt.md b/docs/neomutt.md index 7795853..5e255aa 100644 --- a/docs/neomutt.md +++ b/docs/neomutt.md @@ -66,9 +66,13 @@ pages task retry REQUEST_UUID 最大20件を保留でき、成功した要求はローカルから削除する。同じ本人への再ログインで保留分を維持する。別アカウントへ切り替える場合は別プロファイルを使う。認証済みセッションがない状態からの完全オフライン入力受付ではない。 -同一の保留メールを再入力しても、確定済みの保存先を維持する。他のオプションを変更して保留要求を上書きすることは拒否する。保存成功後に新しい要求として取り込み直し、本文・保存先・年月などが変わった場合は412になるため、保存済みWikiを暗黙に移動しない。旧版からの保留分も `task retry` で元の要求のまま送る。 +CLI v0.4.1以降では、同一内容の保留メールを再入力した場合は、確定済みの保存先を維持する。同じrequest_idで本文・件名・オプションを変更して再入力した場合は、ローカルの保留下書きを新しい内容で上書きしてから1回送信する。送信失敗時も新しい内容を保持する。`task add --request-id` も同じ動作。新しいrequest_idを発行して重複タスクを作る処理ではない。 -サーバーで保存された直後に応答が失われても、同じrequest_idで再送すれば既存タスクが返る。保留要求を書き換えて再送すると412になる。セッションファイルにはトークンと保留中のメール本文があるため、デバッグ目的で内容を貼り付けない。保存先未設定で失敗した場合は `pages task preferences --wiki-prefix /YOUR/MAIL/PATH` で設定してからretryする。 +`task retry` は、その時点で保持されている下書きを変更せずに送信する。下書きを上書きするには、NeoMuttから同じメールを改めて取り込むか、同じrequest_idを指定した `task add` を実行する。旧版で保留していた下書きも対象となる。 + +サーバーにすでに保存済みの同じ要求に対して本文・保存先・オプションが異なる場合は、従来どおり412で停止する。ローカル下書きの上書きは、保存済みタスクやWikiの強制上書きではない。保存済みの内容を変更する場合は通常のタスク/Wiki編集を使う。 + +サーバーで保存された直後に応答が失われても、同じrequest_id・同じ内容で再送すれば既存タスクが返る。サーバー保存済みの要求と異なる内容で再送すると412になる。セッションファイルにはトークンと保留中のメール本文があるため、デバッグ目的で内容を貼り付けない。保存先未設定で失敗した場合は `pages task preferences --wiki-prefix /YOUR/MAIL/PATH` で設定してからretryする。 ## 計画と実績 diff --git a/pages b/pages index 2e45c71..2f0690d 100755 --- a/pages +++ b/pages @@ -32,7 +32,7 @@ import urllib.parse as url import urllib.request as http import webbrowser -VERSION = '0.4.0' +VERSION = '0.4.1' class Failure(Exception): def __init__(self, message, status=0, payload=None): @@ -578,8 +578,9 @@ def tasks(client, profile, words): def capture(payload): pending=profile.data.setdefault('task_outbox',{}) if len(pending)>=20 and payload['request_id'] not in pending:raise Failure('20 pending captures retained. Retry them before adding more.') - if payload['request_id'] in pending and pending[payload['request_id']] != payload:raise Failure('A different draft with this request ID is retained. Use pages task retry '+payload['request_id']) + replaced=payload['request_id'] in pending and pending[payload['request_id']] != payload pending[payload['request_id']]=payload;profile.save() + if replaced:print('Replaced the retained draft with the current input.',file=sys.stderr) try: result=client.json(TASK_API+'capture',method='POST',data=payload) except Failure as e: print('Draft retained; retry with: pages task retry '+payload['request_id'],file=sys.stderr) @@ -622,7 +623,7 @@ def tasks(client, profile, words): value=getattr(a,attr) if value is not None:payload[key]=task_project(client,value) if attr=='project' else value # A retry of the same pending mail must not drift across a month boundary - # when Date was missing. Other changed options still fail closed. + # when Date was missing. Changed input replaces the pending draft below. old=profile.data.get('task_outbox',{}).get(payload['request_id']) if action=='from-mail' and old and {k:v for k,v in old.items() if k!='wiki_suffix'}=={k:v for k,v in payload.items() if k!='wiki_suffix'}: payload=old.copy() diff --git a/test_productivity.py b/test_productivity.py index 0d00079..72370bd 100644 --- a/test_productivity.py +++ b/test_productivity.py @@ -24,7 +24,7 @@ class ProductivityTests(unittest.TestCase): raw=b'Subject: [../unsafe 123] Title\r\n'+date+b'\r\nbody' self.assertEqual(suffix(raw,ident,now),'2030/02/'+hashlib.sha256(raw).hexdigest()) - def test_pending_mail_month_and_options_are_preserved(self): + def test_pending_mail_keeps_month_but_replaces_changed_options(self): from unittest.mock import patch raw=b'Subject: Test\r\nMessage-ID: \r\n\r\nbody' calls=[] @@ -37,10 +37,86 @@ class ProductivityTests(unittest.TestCase): with patch.dict(m['tasks'].__globals__,task_mail_suffix=lambda raw,ident:month+'/'+ident),patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']): m['tasks'](client,profile,['from-mail']) self.assertEqual(calls[0],calls[1]) - with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),self.assertRaises(m['Failure']): + with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']): m['tasks'](client,profile,['from-mail','--wiki-prefix','/changed']) - self.assertEqual(len(calls),2) - self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[0]) + self.assertEqual(len(calls),3) + self.assertEqual(calls[2]['request_id'],calls[0]['request_id']) + self.assertEqual(calls[2]['wiki_prefix'],'/changed') + self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[2]) + + def test_changed_capture_is_saved_before_send_and_retained_on_conflict(self): + ident='b5550cab-22d4-54eb-b06d-3b432d3f5101' + saved,calls=[],[] + old={'request_id':ident,'title':'Old draft','notes':'Old private notes'} + profile=SimpleNamespace(data={'task_outbox':{ident:old}}) + profile.save=lambda:saved.append(json.loads(json.dumps(profile.data))) + def send(route,**kw): + payload=kw['data'].copy();calls.append(payload) + self.assertEqual(saved[-1]['task_outbox'][ident],payload) + if len(calls)==1:raise m['Failure']('conflict',412,{'error':'conflict'}) + return {'item':{'uuid':ident}} + client=SimpleNamespace(json=send) + out,err=io.StringIO(),io.StringIO() + with contextlib.redirect_stdout(out),contextlib.redirect_stderr(err): + with self.assertRaises(m['Failure']) as failure: + m['tasks'](client,profile,['add','New draft','--request-id',ident,'--notes','New private notes']) + self.assertEqual(failure.exception.status,412) + self.assertEqual(profile.data['task_outbox'][ident],calls[0]) + self.assertEqual(len(calls),1) # No automatic server overwrite/retry. + m['tasks'](client,profile,['retry',ident]) + self.assertEqual(calls[0],calls[1]) + self.assertEqual(calls[0]['title'],'New draft') + self.assertEqual(profile.data['task_outbox'],{}) + self.assertIn('Replaced the retained draft',err.getvalue()) + self.assertNotIn('private notes',err.getvalue()) + self.assertEqual(json.loads(out.getvalue())['item']['uuid'],ident) + + def test_replacing_draft_does_not_send_when_local_save_fails(self): + ident='b5550cab-22d4-54eb-b06d-3b432d3f5101' + def fail_save():raise m['Failure']('local write failed') + profile=SimpleNamespace(data={'task_outbox':{ident:{'request_id':ident,'title':'Old','notes':''}}},save=fail_save) + calls=[] + client=SimpleNamespace(json=lambda *a,**kw:calls.append(kw)) + with self.assertRaises(m['Failure']):m['tasks'](client,profile,['add','New','--request-id',ident]) + self.assertEqual(calls,[]) + + def test_full_outbox_allows_replacement_but_not_new_id(self): + import uuid + pending={str(uuid.uuid4()):{'title':'Old'} for _ in range(20)} + ident=next(iter(pending)) + profile=SimpleNamespace(data={'task_outbox':pending},save=lambda:None) + calls=[] + def send(route,**kw): + calls.append(kw['data'].copy()) + raise m['Failure']('offline') + client=SimpleNamespace(json=send) + with contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']): + m['tasks'](client,profile,['add','Replacement','--request-id',ident]) + self.assertEqual(len(calls),1) + self.assertEqual(pending[ident]['title'],'Replacement') + with self.assertRaises(m['Failure']):m['tasks'](client,profile,['add','Another']) + self.assertEqual(len(calls),1) + self.assertEqual(len(pending),20) + + def test_reimported_mail_replaces_body_and_removes_obsolete_options(self): + from unittest.mock import patch + raw=b'Subject: Old\r\nMessage-ID: \r\n\r\nOLD BODY' + calls=[] + def send(route,**kw): + calls.append(kw['data'].copy()) + raise m['Failure']('offline') + client=SimpleNamespace(base='https://example.invalid',json=send) + profile=SimpleNamespace(data={'username':'test'},save=lambda:None) + changed=raw.replace(b'Subject: Old',b'Subject: New').replace(b'OLD BODY',b'NEW BODY') + for mail,args in [(raw,['--wiki-prefix','/old']),(changed,['--wiki-prefix','/new']),(changed,['--metadata-only'])]: + with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(mail))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']): + m['tasks'](client,profile,['from-mail',*args]) + self.assertEqual(len({c['request_id'] for c in calls}),1) + self.assertEqual(calls[1]['title'],'New') + self.assertIn('NEW BODY',calls[1]['wiki_body']) + self.assertNotIn('OLD BODY',calls[1]['wiki_body']) + for key in ('wiki_body','wiki_prefix','wiki_suffix'):self.assertNotIn(key,calls[2]) + self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[2]) def test_mail_privacy_and_long_subject_override(self): raw=b'Subject: Test\r\nFrom: Person \r\nMessage-ID: \r\nContent-Type: text/plain; charset=utf-8\r\n\r\nPRIVATE BODY' diff --git a/test_task_integration.py b/test_task_integration.py index 8d1dd0a..a1d603d 100644 --- a/test_task_integration.py +++ b/test_task_integration.py @@ -5,6 +5,7 @@ import json from pathlib import Path import runpy import sys +import uuid def run(): m=runpy.run_path(str(Path(__file__).with_name('pages'))) @@ -36,5 +37,22 @@ def run(): output=io.StringIO() with contextlib.redirect_stdout(output):m['contacts'](client,['export',contact['uuid']]) assert 'UID:urn:test:cli' in output.getvalue() + # A rejected capture can be corrected under the same request ID. + # A committed capture is still protected by the server receipt. + request_id=str(uuid.uuid4()) + with contextlib.redirect_stderr(io.StringIO()): + try:task('add','Rejected draft','--request-id',request_id,'--estimate','-1') + except m['Failure'] as error:assert error.status==422 + else:raise AssertionError('Invalid estimate accepted') + assert profile.data['task_outbox'][request_id]['estimate_minutes']==-1 + corrected=task('add','Corrected draft','--request-id',request_id,'--estimate','15')['item'] + assert corrected['uuid']==request_id and corrected['title']=='Corrected draft' + assert request_id not in profile.data['task_outbox'] + try:task('add','Changed after commit','--request-id',request_id,'--estimate','30') + except m['Failure'] as error:assert error.status==412 + else:raise AssertionError('Committed capture silently overwritten') + assert profile.data['task_outbox'][request_id]['title']=='Changed after commit' + stored=task('show',request_id)['item'] + assert stored['title']=='Corrected draft' and stored['estimate_minutes']==15 if __name__=='__main__':run() diff --git a/tools/smoke_binary.py b/tools/smoke_binary.py index d07185b..7ccfa15 100644 --- a/tools/smoke_binary.py +++ b/tools/smoke_binary.py @@ -11,6 +11,7 @@ from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer binary=str(Path(sys.argv[1]).resolve()) token='synthetic_session_'+('x'*40) seen=[] +captures=[] class Handler(BaseHTTPRequestHandler): def log_message(self,*args):pass def do_POST(self): @@ -20,6 +21,8 @@ class Handler(BaseHTTPRequestHandler): elif self.path=='/_/api/v1/extension/organizer.tasks/capture': if self.headers.get('Authorization')!='Bearer '+token:self.send_error(401);return item=json.loads(body) + captures.append(item.copy()) + if item.get('wiki_prefix')=='/rejected':self.reply({'error':'invalid'},422);return if item.get('wiki_body') != 'Message-ID: \n\nPRIVATE BODY':self.send_error(422);return item.pop('wiki_body');self.reply({'item':item,'page_path':'/private/mail/synthetic'}) else:self.send_error(404) @@ -29,8 +32,8 @@ class Handler(BaseHTTPRequestHandler): if self.path.startswith('/_/api/v1/extension/organizer.contacts/items?'): self.reply({'items':[{'name':'Synthetic Person','emails':['person@example.invalid'],'organization':'Test'}]}) else:self.reply({'items':[{'uuid':'synthetic-task','title':'Packaged CLI task','status':'todo'}]}) - def reply(self,value): - self.send_response(200);self.send_header('Content-Type','application/json');self.end_headers();self.wfile.write(json.dumps(value).encode()) + def reply(self,value,status=200): + self.send_response(status);self.send_header('Content-Type','application/json');self.end_headers();self.wfile.write(json.dumps(value).encode()) server=ThreadingHTTPServer(('127.0.0.1',0),Handler) thread=threading.Thread(target=server.serve_forever,daemon=True);thread.start() @@ -46,15 +49,18 @@ try: run('login',stdin='synthetic-password\n') if 'Packaged CLI task' not in run('task','list'):raise AssertionError('Task missing') mail='Subject: Mail task\r\nMessage-ID: \r\nContent-Type: text/plain\r\n\r\nPRIVATE BODY' - captured=run('task','from-mail',stdin=mail) + run('task','from-mail','--wiki-prefix','/rejected',stdin=mail,success=False) + captured=run('task','from-mail','--wiki-prefix','/private/mail',stdin=mail) + if len(captures)!=2 or captures[0]['request_id']!=captures[1]['request_id'] or captures[1]['wiki_prefix']!='/private/mail':raise AssertionError('Retained draft was not overwritten under the same request ID') if 'Mail task' not in captured or 'PRIVATE BODY' in captured:raise AssertionError('Mail privacy') contact=run('contacts','query','--neomutt','--','--name') if 'person@example.invalid\tSynthetic Person\tTest' not in contact:raise AssertionError('NeoMutt query') run('shell',stdin='pwd\nexit\n') profile=Path(root)/'pages-cli/sessions/default.json' + if json.loads(profile.read_text()).get('task_outbox'):raise AssertionError('Successful replacement remains pending') if profile.stat().st_mode&0o077:raise AssertionError('Credential permissions') profile.chmod(0o644);run('task','list',success=False);profile.chmod(0o600) run('logout') if not seen:raise AssertionError('No HTTP request') - print('Packaged CLI: configure/login/task-list/mail-capture/neomutt-query/shell/permissions/logout passed') + print('Packaged CLI: configure/login/task-list/mail-capture/draft-overwrite/neomutt-query/shell/permissions/logout passed') finally:server.shutdown();server.server_close();thread.join()