Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update WriteXMP feature to use pyexiv2 only #1043

Merged
merged 1 commit into from
Nov 6, 2021
Merged

Update WriteXMP feature to use pyexiv2 only #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 35 additions & 75 deletions PixivImage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def WriteXMP(self, filename):
import pyexiv2
import tempfile

# need to use temp file due to bad unicod support for pyexiv2 in windows
# need to use temp file due to bad unicode support for pyexiv2 in windows
d = tempfile.mkdtemp(prefix="xmp")
d = d.replace(os.sep, '/')
tempname = f"{d}/{self.imageId}.xmp"
Expand All @@ -453,81 +453,41 @@ def WriteXMP(self, filename):
info.close()

# Reopen file using pyexiv2
if hasattr(pyexiv2, "ImageMetadata"):
info = pyexiv2.ImageMetadata(tempname)
info.read()

info['Xmp.dc.creator'] = [self.artist.artistName]
# Check array isn't empty.
if self.imageTitle:
info['Xmp.dc.title'] = self.imageTitle
# Check array isn't empty.
if self.imageCaption:
info['Xmp.dc.description'] = self.imageCaption
# Check array isn't empty.
if self.imageTags:
info['Xmp.dc.subject'] = self.imageTags
info['Xmp.dc.date'] = [self.worksDateDateTime]
info['Xmp.dc.source'] = f"http://www.pixiv.net/en/artworks/{self.imageId}"
info['Xmp.dc.identifier'] = self.imageId

# Custom 'pixiv' namespace for non-standard details.
pyexiv2.xmp.register_namespace('http://pixiv.com/', 'pixiv')

info['Xmp.pixiv.artist_id'] = self.artist.artistId
info['Xmp.pixiv.image_mode'] = self.imageMode
info['Xmp.pixiv.pages'] = self.imageCount
info['Xmp.pixiv.resolution'] = self.worksResolution
info['Xmp.pixiv.bookmark_count'] = self.bookmark_count

if self.seriesNavData:
info['Xmp.pixiv.series_title'] = self.seriesNavData['title']
info['Xmp.pixiv.series_order'] = self.seriesNavData['order']
info['Xmp.pixiv.series_id'] = self.seriesNavData['seriesId']
if self.ugoira_data:
info['Xmp.pixiv.ugoira_data'] = self.ugoira_data
if len(self.descriptionUrlList) > 0:
info['Xmp.pixiv.urls'] = ", ".join(self.descriptionUrlList)

info.write()
pyexiv2.xmp.closeXmpParser()
else:
# newer version e.g. pyexiv2-2.7.0
info = pyexiv2.Image(tempname)
info_dict = info.read_xmp()
info_dict['Xmp.dc.creator'] = [self.artist.artistName]
# Check array isn't empty.
if self.imageTitle:
info_dict['Xmp.dc.title'] = self.imageTitle
# Check array isn't empty.
if self.imageCaption:
info_dict['Xmp.dc.description'] = self.imageCaption
# Check array isn't empty.
if self.imageTags:
info_dict['Xmp.dc.subject'] = self.imageTags
info_dict['Xmp.dc.date'] = [self.worksDateDateTime]
info_dict['Xmp.dc.source'] = f"http://www.pixiv.net/en/artworks/{self.imageId}"
info_dict['Xmp.dc.identifier'] = self.imageId

# Custom 'pixiv' namespace for non-standard details.
pyexiv2.registerNs('http://pixiv.com/', 'pixiv')

info_dict['Xmp.pixiv.artist_id'] = self.artist.artistId
info_dict['Xmp.pixiv.image_mode'] = self.imageMode
info_dict['Xmp.pixiv.pages'] = self.imageCount
info_dict['Xmp.pixiv.resolution'] = self.worksResolution
info_dict['Xmp.pixiv.bookmark_count'] = self.bookmark_count

if self.seriesNavData:
info_dict['Xmp.pixiv.series_title'] = self.seriesNavData['title']
info_dict['Xmp.pixiv.series_order'] = self.seriesNavData['order']
info_dict['Xmp.pixiv.series_id'] = self.seriesNavData['seriesId']
if self.ugoira_data:
info_dict['Xmp.pixiv.ugoira_data'] = self.ugoira_data
if len(self.descriptionUrlList) > 0:
info_dict['Xmp.pixiv.urls'] = ", ".join(self.descriptionUrlList)
info.modify_xmp(info_dict)
# newer version e.g. pyexiv2-2.7.0
info = pyexiv2.Image(tempname)
info_dict = info.read_xmp()
info_dict['Xmp.dc.creator'] = [self.artist.artistName]
# Check array isn't empty.
if self.imageTitle:
info_dict['Xmp.dc.title'] = self.imageTitle
# Check array isn't empty.
if self.imageCaption:
info_dict['Xmp.dc.description'] = self.imageCaption
# Check array isn't empty.
if self.imageTags:
info_dict['Xmp.dc.subject'] = self.imageTags
info_dict['Xmp.dc.date'] = [self.worksDateDateTime]
info_dict['Xmp.dc.source'] = f"http://www.pixiv.net/en/artworks/{self.imageId}"
info_dict['Xmp.dc.identifier'] = self.imageId

# Custom 'pixiv' namespace for non-standard details.
pyexiv2.registerNs('http://pixiv.com/', 'pixiv')

info_dict['Xmp.pixiv.artist_id'] = self.artist.artistId
info_dict['Xmp.pixiv.image_mode'] = self.imageMode
info_dict['Xmp.pixiv.pages'] = self.imageCount
info_dict['Xmp.pixiv.resolution'] = self.worksResolution
info_dict['Xmp.pixiv.bookmark_count'] = self.bookmark_count

if self.seriesNavData:
info_dict['Xmp.pixiv.series_title'] = self.seriesNavData['title']
info_dict['Xmp.pixiv.series_order'] = self.seriesNavData['order']
info_dict['Xmp.pixiv.series_id'] = self.seriesNavData['seriesId']
if self.ugoira_data:
info_dict['Xmp.pixiv.ugoira_data'] = self.ugoira_data
if len(self.descriptionUrlList) > 0:
info_dict['Xmp.pixiv.urls'] = ", ".join(self.descriptionUrlList)
info.modify_xmp(info_dict)
info.close()

# rename to actual file
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ PySocks>=1.7.1
# apng>=0.3.3
colorama>=0.4.4
cloudscraper>=1.2.58
# py3exiv2>=0.9.3 # Required for writeImageXMP.
# pyexiv2>=2.7.0 # Required for writeImageXMP.