Browse Source

cleanup temporary files

Fabian Peter Hammerle 7 months ago
parent
commit
6a1a39036e
2 changed files with 35 additions and 18 deletions
  1. 6 1
      CHANGELOG.md
  2. 29 17
      ical2vdir/__init__.py

+ 6 - 1
CHANGELOG.md

@@ -6,7 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.1] - 2020-02-06
+### Fixed
+- cleanup temporary files
+
 ## [0.1.0] - 2020-02-06
 
-[Unreleased]: https://github.com/fphammerle/ical2vdir/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/fphammerle/ical2vdir/compare/v0.1.1...HEAD
+[0.1.1]: https://github.com/fphammerle/ical2vdir/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/fphammerle/ical2vdir/releases/tag/v0.1.0

+ 29 - 17
ical2vdir/__init__.py

@@ -16,12 +16,14 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import argparse
+import contextlib
 import datetime
 import logging
 import os
 import pathlib
 import sys
 import tempfile
+import typing
 
 import icalendar
 
@@ -86,27 +88,37 @@ def _event_vdir_filename(event: icalendar.cal.Event) -> str:
     return output_filename + _VDIR_EVENT_FILE_EXTENSION
 
 
-def _export_event(
-    event: icalendar.cal.Event, output_dir_path: pathlib.Path
-) -> pathlib.Path:
+@contextlib.contextmanager
+def _temp_vdir_item() -> typing.Iterator[typing.Tuple[int, str]]:
     temp_fd, temp_path = tempfile.mkstemp(
         prefix="ical2vdir-", suffix=_VDIR_EVENT_FILE_EXTENSION
     )
-    os.write(temp_fd, event.to_ical())
-    os.close(temp_fd)
-    output_path = output_dir_path.joinpath(_event_vdir_filename(event))
-    if not output_path.exists():
-        _LOGGER.info("creating %s", output_path)
-        os.rename(temp_path, output_path)
-    else:
-        with open(output_path, "rb") as current_file:
-            current_event = icalendar.Event.from_ical(current_file.read())
-        if _events_equal(event, current_event):
-            _LOGGER.debug("%s is up to date", output_path)
-        else:
-            _LOGGER.info("updating %s", output_path)
+    try:
+        yield (temp_fd, temp_path)
+    finally:
+        if os.path.exists(temp_path):
+            os.unlink(temp_path)
+
+
+def _export_event(
+    event: icalendar.cal.Event, output_dir_path: pathlib.Path
+) -> pathlib.Path:
+    with _temp_vdir_item() as (temp_fd, temp_path):
+        os.write(temp_fd, event.to_ical())
+        os.close(temp_fd)
+        output_path = output_dir_path.joinpath(_event_vdir_filename(event))
+        if not output_path.exists():
+            _LOGGER.info("creating %s", output_path)
             os.rename(temp_path, output_path)
-    return output_path
+        else:
+            with open(output_path, "rb") as current_file:
+                current_event = icalendar.Event.from_ical(current_file.read())
+            if _events_equal(event, current_event):
+                _LOGGER.debug("%s is up to date", output_path)
+            else:
+                _LOGGER.info("updating %s", output_path)
+                os.rename(temp_path, output_path)
+        return output_path
 
 
 def _main():