Compare commits
75 commits
Author | SHA1 | Date | |
---|---|---|---|
bf31991875 | |||
700df6e98f | |||
fbfaeac64f | |||
a7a44a34b2 | |||
baf0a69396 | |||
bf592168c1 | |||
ebfa86e163 | |||
9e52b9772f | |||
4b8bf96c1c | |||
0176f70c86 | |||
ceccb497dd | |||
e5dcb465fb | |||
20ba6320a5 | |||
e306bd1585 | |||
6b0205e2c1 | |||
718194ccec | |||
92eb2c9008 | |||
0179369fc1 | |||
79bc2d49d4 | |||
c9101ae669 | |||
efa20d3801 | |||
3d4e25866a | |||
4a639f5a0e | |||
d2f01f1456 | |||
cc28fb9314 | |||
c9f6ef1bc0 | |||
fec66bfebb | |||
5704593f4f | |||
0054b5ae6c | |||
07a6db2595 | |||
15a8deca65 | |||
07ca9ec406 | |||
19e8cbfdff | |||
adec36ded9 | |||
7ee4b28c59 | |||
cf3fb80238 | |||
95f5de2377 | |||
0f30584bf3 | |||
8567aeb767 | |||
8be1f17587 | |||
13510f9824 | |||
6c4437db6a | |||
ea0785a639 | |||
fad3bd4adb | |||
c23e9ad58b | |||
16a903ac22 | |||
b3810ac0c7 | |||
355b53c24c | |||
37555b0a2e | |||
bfad499050 | |||
a3b5a82e24 | |||
61f6051c20 | |||
2c6695e9e6 | |||
51cc55cda9 | |||
a3069a4c6a | |||
6d4ee49011 | |||
999f408ab2 | |||
5ff0557956 | |||
06f4ba643b | |||
2ccdd684a2 | |||
6ff10430eb | |||
3def9ad3c3 | |||
ce5817faab | |||
f2769f19ea | |||
db34c8fcb8 | |||
dfeb6993b0 | |||
1f113611d4 | |||
1508ccf5c5 | |||
1dd8958ed5 | |||
d062d90307 | |||
0b32f1fb7f | |||
c255277e89 | |||
d5a7943604 | |||
f2daa3f68d | |||
f5a38c4cac |
12 changed files with 1448 additions and 68 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
build/
|
75
CHANGELOG.md
Normal file
75
CHANGELOG.md
Normal file
|
@ -0,0 +1,75 @@
|
|||
# 0.7 (2021-01-28)
|
||||
|
||||
## Changed
|
||||
|
||||
* spansh.py: Fleet carriers are now explicitly excluded from the outdated
|
||||
stations list.
|
||||
|
||||
## Fixed
|
||||
|
||||
* explorationtools.py: Searching for a CMDR with public profile, but hidden
|
||||
activity will no longer error out.
|
||||
* explorationtools.py: Searching for a CMDR with public profile, but hidden
|
||||
flight log will no longer error out.
|
||||
|
||||
-----
|
||||
|
||||
# 0.6 (2020-07-18)
|
||||
|
||||
## Added
|
||||
|
||||
* `spansh.py` old station snearch now takes a `--minage` (in days) argument for
|
||||
what you would consider “outdated” data.
|
||||
|
||||
## Changed
|
||||
|
||||
* `spansh.py` old station search now outputs an age in days for the last update
|
||||
instead of a time stamp.
|
||||
|
||||
-----
|
||||
|
||||
# 0.5 (2020-07-01)
|
||||
|
||||
Changed Changelog format. Should be even clearer now at a glance!
|
||||
|
||||
See [KeepAChangelog](https://keepachangelog.com/en/1.0.0/).
|
||||
|
||||
## Added
|
||||
|
||||
* `edts.py`: Script for accessing Alot’s hosted EDTS API. Right now the only
|
||||
implemented thing is getting approximate coordinates for a given procedually
|
||||
generated system name.
|
||||
|
||||
-----
|
||||
|
||||
# 0.4.1 (2020-06-18)
|
||||
|
||||
* removed accidentally left over debug print code from `spansh.py`
|
||||
|
||||
-----
|
||||
|
||||
# 0.4 (2020-03-09)
|
||||
|
||||
Kind of a big one. Obviously because in addition to EDSM, I can now do some
|
||||
stuff with Spansh’s database. At this point I’m not sure if I want to keep it in
|
||||
the kind of hacky quick&dirty state it’s in right now or do another abstraction
|
||||
layer in addition to EDSM’s. Probably will be too lazy.
|
||||
|
||||
In addition to that the compiled version of the scripts for windows will now be
|
||||
a single executable file per script instead of having all the libraries stuff in
|
||||
subfolders. It’s cleaner that way, IMO.
|
||||
|
||||
## explorationtools.py
|
||||
|
||||
* `findcommander` now gives a last seen date for the position
|
||||
|
||||
known bugs:
|
||||
|
||||
* I need to fix the way the commander’s last seen is pulled. Right now searching
|
||||
for a commander will error out if their profile is public, but their flight
|
||||
logs (and thus the last updated time stamp) is not.
|
||||
|
||||
## spansh.py
|
||||
|
||||
* added `spansh.py` for accessing data from https://spansh.co.uk
|
||||
* see the README for what it can do right now
|
674
LICENSE
Normal file
674
LICENSE
Normal file
|
@ -0,0 +1,674 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
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.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
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
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
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 an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
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
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
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, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
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.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
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
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
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 section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"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 will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
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 Corresponding
|
||||
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
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
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
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
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
|
||||
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
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
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 of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
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
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
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 CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
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
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
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.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
20
Makefile
20
Makefile
|
@ -1,9 +1,23 @@
|
|||
all: docs
|
||||
all: clean docs release
|
||||
|
||||
zipfile = elite-scripts.zip
|
||||
|
||||
clean:
|
||||
rm -f $(zipfile)
|
||||
|
||||
docs:
|
||||
bash generate_docs.sh
|
||||
|
||||
# requires a windows box
|
||||
exe:
|
||||
pyinstaller.exe -y edsm-getnearest.py
|
||||
pyinstaller.exe -y explorationtools.py
|
||||
pip install --user --upgrade -r requirements.txt
|
||||
pip install --user --upgrade -r pyEDSM\requirements.txt
|
||||
python -OO -m PyInstaller --clean -yF edsm-getnearest.py
|
||||
python -OO -m PyInstaller --clean -yF edts.py
|
||||
python -OO -m PyInstaller --clean -yF explorationtools.py
|
||||
python -OO -m PyInstaller --clean -yF spansh.py
|
||||
|
||||
# probably won’t work unless you’re me :)
|
||||
release: clean
|
||||
rsync -avz gezocks:/mnt/d/git/elite-scripts/dist/ build/
|
||||
cd build && zip -r ../$(zipfile) *
|
||||
|
|
179
README.md
179
README.md
|
@ -1,6 +1,30 @@
|
|||
# A collection of useful scripts around Elite Dangerous #
|
||||
|
||||
## edsm-getnearest.py ##
|
||||
## Requirements ##
|
||||
|
||||
* argcomplete
|
||||
* argparse
|
||||
* requests
|
||||
* Tkinter
|
||||
|
||||
You probably want to install your distribution/OS package for Tkinter instead of
|
||||
using pip. Then do the good old `pip install --user -r requirements.txt`.
|
||||
|
||||
You’ll also need to install pyEDSM’s dependencies:
|
||||
`pip install --user -r pyEDSM/requirements.txt`
|
||||
|
||||
## Pre-Compiled Version (Windows) ##
|
||||
|
||||
If you check the
|
||||
[releases](https://github.com/alterNERDtive/elite-scripts/releases) you’ll find
|
||||
a .zip file with pre-compiled scripts that don’t need Python installed. Mostly
|
||||
a) for saving myself some hassle and b) because that’s easier to distribute with
|
||||
my
|
||||
[VoiceAttack profiles](https://github.com/alterNERDtive/VoiceAttack-profiles).
|
||||
|
||||
## Scripts ##
|
||||
|
||||
### edsm-getnearest.py ###
|
||||
|
||||
```
|
||||
usage: edsm-getnearest.py [-h] --system SYSTEM [--short] [--gui | --text]
|
||||
|
@ -20,10 +44,40 @@ optional arguments:
|
|||
--text explicitly give text output
|
||||
```
|
||||
|
||||
## explorationtools.py ##
|
||||
### edts.py ###
|
||||
|
||||
```
|
||||
usage: explorationtools.py [-h] {bodycount,distancebetween} ...
|
||||
usage: edts.py [-h] {coords} ...
|
||||
|
||||
Script for interfacing with Alot’s hosted EDTS API.
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
|
||||
subcommands:
|
||||
{coords} sub-command help
|
||||
coords Searches for the approximate coordinates of a given procedurally
|
||||
generated system name.
|
||||
```
|
||||
|
||||
```
|
||||
usage: edts.py coords [-h] [--maxuncertainty [MAXUNCERTAINTY]] system
|
||||
|
||||
positional arguments:
|
||||
system the system name to get coordinates for
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--maxuncertainty [MAXUNCERTAINTY]
|
||||
maximum accepted uncertainty, if any
|
||||
```
|
||||
|
||||
### explorationtools.py ###
|
||||
|
||||
```
|
||||
usage: explorationtools.py [-h]
|
||||
{bodycount,distancebetween,findcommander,findsystem,systemlist}
|
||||
...
|
||||
|
||||
A collection of tools useful for exploration.
|
||||
|
||||
|
@ -31,7 +85,7 @@ optional arguments:
|
|||
-h, --help show this help message and exit
|
||||
|
||||
subcommands:
|
||||
{bodycount,distancebetween}
|
||||
{bodycount,distancebetween,findcommander,findsystem,systemlist}
|
||||
sub-command help
|
||||
bodycount Returns the number of bodies in a system. Will exit
|
||||
with code 1 on server error and code 2 if the system
|
||||
|
@ -39,24 +93,135 @@ subcommands:
|
|||
distancebetween Calculates the distance between two systems. Will exit
|
||||
with code 1 on server error and code 2 if (one of) the
|
||||
systems could not be found on EDSM.
|
||||
findcommander Attempts to find a CMDR’s last known position. Will
|
||||
exit with code 1 on server error and code 2 if the
|
||||
CMDR could not be found on EDSM. Will also give you
|
||||
the time of last activity if you search for their
|
||||
system.
|
||||
findsystem Attempts to find a partially matching system that
|
||||
should then hopefully be in the vicinity of the given
|
||||
system
|
||||
systemlist Pulls all system names starting with the given string
|
||||
from EDSM
|
||||
```
|
||||
|
||||
```
|
||||
usage: explorationtools.py bodycount [-h] system
|
||||
|
||||
positional arguments:
|
||||
system
|
||||
system system to query
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
```
|
||||
|
||||
```
|
||||
usage: explorationtools.py distancebetween [-h] system system
|
||||
usage: explorationtools.py distancebetween [-h] [--roundto [ROUNDTO]]
|
||||
system system
|
||||
|
||||
positional arguments:
|
||||
system
|
||||
system the systems to measure
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--roundto [ROUNDTO] the number of digits to round to (default: 2)
|
||||
```
|
||||
|
||||
```
|
||||
usage: explorationtools.py findcommander [-h] [--system | --coords | --url]
|
||||
name [apikey]
|
||||
|
||||
positional arguments:
|
||||
name the commander in question
|
||||
apikey the commander’s EDSM API key. Can be empty for public profiles.
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--system output the commander’s last known system (default)
|
||||
--coords output the commander’s last known position in {x,y,z}
|
||||
coordinates
|
||||
--url output the commander’s profile URL
|
||||
```
|
||||
|
||||
```
|
||||
usage: explorationtools.py findsystem [-h] system
|
||||
|
||||
positional arguments:
|
||||
system the system in question
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
```
|
||||
|
||||
```
|
||||
usage: explorationtools.py systemlist [-h] partialsystem
|
||||
|
||||
positional arguments:
|
||||
partialsystem the partial system name to query against
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
```
|
||||
|
||||
### spansh.py ###
|
||||
|
||||
```
|
||||
usage: spansh.py [-h] {nearestsystem,oldstations,systemexists} ...
|
||||
|
||||
Script for interfacing with Spansh’s API.
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
|
||||
subcommands:
|
||||
{nearestsystem,oldstations,systemexists}
|
||||
sub-command help
|
||||
nearestsystem Searches for the nearest system in the database to
|
||||
given coordinates.
|
||||
oldstations Searches for stations with old data (>1 year without
|
||||
an update.
|
||||
systemexists Checks if a given system exists in the search
|
||||
database.
|
||||
```
|
||||
|
||||
```
|
||||
usage: spansh.py nearestsystem [-h] [--short | --parsable]
|
||||
coordinate coordinate coordinate
|
||||
|
||||
positional arguments:
|
||||
coordinate the coordinates to search for (order: x, y, z)
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--short short output format (system name only)
|
||||
--parsable parsable output format (<name>|<x>,<y>,<z>|<distance>)
|
||||
```
|
||||
|
||||
```
|
||||
usage: spansh.py oldstations [-h] [--system [SYSTEM]] [--count [COUNT]]
|
||||
[--minage [MINAGE]] [--short]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--system [SYSTEM] a single system to query. If not present, get the oldest
|
||||
stations overall.
|
||||
--count [COUNT] how many stations to output. Defaults to 50.
|
||||
--minage [MINAGE] minimum age of data (in days) to be considered
|
||||
“outdated”. Defaults to 365 (= 1 year).
|
||||
--short short output format (system/station names only)
|
||||
```
|
||||
|
||||
```
|
||||
usage: spansh.py systemexists [-h] system
|
||||
|
||||
positional arguments:
|
||||
system the system to search for
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
```
|
||||
|
||||
## Need Help / Want to Contribute? ##
|
||||
|
||||
Just [file an issue](https://github.com/alterNERDtive/elite-scripts/issues/new)
|
||||
here or [hop into Discord](https://discord.gg/XHNX7jN) if that is your thing.
|
||||
|
|
|
@ -10,15 +10,10 @@ from pyEDSM.edsm.models import Commander, System
|
|||
|
||||
# =================================================================================
|
||||
|
||||
def distance (coords1, coords2):
|
||||
return math.sqrt( (coords1['x']-coords2['x'])**2
|
||||
+ (coords1['y']-coords2['y'])**2
|
||||
+ (coords1['z']-coords2['z'])**2 )
|
||||
|
||||
def getDistances (system, cmdrs):
|
||||
def getDistances (system, cmdrs, roundTo=2):
|
||||
distances = {}
|
||||
for cmdr in cmdrs:
|
||||
distances[cmdr] = round(distance(cmdr.currentPosition, system.coords))
|
||||
distances[cmdr] = system.distanceTo(cmdr, roundTo=roundTo)
|
||||
return distances
|
||||
|
||||
# =================================================================================
|
||||
|
@ -68,8 +63,12 @@ def outputGui():
|
|||
# =================================================================================
|
||||
|
||||
def outputText():
|
||||
if shortOutput:
|
||||
roundTo=0
|
||||
else:
|
||||
roundTo=2
|
||||
try:
|
||||
distances = getDistances(system, cmdrs)
|
||||
distances = getDistances(system, cmdrs, roundTo=roundTo)
|
||||
except CommanderNotFoundError as e:
|
||||
print(e)
|
||||
sys.exit(1)
|
||||
|
@ -79,13 +78,10 @@ def outputText():
|
|||
except SystemNotFoundError as e:
|
||||
print(e)
|
||||
sys.exit(2)
|
||||
except EdsmApiException as e:
|
||||
print(e)
|
||||
sys.exit(1)
|
||||
nearestCmdr = min(distances,key=distances.get)
|
||||
if shortOutput:
|
||||
print('nearest commander: {} ({} ly).'.format(nearestCmdr.name,
|
||||
distances[nearestCmdr]))
|
||||
int(distances[nearestCmdr])))
|
||||
else:
|
||||
print('nearest CMDR: {} ({} ly from {}).'.format(nearestCmdr.name,
|
||||
distances[nearestCmdr], system.name))
|
||||
|
|
77
edts.py
Executable file
77
edts.py
Executable file
|
@ -0,0 +1,77 @@
|
|||
#!/usr/bin/env python3
|
||||
# PYTHON_ARGCOMPLETE_OK
|
||||
import argcomplete, argparse
|
||||
import json as JSON
|
||||
import requests
|
||||
import urllib
|
||||
import sys
|
||||
|
||||
from pyEDSM.edsm.exception import ServerError, NotFoundError
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
class ProcGenNameError(Exception):
|
||||
def __str__(self):
|
||||
return "Given system is not a valid proc gen name."
|
||||
|
||||
def getCoords(system):
|
||||
url = APIURLS["coords"] + urllib.parse.quote(system)
|
||||
response = requests.get(url)
|
||||
if response.status_code != 200:
|
||||
if response.status_code == 400:
|
||||
raise ProcGenNameError()
|
||||
else:
|
||||
raise ServerError(url, {})
|
||||
|
||||
json = response.json()['result']
|
||||
|
||||
ret = json['position']
|
||||
ret['uncertainty'] = json['uncertainty']
|
||||
|
||||
return ret
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
parser = argparse.ArgumentParser(description="Script for interfacing with "
|
||||
+ "Alot’s hosted EDTS API.")
|
||||
subparsers = parser.add_subparsers(title="subcommands", help="sub-command help",
|
||||
dest="subcommand", required=True)
|
||||
|
||||
parser_coords = subparsers.add_parser("coords",
|
||||
help="Searches for the approximate coordinates of a given procedurally "
|
||||
+ "generated system name.")
|
||||
parser_coords.add_argument("system",
|
||||
help="the system name to get coordinates for")
|
||||
parser_coords.add_argument("--maxuncertainty", nargs="?", type=int,
|
||||
help="maximum accepted uncertainty, if any")
|
||||
|
||||
argcomplete.autocomplete(parser)
|
||||
args = parser.parse_args()
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
APIURLS = {
|
||||
"coords": "http://edts.thargoid.space/api/v1/system_position/"
|
||||
}
|
||||
|
||||
try:
|
||||
if args.subcommand == "coords":
|
||||
coords = getCoords(args.system)
|
||||
if args.maxuncertainty:
|
||||
if args.maxuncertainty < coords['uncertainty']:
|
||||
raise NotFoundError()
|
||||
out = "{},{},{}|{}".format(int(coords['x']), int(coords['y']),
|
||||
int(coords['z']), int(coords['uncertainty']))
|
||||
except ServerError as e:
|
||||
print(e)
|
||||
sys.exit(1)
|
||||
except ProcGenNameError as e:
|
||||
print(e)
|
||||
sys.exit(4)
|
||||
except NotFoundError as e:
|
||||
print("Maximum uncertainty exceeded: " + str(int(coords['uncertainty']))
|
||||
+ " > " + str(args.maxuncertainty))
|
||||
sys.exit(3)
|
||||
else:
|
||||
print(out)
|
||||
sys.exit(0)
|
|
@ -1,7 +1,9 @@
|
|||
#!/usr/bin/env python3
|
||||
import argparse
|
||||
# PYTHON_ARGCOMPLETE_OK
|
||||
import argcomplete, argparse
|
||||
import math
|
||||
import sys
|
||||
from datetime import datetime
|
||||
|
||||
from pyEDSM.edsm.exception import ServerError, NotFoundError
|
||||
from pyEDSM.edsm.models import System, Commander
|
||||
|
@ -9,57 +11,151 @@ from pyEDSM.edsm.models import System, Commander
|
|||
# ===========================================================================
|
||||
|
||||
def getBodyCount(system):
|
||||
try:
|
||||
bodyCount = System(system).bodyCount
|
||||
except ServerError as e:
|
||||
print(e)
|
||||
sys.exit(1)
|
||||
except NotFoundError as e:
|
||||
print(e)
|
||||
sys.exit(2)
|
||||
else:
|
||||
print(bodyCount)
|
||||
sys.exit(0)
|
||||
return System(system).bodyCount
|
||||
|
||||
def distanceBetween(system1, system2):
|
||||
try:
|
||||
coords1 = System(system1).coords
|
||||
coords2 = System(system2).coords
|
||||
except ServerError as e:
|
||||
print(e)
|
||||
sys.exit(1)
|
||||
except NotFoundError as e:
|
||||
print(e)
|
||||
syst.exit(2)
|
||||
def distanceBetween(system1, system2, roundTo=2):
|
||||
systems = System.getSystems(system1, system2)
|
||||
distance = systems[0].distanceTo(systems[1], roundTo)
|
||||
if roundTo == 0:
|
||||
distance = int(distance)
|
||||
return distance
|
||||
|
||||
def getCommanderPosition(name, apikey):
|
||||
coords = Commander(name, apikey).currentPosition
|
||||
ret = "hidden"
|
||||
if coords:
|
||||
ret = ""
|
||||
for k in coords:
|
||||
ret += "{}: {}, ".format(k, coords[k])
|
||||
ret = ret[:-2]
|
||||
return ret
|
||||
|
||||
def getCommanderProfileUrl(name, apikey):
|
||||
return Commander(name, apikey).profileUrl
|
||||
|
||||
def getCommanderSystem(name, apikey):
|
||||
cmdr = Commander(name, apikey)
|
||||
if cmdr.lastActivity is None:
|
||||
return "{}".format(cmdr.currentSystem)
|
||||
else:
|
||||
print(int(round(math.sqrt( (coords1['x']-coords2['x'])**2
|
||||
+ (coords1['y']-coords2['y'])**2
|
||||
+ (coords1['z']-coords2['z'])**2 ),0)))
|
||||
sys.exit(0)
|
||||
return "{} (last seen {})".format(cmdr.currentSystem,
|
||||
when(cmdr.lastActivity))
|
||||
def when(date):
|
||||
diff = datetime.now() - date
|
||||
ret = ""
|
||||
if diff.days > 0:
|
||||
ret += "{} days ".format(diff.days)
|
||||
if diff.seconds > 0:
|
||||
hours = int(diff.seconds / 3600)
|
||||
if hours > 0:
|
||||
ret += "{} hours ".format(hours)
|
||||
minutes = int(diff.seconds % 3600 / 60)
|
||||
if minutes > 0:
|
||||
ret += "{} minutes ".format(minutes)
|
||||
if diff.days == 0 and hours == 0 and minutes == 0:
|
||||
# ONLY seconds!
|
||||
ret = "{} seconds ".format(diff.seconds)
|
||||
ret += "ago"
|
||||
return ret
|
||||
|
||||
def getSystemList(name):
|
||||
systems = System.getSystems(name)
|
||||
ret = ""
|
||||
for system in systems:
|
||||
ret += "{}\n".format(system.name)
|
||||
return ret[:-1]
|
||||
|
||||
def getSystemNear(name):
|
||||
# Probably want to abort at _some_ point. I’m defining two full words left as
|
||||
# the condition for that now.
|
||||
if name.count(' ') < 2:
|
||||
ret = "Aborting search at {}, require more than 2 words to limit the "
|
||||
ret += "result set."
|
||||
return ret.format(name)
|
||||
|
||||
try:
|
||||
systems = System.getSystems(name)
|
||||
except NotFoundError:
|
||||
return getSystemNear(name[:-1])
|
||||
else:
|
||||
ret = ""
|
||||
for system in systems:
|
||||
ret += "{} ({}, {}, {})\n".format(system.name,
|
||||
system.coords['x'], system.coords['y'], system.coords['z'])
|
||||
return ret[:-1]
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
parser = argparse.ArgumentParser(description="A collection of tools useful for "
|
||||
+ "exploration.")
|
||||
subparsers = parser.add_subparsers(title="subcommands", help="sub-command help",
|
||||
dest="subCommand")
|
||||
dest="subcommand", required=True)
|
||||
|
||||
parser_bodycount = subparsers.add_parser("bodycount",
|
||||
help="Returns the number of bodies in a system. Will exit with code 1 on "
|
||||
+ "server error and code 2 if the system could not be found in EDSM.")
|
||||
parser_bodycount.add_argument("system", nargs=1)
|
||||
parser_bodycount.add_argument("system", nargs=1, help="system to query")
|
||||
|
||||
parser_distance = subparsers.add_parser("distancebetween",
|
||||
help="Calculates the distance between two systems. Will exit with code 1 "
|
||||
+ "on server error and code 2 if (one of) the systems could not be found "
|
||||
+ "on EDSM.")
|
||||
parser_distance.add_argument("system", nargs=2)
|
||||
parser_distance.add_argument("--roundto", nargs="?", type=int, default=2,
|
||||
help="the number of digits to round to (default: 2)")
|
||||
parser_distance.add_argument("system", nargs=2, help="the systems to measure")
|
||||
|
||||
parser_findCmdr = subparsers.add_parser("findcommander",
|
||||
help="Attempts to find a CMDR’s last known position. Will exit with code 1 "
|
||||
+ "on server error and code 2 if the CMDR could not be found on EDSM. Will "
|
||||
+ "also give you the time of last activity if you search for their system.")
|
||||
group = parser_findCmdr.add_mutually_exclusive_group(required=False)
|
||||
group.add_argument('--system', action='store_true',
|
||||
help='output the commander’s last known system (default)')
|
||||
group.add_argument('--coords', action='store_true',
|
||||
help='output the commander’s last known position in {x,y,z} coordinates')
|
||||
group.add_argument('--url', action='store_true',
|
||||
help='output the commander’s profile URL')
|
||||
parser_findCmdr.add_argument("name", help="the commander in question")
|
||||
parser_findCmdr.add_argument("apikey", default="", nargs="?",
|
||||
help="the commander’s EDSM API key. Can be empty for public profiles.")
|
||||
|
||||
parser_findSystem = subparsers.add_parser("findsystem",
|
||||
help="Attempts to find a partially matching system that should then "
|
||||
+ "hopefully be in the vicinity of the given system")
|
||||
parser_findSystem.add_argument("system", help="the system in question")
|
||||
|
||||
parser_bodycount = subparsers.add_parser("systemlist",
|
||||
help="Pulls all system names starting with the given string from EDSM")
|
||||
parser_bodycount.add_argument("partialsystem", nargs=1,
|
||||
help="the partial system name to query against")
|
||||
|
||||
argcomplete.autocomplete(parser)
|
||||
args = parser.parse_args()
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
if args.subCommand == "bodycount":
|
||||
getBodyCount(args.system[0])
|
||||
elif args.subCommand == "distancebetween":
|
||||
distanceBetween(args.system[0], args.system[1])
|
||||
try:
|
||||
if args.subcommand == "bodycount":
|
||||
out = getBodyCount(args.system[0])
|
||||
elif args.subcommand == "distancebetween":
|
||||
out = distanceBetween(args.system[0], args.system[1], args.roundto)
|
||||
elif args.subcommand == "findcommander":
|
||||
if args.coords:
|
||||
out = getCommanderPosition(args.name, args.apikey)
|
||||
elif args.url:
|
||||
out = getCommanderProfileUrl(args.name, args.apikey)
|
||||
else:
|
||||
out = getCommanderSystem(args.name, args.apikey)
|
||||
elif args.subcommand == "findsystem":
|
||||
out = getSystemNear(args.system)
|
||||
elif args.subcommand == "systemlist":
|
||||
out = getSystemList(args.partialsystem)
|
||||
except ServerError as e:
|
||||
print(e)
|
||||
sys.exit(1)
|
||||
except NotFoundError as e:
|
||||
print(e)
|
||||
sys.exit(2)
|
||||
else:
|
||||
print(out)
|
||||
sys.exit(0)
|
||||
|
|
100
generate_docs.sh
100
generate_docs.sh
|
@ -2,42 +2,118 @@
|
|||
cat > README.md << EOF
|
||||
# A collection of useful scripts around Elite Dangerous #
|
||||
|
||||
## edsm-getnearest.py ##
|
||||
## Requirements ##
|
||||
|
||||
* argcomplete
|
||||
* argparse
|
||||
* requests
|
||||
* Tkinter
|
||||
|
||||
You probably want to install your distribution/OS package for Tkinter instead of
|
||||
using pip. Then do the good old \`pip install --user -r requirements.txt\`.
|
||||
|
||||
You’ll also need to install pyEDSM’s dependencies:
|
||||
\`pip install --user -r pyEDSM/requirements.txt\`
|
||||
|
||||
## Pre-Compiled Version (Windows) ##
|
||||
|
||||
If you check the
|
||||
[releases](https://github.com/alterNERDtive/elite-scripts/releases) you’ll find
|
||||
a .zip file with pre-compiled scripts that don’t need Python installed. Mostly
|
||||
a) for saving myself some hassle and b) because that’s easier to distribute with
|
||||
my
|
||||
[VoiceAttack profiles](https://github.com/alterNERDtive/VoiceAttack-profiles).
|
||||
|
||||
## Scripts ##
|
||||
|
||||
### edsm-getnearest.py ###
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
|
||||
./edsm-getnearest.py -h >> README.md
|
||||
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
## explorationtools.py ##
|
||||
### edts.py ###
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./edts.py -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./edts.py coords -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
### explorationtools.py ###
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./explorationtools.py -h >> README.md
|
||||
|
||||
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
|
||||
./explorationtools.py bodycount -h >> README.md
|
||||
|
||||
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
|
||||
./explorationtools.py distancebetween -h >> README.md
|
||||
|
||||
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./explorationtools.py findcommander -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./explorationtools.py findsystem -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./explorationtools.py systemlist -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
### spansh.py ###
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./spansh.py -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./spansh.py nearestsystem -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./spansh.py oldstations -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
\`\`\`
|
||||
EOF
|
||||
./spansh.py systemexists -h >> README.md
|
||||
cat >> README.md << EOF
|
||||
\`\`\`
|
||||
|
||||
## Need Help / Want to Contribute? ##
|
||||
|
||||
Just [file an issue](https://github.com/alterNERDtive/elite-scripts/issues/new)
|
||||
here or [hop into Discord](https://discord.gg/XHNX7jN) if that is your thing.
|
||||
EOF
|
||||
|
|
2
pyEDSM
2
pyEDSM
|
@ -1 +1 @@
|
|||
Subproject commit 105a08a6832f639933889b288806b701d26a1deb
|
||||
Subproject commit da044e918fe17cf18d2b2e18d60ce16a168ea70b
|
3
requirements.txt
Normal file
3
requirements.txt
Normal file
|
@ -0,0 +1,3 @@
|
|||
argcomplete
|
||||
argparse
|
||||
requests
|
203
spansh.py
Executable file
203
spansh.py
Executable file
|
@ -0,0 +1,203 @@
|
|||
#!/usr/bin/env python3
|
||||
# PYTHON_ARGCOMPLETE_OK
|
||||
import argcomplete, argparse
|
||||
import json as JSON
|
||||
import requests
|
||||
import sys
|
||||
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from dateutil import parser as dtparser
|
||||
|
||||
from pyEDSM.edsm.exception import ServerError, NotFoundError
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
def querystations(url, params):
|
||||
response = requests.post(url, params)
|
||||
if response.status_code != 200:
|
||||
raise ServerError(url, params)
|
||||
json = response.json()
|
||||
if json["count"] == 0:
|
||||
raise NotFoundError()
|
||||
return json
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
def getNearestSystem(coords):
|
||||
params = {
|
||||
"x": coords[0],
|
||||
"y": coords[1],
|
||||
"z": coords[2]
|
||||
}
|
||||
response = requests.post(APIURLS["nearest"], params)
|
||||
if response.status_code != 200:
|
||||
raise ServerError(url, params)
|
||||
|
||||
json = response.json()
|
||||
|
||||
ret = None
|
||||
system = json["system"]
|
||||
if args.short:
|
||||
ret = system["name"]
|
||||
elif args.parsable:
|
||||
ret = "{}|{},{},{}|{}".format(system["name"], system["x"],
|
||||
system["y"], system["z"], round(system["distance"], 2))
|
||||
else:
|
||||
system = json["system"]
|
||||
ret = "{} ({}, {}, {}), {} ly".format(system["name"], system["x"],
|
||||
system["y"], system["z"], round(system["distance"], 2))
|
||||
|
||||
return ret
|
||||
|
||||
def getOldStations():
|
||||
params = {
|
||||
"json": JSON.dumps({
|
||||
"filters": FILTERS,
|
||||
"sort": SORT,
|
||||
"size": args.count
|
||||
})
|
||||
}
|
||||
json = querystations(APIURLS["stations"], params)
|
||||
|
||||
ret = ""
|
||||
for station in json["results"]:
|
||||
if args.short:
|
||||
ret += "{}\n".format(station["system_name"])
|
||||
else:
|
||||
ret += "{}: {} ({} days ago)\n".format(station["system_name"], station["name"],
|
||||
(datetime.now(timezone.utc) - dtparser.parse(station["updated_at"])).days)
|
||||
|
||||
return ret[:-1]
|
||||
|
||||
def getOldStationsInSystem(system):
|
||||
FILTERS.update(system_name={"value": system})
|
||||
params = {
|
||||
"json": JSON.dumps({
|
||||
"filters": FILTERS,
|
||||
"sort": SORT
|
||||
})
|
||||
}
|
||||
json = querystations(APIURLS["stations"], params)
|
||||
|
||||
ret = ""
|
||||
# exclude carriers
|
||||
stations = list(filter(lambda station: not station["type"] == "Drake-Class Carrier", json["results"]))
|
||||
if len(stations) == 0:
|
||||
raise NotFoundError()
|
||||
for station in stations:
|
||||
# systems including the given name as a word will also trigger;
|
||||
# looking for e.g. “Mari” will also give you stuff in “Mac Mari”!
|
||||
if station["system_name"] == system:
|
||||
if args.short:
|
||||
ret += "{}\n".format(station["name"])
|
||||
else:
|
||||
ret += "{} ({} days ago)\n".format(station["name"],
|
||||
(datetime.now(timezone.utc) - dtparser.parse(station["updated_at"])).days)
|
||||
|
||||
return ret[:-1]
|
||||
|
||||
def systemExists(system):
|
||||
params = {
|
||||
"json": JSON.dumps({
|
||||
"filters": {
|
||||
"name": {
|
||||
"value": system
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
response = requests.post(APIURLS["systems"], params)
|
||||
if response.status_code != 200:
|
||||
raise ServerError(url, params)
|
||||
|
||||
json = response.json()
|
||||
if json["count"] == 0:
|
||||
raise NotFoundError()
|
||||
|
||||
ret = ""
|
||||
for system in json["results"]:
|
||||
ret += "{} ({}, {}, {})\n".format(system["name"], system["x"], system["y"],
|
||||
system["z"])
|
||||
|
||||
return ret[:-1]
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
parser = argparse.ArgumentParser(description="Script for interfacing with "
|
||||
+ "Spansh’s API.")
|
||||
subparsers = parser.add_subparsers(title="subcommands", help="sub-command help",
|
||||
dest="subcommand", required=True)
|
||||
|
||||
parser_nearestsystem = subparsers.add_parser("nearestsystem",
|
||||
help="Searches for the nearest system in the database to given coordinates.")
|
||||
parser_nearestsystem.add_argument("coordinate", nargs=3, type=int,
|
||||
help="the coordinates to search for (order: x, y, z)")
|
||||
group = parser_nearestsystem.add_mutually_exclusive_group(required=False)
|
||||
group.add_argument("--short", action='store_true',
|
||||
help="short output format (system name only)")
|
||||
group.add_argument("--parsable", action='store_true',
|
||||
help="parsable output format (<name>|<x>,<y>,<z>|<distance>)")
|
||||
|
||||
parser_oldstations = subparsers.add_parser("oldstations",
|
||||
help="Searches for stations with old data (>1 year without an update.")
|
||||
parser_oldstations.add_argument("--system", nargs="?",
|
||||
help="a single system to query. If not present, get the oldest stations "
|
||||
+ "overall.")
|
||||
parser_oldstations.add_argument("--count", nargs="?", type=int, default=50,
|
||||
help="how many stations to output. Defaults to 50.")
|
||||
parser_oldstations.add_argument("--minage", nargs="?", type=int, default=365,
|
||||
help="minimum age of data (in days) to be considered “outdated”. Defaults to "
|
||||
+ "365 (= 1 year).")
|
||||
parser_oldstations.add_argument("--short", action='store_true',
|
||||
help="short output format (system/station names only)")
|
||||
|
||||
parser_systemexists = subparsers.add_parser("systemexists",
|
||||
help="Checks if a given system exists in the search database.")
|
||||
parser_systemexists.add_argument("system", nargs=1,
|
||||
help="the system to search for")
|
||||
|
||||
argcomplete.autocomplete(parser)
|
||||
args = parser.parse_args()
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
APIURLS = {
|
||||
"nearest": "https://spansh.co.uk/api/nearest",
|
||||
"stations": "https://spansh.co.uk/api/stations/search",
|
||||
"systems": "https://spansh.co.uk/api/systems/search",
|
||||
}
|
||||
|
||||
try:
|
||||
if args.subcommand == "nearestsystem":
|
||||
out = getNearestSystem(args.coordinate)
|
||||
elif args.subcommand == "oldstations":
|
||||
FILTERS = {
|
||||
"updated_at":
|
||||
{
|
||||
"value": [
|
||||
"2017-11-06",
|
||||
(datetime.now() - timedelta(days=args.minage)).strftime("%Y-%m-%d")
|
||||
],
|
||||
"comparison": "<=>"
|
||||
}
|
||||
}
|
||||
SORT = {
|
||||
"updated_at": {
|
||||
"direction": "asc"
|
||||
}
|
||||
}
|
||||
if args.system:
|
||||
out = getOldStationsInSystem(args.system)
|
||||
else:
|
||||
out = getOldStations()
|
||||
elif args.subcommand == "systemexists":
|
||||
out = systemExists(args.system)
|
||||
except ServerError as e:
|
||||
print(e)
|
||||
sys.exit(1)
|
||||
except NotFoundError as e:
|
||||
print("No results found.")
|
||||
sys.exit(3)
|
||||
else:
|
||||
print(out)
|
||||
sys.exit(0)
|
Loading…
Reference in a new issue