ruff formatted
This commit is contained in:
@@ -20,7 +20,7 @@ async def archive_current(app) -> None:
|
||||
process = await asyncio.create_subprocess_shell(
|
||||
f"himalaya message move Archives {app.current_message_id}",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
)
|
||||
stdout, stderr = await process.communicate()
|
||||
# app.reload_needed = True
|
||||
|
||||
@@ -2,6 +2,7 @@ import asyncio
|
||||
from textual import work
|
||||
from textual.widgets import ListView
|
||||
|
||||
|
||||
@work(exclusive=False)
|
||||
async def delete_current(app) -> None:
|
||||
app.show_status(f"Deleting message {app.current_message_id}...")
|
||||
@@ -10,7 +11,7 @@ async def delete_current(app) -> None:
|
||||
process = await asyncio.create_subprocess_shell(
|
||||
f"himalaya message delete {app.current_message_id}",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
)
|
||||
stdout, stderr = await process.communicate()
|
||||
# app.reload_needed = True
|
||||
@@ -20,6 +21,9 @@ async def delete_current(app) -> None:
|
||||
app.query_one(ListView).index = index
|
||||
# app.action_next() # Automatically show the next message
|
||||
else:
|
||||
app.show_status(f"Failed to delete message {app.current_message_id}. {stderr.decode()}", "error")
|
||||
app.show_status(
|
||||
f"Failed to delete message {app.current_message_id}. {stderr.decode()}",
|
||||
"error",
|
||||
)
|
||||
except Exception as e:
|
||||
app.show_status(f"Error: {e}", "error")
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
|
||||
|
||||
async def action_newest(app) -> None:
|
||||
"""Show the previous email message by finding the next lower ID from the list of envelope IDs."""
|
||||
try:
|
||||
if (app.reload_needed):
|
||||
if app.reload_needed:
|
||||
await app.action_fetch_list()
|
||||
|
||||
ids = sorted((int(envelope['id']) for envelope in app.all_envelopes), reverse=True)
|
||||
ids = sorted(
|
||||
(int(envelope["id"]) for envelope in app.all_envelopes), reverse=True
|
||||
)
|
||||
app.current_message_id = ids[0]
|
||||
app.show_message(app.current_message_id)
|
||||
return
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
|
||||
async def action_next(app) -> None:
|
||||
"""Show the next email message by finding the next higher ID from the list of envelope IDs."""
|
||||
try:
|
||||
if (app.reload_needed):
|
||||
if app.reload_needed:
|
||||
app.action_fetch_list()
|
||||
ids = sorted(int(envelope['id']) for envelope in app.all_envelopes)
|
||||
ids = sorted(int(envelope["id"]) for envelope in app.all_envelopes)
|
||||
for envelope_id in ids:
|
||||
if envelope_id > int(app.current_message_id):
|
||||
app.show_message(envelope_id)
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
|
||||
|
||||
def action_oldest(app) -> None:
|
||||
"""Show the previous email message by finding the next lower ID from the list of envelope IDs."""
|
||||
try:
|
||||
if (app.reload_needed):
|
||||
if app.reload_needed:
|
||||
app.action_fetch_list()
|
||||
|
||||
ids = sorted((int(envelope['id']) for envelope in app.all_envelopes))
|
||||
ids = sorted((int(envelope["id"]) for envelope in app.all_envelopes))
|
||||
app.current_message_id = ids[0]
|
||||
app.show_message(app.current_message_id)
|
||||
return
|
||||
|
||||
@@ -3,15 +3,19 @@ from maildir_gtd.screens.OpenMessage import OpenMessageScreen
|
||||
|
||||
def action_open(app) -> None:
|
||||
"""Show the input modal for opening a specific message by ID."""
|
||||
|
||||
def check_id(message_id: str | None) -> bool:
|
||||
try:
|
||||
int(message_id)
|
||||
app.show_message(message_id)
|
||||
if (message_id is not None and message_id > 0):
|
||||
if message_id is not None and message_id > 0:
|
||||
app.show_message(message_id)
|
||||
except ValueError:
|
||||
app.bell()
|
||||
app.show_status("Invalid message ID. Please enter an integer.", severity="error")
|
||||
app.show_status(
|
||||
"Invalid message ID. Please enter an integer.", severity="error"
|
||||
)
|
||||
return True
|
||||
return False
|
||||
|
||||
app.push_screen(OpenMessageScreen(), check_id)
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
|
||||
|
||||
def action_previous(app) -> None:
|
||||
"""Show the previous email message by finding the next lower ID from the list of envelope IDs."""
|
||||
try:
|
||||
if (app.reload_needed):
|
||||
if app.reload_needed:
|
||||
app.action_fetch_list()
|
||||
|
||||
ids = sorted((int(envelope['id']) for envelope in app.all_envelopes), reverse=True)
|
||||
ids = sorted(
|
||||
(int(envelope["id"]) for envelope in app.all_envelopes), reverse=True
|
||||
)
|
||||
for envelope_id in ids:
|
||||
if envelope_id < int(app.current_message_id):
|
||||
app.current_message_id = envelope_id
|
||||
|
||||
@@ -7,6 +7,7 @@ logging.basicConfig(
|
||||
handlers=[TextualHandler()],
|
||||
)
|
||||
|
||||
|
||||
def show_message(app, message_id: int) -> None:
|
||||
"""Fetch and display the email message by ID."""
|
||||
logging.info("Showing message ID: " + str(message_id))
|
||||
|
||||
@@ -11,15 +11,18 @@ def action_create_task(app) -> None:
|
||||
result = await asyncio.create_subprocess_shell(
|
||||
f"task add {task_args}",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
)
|
||||
stdout, stderr = await result.communicate()
|
||||
if result.returncode == 0:
|
||||
app.show_status(f"Task created: {stdout.decode()}")
|
||||
else:
|
||||
app.show_status(f"Failed to create task: {stderr.decode()}", severity="error")
|
||||
app.show_status(
|
||||
f"Failed to create task: {stderr.decode()}", severity="error"
|
||||
)
|
||||
except Exception as e:
|
||||
app.show_status(f"Error: {e}", severity="error")
|
||||
return True
|
||||
return False
|
||||
|
||||
app.push_screen(CreateTaskScreen(), check_task)
|
||||
|
||||
@@ -17,7 +17,7 @@ from textual.worker import Worker
|
||||
from textual.app import App, ComposeResult, SystemCommand, RenderResult
|
||||
from textual.logging import TextualHandler
|
||||
from textual.screen import Screen
|
||||
from textual.widgets import Footer, Static, Label, Markdown, ListView, ListItem
|
||||
from textual.widgets import Footer, Static, Label, Markdown, ListView, ListItem
|
||||
from textual.reactive import reactive, Reactive
|
||||
from textual.binding import Binding
|
||||
from textual.timer import Timer
|
||||
@@ -36,7 +36,6 @@ logging.basicConfig(
|
||||
)
|
||||
|
||||
|
||||
|
||||
class StatusTitle(Static):
|
||||
total_messages: Reactive[int] = reactive(0)
|
||||
current_message_index: Reactive[int] = reactive(0)
|
||||
@@ -49,6 +48,7 @@ class StatusTitle(Static):
|
||||
|
||||
class EmailViewerApp(App):
|
||||
"""A simple email viewer app using the Himalaya CLI."""
|
||||
|
||||
CSS_PATH = "email_viewer.tcss"
|
||||
title = "Maildir GTD Reader"
|
||||
current_message_id: Reactive[int] = reactive(0)
|
||||
@@ -70,13 +70,27 @@ class EmailViewerApp(App):
|
||||
def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
|
||||
yield from super().get_system_commands(screen)
|
||||
yield SystemCommand("Next Message", "Navigate to Next ID", self.action_next)
|
||||
yield SystemCommand("Previous Message", "Navigate to Previous ID", self.action_previous)
|
||||
yield SystemCommand("Delete Message", "Delete the current message", self.action_delete)
|
||||
yield SystemCommand("Archive Message", "Archive the current message", self.action_archive)
|
||||
yield SystemCommand("Open Message", "Open a specific message by ID", self.action_open)
|
||||
yield SystemCommand("Create Task", "Create a task using the task CLI", self.action_create_task)
|
||||
yield SystemCommand("Oldest Message", "Show the oldest message", self.action_oldest)
|
||||
yield SystemCommand("Newest Message", "Show the newest message", self.action_newest)
|
||||
yield SystemCommand(
|
||||
"Previous Message", "Navigate to Previous ID", self.action_previous
|
||||
)
|
||||
yield SystemCommand(
|
||||
"Delete Message", "Delete the current message", self.action_delete
|
||||
)
|
||||
yield SystemCommand(
|
||||
"Archive Message", "Archive the current message", self.action_archive
|
||||
)
|
||||
yield SystemCommand(
|
||||
"Open Message", "Open a specific message by ID", self.action_open
|
||||
)
|
||||
yield SystemCommand(
|
||||
"Create Task", "Create a task using the task CLI", self.action_create_task
|
||||
)
|
||||
yield SystemCommand(
|
||||
"Oldest Message", "Show the oldest message", self.action_oldest
|
||||
)
|
||||
yield SystemCommand(
|
||||
"Newest Message", "Show the newest message", self.action_newest
|
||||
)
|
||||
yield SystemCommand("Reload", "Reload the message list", self.fetch_envelopes)
|
||||
|
||||
BINDINGS = [
|
||||
@@ -91,29 +105,32 @@ class EmailViewerApp(App):
|
||||
Binding("%", "reload", "Reload message list"),
|
||||
Binding("1", "focus_1", "Focus Accounts Panel"),
|
||||
Binding("2", "focus_2", "Focus Folders Panel"),
|
||||
Binding("3", "focus_3", "Focus Envelopes Panel")
|
||||
Binding("3", "focus_3", "Focus Envelopes Panel"),
|
||||
]
|
||||
|
||||
BINDINGS.extend([
|
||||
Binding("space", "scroll_page_down", "Scroll page down"),
|
||||
Binding("b", "scroll_page_up", "Scroll page up"),
|
||||
Binding("s", "toggle_sort_order", "Toggle Sort Order")
|
||||
])
|
||||
BINDINGS.extend(
|
||||
[
|
||||
Binding("space", "scroll_page_down", "Scroll page down"),
|
||||
Binding("b", "scroll_page_up", "Scroll page up"),
|
||||
Binding("s", "toggle_sort_order", "Toggle Sort Order"),
|
||||
]
|
||||
)
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield Horizontal(
|
||||
Vertical(
|
||||
ListView(ListItem(Label("All emails...")), id="envelopes_list", classes="list_view", initial_index=0),
|
||||
ListView(id="accounts_list", classes="list_view"),
|
||||
ListView(id="folders_list", classes="list_view"),
|
||||
id="sidebar"
|
||||
ListView(
|
||||
ListItem(Label("All emails...")),
|
||||
id="envelopes_list",
|
||||
classes="list_view",
|
||||
initial_index=0,
|
||||
),
|
||||
ListView(id="accounts_list", classes="list_view"),
|
||||
ListView(id="folders_list", classes="list_view"),
|
||||
id="sidebar",
|
||||
),
|
||||
ScrollableContainer(
|
||||
EnvelopeHeader(),
|
||||
Markdown(),
|
||||
id="main_content"
|
||||
),
|
||||
id="outer-wrapper"
|
||||
ScrollableContainer(EnvelopeHeader(), Markdown(), id="main_content"),
|
||||
id="outer-wrapper",
|
||||
)
|
||||
yield Footer()
|
||||
|
||||
@@ -122,7 +139,7 @@ class EmailViewerApp(App):
|
||||
self.theme = "monokai"
|
||||
self.title = "MaildirGTD"
|
||||
self.query_one("#main_content").border_title = self.status_title
|
||||
sort_indicator = '\u2191' if self.sort_order_ascending else '\u2193'
|
||||
sort_indicator = "\u2191" if self.sort_order_ascending else "\u2193"
|
||||
self.query_one("#envelopes_list").border_title = f"\[1] Emails {sort_indicator}"
|
||||
self.query_one("#accounts_list").border_title = "\[2] Accounts"
|
||||
|
||||
@@ -142,7 +159,7 @@ class EmailViewerApp(App):
|
||||
return f"✉️ Message ID: {self.current_message_id} "
|
||||
|
||||
def compute_valid_envelopes(self) -> None:
|
||||
return (envelope for envelope in self.all_envelopes if envelope.get('id'))
|
||||
return (envelope for envelope in self.all_envelopes if envelope.get("id"))
|
||||
|
||||
def watch_status_title(self, old_status_title: str, new_status_title: str) -> None:
|
||||
self.query_one("#main_content").border_title = new_status_title
|
||||
@@ -153,39 +170,52 @@ class EmailViewerApp(App):
|
||||
self.query_one("#envelopes_list").border_title = f"\[1] Emails {sort_indicator}"
|
||||
|
||||
def watch_current_message_index(self, old_index: int, new_index: int) -> None:
|
||||
if (new_index < 0):
|
||||
if new_index < 0:
|
||||
new_index = 0
|
||||
self.current_message_index = new_index
|
||||
if (new_index > self.total_messages):
|
||||
if new_index > self.total_messages:
|
||||
new_index = self.total_messages
|
||||
self.current_message_index = new_index
|
||||
self.query_one("#envelopes_list").border_subtitle = f"[b]{new_index}[/b]/{self.total_messages}"
|
||||
self.query_one(
|
||||
"#envelopes_list"
|
||||
).border_subtitle = f"[b]{new_index}[/b]/{self.total_messages}"
|
||||
self.query_one("#envelopes_list").index = new_index
|
||||
|
||||
|
||||
def compute_newest_id(self) -> None:
|
||||
if not self.all_envelopes:
|
||||
return 0
|
||||
items = sorted(self.valid_envelopes, key=lambda x: x['date'], reverse=not self.sort_order_ascending)
|
||||
return items[-1]['id'] if items else 0
|
||||
items = sorted(
|
||||
self.valid_envelopes,
|
||||
key=lambda x: x["date"],
|
||||
reverse=not self.sort_order_ascending,
|
||||
)
|
||||
return items[-1]["id"] if items else 0
|
||||
|
||||
def compute_oldest_id(self) -> None:
|
||||
if not self.valid_envelopes:
|
||||
return 0
|
||||
items = sorted(self.valid_envelopes, key=lambda x: x['date'], reverse=not self.sort_order_ascending)
|
||||
return items[0]['id'] if items else 0
|
||||
items = sorted(
|
||||
self.valid_envelopes,
|
||||
key=lambda x: x["date"],
|
||||
reverse=not self.sort_order_ascending,
|
||||
)
|
||||
return items[0]["id"] if items else 0
|
||||
|
||||
|
||||
def watch_reload_needed(self, old_reload_needed: bool, new_reload_needed: bool) -> None:
|
||||
def watch_reload_needed(
|
||||
self, old_reload_needed: bool, new_reload_needed: bool
|
||||
) -> None:
|
||||
logging.info(f"Reload needed: {new_reload_needed}")
|
||||
if (not old_reload_needed and new_reload_needed):
|
||||
if not old_reload_needed and new_reload_needed:
|
||||
self.fetch_envelopes()
|
||||
|
||||
|
||||
def watch_current_message_id(self, old_message_id: int, new_message_id: int) -> None:
|
||||
def watch_current_message_id(
|
||||
self, old_message_id: int, new_message_id: int
|
||||
) -> None:
|
||||
"""Called when the current message ID changes."""
|
||||
logging.info(f"Current message ID changed from {old_message_id} to {new_message_id}")
|
||||
if (new_message_id == old_message_id):
|
||||
logging.info(
|
||||
f"Current message ID changed from {old_message_id} to {new_message_id}"
|
||||
)
|
||||
if new_message_id == old_message_id:
|
||||
return
|
||||
self.msg_worker.cancel() if self.msg_worker else None
|
||||
headers = self.query_one(EnvelopeHeader)
|
||||
@@ -193,19 +223,21 @@ class EmailViewerApp(App):
|
||||
logging.info(f"message_metadata keys: {list(self.message_metadata.keys())}")
|
||||
if new_message_id in self.message_metadata:
|
||||
metadata = self.message_metadata[new_message_id]
|
||||
self.current_message_index = metadata['index']
|
||||
headers.subject = metadata['subject'].strip()
|
||||
headers.from_ = metadata['from'].get('addr', '')
|
||||
headers.to = metadata['to'].get('addr', '')
|
||||
msgdate = re.sub(r"[\+\-]\d\d:\d\d", "", metadata['date'])
|
||||
msgdate = datetime.strptime(msgdate, "%Y-%m-%d %H:%M").strftime("%a %b %d %H:%M")
|
||||
headers.date = msgdate
|
||||
headers.cc = metadata['cc'].get('addr', '') if 'cc' in metadata else ""
|
||||
self.query_one(ListView).index = metadata['index']
|
||||
self.current_message_index = metadata["index"]
|
||||
headers.subject = metadata["subject"].strip()
|
||||
headers.from_ = metadata["from"].get("addr", "")
|
||||
headers.to = metadata["to"].get("addr", "")
|
||||
message_date = re.sub(r"[\+\-]\d\d:\d\d", "", metadata["date"])
|
||||
message_date = datetime.strptime(message_date, "%Y-%m-%d %H:%M").strftime(
|
||||
"%a %b %d %H:%M"
|
||||
)
|
||||
headers.date = message_date
|
||||
headers.cc = metadata["cc"].get("addr", "") if "cc" in metadata else ""
|
||||
self.query_one(ListView).index = metadata["index"]
|
||||
else:
|
||||
logging.warning(f"Message ID {new_message_id} not found in metadata.")
|
||||
|
||||
if (self.message_body_cache.get(new_message_id)):
|
||||
if self.message_body_cache.get(new_message_id):
|
||||
# If the message body is already cached, use it
|
||||
msg = self.query_one(Markdown)
|
||||
msg.update(self.message_body_cache[new_message_id])
|
||||
@@ -217,21 +249,23 @@ class EmailViewerApp(App):
|
||||
def on_list_view_selected(self, event: ListView.Selected) -> None:
|
||||
"""Called when an item in the list view is selected."""
|
||||
# logging.info(f"Selected item: {self.all_envelopes[event.list_view.index]}")
|
||||
if self.all_envelopes[event.list_view.index] is None or self.all_envelopes[event.list_view.index].get("type") == "header":
|
||||
if (
|
||||
self.all_envelopes[event.list_view.index] is None
|
||||
or self.all_envelopes[event.list_view.index].get("type") == "header"
|
||||
):
|
||||
# If the selected item is a header, do not change the current message ID
|
||||
return
|
||||
self.current_message_id = int(self.all_envelopes[event.list_view.index]['id'])
|
||||
self.current_message_id = int(self.all_envelopes[event.list_view.index]["id"])
|
||||
|
||||
@work(exclusive=False)
|
||||
async def fetch_one_message(self, new_message_id:int) -> None:
|
||||
|
||||
async def fetch_one_message(self, new_message_id: int) -> None:
|
||||
msg = self.query_one(Markdown)
|
||||
|
||||
try:
|
||||
process = await asyncio.create_subprocess_shell(
|
||||
f"himalaya message read {str(new_message_id)}",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
)
|
||||
stdout, stderr = await process.communicate()
|
||||
logging.info(f"stdout: {stdout.decode()[0:50]}...")
|
||||
@@ -257,38 +291,59 @@ class EmailViewerApp(App):
|
||||
process = await asyncio.create_subprocess_shell(
|
||||
"himalaya envelope list -o json -s 9999",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
)
|
||||
stdout, stderr = await process.communicate()
|
||||
logging.info(f"stdout: {stdout.decode()[0:50]}")
|
||||
if process.returncode == 0:
|
||||
import json
|
||||
|
||||
envelopes = json.loads(stdout.decode())
|
||||
if envelopes:
|
||||
self.reload_needed = False
|
||||
self.total_messages = len(envelopes)
|
||||
msglist.clear()
|
||||
|
||||
envelopes = sorted(envelopes, key=lambda x: x['date'], reverse=not self.sort_order_ascending)
|
||||
envelopes = sorted(
|
||||
envelopes,
|
||||
key=lambda x: x["date"],
|
||||
reverse=not self.sort_order_ascending,
|
||||
)
|
||||
grouped_envelopes = group_envelopes_by_date(envelopes)
|
||||
self.all_envelopes = grouped_envelopes
|
||||
self.message_metadata = {
|
||||
int(envelope['id']): {
|
||||
'subject': envelope.get('subject', ''),
|
||||
'from': envelope.get('from', {}),
|
||||
'to': envelope.get('to', {}),
|
||||
'date': envelope.get('date', ''),
|
||||
'cc': envelope.get('cc', {}),
|
||||
'index': index # Store the position index
|
||||
int(envelope["id"]): {
|
||||
"subject": envelope.get("subject", ""),
|
||||
"from": envelope.get("from", {}),
|
||||
"to": envelope.get("to", {}),
|
||||
"date": envelope.get("date", ""),
|
||||
"cc": envelope.get("cc", {}),
|
||||
"index": index, # Store the position index
|
||||
}
|
||||
for index, envelope in enumerate(self.all_envelopes)
|
||||
if 'id' in envelope
|
||||
if "id" in envelope
|
||||
}
|
||||
for item in grouped_envelopes:
|
||||
if item.get("type") == "header":
|
||||
msglist.append(ListItem(Label(item["label"], classes="group_header", markup=False)))
|
||||
msglist.append(
|
||||
ListItem(
|
||||
Label(
|
||||
item["label"],
|
||||
classes="group_header",
|
||||
markup=False,
|
||||
)
|
||||
)
|
||||
)
|
||||
else:
|
||||
msglist.append(ListItem(Label(str(item['subject']).strip(), classes="email_subject", markup=False)))
|
||||
msglist.append(
|
||||
ListItem(
|
||||
Label(
|
||||
str(item["subject"]).strip(),
|
||||
classes="email_subject",
|
||||
markup=False,
|
||||
)
|
||||
)
|
||||
)
|
||||
msglist.index = self.current_message_index
|
||||
else:
|
||||
self.show_status("Failed to fetch any envelopes.", "error")
|
||||
@@ -305,16 +360,23 @@ class EmailViewerApp(App):
|
||||
process = await asyncio.create_subprocess_shell(
|
||||
"himalaya account list -o json",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
)
|
||||
stdout, stderr = await process.communicate()
|
||||
logging.info(f"stdout: {stdout.decode()[0:50]}")
|
||||
if process.returncode == 0:
|
||||
import json
|
||||
|
||||
accounts = json.loads(stdout.decode())
|
||||
if accounts:
|
||||
for account in accounts:
|
||||
item = ListItem(Label(str(account['name']).strip(), classes="account_name", markup=False))
|
||||
item = ListItem(
|
||||
Label(
|
||||
str(account["name"]).strip(),
|
||||
classes="account_name",
|
||||
markup=False,
|
||||
)
|
||||
)
|
||||
accounts_list.append(item)
|
||||
except Exception as e:
|
||||
self.show_status(f"Error fetching account list: {e}", "error")
|
||||
@@ -325,22 +387,31 @@ class EmailViewerApp(App):
|
||||
async def fetch_folders(self) -> None:
|
||||
folders_list = self.query_one("#folders_list")
|
||||
folders_list.clear()
|
||||
folders_list.append(ListItem(Label("INBOX", classes="folder_name", markup=False)))
|
||||
folders_list.append(
|
||||
ListItem(Label("INBOX", classes="folder_name", markup=False))
|
||||
)
|
||||
try:
|
||||
folders_list.loading = True
|
||||
process = await asyncio.create_subprocess_shell(
|
||||
"himalaya folder list -o json",
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
)
|
||||
stdout, stderr = await process.communicate()
|
||||
logging.info(f"stdout: {stdout.decode()[0:50]}")
|
||||
if process.returncode == 0:
|
||||
import json
|
||||
|
||||
folders = json.loads(stdout.decode())
|
||||
if folders:
|
||||
for folder in folders:
|
||||
item = ListItem(Label(str(folder['name']).strip(), classes="folder_name", markup=False))
|
||||
item = ListItem(
|
||||
Label(
|
||||
str(folder["name"]).strip(),
|
||||
classes="folder_name",
|
||||
markup=False,
|
||||
)
|
||||
)
|
||||
folders_list.append(item)
|
||||
except Exception as e:
|
||||
self.show_status(f"Error fetching folder list: {e}", "error")
|
||||
@@ -354,7 +425,9 @@ class EmailViewerApp(App):
|
||||
|
||||
def show_status(self, message: str, severity: str = "information") -> None:
|
||||
"""Display a status message using the built-in notify function."""
|
||||
self.notify(message, title="Status", severity=severity, timeout=2.6, markup=True)
|
||||
self.notify(
|
||||
message, title="Status", severity=severity, timeout=2.6, markup=True
|
||||
)
|
||||
|
||||
def action_toggle_header(self) -> None:
|
||||
"""Toggle the visibility of the EnvelopeHeader panel."""
|
||||
@@ -380,7 +453,10 @@ class EmailViewerApp(App):
|
||||
modifier = 1
|
||||
idx = self.current_message_index
|
||||
try:
|
||||
if self.all_envelopes[idx + modifier] is None or self.all_envelopes[idx + modifier].get("type") == "header":
|
||||
if (
|
||||
self.all_envelopes[idx + modifier] is None
|
||||
or self.all_envelopes[idx + modifier].get("type") == "header"
|
||||
):
|
||||
idx = idx + modifier
|
||||
except IndexError:
|
||||
# If we reach the end of the list, wrap around to the beginning
|
||||
@@ -394,7 +470,10 @@ class EmailViewerApp(App):
|
||||
modifier = -1
|
||||
idx = self.current_message_index
|
||||
try:
|
||||
if self.all_envelopes[idx + modifier] is None or self.all_envelopes[idx + modifier].get("type") == "header":
|
||||
if (
|
||||
self.all_envelopes[idx + modifier] is None
|
||||
or self.all_envelopes[idx + modifier].get("type") == "header"
|
||||
):
|
||||
idx = idx + modifier
|
||||
except IndexError:
|
||||
# If we reach the beginning of the list, wrap around to the end
|
||||
@@ -404,30 +483,40 @@ class EmailViewerApp(App):
|
||||
|
||||
async def action_delete(self) -> None:
|
||||
self.query_one("#envelopes_list").pop(self.current_message_index)
|
||||
self.all_envelopes = list(filter(lambda x: int(x.get("id", "0")) != self.current_message_id, self.all_envelopes))
|
||||
self.all_envelopes = list(
|
||||
filter(
|
||||
lambda x: int(x.get("id", "0")) != self.current_message_id,
|
||||
self.all_envelopes,
|
||||
)
|
||||
)
|
||||
self.message_metadata.pop(self.current_message_id, None)
|
||||
self.message_body_cache.pop(self.current_message_id, None)
|
||||
self.total_messages = len(self.message_metadata)
|
||||
delete_current(self)
|
||||
newmsg = self.all_envelopes[self.current_message_index]
|
||||
if newmsg.get('type') == "header":
|
||||
if newmsg.get("type") == "header":
|
||||
newmsg = self.all_envelopes[self.current_message_index + 1]
|
||||
return
|
||||
self.show_message(newmsg['id'])
|
||||
self.show_message(newmsg["id"])
|
||||
|
||||
async def action_archive(self) -> None:
|
||||
self.query_one("#envelopes_list").pop(self.current_message_index)
|
||||
self.all_envelopes = list(filter(lambda x: int(x.get("id", "0")) != self.current_message_id, self.all_envelopes))
|
||||
self.all_envelopes = list(
|
||||
filter(
|
||||
lambda x: int(x.get("id", "0")) != self.current_message_id,
|
||||
self.all_envelopes,
|
||||
)
|
||||
)
|
||||
self.message_metadata.pop(self.current_message_id, None)
|
||||
self.message_body_cache.pop(self.current_message_id, None)
|
||||
self.total_messages = len(self.message_metadata)
|
||||
worker = archive_current(self)
|
||||
await worker.wait()
|
||||
newmsg = self.all_envelopes[self.current_message_index]
|
||||
if newmsg.get('type') == "header":
|
||||
if newmsg.get("type") == "header":
|
||||
newmsg = self.all_envelopes[self.current_message_index + 1]
|
||||
return
|
||||
self.show_message(newmsg['id'])
|
||||
self.show_message(newmsg["id"])
|
||||
|
||||
def action_open(self) -> None:
|
||||
action_open(self)
|
||||
@@ -435,7 +524,6 @@ class EmailViewerApp(App):
|
||||
def action_create_task(self) -> None:
|
||||
action_create_task(self)
|
||||
|
||||
|
||||
def action_scroll_down(self) -> None:
|
||||
"""Scroll the main content down."""
|
||||
self.query_one("#main_content").scroll_down()
|
||||
@@ -473,6 +561,7 @@ class EmailViewerApp(App):
|
||||
def action_focus_3(self) -> None:
|
||||
self.query_one("#folders_list").focus()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
app = EmailViewerApp()
|
||||
app.run()
|
||||
|
||||
@@ -18,22 +18,21 @@ class CreateTaskScreen(ModalScreen[str]):
|
||||
Button("Submit", id="submit", variant="primary"),
|
||||
),
|
||||
id="create_task_container",
|
||||
classes="modal_screen"
|
||||
classes="modal_screen",
|
||||
)
|
||||
|
||||
|
||||
@on(Input.Submitted)
|
||||
def handle_task_args(self) -> None:
|
||||
input_widget = self.query_one("#task_input", Input)
|
||||
self.visible = False
|
||||
self.disabled = True
|
||||
self.loading = True
|
||||
task_args = input_widget.value
|
||||
self.dismiss(task_args)
|
||||
input_widget = self.query_one("#task_input", Input)
|
||||
self.visible = False
|
||||
self.disabled = True
|
||||
self.loading = True
|
||||
task_args = input_widget.value
|
||||
self.dismiss(task_args)
|
||||
|
||||
def on_key(self, event) -> None:
|
||||
if (event.key == "escape" or event.key == "ctrl+c"):
|
||||
self.dismiss()
|
||||
if event.key == "escape" or event.key == "ctrl+c":
|
||||
self.dismiss()
|
||||
|
||||
def button_on_click(self, event):
|
||||
if event.button.id == "cancel":
|
||||
|
||||
@@ -4,24 +4,27 @@ from textual.screen import ModalScreen
|
||||
from textual.widgets import Input, Label, Button
|
||||
from textual.containers import Horizontal
|
||||
|
||||
class OpenMessageScreen(ModalScreen[int | None]):
|
||||
|
||||
class OpenMessageScreen(ModalScreen[int | None]):
|
||||
def compose(self) -> ComposeResult:
|
||||
yield Horizontal(
|
||||
Label("📨 ID", id="message_label"),
|
||||
Input(placeholder="Enter message ID (integer only)", type="integer", id="open_message_input"),
|
||||
Input(
|
||||
placeholder="Enter message ID (integer only)",
|
||||
type="integer",
|
||||
id="open_message_input",
|
||||
),
|
||||
Button("Cancel", id="cancel"),
|
||||
Button("Open", variant="primary", id="submit"),
|
||||
id="open_message_container",
|
||||
classes="modal_screen"
|
||||
classes="modal_screen",
|
||||
)
|
||||
|
||||
@on(Input.Submitted)
|
||||
def handle_message_id(self, event) -> None:
|
||||
input_widget = self.query_one("#open_message_input", Input)
|
||||
message_id = int(input_widget.value if input_widget.value else 0)
|
||||
self.dismiss(message_id)
|
||||
|
||||
input_widget = self.query_one("#open_message_input", Input)
|
||||
message_id = int(input_widget.value if input_widget.value else 0)
|
||||
self.dismiss(message_id)
|
||||
|
||||
def button_on_click(self, event) -> None:
|
||||
if event.button.id == "cancel":
|
||||
@@ -30,4 +33,3 @@ class OpenMessageScreen(ModalScreen[int | None]):
|
||||
input_widget = self.query_one("#open_message_input", Input)
|
||||
message_id = int(input_widget.value if input_widget.value else 0)
|
||||
self.dismiss(message_id)
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ from datetime import datetime, timedelta
|
||||
import re
|
||||
from typing import List, Dict
|
||||
|
||||
|
||||
def group_envelopes_by_date(envelopes: List[Dict]) -> List[Dict]:
|
||||
"""Group envelopes by date and add headers for each group."""
|
||||
grouped_envelopes = []
|
||||
@@ -30,7 +31,7 @@ def group_envelopes_by_date(envelopes: List[Dict]) -> List[Dict]:
|
||||
|
||||
current_group = None
|
||||
for envelope in envelopes:
|
||||
envelope_date = re.sub(r"[\+\-]\d\d:\d\d", "", envelope['date'])
|
||||
envelope_date = re.sub(r"[\+\-]\d\d:\d\d", "", envelope["date"])
|
||||
envelope_date = datetime.strptime(envelope_date, "%Y-%m-%d %H:%M")
|
||||
group_label = get_group_label(envelope_date)
|
||||
if group_label != current_group:
|
||||
|
||||
@@ -3,8 +3,8 @@ from textual.app import ComposeResult
|
||||
from textual.widgets import Label
|
||||
from textual.containers import Horizontal, ScrollableContainer
|
||||
|
||||
class EnvelopeHeader(ScrollableContainer):
|
||||
|
||||
class EnvelopeHeader(ScrollableContainer):
|
||||
subject = Reactive("")
|
||||
from_ = Reactive("")
|
||||
to = Reactive("")
|
||||
@@ -13,35 +13,34 @@ class EnvelopeHeader(ScrollableContainer):
|
||||
bcc = Reactive("")
|
||||
|
||||
"""Header for the email viewer."""
|
||||
|
||||
def on_mount(self) -> None:
|
||||
"""Mount the header."""
|
||||
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield Horizontal(
|
||||
Label("Subject:", classes="header_key"),
|
||||
Label(self.subject, classes="header_value", markup=False, id="subject")
|
||||
)
|
||||
yield Horizontal(
|
||||
Label("Date:", classes="header_key"),
|
||||
Label(self.date, classes="header_value", markup=False, id="date"),
|
||||
)
|
||||
# yield Horizontal(
|
||||
# Label("From:", classes="header_key"),
|
||||
# Label(self.from_, classes="header_value", markup=False, id="from"),
|
||||
# )
|
||||
# yield Horizontal(
|
||||
# Label("To:", classes="header_key"),
|
||||
# Label(self.to, classes="header_value", markup=False, id="to"),
|
||||
# )
|
||||
# yield Horizontal(
|
||||
|
||||
# )
|
||||
# yield Horizontal(
|
||||
# Label("CC:", classes="header_key"),
|
||||
# Label(self.cc, classes="header_value", markup=False, id="cc"),
|
||||
# )
|
||||
yield Horizontal(
|
||||
Label("Subject:", classes="header_key"),
|
||||
Label(self.subject, classes="header_value", markup=False, id="subject"),
|
||||
)
|
||||
yield Horizontal(
|
||||
Label("Date:", classes="header_key"),
|
||||
Label(self.date, classes="header_value", markup=False, id="date"),
|
||||
)
|
||||
# yield Horizontal(
|
||||
# Label("From:", classes="header_key"),
|
||||
# Label(self.from_, classes="header_value", markup=False, id="from"),
|
||||
# )
|
||||
# yield Horizontal(
|
||||
# Label("To:", classes="header_key"),
|
||||
# Label(self.to, classes="header_value", markup=False, id="to"),
|
||||
# )
|
||||
# yield Horizontal(
|
||||
|
||||
# )
|
||||
# yield Horizontal(
|
||||
# Label("CC:", classes="header_key"),
|
||||
# Label(self.cc, classes="header_value", markup=False, id="cc"),
|
||||
# )
|
||||
|
||||
def watch_subject(self, subject: str) -> None:
|
||||
"""Watch the subject for changes."""
|
||||
@@ -62,8 +61,3 @@ class EnvelopeHeader(ScrollableContainer):
|
||||
# def watch_cc(self, cc: str) -> None:
|
||||
# """Watch the cc field for changes."""
|
||||
# self.query_one("#cc").update(cc)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user