2026-03-10 01:40:10 +03:00
|
|
|
|
import json
|
2026-03-12 18:50:39 +03:00
|
|
|
|
import logging
|
2026-03-10 02:20:51 +03:00
|
|
|
|
import time
|
|
|
|
|
|
import threading
|
2026-03-10 01:40:10 +03:00
|
|
|
|
from pathlib import Path
|
2026-03-10 02:20:51 +03:00
|
|
|
|
from datetime import datetime
|
|
|
|
|
|
from typing import Optional, List
|
|
|
|
|
|
from pynput import mouse, keyboard
|
|
|
|
|
|
|
|
|
|
|
|
from .models import TrackerConfig, TrackedTask, WorkDetail, WorkSession
|
2026-03-10 01:40:10 +03:00
|
|
|
|
from .utils import get_platform, ensure_dir
|
|
|
|
|
|
|
2026-03-10 05:35:01 +03:00
|
|
|
|
from dotenv import load_dotenv
|
|
|
|
|
|
import os
|
|
|
|
|
|
|
|
|
|
|
|
from .youtrack_client import YouTrackClient
|
|
|
|
|
|
|
|
|
|
|
|
if not load_dotenv(".env"):
|
|
|
|
|
|
load_dotenv(".env.example")
|
2026-03-10 01:40:10 +03:00
|
|
|
|
|
2026-03-12 18:50:39 +03:00
|
|
|
|
logging.basicConfig(level=logging.WARNING)
|
|
|
|
|
|
logger = logging.getLogger("TimeTracker")
|
|
|
|
|
|
|
2026-03-10 01:40:10 +03:00
|
|
|
|
class Application:
|
|
|
|
|
|
def __init__(self):
|
2026-03-10 02:20:51 +03:00
|
|
|
|
self._lock = threading.Lock()
|
2026-03-10 01:40:10 +03:00
|
|
|
|
self.config_path = Path("config.json")
|
|
|
|
|
|
self.tasks_dir = Path("tasks")
|
|
|
|
|
|
self.config: TrackerConfig = self._load_or_create_config()
|
|
|
|
|
|
self.current_task: Optional[TrackedTask] = None
|
|
|
|
|
|
self.platform = get_platform()
|
|
|
|
|
|
|
2026-03-10 02:20:51 +03:00
|
|
|
|
# Состояние трекинга
|
|
|
|
|
|
self.tracking_enabled = self.config.tracking_enabled
|
|
|
|
|
|
self.last_activity: float = time.time() # timestamp
|
|
|
|
|
|
self.last_window_group: Optional[str] = None
|
|
|
|
|
|
self.is_idle: bool = False
|
|
|
|
|
|
self._tracking_thread: Optional[threading.Thread] = None
|
|
|
|
|
|
self._running = True
|
2026-03-10 02:47:12 +03:00
|
|
|
|
self.session_start_time: Optional[float] = None
|
2026-03-10 02:20:51 +03:00
|
|
|
|
|
|
|
|
|
|
# Загружаем задачу
|
2026-03-10 01:40:10 +03:00
|
|
|
|
if self.config.current_task_id:
|
|
|
|
|
|
self.current_task = self._load_task(self.config.current_task_id)
|
|
|
|
|
|
|
2026-03-12 18:50:39 +03:00
|
|
|
|
try:
|
|
|
|
|
|
self.sync_with_youtrack()
|
|
|
|
|
|
except Exception as e:
|
|
|
|
|
|
logger.error(f"Ошибка при начальной синхронизации: {e}")
|
|
|
|
|
|
|
2026-03-10 01:40:10 +03:00
|
|
|
|
ensure_dir(self.tasks_dir)
|
|
|
|
|
|
|
2026-03-10 02:20:51 +03:00
|
|
|
|
# Запускаем слушатели активности (только если tracking_enabled)
|
|
|
|
|
|
self._start_activity_listeners()
|
|
|
|
|
|
# Запускаем фоновый трекер
|
|
|
|
|
|
self._start_tracking_loop()
|
|
|
|
|
|
|
|
|
|
|
|
def _start_activity_listeners(self):
|
|
|
|
|
|
def on_activity(*_):
|
2026-03-10 02:29:37 +03:00
|
|
|
|
# Активность зафиксирована — но обработаем её только если окно рабочее
|
|
|
|
|
|
self._check_and_update_activity()
|
2026-03-10 02:20:51 +03:00
|
|
|
|
|
|
|
|
|
|
self.mouse_listener = mouse.Listener(on_move=on_activity, on_click=on_activity)
|
|
|
|
|
|
self.keyboard_listener = keyboard.Listener(on_press=on_activity)
|
|
|
|
|
|
self.mouse_listener.start()
|
|
|
|
|
|
self.keyboard_listener.start()
|
|
|
|
|
|
|
2026-03-10 02:29:37 +03:00
|
|
|
|
def _check_and_update_activity(self):
|
|
|
|
|
|
"""Обновляет last_activity, только если текущее окно — рабочее"""
|
|
|
|
|
|
window_info = self.platform.get_active_window()
|
|
|
|
|
|
group_name = self._match_window_to_policy(window_info)
|
|
|
|
|
|
is_blocked = self._is_group_blocked(group_name)
|
2026-03-12 18:50:39 +03:00
|
|
|
|
is_unknown = (group_name == "Unknown app")
|
2026-03-10 02:29:37 +03:00
|
|
|
|
|
|
|
|
|
|
# Считаем "рабочим", если не blocked и не unknown
|
|
|
|
|
|
if not is_blocked and not is_unknown:
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
self.last_activity = time.time()
|
|
|
|
|
|
self.is_idle = False
|
|
|
|
|
|
|
2026-03-10 02:20:51 +03:00
|
|
|
|
def _start_tracking_loop(self):
|
|
|
|
|
|
def loop():
|
|
|
|
|
|
while self._running:
|
|
|
|
|
|
time.sleep(5)
|
|
|
|
|
|
self._check_and_update_tracking()
|
|
|
|
|
|
|
|
|
|
|
|
self._tracking_thread = threading.Thread(target=loop, daemon=True)
|
|
|
|
|
|
self._tracking_thread.start()
|
|
|
|
|
|
|
|
|
|
|
|
def _check_and_update_tracking(self):
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
if not self.tracking_enabled or not self.current_task:
|
2026-03-10 02:47:12 +03:00
|
|
|
|
self.session_start_time = None
|
2026-03-10 02:20:51 +03:00
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
current_time = time.time()
|
|
|
|
|
|
window_info = self.platform.get_active_window()
|
|
|
|
|
|
group_name = self._match_window_to_policy(window_info)
|
|
|
|
|
|
is_blocked = self._is_group_blocked(group_name)
|
|
|
|
|
|
|
2026-03-10 02:29:37 +03:00
|
|
|
|
was_idle = self.is_idle
|
|
|
|
|
|
|
|
|
|
|
|
if current_time - self.last_activity > 60 or is_blocked:
|
2026-03-10 02:20:51 +03:00
|
|
|
|
self.is_idle = True
|
|
|
|
|
|
self.last_window_group = None
|
2026-03-10 02:47:12 +03:00
|
|
|
|
self.session_start_time = None
|
2026-03-10 02:29:37 +03:00
|
|
|
|
else:
|
|
|
|
|
|
self.is_idle = False
|
|
|
|
|
|
if self.last_window_group != group_name:
|
|
|
|
|
|
self.last_window_group = group_name
|
|
|
|
|
|
self._add_work_detail(group_name, 5.0)
|
2026-03-10 02:20:51 +03:00
|
|
|
|
|
2026-03-10 02:47:12 +03:00
|
|
|
|
# Начинаем/продолжаем сессию
|
|
|
|
|
|
if self.session_start_time is None:
|
|
|
|
|
|
self.session_start_time = current_time
|
|
|
|
|
|
|
2026-03-10 02:29:37 +03:00
|
|
|
|
# Сохраняем при переходе в бездействие
|
|
|
|
|
|
if not was_idle and self.is_idle:
|
|
|
|
|
|
self.maybe_save_task()
|
2026-03-10 02:20:51 +03:00
|
|
|
|
|
|
|
|
|
|
def _match_window_to_policy(self, window_info) -> str:
|
|
|
|
|
|
title = window_info.title.lower()
|
|
|
|
|
|
proc = window_info.process_name.lower()
|
|
|
|
|
|
|
|
|
|
|
|
for policy in self.config.window_policies:
|
|
|
|
|
|
for pattern in policy.window_patterns:
|
|
|
|
|
|
if pattern.lower() in title:
|
|
|
|
|
|
return policy.group_name
|
|
|
|
|
|
for pname in policy.process_names:
|
|
|
|
|
|
if pname.lower() == proc:
|
|
|
|
|
|
return policy.group_name
|
2026-03-12 18:50:39 +03:00
|
|
|
|
return "Unknown app"
|
2026-03-10 02:20:51 +03:00
|
|
|
|
|
|
|
|
|
|
def _is_group_blocked(self, group_name: str) -> bool:
|
|
|
|
|
|
for policy in self.config.window_policies:
|
|
|
|
|
|
if policy.group_name == group_name:
|
|
|
|
|
|
return policy.policy_type == "blocked"
|
|
|
|
|
|
return False # по умолчанию — не блокируем
|
|
|
|
|
|
|
|
|
|
|
|
def _add_work_detail(self, group_name: str, seconds: float):
|
|
|
|
|
|
if not self.current_task:
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
# Создаём новую сессию или используем последнюю
|
|
|
|
|
|
if not self.current_task.sessions:
|
|
|
|
|
|
session = WorkSession(
|
|
|
|
|
|
start_time=datetime.now(),
|
|
|
|
|
|
end_time=datetime.now(),
|
|
|
|
|
|
details=[],
|
|
|
|
|
|
synchronized=False
|
|
|
|
|
|
)
|
|
|
|
|
|
self.current_task.sessions.append(session)
|
|
|
|
|
|
else:
|
|
|
|
|
|
session = self.current_task.sessions[-1]
|
|
|
|
|
|
|
|
|
|
|
|
# Ищем detail с такой же группой
|
|
|
|
|
|
for detail in session.details:
|
|
|
|
|
|
if detail.group_name == group_name:
|
|
|
|
|
|
detail.duration_seconds += seconds
|
|
|
|
|
|
break
|
|
|
|
|
|
else:
|
|
|
|
|
|
session.details.append(WorkDetail(group_name=group_name, duration_seconds=seconds))
|
|
|
|
|
|
|
|
|
|
|
|
# Обновляем время сессии
|
|
|
|
|
|
session.end_time = datetime.now()
|
|
|
|
|
|
|
|
|
|
|
|
# === Публичные методы с локом ===
|
|
|
|
|
|
|
2026-03-10 02:29:37 +03:00
|
|
|
|
def maybe_save_task(self):
|
|
|
|
|
|
"""Сохраняет текущую задачу, если она есть"""
|
2026-03-10 05:35:01 +03:00
|
|
|
|
|
2026-03-10 02:29:37 +03:00
|
|
|
|
if self.current_task:
|
|
|
|
|
|
self.save_task(self.current_task)
|
|
|
|
|
|
|
2026-03-10 02:20:51 +03:00
|
|
|
|
def toggle_tracking(self):
|
|
|
|
|
|
with self._lock:
|
2026-03-10 02:29:37 +03:00
|
|
|
|
was_enabled = self.tracking_enabled
|
2026-03-10 02:20:51 +03:00
|
|
|
|
if not self.current_task:
|
|
|
|
|
|
self.tracking_enabled = False
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
self.tracking_enabled = not self.tracking_enabled
|
|
|
|
|
|
self.config.tracking_enabled = self.tracking_enabled
|
|
|
|
|
|
self._save_config(self.config)
|
|
|
|
|
|
|
2026-03-10 02:29:37 +03:00
|
|
|
|
# Сохраняем при переходе в паузу
|
|
|
|
|
|
if was_enabled and not self.tracking_enabled:
|
|
|
|
|
|
self.maybe_save_task()
|
|
|
|
|
|
|
2026-03-10 02:20:51 +03:00
|
|
|
|
def create_task(self, task_id: str, project_id: Optional[str], estimated_minutes: Optional[float]):
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
ensure_dir(self.tasks_dir)
|
|
|
|
|
|
new_task = TrackedTask(
|
|
|
|
|
|
task_id=task_id,
|
|
|
|
|
|
project_id=project_id,
|
|
|
|
|
|
estimated_seconds=estimated_minutes * 60 if estimated_minutes else None,
|
|
|
|
|
|
start_time=datetime.now()
|
|
|
|
|
|
)
|
|
|
|
|
|
self.save_task(new_task)
|
|
|
|
|
|
self.current_task = new_task
|
|
|
|
|
|
self.config.current_task_id = task_id
|
|
|
|
|
|
self.config.tracking_enabled = True
|
|
|
|
|
|
self.tracking_enabled = True
|
|
|
|
|
|
self._save_config(self.config)
|
2026-03-12 18:50:39 +03:00
|
|
|
|
try:
|
|
|
|
|
|
self.sync_with_youtrack()
|
|
|
|
|
|
except Exception as e:
|
|
|
|
|
|
logger.error(f"Ошибка при синхронизации после создания задачи: {e}")
|
2026-03-10 02:20:51 +03:00
|
|
|
|
|
|
|
|
|
|
def select_task(self, task_id: str):
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
task = self._load_task(task_id)
|
|
|
|
|
|
if task:
|
|
|
|
|
|
self.current_task = task
|
|
|
|
|
|
self.config.current_task_id = task_id
|
|
|
|
|
|
self.config.tracking_enabled = True
|
|
|
|
|
|
self.tracking_enabled = True
|
|
|
|
|
|
self._save_config(self.config)
|
|
|
|
|
|
|
2026-03-12 18:50:39 +03:00
|
|
|
|
try:
|
|
|
|
|
|
self.sync_with_youtrack()
|
|
|
|
|
|
except Exception as e:
|
|
|
|
|
|
logger.error(f"Ошибка при синхронизации после выбора задачи: {e}")
|
|
|
|
|
|
|
2026-03-10 02:20:51 +03:00
|
|
|
|
def add_manual_time(self, minutes: float):
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
if not self.current_task:
|
|
|
|
|
|
return
|
|
|
|
|
|
seconds = abs(minutes) * 60
|
|
|
|
|
|
sign = 1 if minutes >= 0 else -1
|
|
|
|
|
|
self._add_work_detail("Manual", sign * seconds)
|
|
|
|
|
|
|
|
|
|
|
|
def get_display_status(self) -> str:
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
if not self.tracking_enabled:
|
|
|
|
|
|
return "Пауза"
|
|
|
|
|
|
if not self.current_task:
|
|
|
|
|
|
return "Пауза"
|
|
|
|
|
|
if self.is_idle:
|
|
|
|
|
|
return "Бездействие"
|
|
|
|
|
|
return "Активная работа"
|
|
|
|
|
|
|
|
|
|
|
|
def get_current_window_info(self) -> dict:
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
if not self.tracking_enabled or not self.current_task:
|
|
|
|
|
|
return {"group": "Пауза", "detail": "Трекинг остановлен. Нажмите «Пауза» для запуска."}
|
|
|
|
|
|
|
|
|
|
|
|
if self.is_idle:
|
|
|
|
|
|
return {"group": "Бездействие", "detail": "Нет активности более 60 сек или отвлекающее окно"}
|
|
|
|
|
|
|
|
|
|
|
|
window_info = self.platform.get_active_window()
|
|
|
|
|
|
group = self._match_window_to_policy(window_info)
|
|
|
|
|
|
return {
|
|
|
|
|
|
"group": group,
|
|
|
|
|
|
"detail": f"{window_info.title} | {window_info.process_name}"
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-03-10 02:47:12 +03:00
|
|
|
|
def get_current_session_duration(self) -> float:
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
if self.session_start_time is None:
|
|
|
|
|
|
return 0.0
|
|
|
|
|
|
return time.time() - self.session_start_time
|
2026-03-10 02:20:51 +03:00
|
|
|
|
|
2026-03-10 01:40:10 +03:00
|
|
|
|
def _load_or_create_config(self) -> TrackerConfig:
|
|
|
|
|
|
if self.config_path.exists():
|
|
|
|
|
|
with open(self.config_path, "r", encoding="utf-8") as f:
|
|
|
|
|
|
data = json.load(f)
|
|
|
|
|
|
return TrackerConfig.model_validate(data)
|
|
|
|
|
|
else:
|
|
|
|
|
|
config = TrackerConfig()
|
|
|
|
|
|
self._save_config(config)
|
|
|
|
|
|
return config
|
|
|
|
|
|
|
|
|
|
|
|
def _save_config(self, config: TrackerConfig) -> None:
|
|
|
|
|
|
with open(self.config_path, "w", encoding="utf-8") as f:
|
|
|
|
|
|
f.write(config.model_dump_json(indent=2))
|
|
|
|
|
|
|
|
|
|
|
|
def _load_task(self, task_id: str) -> Optional[TrackedTask]:
|
|
|
|
|
|
task_file = self.tasks_dir / f"{task_id}.json"
|
|
|
|
|
|
if task_file.exists():
|
|
|
|
|
|
try:
|
|
|
|
|
|
with open(task_file, "r", encoding="utf-8") as f:
|
|
|
|
|
|
data = json.load(f)
|
|
|
|
|
|
return TrackedTask.model_validate(data)
|
|
|
|
|
|
except Exception:
|
|
|
|
|
|
return None
|
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
|
|
def save_task(self, task: TrackedTask) -> None:
|
2026-03-12 18:50:39 +03:00
|
|
|
|
self._save_task_no_sync(task)
|
2026-03-10 01:40:10 +03:00
|
|
|
|
|
2026-03-10 02:20:51 +03:00
|
|
|
|
def shutdown(self):
|
|
|
|
|
|
self._running = False
|
2026-03-10 05:35:01 +03:00
|
|
|
|
self.maybe_save_task()
|
2026-03-10 02:20:51 +03:00
|
|
|
|
if hasattr(self, 'mouse_listener'):
|
|
|
|
|
|
self.mouse_listener.stop()
|
|
|
|
|
|
if hasattr(self, 'keyboard_listener'):
|
2026-03-10 05:35:01 +03:00
|
|
|
|
self.keyboard_listener.stop()
|
|
|
|
|
|
|
|
|
|
|
|
def sync_with_youtrack(self):
|
2026-03-12 18:50:39 +03:00
|
|
|
|
"""
|
|
|
|
|
|
Двусторонняя синхронизация с YouTrack:
|
|
|
|
|
|
1. Проверяет существование задачи в YouTrack
|
|
|
|
|
|
2. Загружает все work items из YouTrack
|
|
|
|
|
|
3. Сопоставляет локальные сессии с удаленными
|
|
|
|
|
|
4. Отправляет/обновляет несинхронизированные локальные сессии
|
|
|
|
|
|
5. Добавляет новые сессии из YouTrack, которых нет локально
|
|
|
|
|
|
"""
|
2026-03-10 05:35:01 +03:00
|
|
|
|
if not self.current_task:
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
client = YouTrackClient()
|
|
|
|
|
|
if not client.enabled:
|
2026-03-12 18:50:39 +03:00
|
|
|
|
logger.info("YouTrack: синхронизация отключена (нет настроек в .env)")
|
2026-03-10 05:35:01 +03:00
|
|
|
|
return
|
|
|
|
|
|
|
2026-03-12 18:50:39 +03:00
|
|
|
|
# Проверяем существование задачи в YouTrack
|
2026-03-10 05:35:01 +03:00
|
|
|
|
if not client.issue_exists(self.current_task.task_id):
|
2026-03-12 18:50:39 +03:00
|
|
|
|
logger.warning(f"YouTrack: задача {self.current_task.task_id} не существует — синхронизация пропущена")
|
2026-03-10 05:35:01 +03:00
|
|
|
|
return
|
|
|
|
|
|
|
2026-03-12 18:50:39 +03:00
|
|
|
|
# Загружаем все work items из YouTrack
|
|
|
|
|
|
remote_items = client.get_issue_work_items(self.current_task.task_id)
|
|
|
|
|
|
if not remote_items:
|
|
|
|
|
|
logger.info(f"YouTrack: нет записей времени для задачи {self.current_task.task_id}")
|
|
|
|
|
|
|
|
|
|
|
|
with self._lock:
|
|
|
|
|
|
changed = False
|
|
|
|
|
|
|
|
|
|
|
|
# Шаг 1: Обрабатываем локальные сессии
|
|
|
|
|
|
for session in self.current_task.sessions:
|
2026-03-10 05:35:01 +03:00
|
|
|
|
total_minutes = sum(detail.duration_seconds for detail in session.details) / 60.0
|
2026-03-12 18:50:39 +03:00
|
|
|
|
|
|
|
|
|
|
# Пропускаем нулевые или отрицательные сессии
|
|
|
|
|
|
if total_minutes <= 0:
|
2026-03-10 05:35:01 +03:00
|
|
|
|
session.synchronized = True
|
|
|
|
|
|
changed = True
|
2026-03-12 18:50:39 +03:00
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
|
|
# Случай A: Сессия уже имеет ID — обновляем существующий work item
|
|
|
|
|
|
if session.id:
|
|
|
|
|
|
if not session.synchronized:
|
|
|
|
|
|
if client.update_work_item(self.current_task.task_id, session.id, total_minutes):
|
|
|
|
|
|
session.synchronized = True
|
|
|
|
|
|
changed = True
|
|
|
|
|
|
logger.info(f"Обновлена сессия {session.id} для задачи {self.current_task.task_id}")
|
|
|
|
|
|
else:
|
|
|
|
|
|
logger.warning(f"Не удалось обновить сессию {session.id}")
|
|
|
|
|
|
# Если synchronized=True — ничего не делаем
|
|
|
|
|
|
|
|
|
|
|
|
# Случай B: Сессия без ID, но помечена как синхронизированная
|
|
|
|
|
|
# (возможно, синхронизирована в предыдущих версиях без сохранения ID)
|
|
|
|
|
|
elif session.synchronized:
|
|
|
|
|
|
# Пропускаем — считаем, что время уже учтено в YouTrack
|
|
|
|
|
|
# Но для надежности можно попробовать найти совпадение по длительности
|
|
|
|
|
|
matching_remote = next(
|
|
|
|
|
|
(item for item in remote_items
|
|
|
|
|
|
if abs(item['minutes'] - total_minutes) < 1), # погрешность 1 минута
|
|
|
|
|
|
None
|
|
|
|
|
|
)
|
|
|
|
|
|
if matching_remote:
|
|
|
|
|
|
session.id = matching_remote['id']
|
|
|
|
|
|
# Удаляем из remote_items, чтобы не дублировать при добавлении
|
|
|
|
|
|
remote_items.remove(matching_remote)
|
|
|
|
|
|
logger.info(f"Сопоставлена сессия без ID с удаленной записью {session.id}")
|
|
|
|
|
|
changed = True
|
|
|
|
|
|
|
|
|
|
|
|
# Случай C: Сессия без ID и не синхронизирована — создаем новый work item
|
2026-03-10 05:35:01 +03:00
|
|
|
|
else:
|
2026-03-12 18:50:39 +03:00
|
|
|
|
work_item_id = client.add_work_item(
|
|
|
|
|
|
self.current_task.task_id,
|
|
|
|
|
|
total_minutes,
|
|
|
|
|
|
description=f"Auto-tracked: {', '.join(set(d.group_name for d in session.details))}"
|
|
|
|
|
|
)
|
|
|
|
|
|
if work_item_id:
|
|
|
|
|
|
session.id = work_item_id
|
|
|
|
|
|
session.synchronized = True
|
|
|
|
|
|
# Сохраняем время создания для будущего сопоставления
|
|
|
|
|
|
session.youtrack_created_at = datetime.fromtimestamp(
|
|
|
|
|
|
next((item['created'] / 1000 for item in remote_items if item['id'] == work_item_id),
|
|
|
|
|
|
time.time())
|
|
|
|
|
|
)
|
|
|
|
|
|
changed = True
|
|
|
|
|
|
logger.info(
|
|
|
|
|
|
f"Создана новая запись времени {work_item_id} для задачи {self.current_task.task_id}")
|
|
|
|
|
|
else:
|
|
|
|
|
|
logger.warning(f"Не удалось создать запись времени для сессии")
|
|
|
|
|
|
|
|
|
|
|
|
# Шаг 2: Добавляем удаленные work items, которых нет локально
|
|
|
|
|
|
# (например, добавленные вручную через веб-интерфейс YouTrack)
|
|
|
|
|
|
local_session_ids = {s.id for s in self.current_task.sessions if s.id}
|
|
|
|
|
|
|
|
|
|
|
|
for remote_item in remote_items:
|
|
|
|
|
|
if remote_item['id'] not in local_session_ids and remote_item['minutes'] > 0:
|
|
|
|
|
|
# Создаем новую сессию на основе удаленной записи
|
|
|
|
|
|
now = datetime.now()
|
|
|
|
|
|
new_session = WorkSession(
|
|
|
|
|
|
start_time=now,
|
|
|
|
|
|
end_time=now,
|
|
|
|
|
|
details=[WorkDetail(
|
|
|
|
|
|
group_name="YouTrack Manual",
|
|
|
|
|
|
duration_seconds=remote_item['minutes'] * 60
|
|
|
|
|
|
)],
|
|
|
|
|
|
synchronized=True,
|
|
|
|
|
|
id=remote_item['id'],
|
|
|
|
|
|
youtrack_created_at=datetime.fromtimestamp(remote_item['created'] / 1000) if remote_item.get(
|
|
|
|
|
|
'created') else now,
|
|
|
|
|
|
description=remote_item.get('text')
|
|
|
|
|
|
)
|
|
|
|
|
|
self.current_task.sessions.append(new_session)
|
|
|
|
|
|
changed = True
|
|
|
|
|
|
logger.info(
|
|
|
|
|
|
f"Добавлена удаленная запись времени {remote_item['id']} ({remote_item['minutes']} мин) в локальную задачу")
|
2026-03-10 05:35:01 +03:00
|
|
|
|
|
2026-03-12 18:50:39 +03:00
|
|
|
|
# Сохраняем задачу, если были изменения
|
|
|
|
|
|
if changed:
|
|
|
|
|
|
self._save_task_no_sync(self.current_task)
|
|
|
|
|
|
logger.info(f"Синхронизация завершена для задачи {self.current_task.task_id}")
|
|
|
|
|
|
|
|
|
|
|
|
def _save_task_no_sync(self, task: TrackedTask) -> None:
|
|
|
|
|
|
"""Сохраняет задачу БЕЗ повторной синхронизации (во избежание рекурсии)"""
|
|
|
|
|
|
task_file = self.tasks_dir / f"{task.task_id}.json"
|
|
|
|
|
|
with open(task_file, "w", encoding="utf-8") as f:
|
|
|
|
|
|
f.write(task.model_dump_json(indent=2))
|