Skip to content

Commit ee3613d

Browse files
committed
Rename imutils.exif to imutils.metadata
Renaming is done as this file handles all metadata related functionalities and not just exif metadata.
1 parent 4f829cb commit ee3613d

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

vimiv/gui/metadatawidget.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
from PyQt5.QtWidgets import QLabel, QSizePolicy, QWidget
1414

1515
from vimiv import api, utils
16-
from vimiv.imutils import exif
16+
from vimiv.imutils import metadata
1717
from vimiv.config import styles
1818

1919
_logger = utils.log.module_logger(__name__)
2020

2121

2222
# TODO: conditional fails as this file is imported before plugins are loaded
23-
# if exif.has_get_metadata():
23+
# if metadata.has_get_metadata():
2424
if True:
2525
class MetadataWidget(QLabel):
2626
"""Overlay widget to display image metadata.
@@ -59,18 +59,18 @@ def __init__(self, parent: QWidget):
5959
self._mainwindow_width = 0
6060
self._path = ""
6161
self._current_set = ""
62-
self._handler: Optional[exif.MetadataHandler] = None
62+
self._handler: Optional[metadata.MetadataHandler] = None
6363

6464
api.signals.new_image_opened.connect(self._on_image_opened)
6565
api.settings.metadata.current_keyset.changed.connect(self._update_text)
6666

6767
self.hide()
6868

6969
@property
70-
def handler(self) -> exif.MetadataHandler:
70+
def handler(self) -> metadata.MetadataHandler:
7171
"""Return the MetadataHandler for the current path."""
7272
if self._handler is None:
73-
self._handler = exif.MetadataHandler(self._path)
73+
self._handler = metadata.MetadataHandler(self._path)
7474
return self._handler
7575

7676
@api.keybindings.register("i", "metadata", mode=api.modes.IMAGE)

vimiv/imutils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
the appropriate Qt widget.
3939
"""
4040

41-
from vimiv.imutils import exif
41+
from vimiv.imutils import metadata
4242
from vimiv.imutils.edit_handler import EditHandler
4343
from vimiv.imutils.filelist import current, pathlist
4444
from vimiv.imutils.filelist import SignalHandler as _FilelistSignalHandler

vimiv/imutils/_file_handler.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def write_pixmap(pixmap, path, original_path):
172172
Args:
173173
pixmap: The QPixmap to write.
174174
path: Path to write the pixmap to.
175-
original_path: Original path of the opened pixmap to retrieve exif information.
175+
original_path: Original path of the opened pixmap to retrieve metadata information.
176176
"""
177177
try:
178178
_can_write(pixmap, path)
@@ -210,10 +210,10 @@ def _write(pixmap, path, original_path):
210210
handle, filename = tempfile.mkstemp(suffix=ext)
211211
os.close(handle)
212212
pixmap.save(filename)
213-
# Copy exif info from original file to new file
213+
# Copy metadata info from original file to new file
214214
try:
215-
imutils.exif.MetadataHandler(original_path).copy_metadata(filename)
216-
except imutils.exif.UnsupportedMetadataOperation:
215+
imutils.metadata.MetadataHandler(original_path).copy_metadata(filename)
216+
except imutils.metadata.UnsupportedMetadataOperation:
217217
pass
218218
shutil.move(filename, path)
219219
# Check if valid image was created

vimiv/imutils/filelist.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ def exif_date_time() -> str:
141141
be used as basis to work with.
142142
"""
143143
try:
144-
return imutils.exif.MetadataHandler(current()).get_date_time()
145-
except imutils.exif.UnsupportedMetadataOperation:
144+
return imutils.metadata.MetadataHandler(current()).get_date_time()
145+
except imutils.metadata.UnsupportedMetadataOperation:
146146
return ""
147147

148148

File renamed without changes.

0 commit comments

Comments
 (0)