move the separate components back into this monorepo

Earlier today I pushed a change that split this code up into multiple
repos, but that has proved to complicate things too much. So we're
back to a single repo, except the individual submodules are better
separated than they were before.

The README files need updating again; I will push them out soon.

Aside from splitting out the different modules, the sound code has
moved from from anki to aqt.
This commit is contained in:
Damien Elmes 2020-01-02 19:43:19 +10:00
parent 4cead7effc
commit b23b6fbe35
557 changed files with 925 additions and 2194 deletions

View File

@ -5,28 +5,22 @@ on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7]
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/checkout@v2
- name: Set up python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Set up Node
python-version: '3.6'
- name: Set up protoc
uses: Arduino/actions/setup-protoc@master
- name: Set up node
uses: actions/setup-node@v1
with:
node-version: 12
- name: Set up Protoc
uses: Arduino/actions/setup-protoc@master
- name: Run checks
run: |
# add requirements
sudo apt install portaudio19-dev
python${{ matrix.python-version }} -m venv ~/pyenv
. ~/pyenv/bin/activate
pip install -r requirements.qt
pip install --upgrade setuptools pip
make check RUSTARGS=""
export UNOPT=1
./check
./bundle

17
.gitignore vendored
View File

@ -6,20 +6,7 @@
.build
.coverage
.DS_Store
build
pyenv
.mypy_cache
.pytype
__pycache__
anki/buildhash.py
anki/backend_pb2.*
aqt/forms
locale
rs/ankirs/src/backend_proto.rs
rs/target
tools/runanki.system
ts/node_modules
web/deckbrowser.js
web/editor.js
web/overview.js
web/reviewer-bottom.js
web/reviewer.js
web/webview.js

692
LICENSE
View File

@ -1,692 +0,0 @@
Anki is licensed under the GNU Affero General Public License, version 3 or
later. A full copy of the version 3 license is included below.
You are free to make changes to Anki and distribute those changes under the
terms of the AGPL listed below. If you would like to contribute changes back
to the official distribution, I ask that you license your code under the BSD
three-clause (no advertising) license, as portions of this code are also used
in the closed-source AnkiWeb. Before sending a patch or pull request for the
first time, please post a private ticket on our support site that states you
are happy to license all contributions you submit to the Anki project under
the three-clause BSD license.
Please see LICENSE.logo for the copyright and license of Anki's logo.
The following included source code items use a license other than AGPL3:
* Anki's translations: A mix of BSD and public domain.
* Qt's bundled translations: LGPL3.
* The anki/template/ folder is based off pystache: MIT.
* The SuperMemo importer: GPL3.
* The Pauker importer: BSD-3.
* mpv.py: MIT.
* statsbg.py: CC BY-SA 3.0.
* winpaths.py: MIT.
* MathJax: Apache 2.
* jQuery and jQuery-UI: MIT.
* browsersel.js: CC BY 2.5.
* plot.js: MIT.
The AGPL3 license follows.
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are 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.
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.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
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 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 work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
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 AGPL, see
<http://www.gnu.org/licenses/>.

237
Makefile
View File

@ -1,237 +0,0 @@
PREFIX := /usr
SHELL := bash
.SHELLFLAGS := -eu -o pipefail -c
.DELETE_ON_ERROR:
MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules
RUNARGS :=
.SUFFIXES:
BLACKARGS := -t py36 anki aqt tests
RUSTARGS := --release --strip
ISORTARGS := anki aqt tests
$(shell mkdir -p .build)
# Installing
######################
.PHONY: all install uninstall
all:
@echo "You can run Anki from this folder with 'make run'."
install:
rm -rf ${DESTDIR}${PREFIX}/share/anki
mkdir -p ${DESTDIR}${PREFIX}/share/anki
cp -av anki aqt web ${DESTDIR}${PREFIX}/share/anki/
-cp -av locale ${DESTDIR}${PREFIX}/share/anki/
sed -e 's:@PREFIX@:${PREFIX}:' tools/runanki.system.in > tools/runanki.system
install -m 0755 -D tools/runanki.system ${DESTDIR}${PREFIX}/bin/anki
install -m 0644 -D -t ${DESTDIR}${PREFIX}/share/pixmaps anki.xpm anki.png
install -m 0644 -D -t ${DESTDIR}${PREFIX}/share/applications anki.desktop
install -m 0644 -D -t ${DESTDIR}${PREFIX}/share/man/man1 anki.1
install -m 0644 -D -t ${DESTDIR}${PREFIX}/share/doc/anki README.contributing README.development README.md LICENSE LICENSE.logo
-xdg-mime install anki.xml --novendor
-xdg-mime default anki.desktop application/x-anki
-xdg-mime default anki.desktop application/x-apkg
@echo
@echo "To finish the installation, you will need to copy the _ankirs module"
@echo "from the venv into your system Python folder, and install all the "
@echo "necessary dependencies."
uninstall:
rm -rf ${DESTDIR}${PREFIX}/share/anki
rm -rf ${DESTDIR}${PREFIX}/bin/anki
rm -rf ${DESTDIR}${PREFIX}/share/pixmaps/anki.xpm
rm -rf ${DESTDIR}${PREFIX}/share/pixmaps/anki.png
rm -rf ${DESTDIR}${PREFIX}/share/applications/anki.desktop
rm -rf ${DESTDIR}${PREFIX}/share/man/man1/anki.1
-xdg-mime uninstall ${DESTDIR}${PREFIX}/share/mime/packages/anki.xml
@echo
@echo "Uninstall complete."
# Prerequisites
######################
RUNREQS := .build/py-run-deps .build/ts-deps
# Python prerequisites
######################
.build/py-run-deps: requirements.txt
pip install -r $<
@touch $@
.build/py-check-reqs: requirements.check .build/py-run-deps
pip install -r $<
./tools/typecheck-setup.sh
@touch $@
# TS prerequisites
######################
.build/ts-deps: ts/package.json
(cd ts && npm i)
@touch $@
# Rust prerequisites
######################
.build/rust-deps: .build/py-run-deps
pip install maturin
@touch $@
RUST_TOOLCHAIN := $(shell cat rs/rust-toolchain)
.build/rs-fmt-deps:
rustup component add rustfmt-preview --toolchain $(RUST_TOOLCHAIN)
@touch $@
.build/rs-clippy-deps:
rustup component add clippy-preview --toolchain $(RUST_TOOLCHAIN)
@touch $@
# Protobuf
######################
PROTODEPS := $(wildcard proto/*.proto)
# Typescript source
######################
TSDEPS := $(wildcard ts/src/*.ts)
JSDEPS := $(patsubst ts/src/%.ts, web/%.js, $(TSDEPS))
# Rust source
######################
RSDEPS := $(shell find rs -type f | egrep -v 'target|/\.|proto.rs')
# Building
######################
BUILDDEPS := .build/ui .build/js .build/rs .build/py-proto
.build/ui: $(RUNREQS) $(shell find designer -type f)
./tools/build_ui.sh
@touch $@
.build/js: .build/ts-deps $(TSDEPS)
(cd ts && npm run build)
@touch $@
.build/rs: .build/rust-deps $(RUNREQS) $(RSDEPS) $(PROTODEPS)
(cd rs/pymod && maturin develop $(RUSTARGS))
@touch $@
.build/py-proto: $(RUNREQS) $(PROTODEPS)
protoc --proto_path=proto --python_out=anki --mypy_out=anki proto/backend.proto
@touch $@
.PHONY: build clean
build: $(BUILDDEPS)
.PHONY: clean
clean:
rm -rf .build
rm -rf $(JSDEPS)
rm -rf rs/target
# Running
######################
.PHONY: run
run: build
./runanki ${RUNARGS}
# Checking
######################
.PHONY: check
check: build rs-test rs-fmt rs-clippy py-mypy py-test py-fmt py-imports py-lint ts-fmt
.PHONY: fix
fix: fix-py-fmt fix-py-imports fix-rs-fmt fix-ts-fmt
# Checking python
######################
PYCHECKDEPS := $(BUILDDEPS) .build/py-check-reqs $(shell find anki aqt -name '*.py' | grep -v buildhash.py)
PYTESTDEPS := $(wildcard tests/*.py)
.build/py-mypy: $(PYCHECKDEPS)
mypy anki aqt
@touch $@
.build/py-test: $(PYCHECKDEPS) $(PYTESTDEPS)
./tools/tests.sh
@touch $@
.build/py-lint: $(PYCHECKDEPS)
pylint -j 0 --rcfile=.pylintrc -f colorized --extension-pkg-whitelist=PyQt5,_ankirs anki aqt
@touch $@
.build/py-imports: $(PYCHECKDEPS) $(PYTESTDEPS)
isort $(ISORTARGS) --check # if this fails, run 'make fix-py-imports'
@touch $@
.build/py-fmt: $(PYCHECKDEPS) $(PYTESTDEPS)
black --check $(BLACKARGS) # if this fails, run 'make fix-py-fmt'
@touch $@
.PHONY: py-mypy py-test py-lint py-imports py-fmt
py-mypy: .build/py-mypy
py-test: .build/py-test
py-lint: .build/py-lint
py-imports: .build/py-imports
py-fmt: .build/py-fmt
.PHONY: fix-py-imports fix-py-fmt
fix-py-imports:
isort $(ISORTARGS)
fix-py-fmt:
black $(BLACKARGS) anki aqt
# Checking rust
######################
.build/rs-test: $(RSDEPS)
(cd rs/ankirs && cargo test)
@touch $@
.build/rs-fmt: .build/rs-fmt-deps $(RSDEPS)
(cd rs && cargo fmt -- --check) # if this fails, run 'make fix-rs-fmt'
@touch $@
.build/rs-clippy: .build/rs-clippy-deps $(RSDEPS)
(cd rs && cargo clippy -- -D warnings)
@touch $@
.PHONY: rs-test rs-fmt fix-rs-fmt rs-clippy
rs-test: .build/rs-test
rs-fmt: .build/rs-fmt
rs-clippy: .build/rs-clippy
fix-rs-fmt:
(cd rs && cargo fmt)
# Checking typescript
######################
TSCHECKDEPS := $(BUILDDEPS) $(TSDEPS)
.build/ts-fmt: $(TSCHECKDEPS)
(cd ts && npm run check-pretty) # if this fails, run 'make fix-ts-fmt'
@touch $@
.PHONY: fix-ts-fmt ts-fmt
ts-fmt: .build/ts-fmt
fix-ts-fmt:
(cd ts && npm run pretty)

View File

@ -1,112 +0,0 @@
Contributing Code
==================
For info on contributing things other than code, such as translations, decks
and add-ons, please see http://ankisrs.net/docs/manual.html#contributing
The goal of Anki 2.1.x is to bring Anki up to date with Python 3 and Qt 5,
while maintaining compatibility with Anki 2.0.x. Some users will be stuck on
Anki 2.0 for a while due to unported add-ons or old hardware, so it's
important that 2.1 doesn't make breaking changes to the file format.
Also of consideration is that the Anki code is indirectly used by the mobile
clients, which try their best to keep as close to the Anki code as possible so
that future updates can be ported more easily. Refactoring code makes it
harder for the mobile clients to track changes, so refactoring should be
limited to times when it is necessary to address an important issue.
Before sending a pull request or a patch, please check the following to
increase your chances of the changes being accepted.
Primarily Bugfixes
-------------------
Small patches that fix a specific problem and don't affect other functionality
are likely to be merged if they meet the other requirements below. Larger
changes are less likely to be accepted for 2.1.x - if in doubt, please ask
before you begin work on them so your work does not go to waste.
Examples of changes that are unlikely to be accepted:
- Altering existing code unnecessarily. Your code may be more elegant than
what already exists, but it takes time for us to review the changes, may
harbour unnoticed bugs, and makes maintaining the mobile clients more
difficult.
- Adding code that is not used within Anki but is only for the benefit of
add-ons - such code is difficult to test and maintain.
- Adding code that addresses niche issues - they are better handled in an
add-on.
Type hints
-----------
Type hints have recently been added to parts of the codebase, mainly using
automated tools. Patches that improve the type hints are welcome, but
pragmatism is advised. Anki's codebase is old and of varying quality, and
there are parts that are difficult to type properly. Don't feel the need to
avoid 'Any' when a proper type is impractical.
When adding type signatures, please avoid refactoring the code, as this is
liable to break add-ons or introduce regressions.
When running 'make check', Anki uses mypy to typecheck the code. Mypy is fast,
but not very good at type inference, so it is mostly useful for checking code
that has type signatures. It is able to read the bundled Qt stubs, and works
across the whole Anki codebase.
The Qt stubs are not perfect, so you'll find when doing things like connecting
signals, you may have to add the following to the end of a line to silence
the spurious errors.
# type: ignore
In cases where you have two modules that reference each other, you can't simply
import the types from each module into the other one, as it can cause a cyclic
import. An example of how to work around this can be seen at
https://github.com/dae/anki/commit/ed0b3d337458d7161811547932b6476f2d4bc887
Tests Must Pass
----------------
Please make sure 'make check' completes successfully before submitting code.
You can do this automatically by adding the following into .git/hooks/pre-push
and making it executable.
#!/bin/bash
set -e
make check
If your change is to anki/ and not covered by the existing unit tests, please
consider adding a unit test at the same time.
Code Style
------------------
You are welcome to use snake_case variable names and functions in newly
introduced code, but please avoid renaming existing variables and functions
that use camelCaps.
If your code isn't formatted correctly, 'make check' will report problems.
You can fix the formatting automatically with 'make fixpyfmt'.
Do One Thing
-------------
A patch or pull request should be the minimum necessary to address one issue.
Please don't make a pull request for a bunch of unrelated changes, as they are
difficult to review and will be rejected - split them up into separate
requests instead.
License
-------
As mentioned in the LICENSE file, we are only able to accept non-trivial
patches or pull requests from people who have sent us a private message
indicating that they license their changes under the BSD license.
Add-ons
========
If you'd like to make more extensive changes, please consider writing an
add-on instead, as add-ons have none of these restrictions and can implement
whatever functionality in whatever style you wish.

View File

@ -1,73 +0,0 @@
Running from source
--------------------
For non-developers who want to try this development code, the easiest way is
to use a binary package - please see:
https://anki.tenderapp.com/discussions/beta-testing
You are welcome to run Anki from source instead, but it is expected that you
can sort out all dependencies and issues by yourself - we are not able to
provide support for problems you encounter when running from source.
To start, make sure you have the following installed:
- Python 3.6+
- Qt 5.9.x or 5.11.x+
- portaudio
- mpv
- lame
- npm
- your platform's C compiler, eg gcc, Xcode or Visual Studio 2017.
- GNU make
- protoc v3 (https://github.com/protocolbuffers/protobuf/releases)
- rustup (https://rustup.rs/)
- pip 19+
Next, build a Python virtual environment and activate it:
$ python3 -m venv ~/pyenv
$ . ~/pyenv/bin/activate
If the distro you are using has PyQt5 installed, make sure you have the PyQt5
WebEngine module and development tools (eg pyqt5-dev-tools) installed as well.
When you use your distro's PyQt5, you have to use the --system-site-packages
option when setting up the virtual environment to give it access to the system
site-packages dir.
Otherwise, run:
$ pip install -r requirements.qt
Then to run the development version:
$ make run
If you get any errors please return to the top and check the requirements
again, and make sure you don't have another version of Anki installed.
If you want to use a language other than English, copy the locale/ folder
from a source tarball into the root of the repo.
To run the unit tests and checks:
$ make check
Before contributing code, please read README.contributing.
If you'd like to contribute translations, please see the translations section
of http://ankisrs.net/docs/manual.html#_contributing
Mac users
----------
You can use homebrew to install some dependencies:
$ brew install python mpv lame portaudio protobuf npm rustup-init
Windows users
--------------
The build process uses a GNU makefile, so you'll either need to run
GNU make via WSL (https://docs.microsoft.com/en-us/windows/wsl/install-win10)
or Cygwin, or manually execute the build steps.

View File

@ -1,17 +1 @@
Anki
-------------------------------------
This is the development branch of Anki.
For stable builds, please see https://apps.ankiweb.net.
For non-developers who want to try this development code,
the easiest way is to use a binary package - please see
https://anki.tenderapp.com/discussions/beta-testing
To run from source, please see README.development.
If you are interested in contributing changes to Anki, please
see README.contributing before you begin work.
![](https://github.com/dae/anki/workflows/Checks/badge.svg)
[update coming soon]

40
anki-qt/.github/workflows/checks.yml vendored Normal file
View File

@ -0,0 +1,40 @@
name: Checks
on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up python
uses: actions/setup-python@v1
with:
python-version: '3.6'
- name: Set up protoc
uses: Arduino/actions/setup-protoc@master
- name: Set up node
uses: actions/setup-node@v1
with:
node-version: 12
- name: Run checks
run: |
# add requirements
sudo apt install portaudio19-dev
python3.6 -m venv ~/pyenv
. ~/pyenv/bin/activate
pip install --upgrade pip setuptools
pip install -r requirements.qt
cd ..
for p in proto lib-rust lib-rspy lib-python; do git clone --depth 1 https://github.com/ankitects/anki-$p.git; done
(cd anki-lib-rspy && make develop build BUILDFLAGS="")
(cd anki-lib-python && make develop build)
# check module
cd anki-qt
make check build
# make sure wheel works
deactivate
cd ..
pip install -r anki-qt/requirements.qt
pip install build/*.whl
python -c 'import aqt'

24
anki-qt/.gitignore vendored Normal file
View File

@ -0,0 +1,24 @@
*.mo
*.pyc
*\#
*~
.*.swp
.build
.coverage
.DS_Store
.mypy_cache
.pytype
__pycache__
aqt/forms
tools/runanki.system
ts/node_modules
aqt_data/locale
aqt_data/web/deckbrowser.js
aqt_data/web/editor.js
aqt_data/web/overview.js
aqt_data/web/reviewer-bottom.js
aqt_data/web/reviewer.js
aqt_data/web/webview.js
dist
aqt.egg-info
build

14
anki-qt/LICENSE Normal file
View File

@ -0,0 +1,14 @@
Anki is licensed under the GNU Affero General Public License, version 3 or
later, with portions contributed by Anki users licensed under the BSD-3
license: https://github.com/ankitects/anki-contributors
Please see LICENSE.logo for the copyright and license of Anki's logo.
The following included source code items use a license other than AGPL3:
* mpv.py: MIT.
* winpaths.py: MIT.
* MathJax: Apache 2.
* jQuery and jQuery-UI: MIT.
* browsersel.js: CC BY 2.5.
* plot.js: MIT.

105
anki-qt/Makefile Normal file
View File

@ -0,0 +1,105 @@
PREFIX := /usr
SHELL := bash
.SHELLFLAGS := -eu -o pipefail -c
.DELETE_ON_ERROR:
MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules
.SUFFIXES:
BLACKARGS := -t py36 aqt tests --exclude=aqt/forms
ISORTARGS := aqt tests
$(shell mkdir -p .build ../build)
PHONY: all
all: check
.build/run-deps: setup.py
pip install -e .
@touch $@
.build/dev-deps: requirements.dev
pip install -r requirements.dev
@touch $@
.build/ui: $(shell find designer -type f)
./tools/build_ui.sh
@touch $@
TSDEPS := $(wildcard ts/src/*.ts)
.build/js: $(TSDEPS)
(cd ts && npm i && npm run build)
@touch $@
BUILD_STEPS := .build/run-deps .build/dev-deps .build/js .build/ui
# Checking
######################
.PHONY: check
check: $(BUILD_STEPS) .build/mypy .build/test .build/fmt .build/imports .build/lint .build/ts-fmt
.PHONY: fix
fix: $(BUILD_STEPS)
isort $(ISORTARGS)
black $(BLACKARGS)
(cd ts && npm run pretty)
.PHONY: clean
clean:
rm -rf .build aqt.egg-info build dist
# Checking Typescript
######################
JSDEPS := $(patsubst ts/src/%.ts, web/%.js, $(TSDEPS))
.build/ts-fmt: $(TSDEPS)
(cd ts && npm i && npm run check-pretty)
@touch $@
# Checking python
######################
LIBPY := ../lib-python
CHECKDEPS := $(shell find aqt tests -name '*.py')
.build/mypy: $(CHECKDEPS) .build/qt-stubs
MYPYPATH=$(LIBPY) mypy aqt
@touch $@
.build/test: $(CHECKDEPS)
python -m nose2 --plugin=nose2.plugins.mp -N 16
@touch $@
.build/lint: $(CHECKDEPS)
pylint -j 0 --rcfile=.pylintrc -f colorized --extension-pkg-whitelist=PyQt5,ankirspy aqt
@touch $@
.build/imports: $(CHECKDEPS)
isort $(ISORTARGS) --check
@touch $@
.build/fmt: $(CHECKDEPS)
black --check $(BLACKARGS)
@touch $@
.build/qt-stubs:
./tools/typecheck-setup.sh
@touch $@
# Building
######################
# we only want the wheel when building, but passing -f wheel to poetry
# breaks the inclusion of files listed in pyproject.toml
.PHONY: build
build: $(BUILD_STEPS)
rm -rf dist
python setup.py bdist_wheel
rsync -a dist/*.whl ../build/
.PHONY: develop
develop: $(BUILD_STEPS)

3
anki-qt/README.md Normal file
View File

@ -0,0 +1,3 @@
Anki's Qt GUI code.
Please see https://github.com/ankitects/anki-desktop

View File

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -15,9 +15,9 @@ from typing import Any, Optional
import anki.lang
from anki import version as _version
from anki.consts import HELP_SITE
from anki.lang import langDir
from anki.utils import checksum, isLin, isMac
from aqt.qt import *
from aqt.utils import locale_dir
appVersion = _version
appWebsite = "http://ankisrs.net/"
@ -129,23 +129,21 @@ dialogs = DialogManager()
# Qt requires its translator to be installed before any GUI widgets are
# loaded, and we need the Qt language to match the gettext language or
# translated shortcuts will not work.
#
# The Qt translator needs to be retained to work.
_gtrans: Optional[Any] = None
_qtrans: Optional[QTranslator] = None
def setupLang(
pm: ProfileManager, app: QApplication, force: Optional[str] = None
) -> None:
global _gtrans, _qtrans
global _qtrans
try:
locale.setlocale(locale.LC_ALL, "")
except:
pass
lang = force or pm.meta["defaultLang"]
dir = langDir()
# gettext
_gtrans = gettext.translation("anki", dir, languages=[lang], fallback=True)
def fn__(arg):
print("accessing _ without importing from anki.lang will break in the future")
@ -165,14 +163,15 @@ def setupLang(
builtins.__dict__["_"] = fn__
builtins.__dict__["ngettext"] = fn_ngettext
anki.lang.setLang(lang, local=False)
ldir = locale_dir()
anki.lang.setLang(lang, ldir, local=False)
if lang in ("he", "ar", "fa"):
app.setLayoutDirection(Qt.RightToLeft)
else:
app.setLayoutDirection(Qt.LeftToRight)
# qt
_qtrans = QTranslator()
if _qtrans.load("qt_" + lang, dir):
if _qtrans.load("qt_" + lang, ldir):
app.installTranslator(_qtrans)

View File

@ -10,10 +10,10 @@ import aqt.modelchooser
from anki.hooks import addHook, remHook, runHook
from anki.lang import _
from anki.notes import Note
from anki.sound import clearAudioQueue
from anki.utils import htmlToTextLine, isMac
from aqt import AnkiQt
from aqt.qt import *
from aqt.sound import clearAudioQueue
from aqt.utils import (
addCloseShortcut,
askUser,

View File

@ -17,7 +17,6 @@ from anki.collection import _Collection
from anki.consts import *
from anki.hooks import addHook, remHook, runFilter, runHook
from anki.lang import _, ngettext
from anki.sound import allSounds, clearAudioQueue, play
from anki.utils import (
bodyClass,
fmtTimeSpan,
@ -29,6 +28,7 @@ from anki.utils import (
)
from aqt import AnkiQt
from aqt.qt import *
from aqt.sound import allSounds, clearAudioQueue, play
from aqt.utils import (
MenuList,
SubMenu,

View File

@ -10,9 +10,9 @@ import aqt
from anki.consts import *
from anki.hooks import runFilter
from anki.lang import _, ngettext
from anki.sound import clearAudioQueue, playFromText
from anki.utils import bodyClass, isMac, isWin, joinFields
from aqt.qt import *
from aqt.sound import clearAudioQueue, playFromText
from aqt.utils import (
askUser,
downArrow,

View File

@ -8,9 +8,9 @@ import aqt
from anki.errors import DeckRenameError
from anki.hooks import runHook
from anki.lang import _, ngettext
from anki.sound import clearAudioQueue
from anki.utils import fmtTimeSpan, ids2str
from aqt.qt import *
from aqt.sound import clearAudioQueue
from aqt.utils import askUser, getOnlyText, openHelp, openLink, shortcut, showWarning

View File

@ -17,8 +17,8 @@ from typing import Callable, List, Optional, Tuple
import requests
from bs4 import BeautifulSoup
import anki.sound
import aqt
import aqt.sound
from anki.hooks import addHook, runFilter, runHook
from anki.lang import _
from anki.sync import AnkiRequestsClient
@ -700,8 +700,8 @@ to a cloze type first, via Edit>Change Note Type."""
name = urllib.parse.quote(fname.encode("utf8"))
return '<img src="%s">' % name
else:
anki.sound.clearAudioQueue()
anki.sound.play(fname)
aqt.sound.clearAudioQueue()
aqt.sound.play(fname)
return "[sound:%s]" % fname
def urlToFile(self, url):

View File

@ -199,7 +199,7 @@ you can enter it here. Use \\t to represent tab."""
elif "invalidTempFolder" in err:
msg += self.mw.errorHandler.tempFolderMsg()
else:
msg += str(traceback.format_exc(), "ascii", "replace")
msg += traceback.format_exc()
showText(msg)
return
finally:

View File

@ -15,11 +15,11 @@ from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple
from send2trash import send2trash
import anki.mpv
import anki.sound
import aqt
import aqt.mediasrv
import aqt.mpv
import aqt.progress
import aqt.sound
import aqt.stats
import aqt.toolbar
import aqt.webview
@ -378,7 +378,7 @@ close the profile or restart Anki."""
def cleanupAndExit(self) -> None:
self.errorHandler.unload()
self.mediaServer.shutdown()
anki.sound.cleanupMPV()
aqt.sound.cleanupMPV()
self.app.exit(0)
# Sound/video
@ -388,10 +388,10 @@ close the profile or restart Anki."""
if isWin:
return
try:
anki.sound.setupMPV()
aqt.sound.setupMPV()
except FileNotFoundError:
print("mpv not found, reverting to mplayer")
except anki.mpv.MPVProcessError:
except aqt.mpv.MPVProcessError:
print("mpv too old, reverting to mplayer")
# Collection load/unload

View File

@ -12,13 +12,12 @@ from typing import Optional
from anki.collection import _Collection
from anki.utils import devMode
from aqt.qt import *
from aqt.utils import aqt_data_folder
# locate web folder in source/binary distribution
def _getExportFolder():
# running from source?
srcFolder = os.path.join(os.path.dirname(__file__), "..")
webInSrcFolder = os.path.abspath(os.path.join(srcFolder, "web"))
data_folder = aqt_data_folder()
webInSrcFolder = os.path.abspath(os.path.join(data_folder, "web"))
if os.path.exists(webInSrcFolder):
return webInSrcFolder
elif isMac:

View File

@ -587,3 +587,7 @@ class MPV(MPVBase):
"""Set the value of property `name`.
"""
return self.command("set_property", name, value)
# alias this module for backwards compat
sys.modules["anki.mpv"] = sys.modules["aqt.mpv"]

View File

@ -4,7 +4,7 @@
import aqt
from anki.lang import _
from anki.sound import clearAudioQueue
from aqt.sound import clearAudioQueue
from aqt.utils import askUserDialog, openLink, shortcut, tooltip

View File

@ -16,14 +16,14 @@ from typing import Any, Dict
from send2trash import send2trash
import anki.lang
import anki.sound
import aqt.forms
import aqt.sound
from anki.db import DB
from anki.lang import _
from anki.utils import intTime, isMac, isWin
from aqt import appHelpSite
from aqt.qt import *
from aqt.utils import showWarning
from aqt.utils import locale_dir, showWarning
metaConf = dict(
ver=0,
@ -74,7 +74,7 @@ class ProfileManager:
# instantiate base folder
self._setBaseFolder(base)
anki.sound.setMpvConfigBase(self.base)
aqt.sound.setMpvConfigBase(self.base)
def setupMeta(self) -> LoadMetaResult:
# load metadata
@ -444,7 +444,7 @@ please see:
sql = "update profiles set data = ? where name = ?"
self.db.execute(sql, self._pickle(self.meta), "_global")
self.db.commit()
anki.lang.setLang(code, local=False)
anki.lang.setLang(code, locale_dir(), local=False)
# OpenGL
######################################################################

View File

@ -14,11 +14,10 @@ import aqt
from anki.cards import Card
from anki.hooks import addHook, runFilter, runHook
from anki.lang import _, ngettext
from anki.sound import clearAudioQueue, play, playFromText
from anki.utils import bodyClass, stripHTML
from aqt import AnkiQt
from aqt.qt import *
from aqt.sound import getAudio
from aqt.sound import clearAudioQueue, getAudio, play, playFromText
from aqt.utils import (
askUserDialog,
downArrow,

View File

@ -5,7 +5,6 @@ import atexit
import html
import os
import random
import re
import subprocess
import sys
import threading
@ -14,14 +13,57 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
from anki.hooks import addHook, runHook
from anki.lang import _
from anki.mpv import MPV, MPVBase
from anki.sound import allSounds
from anki.utils import isLin, isMac, isWin, tmpdir
from aqt.mpv import MPV, MPVBase
from aqt.qt import *
from aqt.utils import restoreGeom, saveGeom, showWarning
def getAudio(parent, encode=True):
"Record and return filename"
# record first
if not Recorder:
showWarning("pyaudio not installed")
return
r = Recorder()
mb = QMessageBox(parent)
restoreGeom(mb, "audioRecorder")
mb.setWindowTitle("Anki")
mb.setIconPixmap(QPixmap(":/icons/media-record.png"))
but = QPushButton(_("Save"))
mb.addButton(but, QMessageBox.AcceptRole)
but.setDefault(True)
but = QPushButton(_("Cancel"))
mb.addButton(but, QMessageBox.RejectRole)
mb.setEscapeButton(but)
t = time.time()
r.start()
time.sleep(r.startupDelay)
QApplication.instance().processEvents()
while not mb.clickedButton():
txt = _("Recording...<br>Time: %0.1f")
mb.setText(txt % (time.time() - t))
mb.show()
QApplication.instance().processEvents()
if mb.clickedButton() == mb.escapeButton():
r.stop()
r.cleanup()
return
saveGeom(mb, "audioRecorder")
# ensure at least a second captured
while time.time() - t < 1:
time.sleep(0.1)
r.stop()
# process
r.postprocess(encode)
return r.file()
# Shared utils
##########################################################################
_soundReg = r"\[sound:(.*?)\]"
def playFromText(text) -> None:
for match in allSounds(text):
@ -30,18 +72,6 @@ def playFromText(text) -> None:
play(match)
def allSounds(text) -> List:
return re.findall(_soundReg, text)
def stripSounds(text) -> str:
return re.sub(_soundReg, "", text)
def hasSound(text) -> bool:
return re.search(_soundReg, text) is not None
# Packaged commands
##########################################################################
@ -471,3 +501,10 @@ def clearAudioQueue() -> None:
Recorder = PyAudioRecorder
if not Recorder:
print("pyaudio not installed")
# add everything from this module into anki.sound for backwards compat
_exports = [i for i in locals().items() if not i[0].startswith("__")]
for (k, v) in _exports:
sys.modules["anki.sound"].__dict__[k] = v

View File

@ -14,6 +14,19 @@ from anki.utils import invalidFilename, isMac, isWin, noBundledLibs, versionWith
from aqt.qt import *
def aqt_data_folder() -> str:
# wheel install?
dir = os.path.join(sys.prefix, "aqt_data")
if not os.path.exists(dir) or not os.listdir(dir):
# running in place?
dir = os.path.join(os.path.dirname(__file__), "..", "aqt_data")
return dir
def locale_dir() -> str:
return os.path.join(aqt_data_folder(), "locale")
def openHelp(section):
link = aqt.appHelpSite
if section:

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 727 B

View File

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 261 B

View File

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 811 B

View File

Before

Width:  |  Height:  |  Size: 632 B

After

Width:  |  Height:  |  Size: 632 B

View File

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 483 B

View File

Before

Width:  |  Height:  |  Size: 330 B

After

Width:  |  Height:  |  Size: 330 B

View File

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 442 B

View File

Before

Width:  |  Height:  |  Size: 850 B

After

Width:  |  Height:  |  Size: 850 B

View File

Before

Width:  |  Height:  |  Size: 859 B

After

Width:  |  Height:  |  Size: 859 B

View File

Before

Width:  |  Height:  |  Size: 434 B

After

Width:  |  Height:  |  Size: 434 B

Some files were not shown because too many files have changed in this diff Show More