join time and date

Author: e3rd

.github/workflows/python-publish.yml

@@ -18,6 +18,6 @@ jobs:
       - name: Build the package
         run: python3 -m pip install --upgrade build && python3 -m build
       - name: Publish package
-        uses: pypa/gh-action-pypi-publish@v1.8.10
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_GITHUB_TOUCHTIMESTAMP }}

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "touch-timestamp"
-version = "0.4.0"
+version = "0.4.1"
 description = "Change file timestamps with a dialog window."
 authors = ["Edvard Rejthar <edvard.rejthar@nic.cz>"]
 license = "GPL-3.0-or-later"

touch_timestamp/app.py

@@ -1,19 +1,19 @@
+import subprocess
+from dataclasses import MISSING, dataclass, field
 from datetime import datetime
 from os import utime
-import subprocess
+from pathlib import Path
+from typing import Annotated, get_args
 
 import dateutil
-from .controller import Controller
-from .utils import (count_relative_shift, get_date, set_files_timestamp,
-                    touch_multiple)
-from typing import Annotated, get_args
 from mininterface import Tag
+from mininterface.exceptions import ValidationFail
+from mininterface.subcommands import Command
 from tyro.conf import Positional
-from dataclasses import MISSING, dataclass, field
-from pathlib import Path
 
-from mininterface.subcommands import Command
-from mininterface.exceptions import ValidationFail
+from .controller import Controller
+from .utils import (count_relative_shift, get_date, set_files_timestamp,
+                    touch_multiple)
 
 DateFormat = str  # Use type as of Python3.12
 
@@ -52,24 +52,28 @@ def init(self):
 class Set(App):
     """ Set to a specific time """
 
-    date: Annotated[str, Tag(on_change=c.refresh_title)] = ""
+    # TODO, should be working with DatetimeTag automatically
+    date: Annotated[datetime, Tag(on_change=c.refresh_title)] = datetime.now()
     """ Set specific date """
-    time: Annotated[str, Tag(on_change=c.refresh_title)] = ""
-    """ Set specific time """
+    # date: Annotated[str, Tag(on_change=c.refresh_title)] = ""
+    # """ Set specific date """
+    # time: Annotated[str, Tag(on_change=c.refresh_title)] = ""
+    # """ Set specific time """
 
     def init(self):
         super().init()
         # NOTE program fails on wrong date in GUI
         if self.ref_date:
-            self.date = self.date or str(self.ref_date.date())
-            self.time = self.time or str(self.ref_date.time())
+            self.date = self.date or str(self.ref_date.timestamp())
+            # self.date = self.date or str(self.ref_date.date())
+            # self.time = self.time or str(self.ref_date.time())
 
     def run(self):
-        if bool(self.date) != bool(self.time):
-            # NOTE allow only time change (the date would stay)
-            print("You have to specify both date and time ")
-            quit()
-        set_files_timestamp(self.date, self.time, self.files)
+        # if bool(self.date) != bool(self.time):
+        #     # NOTE allow only time change (the date would stay)
+        #     print("You have to specify both date and time ")
+        #     quit()
+        set_files_timestamp(self.date, self.files)
 
 
 @dataclass
@@ -151,7 +155,7 @@ def init(self):
         get_args(self.__annotations__["reference"])[1].choices = self.files
 
     def run(self):
-        reference = count_relative_shift(self.date, self.time, self.reference)
+        reference = count_relative_shift(self.date, self.reference)
 
         # microsecond precision is neglected here, touch does not takes it
         touch_multiple(self.files, f"{reference.days} days {reference.seconds} seconds")

touch_timestamp/controller.py

@@ -1,13 +1,6 @@
-import subprocess
-from datetime import datetime
-from os import utime
+from mininterface import Tag
 
-import dateutil.parser
-from mininterface import Mininterface, Tag
-
-# from .env import Env
-from .utils import (count_relative_shift, get_date, set_files_timestamp,
-                    touch_multiple)
+from .utils import count_relative_shift, get_date
 
 
 class Controller:

touch_timestamp/touch_timestamp.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 from mininterface import run
 from mininterface.subcommands import SubcommandPlaceholder
-from .app import FromName, RelativeToReference, Set, Exif, Shift
+
+from .app import Exif, FromName, RelativeToReference, Set, Shift
 
 # NOTE add tests for CLI flags
 

touch_timestamp/utils.py

@@ -3,26 +3,22 @@
 from pathlib import Path
 import subprocess
 
-import dateutil.parser
-
 
 def get_date(path: str | Path):
     return datetime.fromtimestamp(Path(path).stat().st_mtime)
 
 
-def set_files_timestamp(date, time, files: list[str]):
-    print("Touching files", date, time)
+def set_files_timestamp(date: datetime, files: list[str]):
+    print("Touching files", date)
     print(", ".join(str(f) for f in files))
-    if date and time:
-        time = dateutil.parser.parse(f"{date} {time}").timestamp()
+    if date:
+        time = date.timestamp()
         [utime(f, (time, time)) for f in files]
         return True
 
 
-def count_relative_shift(date, time, path: str | Path):
-    target = dateutil.parser.parse(f"{date} {time}")
-    date = get_date(path)
-    return target - date
+def count_relative_shift(date: datetime, path: str | Path):
+    return date - get_date(path)
 
 
 def touch_multiple(files: list[Path], relative_str):