taskwatch 0.2.0__tar.gz → 0.2.1__tar.gz

{taskwatch-0.2.0 → taskwatch-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskwatch
-Version: 0.2.0
+Version: 0.2.1
 Summary: A lightweight local task scheduler with CLI, web UI, and email reporting
 Author-email: Chandler <275737875@qq.com>
 License-Expression: MIT

{taskwatch-0.2.0 → taskwatch-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taskwatch"
-version = "0.2.0"
+version = "0.2.1"
 description = "A lightweight local task scheduler with CLI, web UI, and email reporting"
 readme = "README.md"
 requires-python = ">=3.9"

{taskwatch-0.2.0 → taskwatch-0.2.1}/taskwatch/web/templates/logs.html

@@ -97,26 +97,32 @@
         <div class="fixed inset-0 transition-opacity" aria-hidden="true">
             <div class="absolute inset-0 bg-gray-500 opacity-75" onclick="closeLogModal()"></div>
         </div>
-        <div class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-3xl sm:w-full">
-            <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
-                <h3 class="text-lg font-medium text-gray-900 mb-4">运行详情</h3>
-                <div id="logDetail" class="space-y-4">
-                    <div id="logInfo" class="grid grid-cols-2 gap-2 text-sm"></div>
-                    <div>
-                        <h4 class="text-sm font-medium text-gray-700 mb-1">STDOUT</h4>
-                        <pre id="logStdout" class="bg-gray-50 p-3 rounded text-xs overflow-auto max-h-40 font-mono"></pre>
+        <div class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-4 sm:align-middle sm:max-w-5xl sm:w-full">
+            <div class="bg-white px-6 pt-5 pb-4 sm:p-6 sm:pb-4 flex flex-col max-h-[85vh]">
+                <div class="flex justify-between items-center mb-4 shrink-0">
+                    <h3 class="text-lg font-medium text-gray-900">运行详情</h3>
+                    <button onclick="closeLogModal()" class="text-gray-400 hover:text-gray-600 p-1">
+                        <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg>
+                    </button>
+                </div>
+                <div id="logInfo" class="grid grid-cols-3 gap-x-4 gap-y-1 text-sm mb-4 shrink-0"></div>
+                <div class="flex-1 min-h-0 flex flex-col gap-3 overflow-hidden">
+                    <div class="flex-1 min-h-0 flex flex-col">
+                        <div class="flex justify-between items-center mb-1 shrink-0">
+                            <h4 class="text-sm font-medium text-gray-700">STDOUT</h4>
+                            <button onclick="copyToClipboard('logStdout')" class="text-xs text-indigo-600 hover:text-indigo-800 px-2 py-0.5 rounded hover:bg-indigo-50">复制</button>
+                        </div>
+                        <pre id="logStdout" class="bg-gray-900 text-green-400 p-3 rounded text-xs overflow-auto flex-1 min-h-[120px] max-h-[50vh] font-mono whitespace-pre-wrap break-all"></pre>
                     </div>
-                    <div>
-                        <h4 class="text-sm font-medium text-gray-700 mb-1">STDERR</h4>
-                        <pre id="logStderr" class="bg-red-50 p-3 rounded text-xs overflow-auto max-h-40 font-mono text-red-700"></pre>
+                    <div class="shrink-0 flex flex-col">
+                        <div class="flex justify-between items-center mb-1">
+                            <h4 class="text-sm font-medium text-gray-700">STDERR</h4>
+                            <button onclick="copyToClipboard('logStderr')" class="text-xs text-indigo-600 hover:text-indigo-800 px-2 py-0.5 rounded hover:bg-indigo-50">复制</button>
+                        </div>
+                        <pre id="logStderr" class="bg-red-950 text-red-300 p-3 rounded text-xs overflow-auto min-h-[60px] max-h-[30vh] font-mono whitespace-pre-wrap break-all"></pre>
                     </div>
-                    <div id="logFilePath" class="text-xs text-gray-500"></div>
                 </div>
-            </div>
-            <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
-                <button onclick="closeLogModal()" class="w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 sm:mt-0 sm:w-auto sm:text-sm">
-                    关闭
-                </button>
+                <div id="logFilePath" class="text-xs text-gray-500 mt-2 shrink-0"></div>
             </div>
         </div>
     </div>
@@ -288,24 +294,57 @@
         }
     }
 
-    async function viewLog(runId) {
-        const run = await apiCall(`/api/runs/${runId}`);
-        if (!run) return;
-
+    function renderLogInfo(run) {
         const triggerLabel = { schedule: '定时调度', manual: '手动触发' }[run.trigger] || run.trigger || '-';
         document.getElementById('logInfo').innerHTML = `
             <div><span class="text-gray-500">任务名：</span>${run.task_name || '-'}</div>
             <div><span class="text-gray-500">触发方式：</span>${triggerLabel}</div>
+            <div><span class="text-gray-500">状态：</span>${run.status}</div>
             <div><span class="text-gray-500">开始时间：</span>${run.start_time ? run.start_time.substring(0, 19) : '-'}</div>
             <div><span class="text-gray-500">结束时间：</span>${run.end_time ? run.end_time.substring(0, 19) : '-'}</div>
-            <div><span class="text-gray-500">状态：</span>${run.status}</div>
-            <div><span class="text-gray-500">退出码：</span>${run.exit_code !== null ? run.exit_code : '-'}</div>
             <div><span class="text-gray-500">耗时：</span>${run.duration ? (run.duration / 1000).toFixed(1) + 's' : '-'}</div>
+            <div><span class="text-gray-500">退出码：</span>${run.exit_code !== null ? run.exit_code : '-'}</div>
         `;
+    }
+
+    function scrollLogToBottom() {
+        const stdout = document.getElementById('logStdout');
+        const stderr = document.getElementById('logStderr');
+        stdout.scrollTop = stdout.scrollHeight;
+        stderr.scrollTop = stderr.scrollHeight;
+    }
+
+    function copyToClipboard(elementId) {
+        const text = document.getElementById(elementId).textContent;
+        if (!text || text === '(无输出)' || text === '(无错误)') {
+            showToast('无内容可复制', 'error');
+            return;
+        }
+        navigator.clipboard.writeText(text).then(() => {
+            showToast('已复制到剪贴板');
+        }).catch(() => {
+            const textarea = document.createElement('textarea');
+            textarea.value = text;
+            textarea.style.position = 'fixed';
+            textarea.style.opacity = '0';
+            document.body.appendChild(textarea);
+            textarea.select();
+            document.execCommand('copy');
+            document.body.removeChild(textarea);
+            showToast('已复制到剪贴板');
+        });
+    }
+
+    async function viewLog(runId) {
+        const run = await apiCall(`/api/runs/${runId}`);
+        if (!run) return;
+
+        renderLogInfo(run);
         document.getElementById('logStdout').textContent = run.stdout_summary || '(无输出)';
         document.getElementById('logStderr').textContent = run.stderr_summary || '(无错误)';
         document.getElementById('logFilePath').textContent = run.log_file ? `日志文件: ${run.log_file}` : '';
         document.getElementById('logModal').classList.remove('hidden');
+        scrollLogToBottom();
         if (run.status === 'running') {
             startLogRefresh(runId);
         }
@@ -318,18 +357,10 @@
             if (!run) return;
             document.getElementById('logStdout').textContent = run.stdout_summary || '(无输出)';
             document.getElementById('logStderr').textContent = run.stderr_summary || '(无错误)';
+            scrollLogToBottom();
             if (run.status !== 'running') {
                 stopLogRefresh();
-                const triggerLabel = { schedule: '定时调度', manual: '手动触发' }[run.trigger] || run.trigger || '-';
-                document.getElementById('logInfo').innerHTML = `
-                    <div><span class="text-gray-500">任务名：</span>${run.task_name || '-'}</div>
-                    <div><span class="text-gray-500">触发方式：</span>${triggerLabel}</div>
-                    <div><span class="text-gray-500">开始时间：</span>${run.start_time ? run.start_time.substring(0, 19) : '-'}</div>
-                    <div><span class="text-gray-500">结束时间：</span>${run.end_time ? run.end_time.substring(0, 19) : '-'}</div>
-                    <div><span class="text-gray-500">状态：</span>${run.status}</div>
-                    <div><span class="text-gray-500">退出码：</span>${run.exit_code !== null ? run.exit_code : '-'}</div>
-                    <div><span class="text-gray-500">耗时：</span>${run.duration ? (run.duration / 1000).toFixed(1) + 's' : '-'}</div>
-                `;
+                renderLogInfo(run);
                 loadRuns();
             }
         }, 3000);

{taskwatch-0.2.0 → taskwatch-0.2.1}/taskwatch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskwatch
-Version: 0.2.0
+Version: 0.2.1
 Summary: A lightweight local task scheduler with CLI, web UI, and email reporting
 Author-email: Chandler <275737875@qq.com>
 License-Expression: MIT