Compare commits
17 Commits
Author | SHA1 | Date |
---|---|---|
|
d54ccd64f6 | |
|
836792429f | |
|
b7435c4eac | |
|
723f549f73 | |
|
47b9aa57ae | |
|
9e32052ce3 | |
|
ed58383ea0 | |
|
f6816c6c01 | |
|
b7f0cafe98 | |
|
573a63998e | |
|
01b47c8c40 | |
|
52768f64db | |
|
cdfa408206 | |
|
eee3c71f6a | |
|
1eb2a2c6e0 | |
|
58e282fd87 | |
|
a1ba0663b6 |
|
@ -1,20 +1,139 @@
|
||||||
|
# Byte-compiled / optimized / DLL files
|
||||||
|
__pycache__/
|
||||||
|
*.py[cod]
|
||||||
|
*$py.class
|
||||||
|
|
||||||
|
# C extensions
|
||||||
|
*.so
|
||||||
|
|
||||||
|
# Distribution / packaging
|
||||||
|
.Python
|
||||||
|
build/
|
||||||
|
develop-eggs/
|
||||||
|
dist/
|
||||||
|
downloads/
|
||||||
|
eggs/
|
||||||
|
.eggs/
|
||||||
|
lib/
|
||||||
|
lib64/
|
||||||
|
parts/
|
||||||
|
sdist/
|
||||||
|
var/
|
||||||
|
wheels/
|
||||||
|
pip-wheel-metadata/
|
||||||
|
share/python-wheels/
|
||||||
|
*.egg-info/
|
||||||
|
.installed.cfg
|
||||||
|
*.egg
|
||||||
|
MANIFEST
|
||||||
|
|
||||||
|
# PyInstaller
|
||||||
|
# Usually these files are written by a python script from a template
|
||||||
|
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||||
|
*.manifest
|
||||||
|
*.spec
|
||||||
|
|
||||||
|
# Installer logs
|
||||||
|
pip-log.txt
|
||||||
|
pip-delete-this-directory.txt
|
||||||
|
|
||||||
|
# Unit test / coverage reports
|
||||||
|
htmlcov/
|
||||||
|
.tox/
|
||||||
|
.nox/
|
||||||
|
.coverage
|
||||||
|
.coverage.*
|
||||||
|
.cache
|
||||||
|
nosetests.xml
|
||||||
|
coverage.xml
|
||||||
|
*.cover
|
||||||
|
*.py,cover
|
||||||
|
.hypothesis/
|
||||||
|
.pytest_cache/
|
||||||
|
|
||||||
|
# Translations
|
||||||
|
*.mo
|
||||||
|
*.pot
|
||||||
|
|
||||||
|
# Django stuff:
|
||||||
|
*.log
|
||||||
|
local_settings.py
|
||||||
|
db.sqlite3
|
||||||
|
db.sqlite3-journal
|
||||||
|
|
||||||
|
# Flask stuff:
|
||||||
|
instance/
|
||||||
|
.webassets-cache
|
||||||
|
|
||||||
|
# Scrapy stuff:
|
||||||
|
.scrapy
|
||||||
|
|
||||||
|
# Sphinx documentation
|
||||||
|
docs/_build/
|
||||||
|
|
||||||
|
# PyBuilder
|
||||||
|
target/
|
||||||
|
|
||||||
|
# Jupyter Notebook
|
||||||
|
.ipynb_checkpoints
|
||||||
|
|
||||||
|
# IPython
|
||||||
|
profile_default/
|
||||||
|
ipython_config.py
|
||||||
|
|
||||||
|
# pyenv
|
||||||
|
.python-version
|
||||||
|
|
||||||
|
# pipenv
|
||||||
|
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||||
|
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||||
|
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||||
|
# install all needed dependencies.
|
||||||
|
#Pipfile.lock
|
||||||
|
|
||||||
|
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
|
||||||
|
__pypackages__/
|
||||||
|
|
||||||
|
# Celery stuff
|
||||||
|
celerybeat-schedule
|
||||||
|
celerybeat.pid
|
||||||
|
|
||||||
|
# SageMath parsed files
|
||||||
|
*.sage.py
|
||||||
|
|
||||||
|
# Environments
|
||||||
|
.env
|
||||||
|
.venv
|
||||||
|
env/
|
||||||
|
venv/
|
||||||
|
ENV/
|
||||||
|
env.bak/
|
||||||
|
venv.bak/
|
||||||
|
|
||||||
|
# Spyder project settings
|
||||||
|
.spyderproject
|
||||||
|
.spyproject
|
||||||
|
|
||||||
|
# Rope project settings
|
||||||
|
.ropeproject
|
||||||
|
|
||||||
|
# mkdocs documentation
|
||||||
|
/site
|
||||||
|
|
||||||
|
# mypy
|
||||||
|
.mypy_cache/
|
||||||
|
.dmypy.json
|
||||||
|
dmypy.json
|
||||||
|
|
||||||
|
# Pyre type checker
|
||||||
|
.pyre/
|
||||||
|
|
||||||
# Compiled python modules.
|
# Compiled python modules.
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|
||||||
/build/
|
# Other
|
||||||
/.coverage
|
|
||||||
/diagnostics.lua
|
/diagnostics.lua
|
||||||
docs/_build
|
|
||||||
docs/Ordigi_data_scheme.odg
|
docs/Ordigi_data_scheme.odg
|
||||||
|
|
||||||
# Setuptools distribution folder.
|
|
||||||
/dist/
|
|
||||||
|
|
||||||
# Python egg metadata, regenerated from source files by setuptools.
|
|
||||||
/*.egg-info
|
|
||||||
|
|
||||||
/env/
|
|
||||||
/htmlcov
|
|
||||||
/ressources
|
/ressources
|
||||||
/Session.vim
|
/Session.vim
|
||||||
/tags
|
/tags
|
||||||
|
|
471
LICENSE
471
LICENSE
|
@ -1,26 +1,23 @@
|
||||||
### GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
|
||||||
Version 3, 29 June 2007
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc.
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
<https://fsf.org/>
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies of this
|
Preamble
|
||||||
license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
### Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
The GNU General Public License is a free, copyleft license for
|
||||||
software and other kinds of works.
|
software and other kinds of works.
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
The licenses for most software and other practical works are designed
|
||||||
to take away your freedom to share and change the works. By contrast,
|
to take away your freedom to share and change the works. By contrast,
|
||||||
the GNU General Public License is intended to guarantee your freedom
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
to share and change all versions of a program--to make sure it remains
|
share and change all versions of a program--to make sure it remains free
|
||||||
free software for all its users. We, the Free Software Foundation, use
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
the GNU General Public License for most of our software; it applies
|
GNU General Public License for most of our software; it applies also to
|
||||||
also to any other work released this way by its authors. You can apply
|
any other work released this way by its authors. You can apply it to
|
||||||
it to your programs, too.
|
your programs, too.
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
When we speak of free software, we are referring to freedom, not
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
@ -30,10 +27,9 @@ want it, that you can change the software or use pieces of it in new
|
||||||
free programs, and that you know you can do these things.
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
To protect your rights, we need to prevent others from denying you
|
||||||
these rights or asking you to surrender the rights. Therefore, you
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
have certain responsibilities if you distribute copies of the
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
software, or if you modify it: responsibilities to respect the freedom
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
For example, if you distribute copies of such a program, whether
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
@ -52,44 +48,43 @@ changed, so that their problems will not be attributed erroneously to
|
||||||
authors of previous versions.
|
authors of previous versions.
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
Some devices are designed to deny users access to install or run
|
||||||
modified versions of the software inside them, although the
|
modified versions of the software inside them, although the manufacturer
|
||||||
manufacturer can do so. This is fundamentally incompatible with the
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
aim of protecting users' freedom to change the software. The
|
protecting users' freedom to change the software. The systematic
|
||||||
systematic pattern of such abuse occurs in the area of products for
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
individuals to use, which is precisely where it is most unacceptable.
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
Therefore, we have designed this version of the GPL to prohibit the
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
practice for those products. If such problems arise substantially in
|
products. If such problems arise substantially in other domains, we
|
||||||
other domains, we stand ready to extend this provision to those
|
stand ready to extend this provision to those domains in future versions
|
||||||
domains in future versions of the GPL, as needed to protect the
|
of the GPL, as needed to protect the freedom of users.
|
||||||
freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
Finally, every program is threatened constantly by software patents.
|
||||||
States should not allow patents to restrict development and use of
|
States should not allow patents to restrict development and use of
|
||||||
software on general-purpose computers, but in those that do, we wish
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
to avoid the special danger that patents applied to a free program
|
avoid the special danger that patents applied to a free program could
|
||||||
could make it effectively proprietary. To prevent this, the GPL
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
assures that patents cannot be used to render the program non-free.
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
The precise terms and conditions for copying, distribution and
|
||||||
modification follow.
|
modification follow.
|
||||||
|
|
||||||
### TERMS AND CONDITIONS
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
#### 0. Definitions.
|
0. Definitions.
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
of works, such as semiconductor masks.
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
"recipients" may be individuals or organizations.
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
in a fashion requiring copyright permission, other than the making of
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
an exact copy. The resulting work is called a "modified version" of
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
the earlier work or a work "based on" the earlier work.
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
A "covered work" means either the unmodified Program or a work based
|
||||||
on the Program.
|
on the Program.
|
||||||
|
@ -102,12 +97,11 @@ distribution (with or without modification), making available to the
|
||||||
public, and in some countries other activities as well.
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
To "convey" a work means any kind of propagation that enables other
|
||||||
parties to make or receive copies. Mere interaction with a user
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
through a computer network, with no transfer of a copy, is not
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices" to
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
the extent that it includes a convenient and prominently visible
|
to the extent that it includes a convenient and prominently visible
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
tells the user that there is no warranty for the work (except to the
|
tells the user that there is no warranty for the work (except to the
|
||||||
extent that warranties are provided), that licensees may convey the
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
@ -115,11 +109,11 @@ work under this License, and how to view a copy of this License. If
|
||||||
the interface presents a list of user commands or options, such as a
|
the interface presents a list of user commands or options, such as a
|
||||||
menu, a prominent item in the list meets this criterion.
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
#### 1. Source Code.
|
1. Source Code.
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work for
|
The "source code" for a work means the preferred form of the work
|
||||||
making modifications to it. "Object code" means any non-source form of
|
for making modifications to it. "Object code" means any non-source
|
||||||
a work.
|
form of a work.
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
A "Standard Interface" means an interface that either is an official
|
||||||
standard defined by a recognized standards body, or, in the case of
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
@ -150,13 +144,14 @@ linked subprograms that the work is specifically designed to require,
|
||||||
such as by intimate data communication or control flow between those
|
such as by intimate data communication or control flow between those
|
||||||
subprograms and other parts of the work.
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users can
|
The Corresponding Source need not include anything that users
|
||||||
regenerate automatically from other parts of the Corresponding Source.
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that same
|
The Corresponding Source for a work in source code form is that
|
||||||
work.
|
same work.
|
||||||
|
|
||||||
#### 2. Basic Permissions.
|
2. Basic Permissions.
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
All rights granted under this License are granted for the term of
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
@ -166,22 +161,22 @@ covered work is covered by this License only if the output, given its
|
||||||
content, constitutes a covered work. This License acknowledges your
|
content, constitutes a covered work. This License acknowledges your
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not convey,
|
You may make, run and propagate covered works that you do not
|
||||||
without conditions so long as your license otherwise remains in force.
|
convey, without conditions so long as your license otherwise remains
|
||||||
You may convey covered works to others for the sole purpose of having
|
in force. You may convey covered works to others for the sole purpose
|
||||||
them make modifications exclusively for you, or provide you with
|
of having them make modifications exclusively for you, or provide you
|
||||||
facilities for running those works, provided that you comply with the
|
with facilities for running those works, provided that you comply with
|
||||||
terms of this License in conveying all material for which you do not
|
the terms of this License in conveying all material for which you do
|
||||||
control copyright. Those thus making or running the covered works for
|
not control copyright. Those thus making or running the covered works
|
||||||
you must do so exclusively on your behalf, under your direction and
|
for you must do so exclusively on your behalf, under your direction
|
||||||
control, on terms that prohibit them from making any copies of your
|
and control, on terms that prohibit them from making any copies of
|
||||||
copyrighted material outside their relationship with you.
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under the
|
Conveying under any other circumstances is permitted solely under
|
||||||
conditions stated below. Sublicensing is not allowed; section 10 makes
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
it unnecessary.
|
makes it unnecessary.
|
||||||
|
|
||||||
#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
No covered work shall be deemed part of an effective technological
|
||||||
measure under any applicable law fulfilling obligations under article
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
@ -190,14 +185,14 @@ similar laws prohibiting or restricting circumvention of such
|
||||||
measures.
|
measures.
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
circumvention of technological measures to the extent such
|
circumvention of technological measures to the extent such circumvention
|
||||||
circumvention is effected by exercising rights under this License with
|
is effected by exercising rights under this License with respect to
|
||||||
respect to the covered work, and you disclaim any intention to limit
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
operation or modification of the work as a means of enforcing, against
|
modification of the work as a means of enforcing, against the work's
|
||||||
the work's users, your or third parties' legal rights to forbid
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
circumvention of technological measures.
|
technological measures.
|
||||||
|
|
||||||
#### 4. Conveying Verbatim Copies.
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
You may convey verbatim copies of the Program's source code as you
|
||||||
receive it, in any medium, provided that you conspicuously and
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
@ -210,27 +205,29 @@ recipients a copy of this License along with the Program.
|
||||||
You may charge any price or no price for each copy that you convey,
|
You may charge any price or no price for each copy that you convey,
|
||||||
and you may offer support or warranty protection for a fee.
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
#### 5. Conveying Modified Source Versions.
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
You may convey a work based on the Program, or the modifications to
|
||||||
produce it from the Program, in the form of source code under the
|
produce it from the Program, in the form of source code under the
|
||||||
terms of section 4, provided that you also meet all of these
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
conditions:
|
|
||||||
|
|
||||||
- a) The work must carry prominent notices stating that you modified
|
a) The work must carry prominent notices stating that you modified
|
||||||
it, and giving a relevant date.
|
it, and giving a relevant date.
|
||||||
- b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under
|
b) The work must carry prominent notices stating that it is
|
||||||
section 7. This requirement modifies the requirement in section 4
|
released under this License and any conditions added under section
|
||||||
to "keep intact all notices".
|
7. This requirement modifies the requirement in section 4 to
|
||||||
- c) You must license the entire work, as a whole, under this
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
License to anyone who comes into possession of a copy. This
|
License to anyone who comes into possession of a copy. This
|
||||||
License will therefore apply, along with any applicable section 7
|
License will therefore apply, along with any applicable section 7
|
||||||
additional terms, to the whole of the work, and all its parts,
|
additional terms, to the whole of the work, and all its parts,
|
||||||
regardless of how they are packaged. This License gives no
|
regardless of how they are packaged. This License gives no
|
||||||
permission to license the work in any other way, but it does not
|
permission to license the work in any other way, but it does not
|
||||||
invalidate such permission if you have separately received it.
|
invalidate such permission if you have separately received it.
|
||||||
- d) If the work has interactive user interfaces, each must display
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
work need not make them do so.
|
work need not make them do so.
|
||||||
|
@ -245,18 +242,19 @@ beyond what the individual works permit. Inclusion of a covered work
|
||||||
in an aggregate does not cause this License to apply to the other
|
in an aggregate does not cause this License to apply to the other
|
||||||
parts of the aggregate.
|
parts of the aggregate.
|
||||||
|
|
||||||
#### 6. Conveying Non-Source Forms.
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms of
|
You may convey a covered work in object code form under the terms
|
||||||
sections 4 and 5, provided that you also convey the machine-readable
|
of sections 4 and 5, provided that you also convey the
|
||||||
Corresponding Source under the terms of this License, in one of these
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
ways:
|
in one of these ways:
|
||||||
|
|
||||||
- a) Convey the object code in, or embodied in, a physical product
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
(including a physical distribution medium), accompanied by the
|
(including a physical distribution medium), accompanied by the
|
||||||
Corresponding Source fixed on a durable physical medium
|
Corresponding Source fixed on a durable physical medium
|
||||||
customarily used for software interchange.
|
customarily used for software interchange.
|
||||||
- b) Convey the object code in, or embodied in, a physical product
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
(including a physical distribution medium), accompanied by a
|
(including a physical distribution medium), accompanied by a
|
||||||
written offer, valid for at least three years and valid for as
|
written offer, valid for at least three years and valid for as
|
||||||
long as you offer spare parts or customer support for that product
|
long as you offer spare parts or customer support for that product
|
||||||
|
@ -265,14 +263,16 @@ ways:
|
||||||
product that is covered by this License, on a durable physical
|
product that is covered by this License, on a durable physical
|
||||||
medium customarily used for software interchange, for a price no
|
medium customarily used for software interchange, for a price no
|
||||||
more than your reasonable cost of physically performing this
|
more than your reasonable cost of physically performing this
|
||||||
conveying of source, or (2) access to copy the Corresponding
|
conveying of source, or (2) access to copy the
|
||||||
Source from a network server at no charge.
|
Corresponding Source from a network server at no charge.
|
||||||
- c) Convey individual copies of the object code with a copy of the
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
written offer to provide the Corresponding Source. This
|
written offer to provide the Corresponding Source. This
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
only if you received the object code with such an offer, in accord
|
only if you received the object code with such an offer, in accord
|
||||||
with subsection 6b.
|
with subsection 6b.
|
||||||
- d) Convey the object code by offering access from a designated
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
Corresponding Source in the same way through the same place at no
|
Corresponding Source in the same way through the same place at no
|
||||||
further charge. You need not require recipients to copy the
|
further charge. You need not require recipients to copy the
|
||||||
|
@ -284,36 +284,36 @@ ways:
|
||||||
Corresponding Source. Regardless of what server hosts the
|
Corresponding Source. Regardless of what server hosts the
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
available for as long as needed to satisfy these requirements.
|
available for as long as needed to satisfy these requirements.
|
||||||
- e) Convey the object code using peer-to-peer transmission,
|
|
||||||
provided you inform other peers where the object code and
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
Corresponding Source of the work are being offered to the general
|
you inform other peers where the object code and Corresponding
|
||||||
public at no charge under subsection 6d.
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
A separable portion of the object code, whose source code is excluded
|
||||||
from the Corresponding Source as a System Library, need not be
|
from the Corresponding Source as a System Library, need not be
|
||||||
included in conveying the object code work.
|
included in conveying the object code work.
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
tangible personal property which is normally used for personal,
|
tangible personal property which is normally used for personal, family,
|
||||||
family, or household purposes, or (2) anything designed or sold for
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
incorporation into a dwelling. In determining whether a product is a
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
consumer product, doubtful cases shall be resolved in favor of
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
coverage. For a particular product received by a particular user,
|
product received by a particular user, "normally used" refers to a
|
||||||
"normally used" refers to a typical or common use of that class of
|
typical or common use of that class of product, regardless of the status
|
||||||
product, regardless of the status of the particular user or of the way
|
of the particular user or of the way in which the particular user
|
||||||
in which the particular user actually uses, or expects or is expected
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
to use, the product. A product is a consumer product regardless of
|
is a consumer product regardless of whether the product has substantial
|
||||||
whether the product has substantial commercial, industrial or
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
non-consumer uses, unless such uses represent the only significant
|
the only significant mode of use of the product.
|
||||||
mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
"Installation Information" for a User Product means any methods,
|
||||||
procedures, authorization keys, or other information required to
|
procedures, authorization keys, or other information required to install
|
||||||
install and execute modified versions of a covered work in that User
|
and execute modified versions of a covered work in that User Product from
|
||||||
Product from a modified version of its Corresponding Source. The
|
a modified version of its Corresponding Source. The information must
|
||||||
information must suffice to ensure that the continued functioning of
|
suffice to ensure that the continued functioning of the modified object
|
||||||
the modified object code is in no case prevented or interfered with
|
code is in no case prevented or interfered with solely because
|
||||||
solely because modification has been made.
|
modification has been made.
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
If you convey an object code work under this section in, or with, or
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
@ -327,13 +327,12 @@ modified object code on the User Product (for example, the work has
|
||||||
been installed in ROM).
|
been installed in ROM).
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
The requirement to provide Installation Information does not include a
|
||||||
requirement to continue to provide support service, warranty, or
|
requirement to continue to provide support service, warranty, or updates
|
||||||
updates for a work that has been modified or installed by the
|
for a work that has been modified or installed by the recipient, or for
|
||||||
recipient, or for the User Product in which it has been modified or
|
the User Product in which it has been modified or installed. Access to a
|
||||||
installed. Access to a network may be denied when the modification
|
network may be denied when the modification itself materially and
|
||||||
itself materially and adversely affects the operation of the network
|
adversely affects the operation of the network or violates the rules and
|
||||||
or violates the rules and protocols for communication across the
|
protocols for communication across the network.
|
||||||
network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
in accord with this section must be in a format that is publicly
|
in accord with this section must be in a format that is publicly
|
||||||
|
@ -341,7 +340,7 @@ documented (and with an implementation available to the public in
|
||||||
source code form), and must require no special password or key for
|
source code form), and must require no special password or key for
|
||||||
unpacking, reading or copying.
|
unpacking, reading or copying.
|
||||||
|
|
||||||
#### 7. Additional Terms.
|
7. Additional Terms.
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
License by making exceptions from one or more of its conditions.
|
License by making exceptions from one or more of its conditions.
|
||||||
|
@ -360,26 +359,31 @@ additional permissions on material, added by you to a covered work,
|
||||||
for which you have or can give appropriate copyright permission.
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
Notwithstanding any other provision of this License, for material you
|
||||||
add to a covered work, you may (if authorized by the copyright holders
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
of that material) supplement the terms of this License with terms:
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
- a) Disclaiming warranty or limiting liability differently from the
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
terms of sections 15 and 16 of this License; or
|
terms of sections 15 and 16 of this License; or
|
||||||
- b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
author attributions in that material or in the Appropriate Legal
|
author attributions in that material or in the Appropriate Legal
|
||||||
Notices displayed by works containing it; or
|
Notices displayed by works containing it; or
|
||||||
- c) Prohibiting misrepresentation of the origin of that material,
|
|
||||||
or requiring that modified versions of such material be marked in
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
reasonable ways as different from the original version; or
|
reasonable ways as different from the original version; or
|
||||||
- d) Limiting the use for publicity purposes of names of licensors
|
|
||||||
or authors of the material; or
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
- e) Declining to grant rights under trademark law for use of some
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
trade names, trademarks, or service marks; or
|
trade names, trademarks, or service marks; or
|
||||||
- f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions
|
f) Requiring indemnification of licensors and authors of that
|
||||||
of it) with contractual assumptions of liability to the recipient,
|
material by anyone who conveys the material (or modified versions of
|
||||||
for any liability that these contractual assumptions directly
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
impose on those licensors and authors.
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
All other non-permissive additional terms are considered "further
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
@ -397,10 +401,10 @@ additional terms that apply to those files, or a notice indicating
|
||||||
where to find the applicable terms.
|
where to find the applicable terms.
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
form of a separately written license, or stated as exceptions; the
|
form of a separately written license, or stated as exceptions;
|
||||||
above requirements apply either way.
|
the above requirements apply either way.
|
||||||
|
|
||||||
#### 8. Termination.
|
8. Termination.
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
You may not propagate or modify a covered work except as expressly
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
@ -408,12 +412,12 @@ modify it is void, and will automatically terminate your rights under
|
||||||
this License (including any patent licenses granted under the third
|
this License (including any patent licenses granted under the third
|
||||||
paragraph of section 11).
|
paragraph of section 11).
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your license
|
However, if you cease all violation of this License, then your
|
||||||
from a particular copyright holder is reinstated (a) provisionally,
|
license from a particular copyright holder is reinstated (a)
|
||||||
unless and until the copyright holder explicitly and finally
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
terminates your license, and (b) permanently, if the copyright holder
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
fails to notify you of the violation by some reasonable means prior to
|
holder fails to notify you of the violation by some reasonable means
|
||||||
60 days after the cessation.
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
Moreover, your license from a particular copyright holder is
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
@ -428,10 +432,10 @@ this License. If your rights have been terminated and not permanently
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
material under section 10.
|
material under section 10.
|
||||||
|
|
||||||
#### 9. Acceptance Not Required for Having Copies.
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or run
|
You are not required to accept this License in order to receive or
|
||||||
a copy of the Program. Ancillary propagation of a covered work
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
to receive a copy likewise does not require acceptance. However,
|
to receive a copy likewise does not require acceptance. However,
|
||||||
nothing other than this License grants you permission to propagate or
|
nothing other than this License grants you permission to propagate or
|
||||||
|
@ -439,7 +443,7 @@ modify any covered work. These actions infringe copyright if you do
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
#### 10. Automatic Licensing of Downstream Recipients.
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
Each time you convey a covered work, the recipient automatically
|
||||||
receives a license from the original licensors, to run, modify and
|
receives a license from the original licensors, to run, modify and
|
||||||
|
@ -464,14 +468,14 @@ rights granted under this License, and you may not initiate litigation
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
sale, or importing the Program or any portion of it.
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
#### 11. Patents.
|
11. Patents.
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
License of the Program or a work on which the Program is based. The
|
License of the Program or a work on which the Program is based. The
|
||||||
work thus licensed is called the contributor's "contributor version".
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims owned
|
A contributor's "essential patent claims" are all patent claims
|
||||||
or controlled by the contributor, whether already acquired or
|
owned or controlled by the contributor, whether already acquired or
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
by this License, of making, using, or selling its contributor version,
|
by this License, of making, using, or selling its contributor version,
|
||||||
but do not include claims that would be infringed only as a
|
but do not include claims that would be infringed only as a
|
||||||
|
@ -514,39 +518,38 @@ or convey a specific copy of the covered work, then the patent license
|
||||||
you grant is automatically extended to all recipients of the covered
|
you grant is automatically extended to all recipients of the covered
|
||||||
work and works based on it.
|
work and works based on it.
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within the
|
A patent license is "discriminatory" if it does not include within
|
||||||
scope of its coverage, prohibits the exercise of, or is conditioned on
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
the non-exercise of one or more of the rights that are specifically
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
granted under this License. You may not convey a covered work if you
|
specifically granted under this License. You may not convey a covered
|
||||||
are a party to an arrangement with a third party that is in the
|
work if you are a party to an arrangement with a third party that is
|
||||||
business of distributing software, under which you make payment to the
|
in the business of distributing software, under which you make payment
|
||||||
third party based on the extent of your activity of conveying the
|
to the third party based on the extent of your activity of conveying
|
||||||
work, and under which the third party grants, to any of the parties
|
the work, and under which the third party grants, to any of the
|
||||||
who would receive the covered work from you, a discriminatory patent
|
parties who would receive the covered work from you, a discriminatory
|
||||||
license (a) in connection with copies of the covered work conveyed by
|
patent license (a) in connection with copies of the covered work
|
||||||
you (or copies made from those copies), or (b) primarily for and in
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
connection with specific products or compilations that contain the
|
for and in connection with specific products or compilations that
|
||||||
covered work, unless you entered into that arrangement, or that patent
|
contain the covered work, unless you entered into that arrangement,
|
||||||
license was granted, prior to 28 March 2007.
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
any implied license or other defenses to infringement that may
|
any implied license or other defenses to infringement that may
|
||||||
otherwise be available to you under applicable patent law.
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
#### 12. No Surrender of Others' Freedom.
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
covered work so as to satisfy simultaneously your obligations under
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
this License and any other pertinent obligations, then as a
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
consequence you may not convey it at all. For example, if you agree to
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
terms that obligate you to collect a royalty for further conveying
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
from those to whom you convey the Program, the only way you could
|
the Program, the only way you could satisfy both those terms and this
|
||||||
satisfy both those terms and this License would be to refrain entirely
|
License would be to refrain entirely from conveying the Program.
|
||||||
from conveying the Program.
|
|
||||||
|
|
||||||
#### 13. Use with the GNU Affero General Public License.
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
Notwithstanding any other provision of this License, you have
|
||||||
permission to link or combine any covered work with a work licensed
|
permission to link or combine any covered work with a work licensed
|
||||||
|
@ -557,57 +560,56 @@ but the special requirements of the GNU Affero General Public License,
|
||||||
section 13, concerning interaction through a network will apply to the
|
section 13, concerning interaction through a network will apply to the
|
||||||
combination as such.
|
combination as such.
|
||||||
|
|
||||||
#### 14. Revised Versions of this License.
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
of the GNU General Public License from time to time. Such new versions
|
the GNU General Public License from time to time. Such new versions will
|
||||||
will be similar in spirit to the present version, but may differ in
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
detail to address new problems or concerns.
|
address new problems or concerns.
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
Each version is given a distinguishing version number. If the
|
||||||
specifies that a certain numbered version of the GNU General Public
|
Program specifies that a certain numbered version of the GNU General
|
||||||
License "or any later version" applies to it, you have the option of
|
Public License "or any later version" applies to it, you have the
|
||||||
following the terms and conditions either of that numbered version or
|
option of following the terms and conditions either of that numbered
|
||||||
of any later version published by the Free Software Foundation. If the
|
version or of any later version published by the Free Software
|
||||||
Program does not specify a version number of the GNU General Public
|
Foundation. If the Program does not specify a version number of the
|
||||||
License, you may choose any version ever published by the Free
|
GNU General Public License, you may choose any version ever published
|
||||||
Software Foundation.
|
by the Free Software Foundation.
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future versions
|
If the Program specifies that a proxy can decide which future
|
||||||
of the GNU General Public License can be used, that proxy's public
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
statement of acceptance of a version permanently authorizes you to
|
public statement of acceptance of a version permanently authorizes you
|
||||||
choose that version for the Program.
|
to choose that version for the Program.
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
Later license versions may give you additional or different
|
||||||
permissions. However, no additional obligations are imposed on any
|
permissions. However, no additional obligations are imposed on any
|
||||||
author or copyright holder as a result of your choosing to follow a
|
author or copyright holder as a result of your choosing to follow a
|
||||||
later version.
|
later version.
|
||||||
|
|
||||||
#### 15. Disclaimer of Warranty.
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
CORRECTION.
|
|
||||||
|
|
||||||
#### 16. Limitation of Liability.
|
16. Limitation of Liability.
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
SUCH DAMAGES.
|
||||||
|
|
||||||
#### 17. Interpretation of Sections 15 and 16.
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
above cannot be given local legal effect according to their terms,
|
above cannot be given local legal effect according to their terms,
|
||||||
|
@ -618,17 +620,16 @@ copy of the Program in return for a fee.
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
### How to Apply These Terms to Your New Programs
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
If you develop a new program, and you want it to be of the greatest
|
||||||
possible use to the public, the best way to achieve this is to make it
|
possible use to the public, the best way to achieve this is to make it
|
||||||
free software which everyone can redistribute and change under these
|
free software which everyone can redistribute and change under these terms.
|
||||||
terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest to
|
To do so, attach the following notices to the program. It is safest
|
||||||
attach them to the start of each source file to most effectively state
|
to attach them to the start of each source file to most effectively
|
||||||
the exclusion of warranty; and each file should have at least the
|
state the exclusion of warranty; and each file should have at least
|
||||||
"copyright" line and a pointer to where the full notice is found.
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
Copyright (C) <year> <name of author>
|
Copyright (C) <year> <name of author>
|
||||||
|
@ -646,8 +647,7 @@ the exclusion of warranty; and each file should have at least the
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
If the program does terminal interaction, make it output a short
|
||||||
notice like this when it starts in an interactive mode:
|
notice like this when it starts in an interactive mode:
|
||||||
|
@ -657,19 +657,18 @@ notice like this when it starts in an interactive mode:
|
||||||
This is free software, and you are welcome to redistribute it
|
This is free software, and you are welcome to redistribute it
|
||||||
under certain conditions; type `show c' for details.
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
The hypothetical commands \`show w' and \`show c' should show the
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
appropriate parts of the General Public License. Of course, your
|
parts of the General Public License. Of course, your program's commands
|
||||||
program's commands might be different; for a GUI interface, you would
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
necessary. For more information on this, and how to apply and follow
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
the GNU GPL, see <https://www.gnu.org/licenses/>.
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your
|
The GNU General Public License does not permit incorporating your program
|
||||||
program into proprietary programs. If your program is a subroutine
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
library, you may consider it more useful to permit linking proprietary
|
may consider it more useful to permit linking proprietary applications with
|
||||||
applications with the library. If this is what you want to do, use the
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
GNU Lesser General Public License instead of this License. But first,
|
Public License instead of this License. But first, please read
|
||||||
please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
|
|
119
docs/ordigi.mm
119
docs/ordigi.mm
|
@ -1,119 +0,0 @@
|
||||||
<map version="freeplane 1.7.0">
|
|
||||||
<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
|
|
||||||
<node TEXT="elodie" FOLDED="false" ID="ID_577640973" CREATED="1624709002278" MODIFIED="1624709019473" STYLE="oval"><hook NAME="MapStyle">
|
|
||||||
<conditional_styles>
|
|
||||||
<conditional_style ACTIVE="true" LOCALIZED_STYLE_REF="styles.connection" LAST="false">
|
|
||||||
<node_periodic_level_condition PERIOD="2" REMAINDER="1"/>
|
|
||||||
</conditional_style>
|
|
||||||
<conditional_style ACTIVE="true" LOCALIZED_STYLE_REF="styles.topic" LAST="false">
|
|
||||||
<node_level_condition VALUE="2" MATCH_CASE="false" MATCH_APPROXIMATELY="false" COMPARATION_RESULT="0" SUCCEED="true"/>
|
|
||||||
</conditional_style>
|
|
||||||
<conditional_style ACTIVE="true" LOCALIZED_STYLE_REF="styles.subtopic" LAST="false">
|
|
||||||
<node_level_condition VALUE="4" MATCH_CASE="false" MATCH_APPROXIMATELY="false" COMPARATION_RESULT="0" SUCCEED="true"/>
|
|
||||||
</conditional_style>
|
|
||||||
<conditional_style ACTIVE="true" LOCALIZED_STYLE_REF="styles.subsubtopic" LAST="false">
|
|
||||||
<node_level_condition VALUE="6" MATCH_CASE="false" MATCH_APPROXIMATELY="false" COMPARATION_RESULT="0" SUCCEED="true"/>
|
|
||||||
</conditional_style>
|
|
||||||
</conditional_styles>
|
|
||||||
<properties edgeColorConfiguration="#808080ff,#ff0000ff,#0000ffff,#00ff00ff,#ff00ffff,#00ffffff,#7c0000ff,#00007cff,#007c00ff,#7c007cff,#007c7cff,#7c7c00ff" fit_to_viewport="false" show_note_icons="true"/>
|
|
||||||
|
|
||||||
<map_styles>
|
|
||||||
<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" UNIFORM_SHAPE="true" VGAP_QUANTITY="24.0 pt">
|
|
||||||
<font SIZE="24"/>
|
|
||||||
<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right" STYLE="bubble">
|
|
||||||
<stylenode LOCALIZED_TEXT="default" ICON_SIZE="12.0 pt" COLOR="#000000" STYLE="fork">
|
|
||||||
<font NAME="Arial" SIZE="10" BOLD="false" ITALIC="false"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
|
|
||||||
<stylenode LOCALIZED_TEXT="defaultstyle.attributes">
|
|
||||||
<font SIZE="9"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="defaultstyle.note" COLOR="#000000" BACKGROUND_COLOR="#ffffff" TEXT_ALIGN="LEFT"/>
|
|
||||||
<stylenode LOCALIZED_TEXT="defaultstyle.floating">
|
|
||||||
<edge STYLE="hide_edge"/>
|
|
||||||
<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
|
|
||||||
</stylenode>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right" STYLE="bubble">
|
|
||||||
<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
|
|
||||||
<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
|
|
||||||
<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
|
|
||||||
<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="styles.connection" COLOR="#606060" STYLE="fork">
|
|
||||||
<font NAME="Arial" SIZE="8" BOLD="false"/>
|
|
||||||
</stylenode>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right" STYLE="bubble">
|
|
||||||
<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root" COLOR="#000000" STYLE="oval">
|
|
||||||
<font SIZE="18"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1" COLOR="#0033ff">
|
|
||||||
<font SIZE="16"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" COLOR="#00b439">
|
|
||||||
<font SIZE="14"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" COLOR="#990000">
|
|
||||||
<font SIZE="12"/>
|
|
||||||
</stylenode>
|
|
||||||
<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" COLOR="#111111">
|
|
||||||
<font SIZE="10"/>
|
|
||||||
</stylenode>
|
|
||||||
</stylenode>
|
|
||||||
</stylenode>
|
|
||||||
</map_styles>
|
|
||||||
</hook>
|
|
||||||
<node TEXT="import" POSITION="right" ID="ID_1958811617" CREATED="1624709031603" MODIFIED="1624710428698"><richcontent TYPE="NOTE">
|
|
||||||
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<p>
|
|
||||||
Import from external source
|
|
||||||
</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
</richcontent>
|
|
||||||
<node TEXT="--update" ID="ID_1408411362" CREATED="1624710635676" MODIFIED="1624710643751"/>
|
|
||||||
</node>
|
|
||||||
<node TEXT="update" POSITION="right" ID="ID_200299843" CREATED="1624709041259" MODIFIED="1624710451112"><richcontent TYPE="NOTE">
|
|
||||||
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<p>
|
|
||||||
Update metadata
|
|
||||||
</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
</richcontent>
|
|
||||||
</node>
|
|
||||||
<node TEXT="sort" FOLDED="true" POSITION="right" ID="ID_474160274" CREATED="1624709213958" MODIFIED="1624710465196"><richcontent TYPE="NOTE">
|
|
||||||
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<p>
|
|
||||||
Sort photo
|
|
||||||
</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
</richcontent>
|
|
||||||
<node TEXT="sort files" ID="ID_1215066925" CREATED="1624709364728" MODIFIED="1624709367203"/>
|
|
||||||
</node>
|
|
||||||
</node>
|
|
||||||
</map>
|
|
241
notes.md
241
notes.md
|
@ -1,241 +0,0 @@
|
||||||
|
|
||||||
# Name ideas
|
|
||||||
dozo
|
|
||||||
fog
|
|
||||||
mtool
|
|
||||||
ordigi
|
|
||||||
|
|
||||||
# Geocoders
|
|
||||||
- Pelias
|
|
||||||
- Photon
|
|
||||||
- Nominatium
|
|
||||||
|
|
||||||
# TEST
|
|
||||||
|
|
||||||
def get_exif(filename):
|
|
||||||
image = Image.open(filename)
|
|
||||||
image.verify()
|
|
||||||
return image._getexif()
|
|
||||||
|
|
||||||
def get_geotagging(exif):
|
|
||||||
if not exif:
|
|
||||||
raise ValueError("No EXIF metadata found")
|
|
||||||
|
|
||||||
geotagging = {}
|
|
||||||
for (idx, tag) in TAGS.items():
|
|
||||||
if tag == 'GPSInfo':
|
|
||||||
if idx not in exif:
|
|
||||||
raise ValueError("No EXIF geotagging found")
|
|
||||||
|
|
||||||
for (key, val) in GPSTAGS.items():
|
|
||||||
if key in exif[idx]:
|
|
||||||
geotagging[val] = exif[idx][key]
|
|
||||||
|
|
||||||
return geotagging
|
|
||||||
get_geotagging(exif)
|
|
||||||
from PIL.ExifTags import TAGS
|
|
||||||
|
|
||||||
def get_labeled_exif(exif):
|
|
||||||
labeled = {}
|
|
||||||
for (key, val) in exif.items():
|
|
||||||
labeled[TAGS.get(key)] = val
|
|
||||||
|
|
||||||
return labeled
|
|
||||||
get_geotagging(exif)
|
|
||||||
from PIL.ExifTags import GPSTAGS
|
|
||||||
get_geotagging(exif)
|
|
||||||
geotags = get_geotagging(exif)
|
|
||||||
get_location(geotags)
|
|
||||||
|
|
||||||
def get_decimal_from_dms(dms, ref):
|
|
||||||
|
|
||||||
degrees = dms[0][0] / dms[0][1]
|
|
||||||
minutes = dms[1][0] / dms[1][1] / 60.0
|
|
||||||
seconds = dms[2][0] / dms[2][1] / 3600.0
|
|
||||||
|
|
||||||
if ref in ['S', 'W']:
|
|
||||||
degrees = -degrees
|
|
||||||
minutes = -minutes
|
|
||||||
seconds = -seconds
|
|
||||||
|
|
||||||
return round(degrees + minutes + seconds, 5)
|
|
||||||
|
|
||||||
def get_coordinates(geotags):
|
|
||||||
lat = get_decimal_from_dms(geotags['GPSLatitude'], geotags['GPSLatitudeRef'])
|
|
||||||
|
|
||||||
lon = get_decimal_from_dms(geotags['GPSLongitude'], geotags['GPSLongitudeRef'])
|
|
||||||
|
|
||||||
return (lat,lon)
|
|
||||||
|
|
||||||
def get_geotagging(exif):
|
|
||||||
if not exif:
|
|
||||||
raise ValueError("No EXIF metadata found")
|
|
||||||
|
|
||||||
geotagging = {}
|
|
||||||
for (idx, tag) in TAGS.items():
|
|
||||||
if tag == 'GPSInfo':
|
|
||||||
if idx not in exif:
|
|
||||||
raise ValueError("No EXIF geotagging found")
|
|
||||||
|
|
||||||
for (key, val) in GPSTAGS.items():
|
|
||||||
if key in exif[idx]:
|
|
||||||
geotagging[val] = exif[idx][key]
|
|
||||||
|
|
||||||
return geotagging
|
|
||||||
|
|
||||||
def get_decimal_from_dms(dms, ref):
|
|
||||||
|
|
||||||
degrees = dms[0]
|
|
||||||
minutes = dms[1] / 60.0
|
|
||||||
seconds = dms[2] / 3600.0
|
|
||||||
|
|
||||||
if ref in ['S', 'W']:
|
|
||||||
degrees = -degrees
|
|
||||||
minutes = -minutes
|
|
||||||
seconds = -seconds
|
|
||||||
|
|
||||||
return round(degrees + minutes + seconds, 5)
|
|
||||||
headers = {}
|
|
||||||
params = {
|
|
||||||
'apiKey': os.environ['API_KEY'],
|
|
||||||
'at': "%s,%s" % coords,
|
|
||||||
'lang': 'en-US',
|
|
||||||
'limit': 1,
|
|
||||||
}
|
|
||||||
78/41: headers = {}
|
|
||||||
78/42:
|
|
||||||
params = {
|
|
||||||
'apiKey': os.environ['API_KEY'],
|
|
||||||
'at': "%s,%s" % coords,
|
|
||||||
'lang': 'en-US',
|
|
||||||
'limit': 1,
|
|
||||||
}
|
|
||||||
78/43:
|
|
||||||
params = {
|
|
||||||
'apiKey': os.environ['API_KEY'],
|
|
||||||
'at': "%s,%s" % coords,
|
|
||||||
'lang': 'en-US',
|
|
||||||
'limit': 1,
|
|
||||||
}
|
|
||||||
78/44: API_KEY=m5aGo8xGe4LLhxeKZYpHr2MPXGN2aDhe
|
|
||||||
78/45: API_KEY='m5aGo8xGe4LLhxeKZYpHr2MPXGN2aDhe'
|
|
||||||
78/46:
|
|
||||||
params = {
|
|
||||||
'apiKey': os.environ['API_KEY'],
|
|
||||||
'at': "%s,%s" % coords,
|
|
||||||
'lang': 'en-US',
|
|
||||||
'limit': 1,
|
|
||||||
}
|
|
||||||
78/47: API_KEY='m5aGo8xGe4LLhxeKZYpHr2MPXGN2aDhe'
|
|
||||||
78/48:
|
|
||||||
params = {
|
|
||||||
'apiKey': os.environ['API_KEY'],
|
|
||||||
'at': "%s,%s" % coords,
|
|
||||||
'lang': 'en-US',
|
|
||||||
'limit': 1,
|
|
||||||
}
|
|
||||||
78/49:
|
|
||||||
params = {
|
|
||||||
'apiKey': os.environ['m5aGo8xGe4LLhxeKZYpHr2MPXGN2aDhe'],
|
|
||||||
'at': "%s,%s" % coords,
|
|
||||||
'lang': 'en-US',
|
|
||||||
'limit': 1,
|
|
||||||
}
|
|
||||||
78/50: %load_ext autotime
|
|
||||||
78/51:
|
|
||||||
import pandas as pd
|
|
||||||
import geopandas as gpd
|
|
||||||
import geopy
|
|
||||||
from geopy.geocoders import Nominatim
|
|
||||||
from geopy.extra.rate_limiter import RateLimiterimport matplotlib.pyplot as plt
|
|
||||||
import plotly_express as pximport tqdm
|
|
||||||
from tqdm._tqdm_notebook import tqdm_notebook
|
|
||||||
78/52:
|
|
||||||
import pandas as pd
|
|
||||||
import geopandas as gpd
|
|
||||||
import geopy
|
|
||||||
from geopy.geocoders import Nominatim
|
|
||||||
from geopy.extra.rate_limiter import RateLimiterimport matplotlib.pyplot as plt
|
|
||||||
import plotly_express as px
|
|
||||||
import pandas as pd
|
|
||||||
import geopandas as gpd
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
from PIL import Image
|
|
||||||
|
|
||||||
filename='2021-02-24_09-33-29-20210305_081001_01.mp4'
|
|
||||||
def get_exif(filename):
|
|
||||||
image = Image.open(filename)
|
|
||||||
image.verify()
|
|
||||||
return image._getexif()
|
|
||||||
exif=get_exif(filename)
|
|
||||||
|
|
||||||
from PIL.ExifTags import TAGS
|
|
||||||
from PIL.ExifTags import GPSTAGS
|
|
||||||
def get_geotagging(exif):
|
|
||||||
if not exif:
|
|
||||||
raise ValueError("No EXIF metadata found")
|
|
||||||
|
|
||||||
geotagging = {}
|
|
||||||
for (idx, tag) in TAGS.items():
|
|
||||||
if tag == 'GPSInfo':
|
|
||||||
if idx not in exif:
|
|
||||||
raise ValueError("No EXIF geotagging found")
|
|
||||||
|
|
||||||
for (key, val) in GPSTAGS.items():
|
|
||||||
if key in exif[idx]:
|
|
||||||
geotagging[val] = exif[idx][key]
|
|
||||||
|
|
||||||
return geotagging
|
|
||||||
geotags = get_geotagging(exif)
|
|
||||||
import os
|
|
||||||
import requests
|
|
||||||
|
|
||||||
def get_location(geotags):
|
|
||||||
coords = get_coordinates(geotags)
|
|
||||||
|
|
||||||
uri = 'https://revgeocode.search.hereapi.com/v1/revgeocode'
|
|
||||||
headers = {}
|
|
||||||
params = {
|
|
||||||
'apiKey': os.environ['API_KEY'],
|
|
||||||
'at': "%s,%s" % coords,
|
|
||||||
'lang': 'en-US',
|
|
||||||
'limit': 1,
|
|
||||||
}
|
|
||||||
|
|
||||||
response = requests.get(uri, headers=headers, params=params)
|
|
||||||
try:
|
|
||||||
response.raise_for_status()
|
|
||||||
return response.json()
|
|
||||||
|
|
||||||
except requests.exceptions.HTTPError as e:
|
|
||||||
print(str(e))
|
|
||||||
return {}
|
|
||||||
|
|
||||||
def get_coordinates(geotags):
|
|
||||||
lat = get_decimal_from_dms(geotags['GPSLatitude'], geotags['GPSLatitudeRef'])
|
|
||||||
|
|
||||||
lon = get_decimal_from_dms(geotags['GPSLongitude'], geotags['GPSLongitudeRef'])
|
|
||||||
|
|
||||||
return (lat,lon)
|
|
||||||
coords = get_coordinates(geotags)
|
|
||||||
import geopy
|
|
||||||
from geopy.geocoders import Nominatim
|
|
||||||
locator = Nominatim(user_agent='myGeocoder')
|
|
||||||
# coordinates ='53.480837, -2.244914'
|
|
||||||
lat='45.58339'
|
|
||||||
lon='4.79823'
|
|
||||||
coords = lat + ',' + lon
|
|
||||||
locator.reverse(coords)
|
|
||||||
location =locator.reverse(coords)
|
|
||||||
location.address.split(',')
|
|
||||||
city=location.address.split(',')[1].strip()
|
|
||||||
country=location.address.split(',')[7].strip()
|
|
||||||
location.raw
|
|
||||||
rint
|
|
||||||
country=location.raw['address']['country']
|
|
||||||
city=location.raw['address']['village']
|
|
|
@ -12,11 +12,26 @@ from ordigi.geolocation import GeoLocation
|
||||||
from ordigi import utils
|
from ordigi import utils
|
||||||
|
|
||||||
_logger_options = [
|
_logger_options = [
|
||||||
|
click.option(
|
||||||
|
'--quiet',
|
||||||
|
'-q',
|
||||||
|
default=False,
|
||||||
|
is_flag=True,
|
||||||
|
help='Log level set to ERROR',
|
||||||
|
),
|
||||||
click.option(
|
click.option(
|
||||||
'--verbose',
|
'--verbose',
|
||||||
'-v',
|
'-v',
|
||||||
default='WARNING',
|
default=False,
|
||||||
help='Log level [WARNING,INFO,DEBUG,NOTSET]',
|
is_flag=True,
|
||||||
|
help='Log level set to INFO',
|
||||||
|
),
|
||||||
|
click.option(
|
||||||
|
'--debug',
|
||||||
|
'-d',
|
||||||
|
default=False,
|
||||||
|
is_flag=True,
|
||||||
|
help='Log level set to DEBUG',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -168,7 +183,7 @@ def _check(**kwargs):
|
||||||
"""
|
"""
|
||||||
root = Path(kwargs['path']).expanduser().absolute()
|
root = Path(kwargs['path']).expanduser().absolute()
|
||||||
|
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
|
|
||||||
collection = Collection(root)
|
collection = Collection(root)
|
||||||
|
@ -191,7 +206,7 @@ def _check(**kwargs):
|
||||||
@add_options(_filter_options)
|
@add_options(_filter_options)
|
||||||
@click.option(
|
@click.option(
|
||||||
'--dedup-regex',
|
'--dedup-regex',
|
||||||
'-d',
|
'-D',
|
||||||
default=None,
|
default=None,
|
||||||
multiple=True,
|
multiple=True,
|
||||||
help='Regex to match duplicate strings parts',
|
help='Regex to match duplicate strings parts',
|
||||||
|
@ -218,7 +233,7 @@ def _clean(**kwargs):
|
||||||
"""Clean media collection"""
|
"""Clean media collection"""
|
||||||
|
|
||||||
folders = kwargs['folders']
|
folders = kwargs['folders']
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
|
|
||||||
subdirs = kwargs['subdirs']
|
subdirs = kwargs['subdirs']
|
||||||
|
@ -268,7 +283,7 @@ def _clean(**kwargs):
|
||||||
def _clone(**kwargs):
|
def _clone(**kwargs):
|
||||||
"""Clone media collection to another location"""
|
"""Clone media collection to another location"""
|
||||||
|
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
|
|
||||||
src_path = Path(kwargs['src']).expanduser().absolute()
|
src_path = Path(kwargs['src']).expanduser().absolute()
|
||||||
|
@ -321,7 +336,7 @@ def _compare(**kwargs):
|
||||||
subdirs = kwargs['subdirs']
|
subdirs = kwargs['subdirs']
|
||||||
root = kwargs['collection']
|
root = kwargs['collection']
|
||||||
|
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
paths, root = _get_paths(subdirs, root)
|
paths, root = _get_paths(subdirs, root)
|
||||||
|
|
||||||
|
@ -358,16 +373,25 @@ def _compare(**kwargs):
|
||||||
multiple=True,
|
multiple=True,
|
||||||
help="Select exif tags groups to edit",
|
help="Select exif tags groups to edit",
|
||||||
)
|
)
|
||||||
|
@click.option(
|
||||||
|
'--overwrite',
|
||||||
|
'-O',
|
||||||
|
default=False,
|
||||||
|
is_flag=True,
|
||||||
|
help="Overwrite db and exif value by key value",
|
||||||
|
)
|
||||||
@click.argument('subdirs', required=False, nargs=-1, type=click.Path())
|
@click.argument('subdirs', required=False, nargs=-1, type=click.Path())
|
||||||
@click.argument('path', required=True, nargs=1, type=click.Path())
|
@click.argument('path', required=True, nargs=1, type=click.Path())
|
||||||
def _edit(**kwargs):
|
def _edit(**kwargs):
|
||||||
"""Edit EXIF metadata in files or directories"""
|
"""Edit EXIF metadata in files or directories"""
|
||||||
|
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
|
|
||||||
paths, root = _get_paths(kwargs['subdirs'], kwargs['path'])
|
paths, root = _get_paths(kwargs['subdirs'], kwargs['path'])
|
||||||
|
|
||||||
|
overwrite = kwargs['overwrite']
|
||||||
|
|
||||||
collection = Collection(
|
collection = Collection(
|
||||||
root,
|
root,
|
||||||
{
|
{
|
||||||
|
@ -384,13 +408,11 @@ def _edit(**kwargs):
|
||||||
'camera_make',
|
'camera_make',
|
||||||
'camera_model',
|
'camera_model',
|
||||||
'city',
|
'city',
|
||||||
'coordinates',
|
|
||||||
'country',
|
'country',
|
||||||
# 'date_created',
|
# 'date_created',
|
||||||
'date_media',
|
'date_media',
|
||||||
# 'date_modified',
|
# 'date_modified',
|
||||||
'date_original',
|
'date_original',
|
||||||
'default',
|
|
||||||
'latitude',
|
'latitude',
|
||||||
'location',
|
'location',
|
||||||
'longitude',
|
'longitude',
|
||||||
|
@ -405,6 +427,9 @@ def _edit(**kwargs):
|
||||||
keys = set(editable_keys)
|
keys = set(editable_keys)
|
||||||
else:
|
else:
|
||||||
keys = set(kwargs['key'])
|
keys = set(kwargs['key'])
|
||||||
|
if 'coordinates' in keys:
|
||||||
|
keys.remove('coordinates')
|
||||||
|
keys.update(['latitude', 'longitude'])
|
||||||
|
|
||||||
location = False
|
location = False
|
||||||
for key in keys:
|
for key in keys:
|
||||||
|
@ -412,10 +437,6 @@ def _edit(**kwargs):
|
||||||
LOG.error(f"key '{key}' is not valid")
|
LOG.error(f"key '{key}' is not valid")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if key == 'coordinates':
|
|
||||||
keys.remove('coordinates')
|
|
||||||
keys.update(['latitude', 'longitude'])
|
|
||||||
|
|
||||||
if key in (
|
if key in (
|
||||||
'city',
|
'city',
|
||||||
'latitude',
|
'latitude',
|
||||||
|
@ -431,7 +452,7 @@ def _edit(**kwargs):
|
||||||
else:
|
else:
|
||||||
loc = None
|
loc = None
|
||||||
|
|
||||||
summary = collection.edit_metadata(paths, keys, loc, overwrite=True)
|
summary = collection.edit_metadata(paths, keys, loc, overwrite)
|
||||||
|
|
||||||
if log_level < 30:
|
if log_level < 30:
|
||||||
summary.print()
|
summary.print()
|
||||||
|
@ -448,7 +469,7 @@ def _init(**kwargs):
|
||||||
Init media collection database.
|
Init media collection database.
|
||||||
"""
|
"""
|
||||||
root = Path(kwargs['path']).expanduser().absolute()
|
root = Path(kwargs['path']).expanduser().absolute()
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
|
|
||||||
collection = Collection(root)
|
collection = Collection(root)
|
||||||
|
@ -485,7 +506,7 @@ def _import(**kwargs):
|
||||||
"""Sort files or directories by reading their EXIF and organizing them
|
"""Sort files or directories by reading their EXIF and organizing them
|
||||||
according to ordigi.conf preferences.
|
according to ordigi.conf preferences.
|
||||||
"""
|
"""
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
|
|
||||||
src_paths, root = _get_paths(kwargs['src'], kwargs['dest'])
|
src_paths, root = _get_paths(kwargs['src'], kwargs['dest'])
|
||||||
|
@ -541,7 +562,7 @@ def _sort(**kwargs):
|
||||||
"""Sort files or directories by reading their EXIF and organizing them
|
"""Sort files or directories by reading their EXIF and organizing them
|
||||||
according to ordigi.conf preferences.
|
according to ordigi.conf preferences.
|
||||||
"""
|
"""
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
|
|
||||||
paths, root = _get_paths(kwargs['subdirs'], kwargs['dest'])
|
paths, root = _get_paths(kwargs['subdirs'], kwargs['dest'])
|
||||||
|
@ -592,7 +613,7 @@ def _update(**kwargs):
|
||||||
Update media collection database.
|
Update media collection database.
|
||||||
"""
|
"""
|
||||||
root = Path(kwargs['path']).expanduser().absolute()
|
root = Path(kwargs['path']).expanduser().absolute()
|
||||||
log_level = log.get_level(kwargs['verbose'])
|
log_level = log.get_level(kwargs['quiet'], kwargs['verbose'], kwargs['debug'])
|
||||||
log.console(LOG, level=log_level)
|
log.console(LOG, level=log_level)
|
||||||
|
|
||||||
collection = Collection(root)
|
collection = Collection(root)
|
||||||
|
|
|
@ -494,6 +494,7 @@ class SortMedias:
|
||||||
self.summary = Summary(self.root)
|
self.summary = Summary(self.root)
|
||||||
|
|
||||||
# Attributes
|
# Attributes
|
||||||
|
self.input = request.Input()
|
||||||
self.theme = request.load_theme()
|
self.theme = request.load_theme()
|
||||||
|
|
||||||
def _checkcomp(self, dest_path, src_checksum):
|
def _checkcomp(self, dest_path, src_checksum):
|
||||||
|
@ -580,14 +581,10 @@ class SortMedias:
|
||||||
self.log.warning(f'Target directory {dir_path} is a file')
|
self.log.warning(f'Target directory {dir_path} is a file')
|
||||||
# Rename the src_file
|
# Rename the src_file
|
||||||
if self.interactive:
|
if self.interactive:
|
||||||
prompt = [
|
answer = self.input.text(
|
||||||
inquirer.Text(
|
"New name for" f"'{dir_path.name}' file"
|
||||||
'file_path',
|
)
|
||||||
message="New name for" f"'{dir_path.name}' file",
|
file_path = dir_path.parent / answer
|
||||||
),
|
|
||||||
]
|
|
||||||
answers = inquirer.prompt(prompt, theme=self.theme)
|
|
||||||
file_path = dir_path.parent / answers['file_path']
|
|
||||||
else:
|
else:
|
||||||
file_path = dir_path.parent / (dir_path.name + '_file')
|
file_path = dir_path.parent / (dir_path.name + '_file')
|
||||||
|
|
||||||
|
@ -760,6 +757,7 @@ class Collection(SortMedias):
|
||||||
self.paths,
|
self.paths,
|
||||||
root,
|
root,
|
||||||
self.opt['Exif'],
|
self.opt['Exif'],
|
||||||
|
{},
|
||||||
self.db,
|
self.db,
|
||||||
self.opt['Terminal']['interactive'],
|
self.opt['Terminal']['interactive'],
|
||||||
)
|
)
|
||||||
|
@ -867,7 +865,20 @@ class Collection(SortMedias):
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def check_db(self):
|
def check_file(self, file_path):
|
||||||
|
self.medias.checksums[file_path] = utils.checksum(file_path)
|
||||||
|
if self._check_file(file_path, self.medias.checksums[file_path]):
|
||||||
|
return True
|
||||||
|
|
||||||
|
# We d'ont want to silently ignore or correct this without
|
||||||
|
# resetting the cache as is could be due to file corruption
|
||||||
|
self.log.error(f'modified or corrupted file.')
|
||||||
|
self.log.info(
|
||||||
|
'Use ordigi update --checksum or --reset-cache, check database integrity or try to restore the file'
|
||||||
|
)
|
||||||
|
return False
|
||||||
|
|
||||||
|
def check_db(self, checksums=True):
|
||||||
"""
|
"""
|
||||||
Check if db FilePath match to collection filesystem
|
Check if db FilePath match to collection filesystem
|
||||||
:returns: bool
|
:returns: bool
|
||||||
|
@ -876,18 +887,11 @@ class Collection(SortMedias):
|
||||||
db_rows = [row['FilePath'] for row in self.db.sqlite.get_rows('metadata')]
|
db_rows = [row['FilePath'] for row in self.db.sqlite.get_rows('metadata')]
|
||||||
for file_path in file_paths:
|
for file_path in file_paths:
|
||||||
result = self.file_in_db(file_path, db_rows)
|
result = self.file_in_db(file_path, db_rows)
|
||||||
checksum = utils.checksum(file_path)
|
|
||||||
if not result:
|
if not result:
|
||||||
self.log.error('Db data is not accurate')
|
self.log.error('Db data is not accurate')
|
||||||
self.log.info(f'{file_path} not in db')
|
self.log.info(f'{file_path} not in db')
|
||||||
return False
|
return False
|
||||||
elif not self._check_file(file_path, checksum):
|
elif checksums and not self.check_file(file_path):
|
||||||
# We d'ont want to silently ignore or correct this without
|
|
||||||
# resetting the cache as is could be due to file corruption
|
|
||||||
self.log.error(f'modified or corrupted file.')
|
|
||||||
self.log.info(
|
|
||||||
'Use ordigi update --checksum or --reset-cache, check database integrity or try to restore the file'
|
|
||||||
)
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
nb_files = len(file_paths)
|
nb_files = len(file_paths)
|
||||||
|
@ -906,10 +910,10 @@ class Collection(SortMedias):
|
||||||
self.log.error('Db data is not accurate run `ordigi update`')
|
self.log.error('Db data is not accurate run `ordigi update`')
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
def _init_check_db(self, loc=None):
|
def _init_check_db(self, checksums=True, loc=None):
|
||||||
if self.db.sqlite.is_empty('metadata'):
|
if self.db.sqlite.is_empty('metadata'):
|
||||||
self.init(loc)
|
self.init(loc)
|
||||||
elif not self.check_db():
|
elif not self.check_db(checksums):
|
||||||
self.log.error('Db data is not accurate run `ordigi update`')
|
self.log.error('Db data is not accurate run `ordigi update`')
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
@ -938,6 +942,7 @@ class Collection(SortMedias):
|
||||||
db_rows = list(self.db.sqlite.get_rows('metadata'))
|
db_rows = list(self.db.sqlite.get_rows('metadata'))
|
||||||
invalid_db_rows = set()
|
invalid_db_rows = set()
|
||||||
db_paths = set()
|
db_paths = set()
|
||||||
|
self.log.info(f"Update database:")
|
||||||
for db_row in db_rows:
|
for db_row in db_rows:
|
||||||
abspath = self.root / db_row['FilePath']
|
abspath = self.root / db_row['FilePath']
|
||||||
if abspath not in file_paths:
|
if abspath not in file_paths:
|
||||||
|
@ -949,15 +954,17 @@ class Collection(SortMedias):
|
||||||
relpath = os.path.relpath(file_path, self.root)
|
relpath = os.path.relpath(file_path, self.root)
|
||||||
metadata = {}
|
metadata = {}
|
||||||
|
|
||||||
checksum = utils.checksum(file_path)
|
self.medias.checksums[file_path] = utils.checksum(file_path)
|
||||||
if not self._check_file(file_path, checksum) and update_checksum:
|
if (
|
||||||
|
not self._check_file(file_path, self.medias.checksums[file_path])
|
||||||
|
and update_checksum
|
||||||
|
):
|
||||||
# metatata will fill checksum from file
|
# metatata will fill checksum from file
|
||||||
metadata = self.medias.get_metadata(
|
metadata = self.medias.get_metadata(file_path, self.root, loc=loc)
|
||||||
file_path, self.root, checksum, loc=loc
|
|
||||||
)
|
|
||||||
metadata['file_path'] = relpath
|
metadata['file_path'] = relpath
|
||||||
# set row attribute to the file
|
# set row attribute to the file
|
||||||
self.db.add_file_data(metadata)
|
self.db.add_file_data(metadata)
|
||||||
|
self.log.info(f"Update '{file_path}' checksum to db")
|
||||||
self.summary.append('update', file_path)
|
self.summary.append('update', file_path)
|
||||||
|
|
||||||
# If file not in database
|
# If file not in database
|
||||||
|
@ -978,11 +985,13 @@ class Collection(SortMedias):
|
||||||
break
|
break
|
||||||
# set row attribute to the file
|
# set row attribute to the file
|
||||||
self.db.add_file_data(metadata)
|
self.db.add_file_data(metadata)
|
||||||
|
self.log.info(f"Add '{file_path}' to db")
|
||||||
self.summary.append('update', file_path)
|
self.summary.append('update', file_path)
|
||||||
|
|
||||||
# Finally delete invalid rows
|
# Finally delete invalid rows
|
||||||
for row in invalid_db_rows:
|
for row in invalid_db_rows:
|
||||||
self.db.sqlite.delete_filepath(row['FilePath'])
|
self.db.sqlite.delete_filepath(row['FilePath'])
|
||||||
|
self.log.info(f"Delete invalid row : '{row['FilePath']}' from db")
|
||||||
|
|
||||||
return self.summary
|
return self.summary
|
||||||
|
|
||||||
|
@ -1057,7 +1066,7 @@ class Collection(SortMedias):
|
||||||
Sort files into appropriate folder
|
Sort files into appropriate folder
|
||||||
"""
|
"""
|
||||||
# Check db
|
# Check db
|
||||||
self._init_check_db(loc)
|
self._init_check_db(loc=loc)
|
||||||
|
|
||||||
path_format = self.opt['Path']['path_format']
|
path_format = self.opt['Path']['path_format']
|
||||||
self.log.debug(f'path_format: {path_format}')
|
self.log.debug(f'path_format: {path_format}')
|
||||||
|
@ -1189,35 +1198,43 @@ class Collection(SortMedias):
|
||||||
|
|
||||||
def edit_metadata(self, paths, keys, loc=None, overwrite=False):
|
def edit_metadata(self, paths, keys, loc=None, overwrite=False):
|
||||||
"""Edit metadata and exif data for given key"""
|
"""Edit metadata and exif data for given key"""
|
||||||
self._init_check_db()
|
|
||||||
|
|
||||||
|
if self.db.sqlite.is_empty('metadata'):
|
||||||
|
self.init(loc)
|
||||||
for file_path, media in self.medias.get_medias_datas(paths, loc=loc):
|
for file_path, media in self.medias.get_medias_datas(paths, loc=loc):
|
||||||
|
result = False
|
||||||
media.metadata['file_path'] = os.path.relpath(file_path, self.root)
|
media.metadata['file_path'] = os.path.relpath(file_path, self.root)
|
||||||
|
if not self.check_file(file_path):
|
||||||
|
self.log.error('Db data is not accurate run `ordigi update`')
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
exif = WriteExif(
|
||||||
|
file_path,
|
||||||
|
media.metadata,
|
||||||
|
ignore_tags=self.opt['Exif']['ignore_tags'],
|
||||||
|
)
|
||||||
|
|
||||||
for key in keys:
|
for key in keys:
|
||||||
print()
|
print()
|
||||||
value = media.metadata[key]
|
value = media.metadata[key]
|
||||||
if overwrite or not value:
|
if overwrite or not value:
|
||||||
print(f"FILE: '{file_path}'")
|
print(f"FILE: '{file_path}'")
|
||||||
if overwrite:
|
if overwrite and value:
|
||||||
print(f"{key}: '{value}'")
|
print(f"{key}: '{value}'")
|
||||||
if overwrite or not value:
|
if overwrite or not value:
|
||||||
# Prompt value for given key for file_path
|
# Prompt value for given key for file_path
|
||||||
prompt = [
|
answer = self.input.text(key)
|
||||||
inquirer.Text('value', message=key),
|
# Check value
|
||||||
]
|
|
||||||
answer = inquirer.prompt(prompt, theme=self.theme)
|
|
||||||
# answer = {'value': '03-12-2021 08:12:35'}
|
|
||||||
# Validate value
|
|
||||||
if key in ('date_original', 'date_created', 'date_modified'):
|
if key in ('date_original', 'date_created', 'date_modified'):
|
||||||
# Check date format
|
# Check date format
|
||||||
value = media.get_date_format(answer['value'])
|
value = media.get_date_format(answer)
|
||||||
else:
|
else:
|
||||||
value = answer['value']
|
value = answer
|
||||||
if not value.isalnum():
|
while not value.isalnum():
|
||||||
|
if not value: break
|
||||||
print("Invalid entry, use alphanumeric chars")
|
print("Invalid entry, use alphanumeric chars")
|
||||||
value = inquirer.prompt(prompt, theme=self.theme)
|
value = inquirer.prompt(prompt, theme=self.theme)
|
||||||
|
|
||||||
result = False
|
|
||||||
if value:
|
if value:
|
||||||
media.metadata[key] = value
|
media.metadata[key] = value
|
||||||
if key == 'location':
|
if key == 'location':
|
||||||
|
@ -1228,21 +1245,6 @@ class Collection(SortMedias):
|
||||||
media.set_location_from_coordinates(loc)
|
media.set_location_from_coordinates(loc)
|
||||||
|
|
||||||
# Update exif data
|
# Update exif data
|
||||||
if key in (
|
|
||||||
'date_original',
|
|
||||||
'album',
|
|
||||||
'title',
|
|
||||||
'latitude',
|
|
||||||
'location',
|
|
||||||
'longitude',
|
|
||||||
'latitude_ref',
|
|
||||||
'longitude_ref',
|
|
||||||
):
|
|
||||||
exif = WriteExif(
|
|
||||||
file_path,
|
|
||||||
media.metadata,
|
|
||||||
ignore_tags=self.opt['Exif']['ignore_tags'],
|
|
||||||
)
|
|
||||||
if key == 'location':
|
if key == 'location':
|
||||||
result = exif.set_key_values(
|
result = exif.set_key_values(
|
||||||
'latitude', media.metadata['latitude']
|
'latitude', media.metadata['latitude']
|
||||||
|
@ -1250,7 +1252,7 @@ class Collection(SortMedias):
|
||||||
result = exif.set_key_values(
|
result = exif.set_key_values(
|
||||||
'longitude', media.metadata['longitude']
|
'longitude', media.metadata['longitude']
|
||||||
)
|
)
|
||||||
else:
|
elif key in exif.get_tags().keys():
|
||||||
result = exif.set_key_values(key, value)
|
result = exif.set_key_values(key, value)
|
||||||
|
|
||||||
# Update checksum
|
# Update checksum
|
||||||
|
|
|
@ -46,9 +46,16 @@ def file_logger(logger, file, level=30):
|
||||||
logger.addHandler(handler)
|
logger.addHandler(handler)
|
||||||
|
|
||||||
|
|
||||||
def get_level(verbose):
|
def get_level(quiet=False, verbose=False, debug=False, num=None):
|
||||||
"""Return int logging level from string"""
|
"""Return int logging level from command line args"""
|
||||||
if verbose.isnumeric():
|
if num and num.isnumeric():
|
||||||
return int(verbose)
|
return int(verbose)
|
||||||
|
|
||||||
return int(logging.getLevelName(verbose))
|
if debug:
|
||||||
|
return int(logging.getLevelName('DEBUG'))
|
||||||
|
if verbose:
|
||||||
|
return int(logging.getLevelName('INFO'))
|
||||||
|
if quiet:
|
||||||
|
return int(logging.getLevelName('ERROR'))
|
||||||
|
|
||||||
|
return int(logging.getLevelName('WARNING'))
|
||||||
|
|
|
@ -345,11 +345,8 @@ class Media(ReadExif):
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
if not answers['date_list']:
|
if not answers['date_list']:
|
||||||
prompt = [
|
answer = self.prompt.text("date")
|
||||||
inquirer.Text('date_custom', message="date"),
|
return self.get_date_format(answer)
|
||||||
]
|
|
||||||
answers = inquirer.prompt(prompt, theme=self.theme)
|
|
||||||
return self.get_date_format(answers['date_custom'])
|
|
||||||
|
|
||||||
return answers['date_list']
|
return answers['date_list']
|
||||||
|
|
||||||
|
@ -467,17 +464,12 @@ class Media(ReadExif):
|
||||||
default=f'{album}',
|
default=f'{album}',
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
prompt = [
|
|
||||||
inquirer.Text('custom', message="album"),
|
|
||||||
]
|
|
||||||
|
|
||||||
answers = inquirer.prompt(choices_list, theme=self.theme)
|
answers = inquirer.prompt(choices_list, theme=self.theme)
|
||||||
if not answers:
|
if not answers:
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
if not answers['album']:
|
if not answers['album']:
|
||||||
answers = inquirer.prompt(prompt, theme=self.theme)
|
return self.input.text("album")
|
||||||
return answers['custom']
|
|
||||||
|
|
||||||
return answers['album']
|
return answers['album']
|
||||||
|
|
||||||
|
@ -646,6 +638,7 @@ class Medias:
|
||||||
paths,
|
paths,
|
||||||
root,
|
root,
|
||||||
exif_options,
|
exif_options,
|
||||||
|
checksums=None,
|
||||||
db=None,
|
db=None,
|
||||||
interactive=False,
|
interactive=False,
|
||||||
):
|
):
|
||||||
|
@ -658,6 +651,11 @@ class Medias:
|
||||||
self.root = root
|
self.root = root
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
|
if checksums:
|
||||||
|
self.checksums = checksums
|
||||||
|
else:
|
||||||
|
self.checksums = {}
|
||||||
|
|
||||||
self.exif_opt = exif_options
|
self.exif_opt = exif_options
|
||||||
|
|
||||||
self.ignore_tags = self.exif_opt['ignore_tags']
|
self.ignore_tags = self.exif_opt['ignore_tags']
|
||||||
|
@ -684,7 +682,14 @@ class Medias:
|
||||||
|
|
||||||
return media
|
return media
|
||||||
|
|
||||||
def get_media_data(self, file_path, src_dir, checksum=None, loc=None):
|
def get_media_data(self, file_path, src_dir, loc=None):
|
||||||
|
"""Get media class instance with metadata"""
|
||||||
|
|
||||||
|
if self.checksums and file_path in self.checksums.keys():
|
||||||
|
checksum = self.checksums[file_path]
|
||||||
|
else:
|
||||||
|
checksum = None
|
||||||
|
|
||||||
media = self.get_media(file_path, src_dir, checksum)
|
media = self.get_media(file_path, src_dir, checksum)
|
||||||
media.get_metadata(
|
media.get_metadata(
|
||||||
self.root, loc, self.db.sqlite, self.exif_opt['cache']
|
self.root, loc, self.db.sqlite, self.exif_opt['cache']
|
||||||
|
@ -692,9 +697,9 @@ class Medias:
|
||||||
|
|
||||||
return media
|
return media
|
||||||
|
|
||||||
def get_metadata(self, src_path, src_dir, checksum=None, loc=None):
|
def get_metadata(self, src_path, src_dir, loc=None):
|
||||||
"""Get metadata"""
|
"""Get metadata"""
|
||||||
return self.get_media_data(src_path, src_dir, checksum, loc).metadata
|
return self.get_media_data(src_path, src_dir, loc).metadata
|
||||||
|
|
||||||
def get_paths(self, src_dirs, imp=False):
|
def get_paths(self, src_dirs, imp=False):
|
||||||
"""Get paths"""
|
"""Get paths"""
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import inquirer
|
import inquirer
|
||||||
from blessed import Terminal
|
from blessed import Terminal
|
||||||
|
from colorama import init,Fore,Style,Back
|
||||||
|
|
||||||
term = Terminal()
|
term = Terminal()
|
||||||
|
|
||||||
|
@ -34,6 +35,15 @@ def load_theme():
|
||||||
return inquirer.themes.load_theme_from_dict(custom_theme)
|
return inquirer.themes.load_theme_from_dict(custom_theme)
|
||||||
|
|
||||||
|
|
||||||
|
class Input():
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
|
||||||
|
init()
|
||||||
|
|
||||||
|
def text(self, message):
|
||||||
|
return input(f'{Fore.BLUE}[{Fore.YELLOW}?{Fore.BLUE}]{Fore.WHITE} {message}: ')
|
||||||
|
|
||||||
|
|
||||||
# def edit_prompt(self, key: str, value: str) -> str:
|
# def edit_prompt(self, key: str, value: str) -> str:
|
||||||
# print(f"Date conflict for file: {self.file_path}")
|
# print(f"Date conflict for file: {self.file_path}")
|
||||||
|
|
|
@ -5,6 +5,7 @@ import pytest
|
||||||
import inquirer
|
import inquirer
|
||||||
|
|
||||||
from ordigi import cli
|
from ordigi import cli
|
||||||
|
from ordigi.request import Input
|
||||||
|
|
||||||
CONTENT = "content"
|
CONTENT = "content"
|
||||||
|
|
||||||
|
@ -26,7 +27,7 @@ class TestOrdigi:
|
||||||
def setup_class(cls, sample_files_paths):
|
def setup_class(cls, sample_files_paths):
|
||||||
cls.runner = CliRunner()
|
cls.runner = CliRunner()
|
||||||
cls.src_path, cls.file_paths = sample_files_paths
|
cls.src_path, cls.file_paths = sample_files_paths
|
||||||
cls.logger_options = (('--verbose', 'DEBUG'),)
|
cls.logger_options = ('--debug',)
|
||||||
cls.filter_options = (
|
cls.filter_options = (
|
||||||
('--ignore-tags', 'CreateDate'),
|
('--ignore-tags', 'CreateDate'),
|
||||||
('--ext', 'jpg'),
|
('--ext', 'jpg'),
|
||||||
|
@ -81,21 +82,23 @@ class TestOrdigi:
|
||||||
|
|
||||||
def test_edit(self, monkeypatch):
|
def test_edit(self, monkeypatch):
|
||||||
|
|
||||||
bool_options = ()
|
bool_options = (
|
||||||
|
*self.logger_options,
|
||||||
|
)
|
||||||
|
|
||||||
arg_options = (
|
arg_options = (
|
||||||
*self.logger_options,
|
|
||||||
*self.filter_options,
|
*self.filter_options,
|
||||||
)
|
)
|
||||||
|
|
||||||
def mockreturn(prompt, theme):
|
def mockreturn(self, message):
|
||||||
return {'value': '03-12-2021 08:12:35'}
|
return '03-12-2021 08:12:35'
|
||||||
|
|
||||||
monkeypatch.setattr(inquirer, 'prompt', mockreturn)
|
monkeypatch.setattr(Input, 'text', mockreturn)
|
||||||
|
|
||||||
args = (
|
args = (
|
||||||
'--key',
|
'--key',
|
||||||
'date_original',
|
'date_original',
|
||||||
|
'--overwrite',
|
||||||
str(self.src_path.joinpath('test_exif/photo.png')),
|
str(self.src_path.joinpath('test_exif/photo.png')),
|
||||||
str(self.src_path),
|
str(self.src_path),
|
||||||
)
|
)
|
||||||
|
@ -107,6 +110,7 @@ class TestOrdigi:
|
||||||
|
|
||||||
def test_sort(self):
|
def test_sort(self):
|
||||||
bool_options = (
|
bool_options = (
|
||||||
|
*self.logger_options,
|
||||||
# '--interactive',
|
# '--interactive',
|
||||||
'--dry-run',
|
'--dry-run',
|
||||||
'--album-from-folder',
|
'--album-from-folder',
|
||||||
|
@ -117,7 +121,6 @@ class TestOrdigi:
|
||||||
)
|
)
|
||||||
|
|
||||||
arg_options = (
|
arg_options = (
|
||||||
*self.logger_options,
|
|
||||||
*self.filter_options,
|
*self.filter_options,
|
||||||
('--path-format', '{%Y}/{folder}/{name}.{ext}'),
|
('--path-format', '{%Y}/{folder}/{name}.{ext}'),
|
||||||
|
|
||||||
|
@ -132,36 +135,29 @@ class TestOrdigi:
|
||||||
|
|
||||||
def test_clone(self, tmp_path):
|
def test_clone(self, tmp_path):
|
||||||
|
|
||||||
arg_options = (
|
|
||||||
*self.logger_options,
|
|
||||||
|
|
||||||
)
|
|
||||||
|
|
||||||
paths = (str(self.src_path), str(tmp_path))
|
paths = (str(self.src_path), str(tmp_path))
|
||||||
|
|
||||||
self.assert_cli(cli._init, [str(self.src_path)])
|
self.assert_cli(cli._init, [str(self.src_path)])
|
||||||
self.assert_cli(cli._clone, ['--dry-run', '--verbose', 'DEBUG', *paths])
|
self.assert_cli(cli._clone, ['--dry-run', *self.logger_options, *paths])
|
||||||
self.assert_cli(cli._clone, paths)
|
self.assert_cli(cli._clone, paths)
|
||||||
|
|
||||||
|
|
||||||
def assert_init(self):
|
def assert_init(self):
|
||||||
for opt, arg in self.logger_options:
|
self.assert_cli(cli._init, [*self.logger_options, str(self.src_path)])
|
||||||
self.assert_cli(cli._init, [opt, arg, str(self.src_path)])
|
|
||||||
|
|
||||||
def assert_update(self):
|
def assert_update(self):
|
||||||
file_path = Path(ORDIGI_PATH, 'samples/test_exif/photo.cr2')
|
file_path = Path(ORDIGI_PATH, 'samples/test_exif/photo.cr2')
|
||||||
dest_path = self.src_path / 'photo_moved.cr2'
|
dest_path = self.src_path / 'photo_moved.cr2'
|
||||||
shutil.copyfile(file_path, dest_path)
|
shutil.copyfile(file_path, dest_path)
|
||||||
for opt, arg in self.logger_options:
|
self.assert_cli(cli._update, [*self.logger_options, str(self.src_path)])
|
||||||
self.assert_cli(cli._update, [opt, arg, str(self.src_path)])
|
|
||||||
self.assert_cli(cli._update, ['--checksum', str(self.src_path)])
|
self.assert_cli(cli._update, ['--checksum', str(self.src_path)])
|
||||||
|
|
||||||
def assert_check(self):
|
def assert_check(self):
|
||||||
for opt, arg in self.logger_options:
|
self.assert_cli(cli._check, [*self.logger_options, str(self.src_path)])
|
||||||
self.assert_cli(cli._check, [opt, arg, str(self.src_path)])
|
|
||||||
|
|
||||||
def assert_clean(self):
|
def assert_clean(self):
|
||||||
bool_options = (
|
bool_options = (
|
||||||
|
*self.logger_options,
|
||||||
# '--interactive',
|
# '--interactive',
|
||||||
'--dry-run',
|
'--dry-run',
|
||||||
'--delete-excluded',
|
'--delete-excluded',
|
||||||
|
@ -171,7 +167,6 @@ class TestOrdigi:
|
||||||
)
|
)
|
||||||
|
|
||||||
arg_options = (
|
arg_options = (
|
||||||
*self.logger_options,
|
|
||||||
*self.filter_options,
|
*self.filter_options,
|
||||||
('--dedup-regex', r'\d{4}-\d{2}'),
|
('--dedup-regex', r'\d{4}-\d{2}'),
|
||||||
)
|
)
|
||||||
|
@ -192,6 +187,7 @@ class TestOrdigi:
|
||||||
|
|
||||||
def test_import(self, tmp_path):
|
def test_import(self, tmp_path):
|
||||||
bool_options = (
|
bool_options = (
|
||||||
|
*self.logger_options,
|
||||||
# '--interactive',
|
# '--interactive',
|
||||||
'--dry-run',
|
'--dry-run',
|
||||||
'--album-from-folder',
|
'--album-from-folder',
|
||||||
|
@ -202,7 +198,6 @@ class TestOrdigi:
|
||||||
)
|
)
|
||||||
|
|
||||||
arg_options = (
|
arg_options = (
|
||||||
*self.logger_options,
|
|
||||||
('--exclude', '.DS_Store'),
|
('--exclude', '.DS_Store'),
|
||||||
*self.filter_options,
|
*self.filter_options,
|
||||||
('--path-format', '{%Y}/{folder}/{stem}.{ext}'),
|
('--path-format', '{%Y}/{folder}/{stem}.{ext}'),
|
||||||
|
@ -218,6 +213,7 @@ class TestOrdigi:
|
||||||
|
|
||||||
def test_compare(self):
|
def test_compare(self):
|
||||||
bool_options = (
|
bool_options = (
|
||||||
|
*self.logger_options,
|
||||||
# '--interactive',
|
# '--interactive',
|
||||||
'--dry-run',
|
'--dry-run',
|
||||||
'--find-duplicates',
|
'--find-duplicates',
|
||||||
|
@ -225,7 +221,6 @@ class TestOrdigi:
|
||||||
)
|
)
|
||||||
|
|
||||||
arg_options = (
|
arg_options = (
|
||||||
*self.logger_options,
|
|
||||||
*self.filter_options,
|
*self.filter_options,
|
||||||
# ('--similar-to', ''),
|
# ('--similar-to', ''),
|
||||||
('--similarity', '65'),
|
('--similarity', '65'),
|
||||||
|
|
|
@ -8,13 +8,14 @@ import inquirer
|
||||||
|
|
||||||
from ordigi import LOG
|
from ordigi import LOG
|
||||||
from ordigi import constants
|
from ordigi import constants
|
||||||
|
from ordigi import utils
|
||||||
|
from ordigi.summary import Summary
|
||||||
from ordigi.collection import Collection, FPath, Paths
|
from ordigi.collection import Collection, FPath, Paths
|
||||||
from ordigi.exiftool import ExifTool, ExifToolCaching, exiftool_is_running, terminate_exiftool
|
from ordigi.exiftool import ExifTool, ExifToolCaching, exiftool_is_running, terminate_exiftool
|
||||||
from ordigi.geolocation import GeoLocation
|
from ordigi.geolocation import GeoLocation
|
||||||
from ordigi.media import Media, ReadExif
|
from ordigi.media import Media, ReadExif
|
||||||
from ordigi import utils
|
from ordigi.request import Input
|
||||||
from .conftest import randomize_files, randomize_db
|
from .conftest import randomize_files, randomize_db
|
||||||
from ordigi.summary import Summary
|
|
||||||
|
|
||||||
LOG.setLevel(10)
|
LOG.setLevel(10)
|
||||||
|
|
||||||
|
@ -169,7 +170,7 @@ class TestCollection:
|
||||||
path_format = 'test_exif/<city>/<%Y>-<name>.%l<ext>'
|
path_format = 'test_exif/<city>/<%Y>-<name>.%l<ext>'
|
||||||
summary = collection.sort_files([tmp_path], loc)
|
summary = collection.sort_files([tmp_path], loc)
|
||||||
|
|
||||||
self.assert_sort(summary, 26)
|
self.assert_sort(summary, 23)
|
||||||
|
|
||||||
shutil.copytree(tmp_path / 'test_exif', tmp_path / 'test_exif_copy')
|
shutil.copytree(tmp_path / 'test_exif', tmp_path / 'test_exif_copy')
|
||||||
collection.summary = Summary(tmp_path)
|
collection.summary = Summary(tmp_path)
|
||||||
|
@ -257,10 +258,10 @@ class TestCollection:
|
||||||
shutil.copytree(self.src_path, path)
|
shutil.copytree(self.src_path, path)
|
||||||
collection = Collection(path, {'cache': False})
|
collection = Collection(path, {'cache': False})
|
||||||
|
|
||||||
def mockreturn(prompt, theme):
|
def mockreturn(self, message):
|
||||||
return {'value': '03-12-2021 08:12:35'}
|
return '03-12-2021 08:12:35'
|
||||||
|
|
||||||
monkeypatch.setattr(inquirer, 'prompt', mockreturn)
|
monkeypatch.setattr(Input, 'text', mockreturn)
|
||||||
|
|
||||||
collection.edit_metadata({path}, {'date_original'}, overwrite=True)
|
collection.edit_metadata({path}, {'date_original'}, overwrite=True)
|
||||||
# check if db value is set
|
# check if db value is set
|
||||||
|
@ -278,10 +279,10 @@ class TestCollection:
|
||||||
collection = Collection(path, {'cache': False})
|
collection = Collection(path, {'cache': False})
|
||||||
loc = GeoLocation()
|
loc = GeoLocation()
|
||||||
|
|
||||||
def mockreturn(prompt, theme):
|
def mockreturn(self, message):
|
||||||
return {'value': 'lyon'}
|
return 'lyon'
|
||||||
|
|
||||||
monkeypatch.setattr(inquirer, 'prompt', mockreturn)
|
monkeypatch.setattr(Input, 'text', mockreturn)
|
||||||
|
|
||||||
collection.edit_metadata({path}, {'location'}, loc, True)
|
collection.edit_metadata({path}, {'location'}, loc, True)
|
||||||
# check if db value is set
|
# check if db value is set
|
||||||
|
|
111
todo.md
111
todo.md
|
@ -1,111 +0,0 @@
|
||||||
# NOW
|
|
||||||
|
|
||||||
- db integrity have not to be checked in media but in collection??
|
|
||||||
|
|
||||||
- build structure to store file path and info with metadata
|
|
||||||
metadatas[file_path] = {'checksum': value}. Init must select same files than
|
|
||||||
get_metadatata
|
|
||||||
|
|
||||||
- check edit_metadata again test with valid doc
|
|
||||||
- show exif metadata
|
|
||||||
- print all values and select some to edit
|
|
||||||
- dry run = no changes
|
|
||||||
|
|
||||||
- compare custom output folder similar to?
|
|
||||||
- ordigi-gui
|
|
||||||
- add name and dirpath options???
|
|
||||||
|
|
||||||
# TODO
|
|
||||||
Options:
|
|
||||||
--location --time
|
|
||||||
# -f overwrite metadata
|
|
||||||
--auto|-a: a set of option: geolocalisation, best match date, rename, album
|
|
||||||
from folder...
|
|
||||||
# --keep-folder option
|
|
||||||
# --rename
|
|
||||||
--confirm unsure operation
|
|
||||||
|
|
||||||
# Bugs
|
|
||||||
- summary
|
|
||||||
|
|
||||||
- set date original???, interactive mode...
|
|
||||||
|
|
||||||
- Faire en sorte que le programme ne plante pas...
|
|
||||||
- option to not update exif metadata...
|
|
||||||
## Exiftools
|
|
||||||
https://gitlab.com/TNThieding/exif
|
|
||||||
exiftool -akljklbum=tjkljkestjlj /tmp/pytest-of-cedric/pytest-12/test_sort_files0/2008-10-Oct/test_exif/2008-10-24_09-12-56-photo.nef
|
|
||||||
|
|
||||||
exiftool -album=tjkljkestjlj /tmp/pytest-of-cedric/pytest-12/test_sort_files0/2008-10-Oct/test_exif/2008-10-24_09-12-56-photo.nef
|
|
||||||
1 image files updated
|
|
||||||
|
|
||||||
Get result code....
|
|
||||||
|
|
||||||
|
|
||||||
## Doc use sphinx??
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
- ordigi view/show
|
|
||||||
- ordigi search
|
|
||||||
- use tree to show paths?
|
|
||||||
|
|
||||||
|
|
||||||
# Pylint
|
|
||||||
https://pythonspeed.com/articles/pylint/
|
|
||||||
use config file
|
|
||||||
|
|
||||||
# Media:
|
|
||||||
|
|
||||||
# Test:
|
|
||||||
|
|
||||||
# enhancement
|
|
||||||
- summary: replace success by copied/moved/deleted
|
|
||||||
|
|
||||||
## Alias
|
|
||||||
alias ogi=ordigi
|
|
||||||
|
|
||||||
## Image analysis
|
|
||||||
https://pypi.org/project/google-cloud-vision/
|
|
||||||
https://googleapis.dev/python/vision/latest/index.html
|
|
||||||
https://www.datacamp.com/community/tutorials/beginner-guide-google-vision-api
|
|
||||||
|
|
||||||
|
|
||||||
## Album form folder
|
|
||||||
|
|
||||||
# Update
|
|
||||||
|
|
||||||
https://github.com/JohannesBuchner/imagehash
|
|
||||||
https://github.com/cw-somil/Duplicate-Remover
|
|
||||||
https://leons.im/posts/a-python-implementation-of-simhash-algorithm/
|
|
||||||
|
|
||||||
Visualy check similar image
|
|
||||||
https://www.pluralsight.com/guides/importing-image-data-into-numpy-arrays
|
|
||||||
https://stackoverflow.com/questions/56056054/add-check-boxes-to-scrollable-image-in-python
|
|
||||||
https://wellsr.com/python/python-image-manipulation-with-pillow-library/
|
|
||||||
kitty gird image?
|
|
||||||
https://fr.wikibooks.org/wiki/PyQt/PyQt_versus_wxPython
|
|
||||||
https://docs.python.org/3/faq/gui.html
|
|
||||||
https://docs.opencv.org/3.4/d3/df2/tutorial_py_basic_ops.html
|
|
||||||
https://stackoverflow.com/questions/52727332/python-tkinter-create-checkbox-list-from-listbox
|
|
||||||
|
|
||||||
|
|
||||||
Image gird method:
|
|
||||||
matplot
|
|
||||||
https://gist.github.com/lebedov/7018889ba47668c64bcf96aee82caec0
|
|
||||||
|
|
||||||
Tkinter
|
|
||||||
https://python-forum.io/thread-22700.html
|
|
||||||
https://stackoverflow.com/questions/43326282/how-can-i-use-images-in-a-tkinter-grid
|
|
||||||
|
|
||||||
wxwidget
|
|
||||||
https://wxpython.org/Phoenix/docs/html/wx.lib.agw.thumbnailctrl.html
|
|
||||||
|
|
||||||
|
|
||||||
Ability to change metadata to selection
|
|
||||||
|
|
||||||
Fix: change versvalidion number to 0.x99
|
|
||||||
|
|
||||||
https://github.com/andrewning/sortphotos/blob/master/src/sortphotos.py
|
|
||||||
|
|
||||||
# AFTER
|
|
||||||
|
|
30
workflow.md
30
workflow.md
|
@ -1,30 +0,0 @@
|
||||||
# Create virtual environment
|
|
||||||
nmkvirtualenv ordigi
|
|
||||||
|
|
||||||
# Work on it (activate and cd)
|
|
||||||
workon ordigi
|
|
||||||
|
|
||||||
# Install required dependencies
|
|
||||||
pip install -r requirements.txt
|
|
||||||
|
|
||||||
# Liked it to path
|
|
||||||
pip install -e .
|
|
||||||
|
|
||||||
# View file tree of path
|
|
||||||
tree /dest/path
|
|
||||||
|
|
||||||
# Test code
|
|
||||||
pylint ordigi/* -E
|
|
||||||
pylint ordigi/**
|
|
||||||
pytest --cov=ordigi --cov-report html tests/*.py
|
|
||||||
pip install --prefix=~/.local -e .
|
|
||||||
|
|
||||||
# config
|
|
||||||
|
|
||||||
## Path format
|
|
||||||
dirs_path=<%Y>/<%m-%b>-<city>-<folder>
|
|
||||||
name=<%Y%m%d-%H%M%S>-%u<original_name>|%u<basename>.%l<ext>
|
|
||||||
|
|
||||||
|
|
||||||
## run
|
|
||||||
ordigi import 220719.bkp -f -c -R collection
|
|
Loading…
Reference in New Issue