Merge branch 'develop'

flatpak/com.github.ransome1.sleek.appdata.xml

@@ -9,7 +9,7 @@
   <developer_name>Robin Ahle</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="2.0.12" date="2024-03-23"/>
+    <release version="2.0.13-rc.2" date="2024-03-27"/>
   </releases>
   <url type="homepage">https://github.com/ransome1/sleek</url>
   <url type="contact">https://github.com/ransome1/sleek/issues</url>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.12",
+  "version": "2.0.13-rc.2",
   "main": "./src/main/main.tsx",
   "scripts": {
     "build": "concurrently \"yarn run peggy\" \"yarn run build:main\" \"yarn run build:renderer\"",
@@ -147,7 +147,7 @@
     "webpack-merge": "^5.9.0"
   },
   "build": {
-    "buildVersion": "41",
+    "buildVersion": "42",
     "asar": true,
     "asarUnpack": "**\\*.{node,dll}",
     "files": [

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "synopsis": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "keywords": [

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: sleek
 base: core20
-version: "2.0.12"
+version: "2.0.13-rc.2"
 summary: todo.txt manager for Linux, free and open-source (FOSS)
 description: |
   sleek is an open-source (FOSS) todo manager based on the todo.txt syntax. Stripped down to only the most necessary features, and with a clean and simple interface, sleek aims to help you focus on getting things done.

src/locales/cs.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Přiblížení",
   "settings.disableAnimations": "Vypnout animace",
   "settings.useHumanFriendlyDates": "Používat lidsky přívětivá data",
+  "settings.weekStart": "První den týdne",
+  "settings.0": "Neděle",
+  "settings.1": "Pondělí",
   "drawer.tabs.attributes": "Atributy",
   "drawer.tabs.filters": "Filtry",
   "drawer.tabs.sorting": "Řazení",

src/locales/de.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Vergrößerung",
   "settings.disableAnimations": "Animationen deaktivieren",
   "settings.useHumanFriendlyDates": "Benutze benutzerfreundliche Datumsangaben",
+  "settings.weekStart": "Erster Tag der Woche",
+  "settings.0": "Sonntag",
+  "settings.1": "Montag",
   "drawer.tabs.attributes": "Attribute",
   "drawer.tabs.filters": "Filter",
   "drawer.tabs.sorting": "Sortierung",

src/locales/en.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Zoom",
   "settings.disableAnimations": "Disable animations",
   "settings.useHumanFriendlyDates": "Use human friendly dates",
+  "settings.weekStart": "First day of the week",
+  "settings.0": "Sunday",
+  "settings.1": "Monday",
   "drawer.tabs.attributes": "Attributes",
   "drawer.tabs.filters": "Filters",
   "drawer.tabs.sorting": "Sorting",

src/locales/es.json

@@ -26,6 +26,10 @@
   "settings.matomo": "Permitir análisis de Matomo",
   "settings.zoom": "Zoom",
   "settings.disableAnimations": "Desactivar animaciones",
+  "settings.useHumanFriendlyDates": "Usar fechas amigables para el usuario",
+  "settings.weekStart": "Primer día de la semana",
+  "settings.0": "Domingo",
+  "settings.1": "Lunes",
   "drawer.tabs.attributes": "Atributos",
   "drawer.tabs.filters": "Filtros",
   "drawer.tabs.sorting": "Ordenación",

src/locales/fr.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Zoom",
   "settings.disableAnimations": "Désactiver les animations",
   "settings.useHumanFriendlyDates": "Utiliser des dates conviviales",
+  "settings.weekStart": "Premier jour de la semaine",
+  "settings.0": "Dimanche",
+  "settings.1": "Lundi",
   "drawer.tabs.attributes": "Attributs",
   "drawer.tabs.filters": "Filtres",
   "drawer.tabs.sorting": "Tri",

src/locales/hi.json

@@ -27,6 +27,9 @@
   "settings.zoom": "ज़ूम",
   "settings.disableAnimations": "एनिमेशन अक्षम करें",
   "settings.useHumanFriendlyDates": "मानव-मित्रता योग्य तिथियाँ उपयोग करें",
+  "settings.weekStart": "सप्ताह का पहला दिन",
+  "settings.0": "रविवार",
+  "settings.1": "सोमवार",
   "drawer.tabs.attributes": "गुण",
   "drawer.tabs.filters": "फ़िल्टर",
   "drawer.tabs.sorting": "क्रमबद्ध करना",

src/locales/hu.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Nagyítás",
   "settings.disableAnimations": "Animációk kikapcsolása",
   "settings.useHumanFriendlyDates": "Használjon emberbarát dátumokat",
+  "settings.weekStart": "Hét első napja",
+  "settings.0": "Vasárnap",
+  "settings.1": "Hétfő",
   "drawer.tabs.attributes": "Tulajdonságok",
   "drawer.tabs.filters": "Szűrők",
   "drawer.tabs.sorting": "Rendezés",

src/locales/it.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Zoom",
   "settings.disableAnimations": "Disattiva animazioni",
   "settings.useHumanFriendlyDates": "Usa date user-friendly",
+  "settings.weekStart": "Primo giorno della settimana",
+  "settings.0": "Domenica",
+  "settings.1": "Lunedì",
   "drawer.tabs.attributes": "Attributi",
   "drawer.tabs.filters": "Filtri",
   "drawer.tabs.sorting": "Ordinamento",

src/locales/jp.json

@@ -27,6 +27,9 @@
   "settings.zoom": "ズーム",
   "settings.disableAnimations": "アニメーションを無効にする",
   "settings.useHumanFriendlyDates": "使いやすい日付を使用する",
+  "settings.weekStart": "週の初日",
+  "settings.0": "日曜日",
+  "settings.1": "月曜日",
   "drawer.tabs.attributes": "属性",
   "drawer.tabs.filters": "フィルター",
   "drawer.tabs.sorting": "ソート",

src/locales/ko.json

@@ -27,6 +27,9 @@
   "settings.zoom": "줌",
   "settings.disableAnimations": "애니메이션 비활성화",
   "settings.useHumanFriendlyDates": "사용자 친화적인 날짜 사용",
+  "settings.weekStart": "주의 첫날",
+  "settings.0": "일요일",
+  "settings.1": "월요일",
   "drawer.tabs.attributes": "속성",
   "drawer.tabs.filters": "필터",
   "drawer.tabs.sorting": "정렬",

src/locales/pl.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Powiększenie",
   "settings.disableAnimations": "Wyłącz animacje",
   "settings.useHumanFriendlyDates": "Używaj przyjaznych dla użytkownika dat",
+  "settings.weekStart": "Pierwszy dzień tygodnia",
+  "settings.0": "Niedziela",
+  "settings.1": "Poniedziałek",
   "drawer.tabs.attributes": "Atrybuty",
   "drawer.tabs.filters": "Filtry",
   "drawer.tabs.sorting": "Sortowanie",

src/locales/pt.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Zoom",
   "settings.disableAnimations": "Desativar animações",
   "settings.useHumanFriendlyDates": "Usar datas amigáveis",
+  "settings.weekStart": "Primeiro dia da semana",
+  "settings.0": "Domingo",
+  "settings.1": "Segunda-feira",
   "drawer.tabs.attributes": "Atributos",
   "drawer.tabs.filters": "Filtros",
   "drawer.tabs.sorting": "Ordenação",

src/locales/ru.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Масштаб",
   "settings.disableAnimations": "Отключить анимации",
   "settings.useHumanFriendlyDates": "Использовать удобочитаемые даты",
+  "settings.weekStart": "Первый день недели",
+  "settings.0": "Воскресенье",
+  "settings.1": "Понедельник",
   "drawer.tabs.attributes": "Атрибуты",
   "drawer.tabs.filters": "Фильтры",
   "drawer.tabs.sorting": "Сортировка",

src/locales/tr.json

@@ -27,6 +27,9 @@
   "settings.zoom": "Yakınlaştırma",
   "settings.disableAnimations": "Animasyonları devre dışı bırak",
   "settings.useHumanFriendlyDates": "İnsan dostu tarihleri kullan",
+  "settings.weekStart": "Haftanın ilk günü",
+  "settings.0": "Pazar",
+  "settings.1": "Pazartesi",
   "drawer.tabs.attributes": "Özellikler",
   "drawer.tabs.filters": "Filtreler",
   "drawer.tabs.sorting": "Sıralama",

src/locales/zh.json

@@ -27,6 +27,9 @@
   "settings.zoom": "缩放",
   "settings.disableAnimations": "禁用动画",
   "settings.useHumanFriendlyDates": "使用人性化日期",
+  "settings.weekStart": "一周的第一天",
+  "settings.0": "星期日",
+  "settings.1": "星期一",
   "drawer.tabs.attributes": "属性",
   "drawer.tabs.filters": "过滤器",
   "drawer.tabs.sorting": "排序",

src/main/config.tsx

@@ -104,6 +104,20 @@ const config: Store<Settings> = new Store<Settings>({
       store.set('fileWatcherPolling', false);
       store.set('fileWatcherPollingInterval', 100);
     },
+    '2.0.13': store => {
+      console.log('Migrating from 2.0.12 → 2.0.13');
+      store.set('weekStart', 1);
+      store.delete('fileWatcherAtomic');
+      store.delete('fileWatcherPolling');
+      store.delete('fileWatcherPollingInterval');
+      store.delete('language');
+      store.set('chokidarOptions', {
+        awaitWriteFinish: {
+          stabilityThreshold: 100,
+          pollInterval: 100
+        }
+      })
+    },
   }
 });
 

src/main/modules/File/Watcher.tsx

@@ -17,15 +17,9 @@ function createFileWatcher(files: FileObject[]): void {
     config.set('files', files)
   }
 
-  const fileWatcherAtomic = config.get('fileWatcherAtomic') || 1000;
-  const fileWatcherPolling = config.get('fileWatcherPolling') || false;
-  const fileWatcherPollingInterval = config.get('fileWatcherPollingInterval') || 100;
-
-  watcher = chokidar.watch(files.map((file) => file.todoFilePath), {
-    atomic: fileWatcherAtomic,
-    usePolling: fileWatcherPolling,
-    interval: fileWatcherPollingInterval
-  });
+  const chokidarOptions = config.get('chokidarOptions');
+
+  watcher = chokidar.watch(files.map((file) => file.todoFilePath), chokidarOptions);
 
   watcher
     .on('add', (file) => {

src/main/modules/ProcessDataRequest/ProcessTodoObjects.tsx

@@ -56,9 +56,10 @@ function handleCompletedTodoObjects(todoObjects: TodoObject[]): TodoObject[] {
   const showCompleted: boolean = config.get('showCompleted');
   return todoObjects.map((todoObject: TodoObject) => {
     if(todoObject.complete && !showCompleted) {
-      todoObject.visible = false;
+      return false;
+    } else {
+      return todoObject;
     }
-    return todoObject;
   });
 }
 
@@ -74,20 +75,14 @@ function handleTodoObjectsDates(todoObjects: TodoObject[]): TodoObject[] {
   const thresholdDateInTheFuture: boolean = config.get('thresholdDateInTheFuture');
   const dueDateInTheFuture: boolean = config.get('dueDateInTheFuture');
 
-  return todoObjects.map((todoObject: TodoObject) => {
+  return todoObjects.filter((todoObject: TodoObject) => {
+    if (!todoObject.visible) return true;
 
-    if(!todoObject.visible) return todoObject;
-
     const thresholdDate = dayjs(todoObject?.t);
     const dueDate = dayjs(todoObject?.due);
 
-    if(thresholdDate && thresholdDate.isAfter(dayjs()) && !thresholdDateInTheFuture) {
-      todoObject.visible = false;  
-    } else if(dueDate && dueDate.isAfter(dayjs()) && !dueDateInTheFuture) {
-      todoObject.visible = false;  
-    }
-
-    return todoObject;
+    return !(thresholdDate && thresholdDate.isAfter(dayjs()) && !thresholdDateInTheFuture) &&
+           !(dueDate && dueDate.isAfter(dayjs()) && !dueDateInTheFuture);
   });
 }
 

src/renderer/App.tsx

@@ -64,7 +64,7 @@ const App = () => {
       .catch((error) => {
         console.error(error);
       });
-  }, [settings.language]);  
+  }, [settings.language]);
 
   useEffect(() => {
     const windowHeight = window.innerHeight;

src/renderer/Dialog/DatePicker.tsx

@@ -4,7 +4,9 @@ import { i18n } from '../Settings/LanguageSelector';
 import { DatePicker, LocalizationProvider } from '@mui/x-date-pickers';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 import dayjs from 'dayjs';
+import updateLocale from 'dayjs/plugin/updateLocale';
 import './DatePicker.scss';
+dayjs.extend(updateLocale);
 
 interface Props extends WithTranslation {
   date: string | null;
@@ -21,6 +23,9 @@ const DatePickerComponent: React.FC<Props> = ({
   handleChange,
   t,
 }) => {
+  dayjs.updateLocale(settings.language, {
+    weekStart: settings.weekStart,
+  });
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs} adapterLocale={settings.language}>
       <DatePicker

src/renderer/Drawer/Attributes.tsx

@@ -43,7 +43,7 @@ const DrawerAttributes: React.FC<DrawerAttributesProps> = memo(({
     Object.keys(attributes).forEach((key) => {
       if (attributes[key]) {
         const count = attributes[key].count;
-        const formattedValues = settings.useHumanFriendlyDates && isDate ? friendlyDate(key, attributeKey, settings.language, t) : [key];
+        const formattedValues = settings.useHumanFriendlyDates && isDate ? friendlyDate(key, attributeKey, settings, t) : [key];
 
         formattedValues.forEach((formattedValue) => {
           if (!processedAttributes[formattedValue]) {