diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml new file mode 100644 index 0000000..cd33214 --- /dev/null +++ b/.github/workflows/python-ci.yml @@ -0,0 +1,17 @@ +name: python-ci +on: + pull_request: + branches: + - main + - master + push: + branches: + - main + - master + +jobs: + python-ci: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: curl -LsS https://radia.run | bash -s python-ci diff --git a/.gitignore b/.gitignore index eef86a0..f066f14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,11 @@ MANIFEST.in -tox.ini pytest.ini -pykern_setup.yaml +tox.ini .python-version .#* \#* +.idea/ +.vscode/ # Byte-compiled / optimized / DLL files __pycache__/ @@ -45,9 +46,12 @@ pip-delete-this-directory.txt htmlcov/ .tox/ .coverage +.coverage.* .cache nosetests.xml coverage.xml +*,cover +.pytest_cache # Translations *.mo diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 0000000..a420660 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,12 @@ +# Read The Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details +version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.9" + jobs: + pre_build: + - curl https://radia.run | bash -s readthedocs +sphinx: + configuration: docs/conf.py diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 92537c4..0000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -language: python -branches: - only: - - master -install: - - pip install -r requirements.txt -script: - - python setup.py pkdeploy diff --git a/LICENSE b/LICENSE index f9eb8a7..d645695 100644 --- a/LICENSE +++ b/LICENSE @@ -1,399 +1,202 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Apache License, Version 2.0 - - - - - - - - - - - - -
- -
- -
-
-
- Apache Logo -
-
-
- - -
- The Apache Way - Contribute - ASF Sponsors -
-
-
-

Apache License

Version 2.0, January 2004

-http://www.apache.org/licenses/

-

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

1. Definitions.

-

"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document.

-

"Licensor" shall mean the copyright owner or entity authorized by the -copyright owner that is granting the License.

-

"Legal Entity" shall mean the union of the acting entity and all other -entities that control, are controlled by, or are under common control with -that entity. For the purposes of this definition, "control" means (i) the -power, direct or indirect, to cause the direction or management of such -entity, whether by contract or otherwise, or (ii) ownership of fifty -percent (50%) or more of the outstanding shares, or (iii) beneficial -ownership of such entity.

-

"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License.

-

"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation source, -and configuration files.

-

"Object" form shall mean any form resulting from mechanical transformation -or translation of a Source form, including but not limited to compiled -object code, generated documentation, and conversions to other media types.

-

"Work" shall mean the work of authorship, whether in Source or Object form, -made available under the License, as indicated by a copyright notice that -is included in or attached to the work (an example is provided in the -Appendix below).

-

"Derivative Works" shall mean any work, whether in Source or Object form, -that is based on (or derived from) the Work and for which the editorial -revisions, annotations, elaborations, or other modifications represent, as -a whole, an original work of authorship. For the purposes of this License, -Derivative Works shall not include works that remain separable from, or -merely link (or bind by name) to the interfaces of, the Work and Derivative -Works thereof.

-

"Contribution" shall mean any work of authorship, including the original -version of the Work and any modifications or additions to that Work or -Derivative Works thereof, that is intentionally submitted to Licensor for -inclusion in the Work by the copyright owner or by an individual or Legal -Entity authorized to submit on behalf of the copyright owner. For the -purposes of this definition, "submitted" means any form of electronic, -verbal, or written communication sent to the Licensor or its -representatives, including but not limited to communication on electronic -mailing lists, source code control systems, and issue tracking systems that -are managed by, or on behalf of, the Licensor for the purpose of discussing -and improving the Work, but excluding communication that is conspicuously -marked or otherwise designated in writing by the copyright owner as "Not a -Contribution."

-

"Contributor" shall mean Licensor and any individual or Legal Entity on -behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work.

-

2. Grant of Copyright License. Subject to the -terms and conditions of this License, each Contributor hereby grants to You -a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, publicly -display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form.

-

3. Grant of Patent License. Subject to the terms -and conditions of this License, each Contributor hereby grants to You a -perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, use, -offer to sell, sell, import, and otherwise transfer the Work, where such -license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by -combination of their Contribution(s) with the Work to which such -Contribution(s) was submitted. If You institute patent litigation against -any entity (including a cross-claim or counterclaim in a lawsuit) alleging -that the Work or a Contribution incorporated within the Work constitutes -direct or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate as of the -date such litigation is filed.

-

4. Redistribution. You may reproduce and -distribute copies of the Work or Derivative Works thereof in any medium, -with or without modifications, and in Source or Object form, provided that -You meet the following conditions:

-
    -
  1. You must give any other recipients of the Work or Derivative Works a -copy of this License; and
    2. - -
  2. You must cause any modified files to carry prominent notices stating -that You changed the files; and
    3. - -
  3. You must retain, in the Source form of any Derivative Works that You -distribute, all copyright, patent, trademark, and attribution notices from -the Source form of the Work, excluding those notices that do not pertain to -any part of the Derivative Works; and
    4. - -
  4. If the Work includes a "NOTICE" text file as part of its distribution, -then any Derivative Works that You distribute must include a readable copy -of the attribution notices contained within such NOTICE file, excluding -those notices that do not pertain to any part of the Derivative Works, in -at least one of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or documentation, -if provided along with the Derivative Works; or, within a display generated -by the Derivative Works, if and wherever such third-party notices normally -appear. The contents of the NOTICE file are for informational purposes only -and do not modify the License. You may add Your own attribution notices -within Derivative Works that You distribute, alongside or as an addendum to -the NOTICE text from the Work, provided that such additional attribution -notices cannot be construed as modifying the License. -
    -
    -You may add Your own copyright statement to Your modifications and may -provide additional or different license terms and conditions for use, -reproduction, or distribution of Your modifications, or for any such -Derivative Works as a whole, provided Your use, reproduction, and -distribution of the Work otherwise complies with the conditions stated in -this License. -
    5. - -
- -

5. Submission of Contributions. Unless You -explicitly state otherwise, any Contribution intentionally submitted for -inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the -terms of any separate license agreement you may have executed with Licensor -regarding such Contributions.

-

6. Trademarks. This License does not grant -permission to use the trade names, trademarks, service marks, or product -names of the Licensor, except as required for reasonable and customary use -in describing the origin of the Work and reproducing the content of the -NOTICE file.

-

7. Disclaimer of Warranty. Unless required by -applicable law or agreed to in writing, Licensor provides the Work (and -each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, -without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You -are solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise -of permissions under this License.

-

8. Limitation of Liability. In no event and -under no legal theory, whether in tort (including negligence), contract, or -otherwise, unless required by applicable law (such as deliberate and -grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a result -of this License or out of the use or inability to use the Work (including -but not limited to damages for loss of goodwill, work stoppage, computer -failure or malfunction, or any and all other commercial damages or losses), -even if such Contributor has been advised of the possibility of such -damages.

-

9. Accepting Warranty or Additional Liability. -While redistributing the Work or Derivative Works thereof, You may choose -to offer, and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this License. -However, in accepting such obligations, You may act only on Your own behalf -and on Your sole responsibility, not on behalf of any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor -harmless for any liability incurred by, or claims asserted against, such -Contributor by reason of your accepting any such warranty or additional -liability.

-

END OF TERMS AND CONDITIONS

-

APPENDIX: How to apply the Apache License to your work

-

To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included -on the same "printed page" as the copyright notice for easier -identification within third-party archives.

-
Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
- - - - - - - - - - - + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index 6c0792c..19e3e43 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,13 @@ -### Photo Library Tools +### rnpix -For a demo, visit [rnpix.github.io](https://rnpix.github.io). +Photo library tools -The photo library is organized into "day" directories of the form -`YYYY/MM-DD/*.{jpg,mov,...}`. In each day directory, `index.txt` -contains: +Learn more at http://github.com/robnagler/rnpix. -```text -foo.jpg Some description for foo on one line -bar.mov A movie of something -``` - -The file may have comments with a `#` starting on the first character. (Historical version allows a `:` after the image name.) - -The tools search `YY/MM-DD` directories to create `index.txt` and uses it to create a searchable, static HTML tree: - -1. [identify](rnpix/pkcli/identify.py) appends to `index.txt` from the images in a day directory, prompting the user for each unidentified image. -2. [generate](rnpix/pkcli/generate.py) reads `index.txt` to create `index.html` and thumbnail directories `50` (pixel) and `200`, which are referenced in `index.html` -3. [indexer](rnpix/pkcli/indexer.py) reads `index.txt` to create `rnpix-index.js`, which is read by [rnindex](rnpix/package_data/static/rnindex.js) to find images by their description. -4. [fix](rnpix/pkcli/fix.py) reads `index.txt` and images in directory, and verifies and fixes the format. - -#### Acknowledgements - -Thanks to the excellent [js-search](https://github.com/cebe/js-search) by [Carsten Brandt](http://cebe.cc/about). It was first transliterated from the PHP -to Python, and then rewritten to match the picture indexing problem, -which was significantly different from the general HTML problem `js-search` -solves. I wouldn't have gotten the idea of how to implement a search -engine in Javascript without Carsten's project. - -The rest of the code is all mine and evolved over a couple of decades -from a collection of simple Perl programs to be transformed this -year to Python. +Documentation: https://rnpix.readthedocs.io #### License -License: http://www.apache.org/licenses/LICENSE-2.0.html +License: https://www.apache.org/licenses/LICENSE-2.0.html -Copyright (c) 2016 Robert Nagler. All Rights Reserved. +Copyright (c) 2024 Rob Nagler. All Rights Reserved. diff --git a/docs/index.rst b/docs/index.rst index effb1e6..89efa7b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,6 +3,10 @@ Welcome to rnpix Photo library tools +.. autosummary:: + :toctree: _autosummary + :recursive: + .. toctree:: :maxdepth: 2 diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..55de141 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,37 @@ +[build-system] +requires = ["chronver", "setuptools>=66"] +build-backend = "setuptools.build_meta" + +[project] +authors = [ + { name = "Rob Nagler", email = "rnpix@robnagler.com" }, +] +classifiers = [ + "Development Status :: 2 - Pre-Alpha", + "Environment :: Console", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Natural Language :: English", + "Programming Language :: Python", + "Topic :: Utilities", +] +dependencies = [ + "exif", + "pykern", +] +description = "Photo library tools" +dynamic = ["version"] +name = "rnpix" +readme = "README.md" + +[project.scripts] +rnpix = "rnpix.rnpix_console:main" + +[project.urls] +Homepage = "http://github.com/robnagler/rnpix" + +[tool.setuptools.package-data] +rnpix = ["package_data/**"] + +[tool.setuptools.packages.find] +include = ["rnpix*"] diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index f4e05e9..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -pykern diff --git a/rnpix/__init__.py b/rnpix/__init__.py index 792d600..0589a57 100644 --- a/rnpix/__init__.py +++ b/rnpix/__init__.py @@ -1 +1,12 @@ -# +""":mod:`rnpix` package + +:copyright: Copyright (c) 2024 Rob Nagler. All Rights Reserved. +:license: https://www.apache.org/licenses/LICENSE-2.0.html +""" +import pkg_resources + +try: + # We only have a version once the package is installed. + __version__ = pkg_resources.get_distribution("rnpix").version +except pkg_resources.DistributionNotFound: + pass diff --git a/rnpix/base_pkconfig.py b/rnpix/base_pkconfig.py deleted file mode 100644 index 6dfca25..0000000 --- a/rnpix/base_pkconfig.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -"""Default config - -:copyright: Copyright (c) 2016 Robert Nagler. All Rights Reserved. -:license: http://www.apache.org/licenses/LICENSE-2.0.html -""" -from __future__ import absolute_import, division, print_function - - -def alpha(): - return {} - - -def beta(): - return {} - - -def dev(): - return {} - - -def prod(): - return {} diff --git a/rnpix/common.py b/rnpix/common.py index 71cc085..68d5bb8 100644 --- a/rnpix/common.py +++ b/rnpix/common.py @@ -95,7 +95,7 @@ def _pid(): os.rmdir(lock_d) -def move_one(src, dst_root): +def move_one(src, dst_root=None): e = src.ext.lower() if e == ".jpeg": e = ".jpg" diff --git a/rnpix/pkcli/picasa.py b/rnpix/pkcli/picasa.py deleted file mode 100644 index fa49ab8..0000000 --- a/rnpix/pkcli/picasa.py +++ /dev/null @@ -1,114 +0,0 @@ -# -*- coding: utf-8 -*- -"""deduplicate - -:copyright: Copyright (c) 2021 Robert Nagler. All Rights Reserved. -:license: http://www.apache.org/licenses/LICENSE-2.0.html -""" -from __future__ import absolute_import, division, print_function -from pykern.pkcollections import PKDict -from pykern.pkdebug import pkdc, pkdlog, pkdp -import os -import pykern.pkio -import re -import rnpix.common -import subprocess -import sys -import time - - -def dedup(files, keep): - r = rnpix.common.root() - a = _split_file(files) - k = _split_file(keep) - print( - f"""#!/bin/bash -set -euo pipefail -export RNPIX_ROOT='{r}' -""" - + """ -_mv() { - local p=$1 - local o=${2:-} - if [[ $o && ! -e $o || -e $p ]]; then - return - fi - local t=$RNPIX_ROOT-trash${p#$RNPIX_ROOT} - mkdir -p "$(dirname "$t")" - mv "$p" "$t" - if [[ $o ]]; then - mv "$o" "$p" - fi -}""" - ) - for p in sorted(a): - if not p.check(file=True, exists=True) or p in k: - continue - f = "" - o = _originals(p, a) - if not o: - # no originals - continue - if not re.search(r"(.+)-\d+$", p.purebasename): - for i in range(1, 9): - f = p.new(basename=p.basename.replace(".jpg", f"-{i}.jpg")) - if f in o: - break - else: - # no originals so should not get here - raise AssertionError(f"no originals {p}") - print(f"_mv '{p}' '{f}'") - - -def find(path): - """find images created by Google Picasa""" - for p in _walk(path): - if p.ext.lower() not in (".jpg", ".jpeg"): - continue - x = subprocess.check_output( - ("exiftool", "-Creator", "-Artist", "-Orientation", str(p)) - ) - if b"Picasa" in x and "Orientation" not in x: - print(p) - - -def _originals(path, all_picasa): - b = path.purebasename - m = re.search(r"(.+)-\d+$", b) - if m: - b = m.group(1) - p = path.new(purebasename=b + "*") - return set(pykern.pkio.sorted_glob(p)) - all_picasa - - -def _split_file(path): - return set( - [ - pykern.pkio.py_path(f) - for f in re.split( - r"\s*\n\s*", - pykern.pkio.read_text(path), - ) - if f - ] - ) - - -def _walk(path): - c = "" - start = None # '2008-07-22' - for p in pykern.pkio.walk_tree(path): - if ( - p.islink() - or rnpix.common.THUMB_DIR.search(p.dirpath().basename) - or not rnpix.common.STILL.search(p.basename) - ): - continue - if start is not None: - if p.dirpath().basename != start: - continue - start = None - if c != p.dirname: - c = p.dirname - print(f"SLEEP: {c}", file=sys.stderr) - time.sleep(3) - yield p diff --git a/rnpix/rnpix_console.py b/rnpix/rnpix_console.py index 6faf52d..ac88732 100644 --- a/rnpix/rnpix_console.py +++ b/rnpix/rnpix_console.py @@ -1,20 +1,17 @@ -# -*- coding: utf-8 -*- """Front-end command line for :mod:`rnpix`. See :mod:`pykern.pkcli` for how this module is used. -:copyright: Copyright (c) 2016 Rob Nagler. All Rights Reserved. -:license: http://www.apache.org/licenses/LICENSE-2.0.html +:copyright: Copyright (c) 2024 Rob Nagler. All Rights Reserved. +:license: https://www.apache.org/licenses/LICENSE-2.0.html """ -from __future__ import absolute_import, division, print_function +import pykern.pkcli import sys -from pykern import pkcli - def main(): - return pkcli.main("rnpix") + return pykern.pkcli.main("rnpix") if __name__ == "__main__": diff --git a/setup.py b/setup.py deleted file mode 100644 index 85282f7..0000000 --- a/setup.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -"""rnpix setup script - -:copyright: Copyright (c) 2016 Rob Nagler. All Rights Reserved. -:license: http://www.apache.org/licenses/LICENSE-2.0.html -""" -from pykern.pksetup import setup - -setup( - name="rnpix", - author="Rob Nagler", - author_email="rnpix@robnagler.com", - description="Photo library tools", - license="http://www.apache.org/licenses/LICENSE-2.0.html", - url="http://github.com/robnagler/rnpix", - classifiers=[ - "Development Status :: 2 - Pre-Alpha", - "Environment :: Console", - "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", - "Natural Language :: English", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python", - "Topic :: Utilities", - ], -)