From 5f7a807ad16dbdc30451afdac439edfae7645097 Mon Sep 17 00:00:00 2001 From: Abid Khan Date: Wed, 2 Oct 2024 10:53:22 +0600 Subject: [PATCH] raw format parsing added for arw, dng, cr2 yurijmikhalevich/rclip#15 --- poetry.lock | 46 +++++++++++++++++++++++++++++++++++++++++++++- pyproject.toml | 1 + rclip/main.py | 19 +++++++++++++++++-- 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 34926f23..9db0b5d9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -567,6 +567,7 @@ description = "Nvidia JIT LTO Library" optional = false python-versions = ">=3" files = [ + {file = "nvidia_nvjitlink_cu12-12.5.82-py3-none-manylinux2014_aarch64.whl", hash = "sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27"}, {file = "nvidia_nvjitlink_cu12-12.5.82-py3-none-manylinux2014_x86_64.whl", hash = "sha256:f9b37bc5c8cf7509665cb6ada5aaa0ce65618f2332b7d3e78e9790511f111212"}, {file = "nvidia_nvjitlink_cu12-12.5.82-py3-none-win_amd64.whl", hash = "sha256:e782564d705ff0bf61ac3e1bf730166da66dd2fe9012f111ede5fc49b64ae697"}, ] @@ -774,6 +775,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -781,8 +783,16 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -799,6 +809,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -806,11 +817,44 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, ] +[[package]] +name = "rawpy" +version = "0.23.1" +description = "RAW image processing for Python, a wrapper for libraw" +optional = false +python-versions = "*" +files = [ + {file = "rawpy-0.23.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef176760c6cf8347fffad83a27f5c40aee27602277393a8031e4939ea7ed620e"}, + {file = "rawpy-0.23.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ab8a6b4348dd047cb2a77b4e7ec03d6f74acc63610e12541e0749f189dd31f63"}, + {file = "rawpy-0.23.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:95b4ab2ad6e53f289ed5137f991a22b7f05ab80c8bd46e83a504b0831c014978"}, + {file = "rawpy-0.23.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0aa97213e925283bc88d914203c83e0c2ec565aa6189fa42af8388c53216e09"}, + {file = "rawpy-0.23.1-cp310-cp310-win_amd64.whl", hash = "sha256:8ed6ab42051fdde69966091f88dc9284d51dddfca006333f23ddf1d6f79b44e8"}, + {file = "rawpy-0.23.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b030a10e4c89eef98ef4cb5dda41b210bda00c283838de25add1d1a5aa8ce503"}, + {file = "rawpy-0.23.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e5098f3bb560d855ead6554fa6074b43c75bc15d1f801d2e837a327b72c50a3b"}, + {file = "rawpy-0.23.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1202657ffb51710fa0fb6ae00012648320fc30e6226af92c8b7b78f44bc7e03"}, + {file = "rawpy-0.23.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:391c6fe448f419e0c36663d52413fc66b7772cb6724fb2d3473ff52cef817895"}, + {file = "rawpy-0.23.1-cp311-cp311-win_amd64.whl", hash = "sha256:08bf5a03ec94983edf37065a8ac3f6efdf464e85e0d3e052ab941fbccd89d998"}, + {file = "rawpy-0.23.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c36b758a43d695dc9b64ee0614f8441f0b7f2b92a815da99aaa30d1d8dd31208"}, + {file = "rawpy-0.23.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6f412896f17997b5eb6f06332c8abbceaea2fe7c9230382062fdd4acc555fb77"}, + {file = "rawpy-0.23.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:86c452cff6d6aad6e871b2956163679f41abd94732fc0295aef5626457d8fcb0"}, + {file = "rawpy-0.23.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1fef0e717a956c0b3e4e50709c38c0ec447853ce883ddc2305a2c73948cc533d"}, + {file = "rawpy-0.23.1-cp312-cp312-win_amd64.whl", hash = "sha256:a5077ca1cf9661e402748362abb0b4e66740b81f0478cf7f99c7150eb1149d44"}, + {file = "rawpy-0.23.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6fbdc64283917e20f66199d057be7ba6cecc690778793e9f7af045a2322d4e8b"}, + {file = "rawpy-0.23.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:16879658e7839cdfa2579f4a318543c4a44dbf316dc61e7cbb0472c1d90335e6"}, + {file = "rawpy-0.23.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d379b3aa86f25dd7c28c254edbb0d3e077ec736b1e5105e688399dd9cd2e31"}, + {file = "rawpy-0.23.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7b563dd4b2ea0e17547577253d88497b26a8ecaa17cc72afb40bfa5f19e39b6"}, + {file = "rawpy-0.23.1-cp39-cp39-win_amd64.whl", hash = "sha256:da99235c80af8926eb91e7268b0dedc30d7b0cbe6ab8ddb3b23aa4536d134447"}, +] + +[package.dependencies] +numpy = ">=1.26.0" + [[package]] name = "regex" version = "2024.5.15" @@ -1353,4 +1397,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = ">=3.9 <3.13" -content-hash = "ffbdbfd76077322c443179339fb5037cb8a8437286546d753d2a241dfcf285d2" +content-hash = "9d0705f14dedc9cb69f4763dc20fde3ed0124b17a5084fea0876cbc7575b1376" diff --git a/pyproject.toml b/pyproject.toml index 9a70d664..cc55fa2e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ torchvision = [ { version = "==0.17.2+cpu", source = "pytorch-cpu", markers = "sys_platform == 'linux' and platform_machine != 'aarch64'" } ] tqdm = "^4.65.0" +rawpy = "^0.23.1" [tool.poetry.group.dev.dependencies] pycodestyle = ">=2.7,<3.0" diff --git a/rclip/main.py b/rclip/main.py index 53a9a328..78d6b03e 100644 --- a/rclip/main.py +++ b/rclip/main.py @@ -9,6 +9,7 @@ from tqdm import tqdm import PIL from PIL import Image, ImageFile +from rawpy import imread from rclip import db, fs, model from rclip.utils.preview import preview @@ -41,7 +42,7 @@ def is_image_meta_equal(image: db.Image, meta: ImageMeta) -> bool: class RClip: EXCLUDE_DIRS_DEFAULT = ['@eaDir', 'node_modules', '.git'] - IMAGE_REGEX = re.compile(r'^.+\.(jpe?g|png|webp)$', re.I) + IMAGE_REGEX = re.compile(r'^.+\.(jpe?g|png|webp|arw|dng|cr2)$', re.I) DB_IMAGES_BEFORE_COMMIT = 50_000 class SearchResult(NamedTuple): @@ -62,6 +63,17 @@ def __init__( excluded_dirs = '|'.join(re.escape(dir) for dir in exclude_dirs or self.EXCLUDE_DIRS_DEFAULT) self._exclude_dir_regex = re.compile(f'^.+\\{os.path.sep}({excluded_dirs})(\\{os.path.sep}.+)?$') + def _read_raw_file(self, path: str): + image = None + try: + raw = imread(path) + rgb = raw.postprocess() + image = Image.fromarray(np.array(rgb)) + except Exception as ex: + print(f'not a valid raw file {path}', ex, file=sys.stderr) + return image + + def _index_files(self, filepaths: List[str], metas: List[ImageMeta]): images: List[Image.Image] = [] filtered_paths: List[str] = [] @@ -71,7 +83,10 @@ def _index_files(self, filepaths: List[str], metas: List[ImageMeta]): images.append(image) filtered_paths.append(path) except PIL.UnidentifiedImageError as ex: - pass + image = self._read_raw_file(path) + if not image: + images.append(image) + filtered_paths.append(path) except Exception as ex: print(f'error loading image {path}:', ex, file=sys.stderr)