[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0d755a1: * externals-list: Convert dired-du to :external
|
From: |
Stefan Monnier |
|
Subject: |
[elpa] master 0d755a1: * externals-list: Convert dired-du to :external |
|
Date: |
Tue, 1 Dec 2020 10:51:03 -0500 (EST) |
branch: master
commit 0d755a1a16e43a5599dc41162c1912103cadcd1e
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* externals-list: Convert dired-du to :external
---
externals-list | 1 +
packages/dired-du/.travis.yml | 21 -
packages/dired-du/LICENSE | 674 ----------
packages/dired-du/Makefile | 16 -
packages/dired-du/README.md | 39 -
packages/dired-du/dired-du-tests.el | 282 ----
packages/dired-du/dired-du.el | 2492 -----------------------------------
7 files changed, 1 insertion(+), 3524 deletions(-)
diff --git a/externals-list b/externals-list
index dfaa8e8..94873e7 100644
--- a/externals-list
+++ b/externals-list
@@ -88,6 +88,7 @@
("delight" :external "https://git.savannah.gnu.org/r/delight.git";)
("diffview" :external
"https://github.com/mgalgs/diffview-mode.git";)
("diff-hl" :external "https://github.com/dgutov/diff-hl.git";)
+ ("dired-du" :external nil)
("dired-git-info" :external "https://github.com/clemera/dired-git-info";)
("disk-usage" :external
"https://gitlab.com/ambrevar/emacs-disk-usage";)
("dismal" :external nil)
diff --git a/packages/dired-du/.travis.yml b/packages/dired-du/.travis.yml
deleted file mode 100644
index bcbd52b..0000000
--- a/packages/dired-du/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: emacs-lisp
-
-notifications:
- email:
- on_success: never
- on_failure: always
-
-env:
- - EVM_EMACS=emacs-24.4-travis
- - EVM_EMACS=emacs-24.5-travis
- - EVM_EMACS=emacs-git-snapshot-travis
-
-before_install:
- - git clone https://github.com/rejeep/evm.git $HOME/.evm
- - export PATH=$HOME/.evm/bin:$PATH
-
- - evm config path /tmp
- - evm install $EVM_EMACS --use --skip
-
-script:
- - make test
diff --git a/packages/dired-du/LICENSE b/packages/dired-du/LICENSE
deleted file mode 100644
index 9cecc1d..0000000
--- a/packages/dired-du/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- 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:
-
- {project} Copyright (C) {year} {fullname}
- 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>.
diff --git a/packages/dired-du/Makefile b/packages/dired-du/Makefile
deleted file mode 100644
index 4aeb9e7..0000000
--- a/packages/dired-du/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-emacs ?= emacs
-
-LOAD = -l dired-du.el
-
-all: test
-
-test:
- $(emacs) -batch $(LOAD) -l dired-du-tests.el -f
ert-run-tests-batch-and-exit
-
-compile:
- $(emacs) -batch --eval "(progn (add-to-list 'load-path
default-directory) (byte-compile-file \"dired-du.el\"))"
-
-clean:
- rm -f *.elc
-
-.PHONY: all compile clean test
diff --git a/packages/dired-du/README.md b/packages/dired-du/README.md
deleted file mode 100644
index 675d78d..0000000
--- a/packages/dired-du/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# dired-du
-
-[](https://travis-ci.org/calancha/dired-du)
-
-## Display the recursive size of directories in Dired
-
-This file defines a minor mode **dired-du-mode** to show
-the recursive size of directories in Dired buffers.
-If *du* program is available, then the directory sizes are
-obtained with it. Otherwise, the directory sizes are obtained
-with Lisp. The former is much faster.
-For directories where the user doesn't have read permission,
-the recursive size is not obtained.
-
-Once this mode is enabled, every new Dired buffer displays
-recursive dir sizes.
-
-To enable the mode at start up:
-
-1. Store the file in a directory within *load-path*.
-2. Add the following into .emacs file:
-
-```(add-hook 'dired-mode-hook #'dired-du-mode)```
-
-Note that obtaining the recursive size of all the directories
-in a Dired buffer might be very slow: it may significantly delay
-the time to display a new Dired buffer.
-Instead of enabling *dired-du-mode* by default in all Dired buffers
-you might prefer to use this mode as an interfaz to
-the *du* program: you can enable it in the current Dired buffer,
-and disable it once you have finished checking the used space.
-
-## Number of marked files and their size
-
-In adition, this library adds a command, **dired-du-count-sizes**,
-to count the number of marked files and how much space
-they use; the command accepts a particular character mark
-i.e., '*' or all kind of marks i.e, any character other than ?\s.
-
diff --git a/packages/dired-du/dired-du-tests.el
b/packages/dired-du/dired-du-tests.el
deleted file mode 100644
index 4c77932..0000000
--- a/packages/dired-du/dired-du-tests.el
+++ /dev/null
@@ -1,282 +0,0 @@
-;;; dired-du-tests.el --- Tests for dired-du.el -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
-
-;; Author: Tino Calancha <tino.calancha@gmail.com>,
-;; Keywords:
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs 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.
-
-;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;
-
-;;; code:
-
-(require 'ert)
-(require 'dired-du)
-(require 'ls-lisp)
-
-(ert-deftest dired-du-test1 ()
- (let* ((dir (make-temp-file "dired-du" 'dir))
- (dir2 (expand-file-name "foo" dir))
- (dired-du-used-space-program nil)
- (buffers '())
- mode-on)
- (unwind-protect
- (progn
- (make-directory dir2)
- (push (dired dir2) buffers)
- (setq mode-on dired-du-mode)
- (dotimes (i 9)
- (write-region "1234" nil (format "baz%d" i)))
- (push (dired dir) buffers)
- (dired-goto-file dir2)
- (should (= 36 (dired-du-get-recursive-dir-size))))
- (if mode-on
- (dired-du-mode 1)
- (dired-du-mode 0))
- (mapc #'kill-buffer buffers)
- (delete-directory dir 'recursive))))
-
-(ert-deftest dired-du-test2 ()
- (let* ((dir (make-temp-file "dired-du" 'dir))
- (dir2 (expand-file-name "foo" dir))
- (buffers '()) mode-on)
- (unwind-protect
- (progn
- (make-directory dir2)
- (add-to-list 'buffers (dired dir2))
- (setq mode-on dired-du-mode)
- (dotimes (i 9)
- (write-region "1234" nil (format "baz%d" i)))
- (add-to-list 'buffers (dired dir))
- (dired-goto-file dir2)
- (let ((size-orig (floor (dired-du--read-size-from-buffer)))
- (size-du (dired-du-get-recursive-dir-size)))
- (dolist (dired-du-size-format (list nil 'comma t))
- (unwind-protect
- (progn
- (should (/= size-orig size-du))
- (dired-du-mode 1)
- (unless (eq dired-du-size-format t)
- (should (= (floor (dired-du--read-size-from-buffer))
- size-du)))
- ;; Disable user write permissions on this dir: The size
shown
- ;; must be equal to `size-orig'.
- (set-file-modes dir2 #o000)
- (dired-du-mode 0)
- (dired-du--reset)
- (revert-buffer)
- (dired-du-mode 1)
- (unless dired-du-used-space-program
- (should (= size-orig
- (floor (dired-du--read-size-from-buffer))))))
- ;; Clean up
- (set-file-modes dir2 #o755)
- (dired-du-mode 0)
- (dired-du--reset)))))
- (if mode-on
- (dired-du-mode 1)
- (dired-du-mode 0))
- (mapc #'kill-buffer buffers)
- (delete-directory dir 'recursive))))
-
-(ert-deftest dired-du-test3 ()
- (let* ((dir (make-temp-file "dired-du" 'dir))
- (dir2 (expand-file-name "foo" dir))
- (dir3 (expand-file-name "bar" dir))
- (file (expand-file-name "qux" dir))
- (dired-du-used-space-program nil)
- (buffers '()) mode-on info)
- (unwind-protect
- (let ((name2 (file-name-nondirectory dir2))
- (name3 (file-name-nondirectory dir3)))
- (make-directory dir2)
- (make-directory dir3)
- (write-region "" nil file)
- (add-to-list 'buffers (dired dir))
- (setq mode-on dired-du-mode)
- (dired-du-mode 1)
- ;; (should (dired-du--get-position name2))
- (should (dired-du--file-in-dir-info-p name2))
- (should (dired-du--get-value name2 'size))
- ;; (should (dired-du--get-position name3))
- (should (dired-du--file-in-dir-info-p name3))
- (should (dired-du--get-value name3 'size))
- (setq info (assoc name3
- (cdr (nth 0 dired-du-dir-info))))
- (dired-du--delete-entry name3)
- (should-not (dired-du--file-in-dir-info-p name3))
- ;; Reinsert it.
- (dired-du--global-update-dir-info
- (progn
- (dired-goto-file dir3)
- (list (dired-du-get-file-info)))
- 0)
- (should (dired-du--file-in-dir-info-p name3))
- (delete-directory dir3 t)
- (should (dired-du--file-in-dir-info-p name3))
- (dired-mark 1)
- (dired-do-kill-lines nil)
- (dired-du--drop-unexistent-files)
- (should-not (dired-du--file-in-dir-info-p name3))
- ;; `dired-du-dir-info' just stored directories.
- (should-not (dired-du--get-position (file-name-nondirectory file))))
- (if mode-on
- (dired-du-mode 1)
- (dired-du-mode 0))
- (mapc #'kill-buffer buffers)
- (delete-directory dir 'recursive))))
-
-(ert-deftest dired-du-test4 ()
- (let* ((dir (make-temp-file "dired-du" 'dir))
- (dir2 (expand-file-name "foo" dir))
- (dir3 (expand-file-name "bar" dir))
- (file (expand-file-name "qux" dir))
- (buffers '()))
- (unwind-protect
- (let ((name2 (file-name-nondirectory dir2))
- (name3 (file-name-nondirectory dir3))
- (marks '()))
- (make-directory dir2)
- (make-directory dir3)
- (write-region "" nil file)
- (add-to-list 'buffers (dired dir))
- (dired-mark-directories nil)
- (dired-change-marks ?* ?1)
- (dired-toggle-marks)
- (setq marks
- (sort (dired-du-get-all-marks) #'<))
- (should (equal (sort (list ?* ?1) #'<) marks)))
- (mapc #'kill-buffer buffers)
- (delete-directory dir 'recursive))))
-
-(ert-deftest dired-du-test5 ()
- (let* ((dir (make-temp-file "dired-du" 'dir))
- (dir2 (expand-file-name "foo" dir))
- (dir3 (expand-file-name "bar" dir))
- (file1 (expand-file-name "qux" dir))
- (file2 (expand-file-name "qux" dir2))
- (file3 (expand-file-name "qux" dir3))
- (buffers '()) mode-on)
- (unwind-protect
- (let ((name2 (file-name-nondirectory dir2))
- (name3 (file-name-nondirectory dir3))
- (marks '()))
- (make-directory dir2)
- (make-directory dir3)
- (dolist (file (list file1 file2 file3))
- (write-region "" nil file))
- (add-to-list 'buffers (dired dir))
- (setq mode-on dired-du-mode)
- (dired-du-mode 1)
- (dired-insert-subdir dir2)
- (dired-insert-subdir dir3)
- (should (= 3 (length dired-du-dir-info)))
- (dired-goto-file file2)
- (dired-kill-subdir)
- (dired-du--drop-unexistent-files)
- (should (= 2 (length dired-du-dir-info))))
- (if mode-on
- (dired-du-mode 1)
- (dired-du-mode 0))
- (mapc #'kill-buffer buffers)
- (delete-directory dir 'recursive))))
-
-(ert-deftest dired-du-count-sizes-test ()
- (let* ((dir (make-temp-file "dired-du" 'dir))
- (dir2 (expand-file-name "foo" dir))
- (dir3 (expand-file-name "bar" dir))
- (file1 (expand-file-name "file1" dir))
- (file2 (expand-file-name "file2" dir))
- (file3 (expand-file-name "file3" dir))
- (buffers '()) mode-on)
- (unwind-protect
- (let ((name2 (file-name-nondirectory dir2))
- (name3 (file-name-nondirectory dir3))
- (marks '()))
- (make-directory dir2)
- (make-directory dir3)
- (dolist (file (list file1 file2 file3))
- (write-region "" nil file))
- (add-to-list 'buffers (dired dir))
- (setq mode-on dired-du-mode)
- (dired-du-mode 1)
- (should (string-match "No marked files with mark"
- (dired-du-count-sizes ?*)))
- ;; Mark dirs.
- (dired-mark-directories nil)
- (should (dired-du-count-sizes ?*))
- (dired-change-marks ?* ?1)
- (should (dired-du-count-sizes ?1))
- (dired-mark-files-regexp "\\`file[1-3]\\'")
- (should (string-match "Marked with [^ ]+ 3 files"
- (dired-du-count-sizes ?*)))
- (should (windowp (dired-du-count-sizes ?* 'all-marks))))
- (if mode-on
- (dired-du-mode 1)
- (dired-du-mode 0))
- (mapc #'kill-buffer buffers)
- (delete-directory dir 'recursive))))
-
-;; Sort by size only supported in `ls-lisp'.
-(ert-deftest dired-du-sort-by-size ()
- "Test ls-lisp sort by size with recursive size dir feature."
- (let* ((dir (make-temp-file "dired-du" 'dir))
- (filled-subdir (expand-file-name "filled-subdir" dir))
- (empty-subdir (expand-file-name "empty-subdir" dir))
- (external-file (expand-file-name "external-file" dir))
- (inner-file (expand-file-name "inner-file" filled-subdir))
- (ls-lisp-use-insert-directory-program nil)
- (orig-def-dir default-directory)
- (dired-listing-switches "-lS")
- (buffers '()) mode-on)
- (unwind-protect
- (let (filled-subdir-size empty-subdir-size file-size)
- (make-directory filled-subdir)
- (make-directory empty-subdir)
- (setq default-directory dir)
- (add-to-list 'buffers (dired dir))
- (dired dir)
- (setq empty-subdir-size (dired-du--get-recursive-dir-size
"empty-subdir"))
- (setq file-size (* empty-subdir-size 2))
- (setq filled-subdir-size (+ empty-subdir-size file-size))
- (dolist (file (list external-file inner-file))
- (write-region (make-string file-size ?.) nil file))
- (dired-revert) ; Revert to show external-file
- (setq filled-subdir-size (dired-du--get-recursive-dir-size
"filled-subdir"))
- (setq mode-on dired-du-mode)
- (dired-du-mode 1)
- ;; Enable the mode just replace the recursive dir sizes; it won't
reorder the Dired buffer.
- ;; Revert the buffer to force a reorder.
- (dired-revert)
- ;; At this point, the Dired buffer must be ordered by size as
follows:
- ;; file/dir name size
- ;; filled-subdir 3x
- ;; external-file 2x
- ;; empty subdir x
- (dired-toggle-marks)
- (should (equal '("filled-subdir" "external-file" "empty-subdir")
- (dired-get-marked-files 'local))))
- (if mode-on (dired-du-mode 1)
- (dired-du-mode 0))
- (setq default-directory orig-def-dir)
- (mapc #'kill-buffer buffers)
- (delete-directory dir 'recursive))))
-
-(provide 'dired-du-tests)
-;;; dired-du-tests.el ends here
diff --git a/packages/dired-du/dired-du.el b/packages/dired-du/dired-du.el
deleted file mode 100644
index 7d30b25..0000000
--- a/packages/dired-du/dired-du.el
+++ /dev/null
@@ -1,2492 +0,0 @@
-;;; dired-du.el --- Dired with recursive directory sizes -*- lexical-binding:
t -*-
-
-;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
-
-;; Author: Tino Calancha <tino.calancha@gmail.com>
-;; Maintainer: Tino Calancha <tino.calancha@gmail.com>
-;; Keywords: files, unix, convenience
-
-;; Created: Wed Mar 23 22:54:00 2016
-;; Version: 0.5.2
-;; Package-Requires: ((emacs "24.4") (cl-lib "0.5"))
-;; Last-Updated: Sun Feb 24 19:53:27 JST 2019
-;; By: calancha
-;; Update #: 344
-;; Compatibility: GNU Emacs: 24.4
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This file is part of GNU Emacs.
-;;
-;; 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/>.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-;;; Commentary:
-;;
-;; -- Display the recursive size of directories in Dired --
-;;
-;; This file defines a minor mode `dired-du-mode' to show
-;; the recursive size of directories in Dired buffers.
-;; If `du' program is available, then the directory sizes are
-;; obtained with it. Otherwise, the directory sizes are obtained
-;; with Lisp. The former is faster and provide a more precise value.
-;; For directories where the user doesn't have read permission,
-;; the recursive size is not obtained.
-;; Once this mode is enabled, every new Dired buffer displays
-;; recursive dir sizes.
-;;
-;; To enable the mode at start up:
-;;
-;; 1) Store the file in a directory within `load-path'.
-;; 2) Add the following into .emacs file:
-;;
-;; (add-hook 'dired-mode-hook #'dired-du-mode)
-;;
-;; Note that obtaining the recursive size of all the directories
-;; in a Dired buffer might be very slow: it may significantly delay
-;; the time to display a new Dired buffer.
-;; Instead of enabling `dired-du-mode' by default in all Dired buffers
-;; you might prefer to use this mode just as an interfaz to
-;; the `du' program: you can enable it in the current Dired buffer,
-;; and disable it once you have finished checking the used space.
-;;
-;; -- Number of marked files and their size --
-;;
-;; In addition, this library adds a command, `dired-du-count-sizes',
-;; to count the number of marked files and how much space
-;; they use; the command accepts a particular character mark
-;; i.e., '*' or all kind of marks i.e, any character other than ?\s.
-;;
-;; Bugs
-;; ====
-;; * Some progress reporter might show percent > 100.
-;;
-;; * Order by size only works with directory recursive sizes if you use
-;; `ls-lisp' with `ls-lisp-use-insert-directory-program' set nil; otherwise,
-;; the external ls program is responsible to do the sorting ignoring
-;; the recursive dir sizes.
-;;
-;;
-;; Internal variables defined here:
-;;
-;; `dired-du--user-warned', `dired-du-dir-info',
-;; `dired-du-filesp-subdir-header', `dired-du-find-dired-buffer',
-;; `dired-du-local-subdir-header', `dired-du-mode',
-;; `dired-du-remote-subdir-header'.
-;;
-;; Coustom variables defined here:
-;;
-;; `dired-du-bind-count-sizes', `dired-du-bind-human-toggle',
-;; `dired-du-bind-mode', `dired-du-on-find-dired-ok',
-;; `dired-du-size-format', `dired-du-update-headers',
-;; `dired-du-used-space-program'.
-;;
-;; Macros defined here:
-;;
-;; `dired-du-map-over-marks', `dired-du-with-saved-marks'.
-;;
-;; Commands defined here:
-;;
-;; `dired-du--toggle-human-readable', `dired-du-count-sizes',
-;; `dired-du-drop-all-subdirs', `dired-du-insert-marked-dirs',
-;; `dired-du-on-find-dired-ok-toggle', `dired-du-recompute-dir-size',
-;; `dired-du-update-dir-info'.
-;;
-;; Non-interactive functions defined here:
-;;
-;; `dired-du--cache-dir-info', `dired-du--change-human-sizes',
-;; `dired-du--count-sizes-1', `dired-du--count-sizes-2',
-;; `dired-du--create-or-check-dir-info', `dired-du--delete-entry',
-;; `dired-du--drop-unexistent-files', `dired-du--file-in-dir-info-p',
-;; `dired-du--find-dired-around', `dired-du--fullname-to-glob-pos',
-;; `dired-du--get-all-files-type',
-;; `dired-du--get-max-gid-and-size-lengths-for-subdir',
-;; `dired-du--get-num-extra-blanks', `dired-du--get-position',
-;; `dired-du--get-position-1', `dired-du--get-recursive-dir-size',
-;; `dired-du--get-value', `dired-du--global-update-dir-info',
-;; `dired-du--initialize', `dired-du--insert-subdir',
-;; `dired-du--local-update-dir-info', `dired-du--number-as-string-p',
-;; `dired-du--read-size-from-buffer', `dired-du--replace',
-;; `dired-du--replace-1', `dired-du--reset',
-;; `dired-du--revert', `dired-du--size-sorter',
-;; `dired-du--subdir-position', `dired-du--update-subdir-header',
-;; `dired-du--update-subdir-header-1', `dired-du-alist-get',
-;; `dired-du-directory-at-current-line-p',
-;; `dired-du-distinguish-one-marked',
-;; `dired-du-filename-relative-to-default-dir',
-;; `dired-du-get-all-directories', `dired-du-get-all-files',
-;; `dired-du-get-all-marks', `dired-du-get-all-non-directories',
-;; `dired-du-get-all-subdir-directories',
-;; `dired-du-get-all-subdir-non-directories', `dired-du-get-file-info',
-;; `dired-du-get-file-size-local', `dired-du-get-file-size-remote',
-;; `dired-du-get-marked-files', `dired-du-get-recursive-dir-size',
-;; `dired-du-get-recursive-dir-size-in-parallel',
-;; `dired-du-ls-lisp-handle-switches', `dired-du-mark-buffer',
-;; `dired-du-mark-subdir-files', `dired-du-marker-regexp',
-;; `dired-du-run-in-parallel', `dired-du-string-to-number',
-;; `dired-du-unmark-buffer', `dired-du-use-comma-separator'.
-;;
-;; Inline functions defined here:
-;;
-;; `dired-du-assert-dired-mode', `dired-du-link-number',
-;; `dired-du-modification-time', `dired-du-size'.
-;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;; Code:
-
-
-(require 'cl-lib)
-(require 'dired)
-(require 'find-dired)
-(autoload 'dired-subdir-min "dired-aux")
-
-(defgroup dired-du nil
- "Dired with recursive size dir."
- :prefix "dired-du-"
- :group 'dired)
-
-(defvar dired-du-dir-info nil
- "Alist of cached (DIRNAME . DIR-INFO) in Dired buffer.
-DIRNAME is a subdirectory in the DIRED buffer.
-
-DIR-INFO is one alist with information about each directory
-in DIRNAME obtained with `dired-du-get-file-info'. Each
-element is an alist:
-\(NAME ((nlink . NLINK) (size . SIZE) (time . TIME))).
-
-The size of the directories is the recursive size obtained with
-`dired-du-used-space-program'. The size of the entries
-'.' and '..' is not changed.")
-(make-variable-buffer-local 'dired-du-dir-info)
-
-(defvar dired-du-mode nil
- "Variable with the status of the mode.
-If this variable evaluates non-nil, then show recursive size
-for directories in the Dired buffer. This variable is also used
-as default value for INCLUDE-DIRS in `dired-du-count-sizes'.")
-(make-variable-buffer-local 'dired-du-mode)
-
-(put 'dired-du-mode 'permanent-local t)
-
-(defcustom dired-du-used-space-program
- (purecopy (let ((opts (if (string-prefix-p "gnu" (symbol-name system-type))
- "-sb"
- "-sk"))) ; -k overestimate used space\
- ; for files w/ size < 1024.
- (cond ((executable-find "du") (list "du" opts))
- ((file-executable-p "/usr/sbin/du")
- (list "/usr/sbin/du" opts))
- ((file-executable-p "/etc/du") (list "/etc/du" opts)))))
- "Program and its options to get recursively the total size of a directory.
-We assume the output has the format of `du'.
-A value of nil disables this feature."
- :type '(choice (const :tag "Unset" nil)
- (list (string :tag "Program")
- (repeat :tag "Options"
- :inline t
- (string :format "%v")))))
-
-(defvar dired-du--user-warned (and dired-du-used-space-program t)
- "Nil if the user must be warned about \
-`dired-du-used-space-program' being nil.")
-
-(defcustom dired-du-size-format nil
- "Set the format for file sizes.
-If equals t, then `dired-du-count-sizes' displays file
-sizes using `file-size-human-readable'.
-
-If equals 'comma, then `dired-du-count-sizes' displays
-file sizes using thousands comma separator.
-
-Otherwise display file sizes in default numeric format."
- :type '(choice
- (const :tag "Use default numeric format" nil)
- (const :tag "Use human readable string" t)
- (const :tag "Use thousands comma separator" 'comma)))
-
-(defcustom dired-du-on-find-dired-ok nil
- "If Non-nil show recursive dir sizes in `find-dired'.
-The format to display the file sizes is control by
-`dired-du-size-format'."
- :type 'boolean)
-
-(defvar dired-du-find-dired-buffer nil
- "Non-nil if current buffer is a `find-dired' buffer.
-When `dired-du-on-find-dired-ok' evaluates non-nil, then this
-buffer show recursive dir sizes with format according with
-`dired-du-size-format' if the mode is enabled.")
-(make-variable-buffer-local 'dired-du-find-dired-buffer)
-
-(defcustom dired-du-update-headers nil
- "If Non-nil, update the subdir headers.
-The total used space shown contains the recursive size of the directories."
- :type 'boolean)
-
-(defvar dired-du-local-subdir-header
- "^ total used in directory \\([,.0-9]+[BkKMGTPEZY]?\\) \
-available \\([,.0-9]+[BkKMGTPEZY]?\\)"
- "Regexp matching a subdir header in a Dired buffer in the local host.")
-
-(defvar dired-du-remote-subdir-header
- "^ total \\([,.0-9]+[BkKMGTPEZY]?\\)"
- "Regexp matching a subdir header in a Dired buffer visiting a remote host.")
-
-(defvar dired-du-filesp-subdir-header
- "^ *files \\([,0-9]+\\)/\\([,0-9]+\\) space used \
-\\([,.0-9]+[BkKMGTPEZY]?\\) available \\([,.0-9]+[BkKMGTPEZY]?\\)"
- "Regexp matching a subdir header in a Dired buffer using lib `files+'.")
-
-
-
-(defcustom dired-du-bind-mode t
- "Non-nil means bind `dired-du-mode' to C-x M-r in `dired-mode-map',
otherwise do not."
- :type 'boolean
- :set (lambda (sym val)
- (let ((map dired-mode-map))
- (when (set sym val)
- (define-key map (kbd "C-x M-r") 'dired-du-mode))))
- :group 'dired-keys)
-
-(defcustom dired-du-bind-human-toggle t
- "Non-nil means bind `dired-du--toggle-human-readable' to C-x C-h in
`dired-mode-map', otherwise do not."
- :type 'boolean
- :set (lambda (sym val)
- (let ((map dired-mode-map))
- (when (set sym val)
- (define-key map (kbd "C-x C-h")
'dired-du--toggle-human-readable))))
- :group 'dired-keys)
-
-(defcustom dired-du-bind-count-sizes t
- "Non-nil means bind `dired-du-count-sizes' to *N in `dired-mode-map',
otherwise do not."
- :type 'boolean
- :set (lambda (sym val)
- (let ((map dired-mode-map))
- (when (set sym val)
- (define-key map "*N" 'dired-du-count-sizes))))
- :group 'dired-keys)
-
-;;; Macros.
-
-(defmacro dired-du-with-saved-marks (&rest body)
- "Save alist of files and their marks; execute BODY; restore the marks.
-The value returned is the value of the last form in BODY."
- (declare (indent 0) (debug t))
- (let ((saved-marks (make-symbol "saved-marks"))
- (new-marks (make-symbol "new-marks")))
- `(let ((,saved-marks (dired-remember-marks (point-min) (point-max))))
- (unwind-protect
- (progn ,@body)
- (let ((,new-marks (dired-remember-marks (point-min) (point-max))))
- (unless (equal ,saved-marks ,new-marks)
- (dired-du-unmark-buffer)
- (let ((inhibit-read-only t))
- (dired-mark-remembered ,saved-marks))))))))
-
-;; As `dired-map-over-marks' but with additional arg ALL-MARKS.
-(defmacro dired-du-map-over-marks (body arg &optional show-progress
- distinguish-one-marked
- marker-char all-marks)
- "Eval BODY with point on each marked line. Return a list of BODY's results.
-If no marked file could be found, execute BODY on the current
-line. ARG, if non-nil, specifies the files to use instead of the
-marked files.
-
-If ARG is an integer, use the next ARG (or previous -ARG, if
-ARG<0) files. In that case, point is dragged along. This is so
-that commands on the next ARG (instead of the marked) files can
-be chained easily.
-For any other non-nil value of ARG, use the current file.
-
-If optional third arg SHOW-PROGRESS evaluates to non-nil,
-redisplay the dired buffer after each file is processed.
-
-No guarantee is made about the position on the marked line.
-BODY must ensure this itself if it depends on this.
-
-Search starts at the beginning of the buffer, thus the car of the
-list corresponds to the line nearest to the buffer's bottom.
-This is also true for (positive and negative) integer values of
-ARG.
-
-BODY should not be too long as it is expanded four times.
-
-If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one
-marked file, return (t FILENAME) instead of (FILENAME).
-
-If MARKER-CHAR is non-nil, then it is the mark
-character to search. Otherwise use `dired-marker-char'.
-
-If ALL-MARKS is non-nil, accept all mark characters. Otherwise use
-just MARKER-CHAR."
- ;;
- ;;Warning: BODY must not add new lines before point - this may cause an
- ;;endless loop.
- ;;This warning should not apply any longer, sk 2-Sep-1991 14:10.
- `(prog1
- (let ((inhibit-read-only t) case-fold-search found results)
- (if ,arg
- (if (integerp ,arg)
- (progn ;; no save-excursion, want to move point.
- (dired-repeat-over-lines
- ,arg
- (function (lambda ()
- (if ,show-progress (sit-for 0))
- (setq results (cons ,body results)))))
- (if (< ,arg 0)
- (nreverse results)
- results))
- ;; non-nil, non-integer ARG means use current file:
- (list ,body))
- (let ((regexp (dired-du-marker-regexp ,marker-char ,all-marks))
- next-position)
- (save-excursion
- (goto-char (point-min))
- ;; remember position of next marked file before BODY
- ;; can insert lines before the just found file,
- ;; confusing us by finding the same marked file again
- ;; and again and...
- (setq next-position (and (re-search-forward regexp nil t)
- (point-marker))
- found (not (null next-position)))
- (while next-position
- (goto-char next-position)
- (if ,show-progress (sit-for 0))
- (setq results (cons ,body results))
- ;; move after last match
- (goto-char next-position)
- (forward-line 1)
- (set-marker next-position nil)
- (setq next-position (and (re-search-forward regexp nil t)
- (point-marker)))))
- (if (and ,distinguish-one-marked (= (length results) 1))
- (setq results (cons t results)))
- (if found
- results
- (list ,body)))))
- ;; save-excursion loses, again
- (dired-move-to-filename)))
-
-
-;;; Advice `find-dired'.
-;; Set buffer local variable `dired-du-find-dired-buffer' non-nil
-;; on the output buffer of `find-dired' commands.
-;; Substitute recursive dir sizes in those buffers only if
-;; `dired-du-on-find-dired-ok' non-nil.
-
-(defun dired-du--find-dired-around (orig-fun &rest args)
- "Advice function for `find-dired-sentinel'.
-Set `dired-du-find-dired-buffer' non-nil in current buffer
-and run `dired-after-readin-hook'.
-ORIG-FUN is the original `find-dired-sentinel'.
-ARGS are the arguments for `find-dired-sentinel'."
- (setq dired-du-find-dired-buffer t)
- (let ((res (apply orig-fun args)))
- (unless (featurep 'find-dired+)
- (run-hooks 'dired-after-readin-hook))
- res))
-
-
-;; As `dired-du-get-marked-files' but with additional arg ALL-MARKS.
-(defun dired-du-get-marked-files (&optional localp arg filter
- distinguish-one-marked
- marker-char all-marks)
- "Return the marked files names as a list of strings.
-The list is in the same order as the buffer, that is, the car is the
- first marked file.
-Values returned are normally absolute file names.
-Optional arg LOCALP as in `dired-get-filename'.
-Optional second argument ARG, if non-nil, specifies files near
- point instead of marked files. It usually comes from the prefix
- argument.
- If ARG is an integer, use the next ARG files.
- If ARG is any other non-nil value, return the current file name.
- If no files are marked, and ARG is nil, also return the current file name.
-Optional third argument FILTER, if non-nil, is a function to select
- some of the files--those for which (funcall FILTER FILENAME) is non-nil.
-
-If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file,
-return (t FILENAME) instead of (FILENAME).
-Don't use that together with FILTER.
-
-Optional arg MARKER-CHAR, if non-nil, then it is the mark
-character to search. Otherwise use `dired-marker-char'.
-
-Optional arg ALL-MARKS, if non-nil, then accept all mark characters.
-Otherwise use just MARKER-CHAR."
- (let ((all-of-them
- (save-excursion
- (delq nil (dired-du-map-over-marks
- (dired-get-filename localp 'no-error-if-not-filep)
- arg nil distinguish-one-marked marker-char all-marks))))
- result)
- (when (equal all-of-them '(t))
- (setq all-of-them nil))
- (if (not filter)
- (if (and distinguish-one-marked (eq (car all-of-them) t))
- all-of-them
- (nreverse all-of-them))
- (dolist (file all-of-them)
- (if (funcall filter file)
- (push file result)))
- result)))
-
-;; As `dired-marker-regexp' but with optional args. MARKER-CHAR and ALL-MARKS.
-(defun dired-du-marker-regexp (&optional marker-char all-marks)
- "Return a regexp matching `dired-marker-char' at the beginning of line.
-If MARKER-CHAR evaluates non-nil, then the regexp matches MARKER-CHAR
-instead of `dired-marker-char'.
-If optional argument ALL-MARKS evaluates to non-nil, then the regexp
-matches any mark character."
- (if all-marks
- dired-re-mark
- (concat "^"
- (regexp-quote
- (char-to-string (or marker-char dired-marker-char))))))
-
-(defsubst dired-du-link-number (attributes)
- "Return the number of links in ATTRIBUTES returned by `file-attributes'."
- (nth 1 attributes))
-
-(defsubst dired-du-modification-time (attributes)
- "The modification time in ATTRIBUTES returned by `file-attributes'.
-This is the time of the last change to the file's contents, and
-is a list of integers (HIGH LOW USEC PSEC) in the same style
-as (current-time)."
- (nth 5 attributes))
-
-(defsubst dired-du-size (attributes)
- "The size (in bytes) in ATTRIBUTES returned by `file-attributes'.
-This is a floating point number if the size is too large for an integer."
- (nth 7 attributes))
-
-
-;;; Toggle on `dired-du-on-find-dired-ok'.
-
-(defun dired-du-on-find-dired-ok-toggle ()
- "Toggle on `dired-du-on-find-dired-ok'."
- (interactive)
- (setq dired-du-on-find-dired-ok
- (not dired-du-on-find-dired-ok))
- (if dired-du-on-find-dired-ok
- (message "Enabled `dired-du-on-find-dired-ok'")
- (message "Disabled `dired-du-on-find-dired-ok'"))
- (when dired-du-find-dired-buffer
- (cond ((and dired-du-on-find-dired-ok
- dired-du-mode)
- (dired-du--replace))
- ((not dired-du-on-find-dired-ok)
- (revert-buffer)))))
-
-
-;;; Handle sizes with thousands comma separator.
-(defun dired-du-string-to-number (str)
- "Like `string-to-number' but recognize a trailing unit prefix.
-For example, 2K is expanded to 2048.0. The caller should make
-sure that a trailing letter in STR is one of BKkMGTPEZY.
-It handles thousands comma separator."
- (let* ((str-new (replace-regexp-in-string "," "" str))
- (val (string-to-number str-new))
- (u (unless (zerop val)
- (aref str-new (1- (length str-new))))))
- (when (and u (> u ?9))
- (when (= u ?k)
- (setq u ?K))
- (let ((units '(?B ?K ?M ?G ?T ?P ?E ?Z ?Y)))
- (while (and units (/= (pop units) u))
- (setq val (* 1024.0 val)))))
- val))
-
-(defun dired-du-use-comma-separator (num)
- "Return number NUM as an string using comma separator."
- (replace-regexp-in-string
- "^," ""
- (apply #'string
- (reverse
- (string-to-list
- (replace-regexp-in-string
- ",\\." "."
- (replace-regexp-in-string
- "\\([0-9]\\{3\\}\\)" "\\1,"
- (apply #'string
- (reverse
- (string-to-list
- (replace-regexp-in-string
- "\\.0$" ""
- (number-to-string
- num))))))))))))
-
-
-;;; Functions to obtain recursive dir size.
-(defsubst dired-du-assert-dired-mode ()
- "Ensure current buffer is in `dired-mode'."
- (cl-assert (derived-mode-p 'dired-mode)))
-
-(defun dired-du-directory-at-current-line-p ()
- "Return non-nil if there is a directory at current line in the Dired buffer."
- (dired-du-assert-dired-mode)
- (save-excursion
- (goto-char (line-beginning-position)) (looking-at-p dired-re-dir)))
-
-(defun dired-du-filename-relative-to-default-dir (&optional file)
- "Return the filename relative to default directory of a file.
-Optional arg FILE, if non-nil, then is the file relative or fullname.
-Otherwise use the file at the current line in the Dired buffer."
- (if (not file)
- (dired-get-filename t t)
- (let ((basename (file-name-nondirectory file))
- (relname (file-relative-name file)))
- (cond ((member basename '("." ".."))
- (let ((dir (file-name-directory file)))
- (cond (dir
- (concat
- (file-name-as-directory
- (file-name-nondirectory
- (directory-file-name
- dir))) basename))
- (t
- file))))
- (t
- relname)))))
-
-(defun dired-du--read-size-from-buffer ()
- "Return displayed size for file at current line as a decimal number."
- (save-excursion
- (when (dired-move-to-filename)
- (re-search-backward
- directory-listing-before-filename-regexp)
- (let ((pos (progn (skip-chars-forward "^ \t") (point))))
- (skip-chars-backward "^ \t")
- (dired-du-string-to-number
- (buffer-substring-no-properties (point) pos))))))
-
-
-(defun dired-du--get-recursive-dir-size (dir-rel)
- "Return recursive directory size for DIR-REL."
- (let ((size 0)
- (dired-buffer (current-buffer)))
- (with-temp-buffer
- (if dired-du-used-space-program
- (process-file (car dired-du-used-space-program)
- nil t nil
- (cadr dired-du-used-space-program)
- dir-rel)
- ;; `du' not available: estimate the size with Lisp as
- ;; the size of all the regular files under this dir. This is
- ;; an underestimation, but it's OK for most of the cases.
- (require 'find-lisp)
- (with-no-warnings
- (let* ((files (ignore-errors ; Ignore permission denied errors.
- (find-lisp-find-files dir-rel "")))
- (tmp (if (null files)
- (with-current-buffer dired-buffer
- (dired-du--read-size-from-buffer))
- (apply #'+ (mapcar
- (lambda (f)
- (dired-du-size
- (file-attributes f)))
- files)))))
- (insert (format "%d" tmp)))))
- (goto-char 1)
- (while (re-search-forward "^[0-9]+" nil t)
- (setq size (+ size (string-to-number (match-string 0))))))
- size))
-
-(defun dired-du-get-recursive-dir-size ()
- "Return recursive directory size for dir at current line.
-If there is not a directory in the current line return nil."
- (dired-du-assert-dired-mode)
- (when (dired-du-directory-at-current-line-p)
- ;; remote files need relative name.
- (let ((dir-rel (dired-get-filename t 'noerror)))
- (dired-du--get-recursive-dir-size dir-rel))))
-
-(defun dired-du-run-in-parallel (command out-buf)
- "Run COMMAND for several files in parallel.
-Like `dired-run-shell-command' but adding optional arg OUT-BUF and not
-displaying the buffer associated to the shell process."
- ;; prevent showing temp buffer.
- (let ((display-buffer-alist (cons '(" \\*temp\\*"
- (display-buffer-no-window)
- (allow-no-window . t))
- display-buffer-alist))
- (handler
- (find-file-name-handler (directory-file-name default-directory)
- 'shell-command)))
- (if handler (apply handler 'shell-command (list command out-buf))
- (shell-command command out-buf))
- ;; change process sentinel to avoid showing a large command in the echo
area.
- (let ((sentinel (lambda (process signal)
- (when (memq (process-status process) '(exit signal))
- (message "collection of recursive dir size: %s."
- (substring signal 0 -1))
- (message nil)))))
- (set-process-sentinel (get-buffer-process out-buf) sentinel)))
- ;; return nil for sake of nconc in dired-bunch-files.
- nil)
-
-(defun dired-du-get-recursive-dir-size-in-parallel (dirs)
- "Get recursive directory size for DIRS.
-DIRS is a list of directories.
-The return value is an alist (DIRNAME . SIZE)."
- (dired-du-assert-dired-mode)
- (save-excursion
- (let ((dirs-rel (mapcar #'file-relative-name dirs))
- (command (format "%s %s&" (car dired-du-used-space-program)
- (cadr dired-du-used-space-program)))
- (prep (make-progress-reporter
- "Dired-Du collecting recursive dir sizes, please wait ..."
- 0 (length dirs)))
- result)
- (dired-bunch-files
- (- 10000 (length command))
- (function (lambda (&rest files)
- (with-temp-buffer
- (let ((buff (current-buffer)))
- (dired-du-run-in-parallel
- (dired-shell-stuff-it
- command files 'on-each)
- buff)
- (let ((proc (get-buffer-process buff)))
- ;; wait until all files processed.
- (while (eq (process-status proc) 'run)
- (let ((completed (count-lines (point-min)
- (point-max)))
- (old 0))
- (unless (= completed old)
- (progress-reporter-force-update
- prep
- completed
- (format
- "Dired-Du collecting dir sizes ...(%d/%d) "
- completed
- (length dirs)))
- (setq old completed))
- (setq completed (count-lines (point-min)
- (point-max)))
- ;; Give a bit of time to the process to end.
Initially we
- ;; were waiting 1 s; it turned out to be too
conservative value.
- ;; TODO: Shouldn't this be run in a sentinel?
- (sleep-for 0 10))))
- ;; collect dir sizes.
- (goto-char 1)
- (while (re-search-forward "^[0-9]+" nil t)
- (let ((size (string-to-number (match-string 0)))
- (dir-name (progn
- (skip-chars-forward " \t")
- (buffer-substring-no-properties
- (point)
- (line-end-position)))))
- (push (cons dir-name size) result)))))))
- nil
- dirs-rel) result)))
-
-
-;;; Query functions for `dired-du-dir-info'.
-
-(defun dired-du--get-position-1 (name &optional dir-info)
- "Return position of NAME in DIR-INFO."
- ;; (unless dir-info (setq dir-info (cdar dired-du-dir-info)))
- (let ((elt (cond ((hash-table-p dir-info)
- (gethash name dir-info))
- (t (assoc name dir-info)))))
- (when elt
- (cl-position elt dir-info :test #'equal))))
-
-(defun dired-du--get-position (name &optional dir-info glob-pos)
- "Return position of NAME in DIR-INFO.
-Optional arg DIR-INFO, if non-nil, is an alist with same structure as
-`dired-du-dir-info'. Otherwise defaults to `dired-du-dir-info'.
-
-Optional arg GLOB-POS, if non-nil, is the global position
-in DIR-INFO of the alist containing (KEY . VALUE). Otherwise, it
-is obtained inside this function.
-
-Return value is a cons (GLOB-POS . REL-POS); REL-POS is the
-position of NAME in the alist.
-
-If NAME is not found in DIR-INFO return nil."
- (unless dir-info
- (setq dir-info (dired-du--create-or-check-dir-info)))
- (let ((info (cl-remove-if-not (lambda (x) (cdr-safe x)) dir-info))
- res)
- (when info
- (cl-labels ((fn (v alist gpos)
- (let ((rpos (dired-du--get-position-1 v (cdr alist))))
- (when rpos
- (setq res
- (cons
- (or gpos
- (dired-du--subdir-position (car alist)))
- rpos))))))
- (if glob-pos
- (let ((local-info (nth glob-pos dir-info)))
- (if (not (consp local-info))
- (setq res nil)
- (fn name local-info glob-pos)))
- (catch 'found ; Loop on info.
- (dolist (local-info info)
- (when (fn name local-info nil)
- (throw 'found nil))))))) res))
-
-(defun dired-du-alist-get (key alist &optional default)
- "Return the value associated with KEY in ALIST, using `assq'.
-If KEY is not found in ALIST, return DEFAULT."
- (let ((x (assq key alist)))
- (if x (cdr x) default)))
-
-(defun dired-du--get-value (name key &optional dir-info glob-pos)
- "Return for file NAME its VALUE in (KEY . VALUE).
-KEY is a symbol.
-Optional arg DIR-INFO, if non-nil, is an alist with same structure as
-`dired-du-dir-info'. Otherwise defaults to
-`dired-du-dir-info'.
-
-Optional arg GLOB-POS, if non-nil, is the global position
-in DIR-INFO of the alist containing (KEY . VALUE). Otherwise, it
-is obtained inside this function.
-
-If name is not found in DIR-INFO return nil."
- (unless dir-info
- (setq dir-info dired-du-dir-info))
- (let ((pos (dired-du--get-position name dir-info glob-pos))
- info value)
- (when pos
- (let ((global-pos (car pos))
- (rel-pos (cdr pos)))
- (setq info (cdr (nth global-pos dir-info))
- value (dired-du-alist-get key (nth rel-pos info)))))
- value))
-
-(defun dired-du--subdir-position (subdir)
- "Return the position of SUBDIR in `dired-du-dir-info'.
-SUBDIR should be a fullname.
-If SUBDIR is not found return nil."
- (dired-du--create-or-check-dir-info)
- (cl-position-if (lambda (x)
- (let ((dir (car-safe x)))
- (and (stringp dir)
- (string= dir subdir))))
- dired-du-dir-info))
-
-(defun dired-du--fullname-to-glob-pos (dir)
- "Return the global index of DIR in `dired-du-dir-info'."
- (let ((rel-name (file-relative-name dir)))
- (car (dired-du--get-position rel-name))))
-
-(defun dired-du--file-in-dir-info-p (file &optional dir-info)
- "Return non-nil if FILE is included in DIR-INFO."
- (let ((relname (dired-du-filename-relative-to-default-dir file))
- (glob-pos (dired-du--fullname-to-glob-pos file)))
- (dired-du--get-position relname dir-info glob-pos)))
-
-(defun dired-du--create-or-check-dir-info (&optional keep-drop-dirs)
- "Initialize `dired-du-dir-info' and return it.
-Initial value is just a list with the subdir names included in the
-Dired buffer. If there are subdirs not included in `dired-du-dir-info'
-then they are added.
-
-Optional arg KEEP-DROP-DIRS, when evaluates non-nil, keep the information of
-subdirectories shown before. Otherwise that information is discarded for
-performance reasons."
- (let* ((subdir-alist dired-subdir-alist)
- (num-subdirs (length subdir-alist)))
- (cond ((not dired-du-dir-info)
- (setq dired-du-dir-info
- (mapcar (lambda (x) (cons (car x) nil)) subdir-alist)))
- ((> num-subdirs ; add missing subdirs.
- (length dired-du-dir-info))
- (let ((subdirs (mapcar #'car subdir-alist)))
- (dolist (dir subdirs)
- (unless (assoc-string dir dired-du-dir-info)
- (push (list dir) dired-du-dir-info)))))
- ((and (< num-subdirs ; drop subdirs not shown anymore.
- (length dired-du-dir-info))
- (not keep-drop-dirs))
- (setq dired-du-dir-info
- (cl-delete-if
- (lambda (x)
- (let ((old (car-safe x)))
- (and (stringp old)
- (not (assoc-string old subdir-alist)))))
- dired-du-dir-info))))
- dired-du-dir-info))
-
-
-;;; Get info for file at current line.
-
-(defun dired-du-get-file-info (&optional glob-pos dir-dots dir-size)
- "Get file info for file at current line in dired buffer.
-Optional arg GLOB-POS, when non-nil, is the position in
-`dired-du-dir-info' to look up. Otherwise, look in all positions.
-
-Optional arg DIR-DOTS, if non-nil, then obtain the recursive dir size
-for '.' and '..' as well. Otherwise obtain their size from the buffer.
-
-Optional arg DIR-SIZE, if non-nil, is the recursive dir size for the
-the file in the current dired line."
- ;; code for this function is borrowed from dired-x.el::dired-mark-sexp
- (let ((remote-dir (file-remote-p default-directory))
- nlink gid size time time-mod
- name time-cache size-cache nlink-cache change isdir)
- (save-excursion
- (dired-du--create-or-check-dir-info)
- (if (dired-move-to-filename)
- (let ((mode-len 10)
- (filename (and (null remote-dir)
- (dired-get-filename 'local 'noerror)))
- ;; When the buffer is remote, all information but the recursize
- ;; dir size, is collected from the buffer for performance
- ;; reasons; this may cause a lost in the precision
- ;; if a file has time-cache equals to its modification time.
- ;; For instance, if the file has a cached time "mar 19 12:46",
- ;; and it changes its size before "mar 19 12:47", then neither
- ;; the time-cache nor the size-cache are updated.
- ;; For local files the file information is collected with
- ;; `file-attributes',so in the previous example file would
- ;; update its size on the buffer.
- (attributes (and (null remote-dir)
- (file-attributes
- (dired-get-filename nil 'noerror) 'string)))
- (dired-re-inode-size "\\=\\s *\\([0-9]+\\s +\\)?\
-\\(?:\\([0-9]+\\(?:\\.[0-9]*\\)?[BkKMGTPEZY]?\\)? ?\\)"))
- (beginning-of-line)
- (forward-char 2)
- (re-search-forward dired-re-inode-size nil t)
- (setq isdir (dired-du-directory-at-current-line-p))
- (cond (remote-dir ; collect info from buffer
- ;; xxx might be a size not followed by a unit prefix.
- ;; we could set s to inode if it were otherwise nil,
- ;; with a similar reasoning as below for setting gid to uid,
- ;; but it would be even more whimsical.
- ;; (setq inode (when (match-string 1)
- ;; (string-to-number (match-string 1)))
- (setq nlink
- (progn
- (forward-char mode-len)
- ;; skip any extended attributes marker ("." or "+").
- (or (looking-at-p " ")
- (forward-char 1))
- (read (current-buffer)))
- name
- (progn
- (dired-move-to-filename)
- (buffer-substring-no-properties
- (point)
- (or
- (dired-move-to-end-of-filename t)
- (point)))))
- ;; the name stored is the relative name to
default-directory.
- ; In non-remote case, its returned by
- (let* ((basename (file-name-nondirectory name))
- (fullname
- (if (member basename '("." ".."))
- (concat
- (file-name-as-directory
- (dired-current-directory))
- basename)
- (expand-file-name name default-directory))))
- (setq name
- (dired-du-filename-relative-to-default-dir
- fullname))))
- (t
- ;; collect info from file system
- ;; gid read from buffer: user may disable gid display;
- ;; we need the the string in the left of the size,
- ;; whatever it is (uid/gid).
- (setq nlink (dired-du-link-number attributes)
- time-mod (dired-du-modification-time attributes)
- name filename)))
- (setq time-cache (dired-du--get-value name 'time nil glob-pos)
- size-cache (dired-du--get-value name 'size nil glob-pos)
- nlink-cache (dired-du--get-value name 'nlink nil glob-pos))
- (dired-move-to-filename)
- (save-excursion
- (setq time
- (cond (remote-dir
- ;; the regexp below tries to match from the last
- ;; digit of the size field through a space after
- ;; the date. Also, dates may have different
- ;; formats depending on file age, so the date
- ;; column need not be aligned to the right.
- (buffer-substring-no-properties
- (save-excursion
- (skip-chars-backward " \t")
- (point))
- (progn
- (re-search-backward
- directory-listing-before-filename-regexp)
- (skip-chars-forward "^ \t")
- (1+ (point)))))
- (t ; local file
- (progn
- (re-search-backward
- directory-listing-before-filename-regexp)
- (skip-chars-forward "^ \t")
- (format "%s" time-mod))))
- size (let ((size-on-buffer
- (dired-du-string-to-number
- (buffer-substring-no-properties
- (point)
- (progn
- (skip-chars-backward "^ \t")
- (point))))))
- (cond ((member
- (file-name-nondirectory name) '("." ".."))
- (let* ((size-file size-on-buffer)
- (size-human
- (file-size-human-readable size-file))
- (size-no-human
- (format "%d" size-file))
- (size-comma
- (dired-du-use-comma-separator
- size-file))
- (fn (lambda (human default size-comma)
- (cond ((eq t
dired-du-size-format)
- human)
- ((null
dired-du-size-format)
- default)
- (t
- size-comma)))))
- (cond ((null dir-dots)
- (funcall fn size-human size-no-human
- size-comma))
- (t ; obtain recursive size also\
- ; for '.' and
'..'.
- (let* ((size-dir
- (or dir-size
-
(dired-du-get-recursive-dir-size)))
- (size-human
- (file-size-human-readable
- size-dir))
- (size-no-human
- (format "%d" size-dir))
- (size-comma
-
(dired-du-use-comma-separator
- size-dir)))
- (funcall fn size-human
- size-no-human
- size-comma))))))
- ((and dired-du-mode
- (dired-du-directory-at-current-line-p))
- (let* ((size-recur
- (or (and (string= time time-cache)
- (= nlink nlink-cache)
- (dired-du-string-to-number
- size-cache))
- (or
- dir-size
-
(dired-du-get-recursive-dir-size))))
- (recursive-size
- (cond ((eq t dired-du-size-format)
- (file-size-human-readable
- size-recur))
- ((null dired-du-size-format)
- (format "%d" size-recur))
- (t
- (dired-du-use-comma-separator
- size-recur)))))
- recursive-size))
- (t
- (let* ((size-file
- (progn
- (dired-du-string-to-number
- (format "%d" size-on-buffer))))
- (size-human
- (file-size-human-readable size-file))
- (size-no-human
- (format "%d" size-file))
- (size-comma
- (dired-du-use-comma-separator
- size-file)))
- (cond ((eq t dired-du-size-format)
- size-human)
- ((null dired-du-size-format)
- size-no-human)
- (t
- size-comma))))))
- gid (buffer-substring-no-properties
- (progn
- (skip-chars-backward " \t")
- (point))
- (progn
- (skip-chars-backward "^ \t")
- (point)))
- ;; set update change flag.
- change (cond ((and (dired-du-directory-at-current-line-p)
- (not (string= size size-cache)))
- 'change-size)
- (t
- (or
- (not (string= size size-cache))
- (not (= nlink nlink-cache))
- (not (string= time time-cache)))))))
- (cons name
- (list
- (cons 'nlink nlink)
- (cons 'gid gid)
- (cons 'size size)
- (cons 'time time)
- (cons 'isdir isdir)
- (cons 'change change))))
- nil))))
-
-(defun dired-du-get-file-size-local ()
- "Return size for non-directory at current line."
- (dired-du-assert-dired-mode)
- (unless (dired-du-directory-at-current-line-p)
- (dired-du-size (file-attributes (dired-get-filename)))))
-
-(defun dired-du-get-file-size-remote ()
- "Return size for file at current line.
-The return value is the size shown in the Dired buffer.
-To return the recursive size of directories use
-`dired-du-get-recursive-dir-size'."
- (dired-du-assert-dired-mode)
- ;; (unless (dired-du-directory-at-current-line-p)
- (save-excursion
- (dired-move-to-filename)
- (re-search-backward directory-listing-before-filename-regexp)
- (skip-chars-forward "^ \t")
- (backward-char 1)
- (dired-du-string-to-number
- (buffer-substring-no-properties
- (1+ (point))
- (save-excursion
- (skip-chars-backward "^ \t")
- (point))))));)
-
-
-;;; Mark/Unmark subdirs or whole buffer (including "." and "..").
-
-(defun dired-du-mark-subdir-files (&optional mark must-exist)
- "Mark all files in current subdirectory.
-Optional arg MARK, if non-nil, then is the character mark used.
-Otherwise use `dired-marker-char'.
-Optional arg MUST-EXIST, if non-nil, hide non-existent files.
-
-Directories '.' and '..' are also marked."
- (save-restriction
- (narrow-to-region (dired-subdir-min)
- (dired-subdir-max))
- (dired-du-mark-buffer mark must-exist)))
-
-(defun dired-du-mark-buffer (&optional mark must-exist)
- "Mark all files in the Dired buffer.
-Optional arg MARK, if non-nil, then is the character mark used.
-Otherwise use `dired-marker-char'.
-Optional arg MUST-EXIST, if non-nil, hide non-existent files.
-
-Directories '.' and '..' are also marked."
- (let ((dired-marker-char (or mark dired-marker-char)))
- (save-excursion
- (dired-mark-files-in-region (point-min) (point-max))
- ;; Handle '.' and '..'
- (let ((inhibit-read-only t))
- (goto-char (point-min))
- (while (re-search-forward dired-re-dot (point-max) t)
- (goto-char (line-beginning-position))
- (delete-char 1)
- (insert dired-marker-char))))
- (when (and must-exist (not (eq dired-marker-char ?\s)))
- (dired-du-map-over-marks
- (let ((file (dired-get-filename t t))
- (inhibit-read-only t))
- (when (and file (not (file-exists-p file)))
- (delete-region (line-beginning-position)
- (progn (forward-line 1) (point)))))
- nil) nil)))
-
-(defun dired-du-unmark-buffer (&optional mark)
- "Remove MARK from all files in the Dired buffer.
-If MARK evaluates nil, remove any mark.
-
-Like `dired-du-unmark-buffer' but don't print
-any message in the echo area."
- (cond ((null mark)
- (dired-du-mark-buffer ?\s))
- (t
- (let ((start (point-min))
- (end (point-max))
- (regexp (dired-du-marker-regexp mark))
- (inhibit-read-only t))
- (save-excursion
- (goto-char start)
- (while (re-search-forward regexp end t)
- (goto-char (line-beginning-position))
- (delete-char 1)
- (insert-char ?\s)))))))
-
-
-;;; Update subdir headers.
-
-(defun dired-du--update-subdir-header-1 (size-data)
- "Helper function for `dired-du--update-subdir-header'.
-SIZE-DATA are the numbers in the subdir header line."
- (let ((inhibit-read-only t))
- (dotimes (i (length size-data))
- (let* ((j (1+ i))
- (fn (lambda ()
- (cond ((eq t dired-du-size-format)
- (let ((fn2 (if (or (> j 2)
- (< (length size-data) 4))
- (function file-size-human-readable)
- (lambda (x) (format "%d" x)))))
- (replace-match (funcall fn2
- (dired-du-string-to-number
- (nth i size-data)))
- nil nil nil j)))
- ((null dired-du-size-format)
- (replace-match (format "%d"
- (dired-du-string-to-number
- (nth i size-data)))
- nil nil nil j))
- (t
- (replace-match (dired-du-use-comma-separator
- (dired-du-string-to-number
- (nth i size-data)))
- nil nil nil j))))))
- (funcall fn)))))
-
-(defun dired-du--update-subdir-header (subdir &optional file-info)
- "Show numbers in SUBDIR header according with `dired-du-size-format'.
-Optional arg FILE-INFO, if non-nil, is the file info for SUBDIR files."
- (when dired-du-update-headers
- (let ((fn (lambda () (let (new-info)
- (save-excursion
- (when (dired-move-to-filename)
- (setq new-info (dired-du-get-file-info))
- new-info)))))
- (local dired-du-local-subdir-header)
- (remote dired-du-remote-subdir-header)
- (filesp dired-du-filesp-subdir-header)
- limit used-space available-space num-files
- num-tot-files size-data num-matches)
- (save-excursion
- (dired-goto-subdir subdir)
- (save-excursion (forward-line 2) (setq limit (point)))
- (when (save-excursion
- (or (re-search-forward local limit t)
- (re-search-forward remote limit t)
- (re-search-forward filesp limit t)))
- (setq num-matches (/ (- (length (match-data)) 2) 2)
- used-space
- (save-match-data
- (cond ((null dired-du-mode)
- (match-string (1- num-matches)))
- (t
- (unless file-info
- (setq file-info
- (delq nil
- (dired-du-with-saved-marks
- (save-excursion
- (dired-du-mark-subdir-files
- nil 'must-exist)
- (dired-du-map-over-marks
- (funcall fn) nil nil nil))))))
- (let ((size
- (apply #'+
- (mapcar
- (lambda (x)
- (dired-du-string-to-number
- (dired-du-alist-get 'size x)))
- file-info))))
- (format "%d" size)))))
- num-files (match-string 1) ; equals used-space for local
- num-tot-files (match-string 2) ; equals available-space for
local
- ;; The available-space is shown in kb when
- ;; `directory-free-space-args' is set to its default value
(-Pk);
- ;; it may be shown in other units if the user has changed
- ;; `directory-free-space-args'.
- ;; To convert available-space to bytes, its better call
- ;; `directory-free-space-program' again with
- ;; `directory-free-space-args' bind to "-Pk".
- available-space
- (and (not (file-remote-p default-directory))
- (let ((directory-free-space-args "-Pk"))
- (format "%d"
- (* 1024
- (dired-du-string-to-number
- (get-free-disk-space
- (dired-current-directory)))))))
- size-data (list num-files
- num-tot-files
- used-space
- available-space))
- (cond ((re-search-forward local limit t)
- (dired-du--update-subdir-header-1 (nthcdr 2 size-data)))
- ((re-search-forward remote limit t)
- (dired-du--update-subdir-header-1 (list (nth 2 size-data))))
- ((re-search-forward filesp limit t)
- (dired-du--update-subdir-header-1 size-data))))))))
-
-
-;;; Obtain required width for the column showing file sizes.
-
-(defun dired-du--get-num-extra-blanks (dir-info)
- "Return the minimum width of size column to fit the largest dir size.
-DIR-INFO is the alist with file info as in `dired-du-get-file-info'.
-
-Return value is a list
-\(NUM-BLANKS NUM-BLANKS-HUMAN NUM-BLANKS-COMMA MAX-GID-LEN).
-
-NUM-BLANKS is the minimum width of the size column to show the largest
-directory size.
-
-NUM-BLANKS-HUMAN is the minimum width of the size column to show the largest
-directory size using human readable units.
-
-NUM-BLANKS-COMMA is the minimum width of the size column to show the largest
-directory size using thousands comma separator.
-
-MAX-GID-LEN is the largest element of the column just left side of
-the size column; usually the gid, but the code is agnostic about the
-meaning of such column."
- (let* ((fn (lambda (x)
- (length
- (format "%d"
- (dired-du-string-to-number
- (dired-du-alist-get 'size x))))))
- (fn2 (lambda (x)
- (length (file-size-human-readable
- (dired-du-string-to-number
- (dired-du-alist-get 'size x))))))
- (fn3 (lambda (x)
- (length (dired-du-use-comma-separator
- (dired-du-string-to-number
- (dired-du-alist-get 'size x))))))
- (fn4 (lambda (x) (length (dired-du-alist-get 'gid x))))
- (max-size-len
- (or (and dir-info (apply #'max (mapcar fn dir-info))) 0))
- (max-size-human-len
- (or (and dir-info (apply #'max (mapcar fn2 dir-info))) 0))
- (max-size-comma-len
- (or (and dir-info (apply #'max (mapcar fn3 dir-info))) 0))
- (max-gid-len
- (or (and dir-info (apply #'max (mapcar fn4 dir-info))) 0))
- result num-blanks num-blanks-human num-blanks-comma)
- (setq num-blanks (1+ max-size-len) ; 1 space far from gid
- num-blanks-human (1+ max-size-human-len)
- num-blanks-comma (1+ max-size-comma-len)
- result (list num-blanks
- num-blanks-human
- num-blanks-comma
- max-gid-len))
- result))
-
-(defun dired-du--get-max-gid-and-size-lengths-for-subdir
- (subdir max-lens &optional non-dirs)
- "Get max length of gids and sizes for SUBDIR in several formats.
-MAX-LENS is a list
-\(MAX-SIZE-LEN MAX-SIZE-HUMAN-LEN MAX-SIZE-COMMA-LEN MAX-GID-LEN).
-
-Supported size formats are: default (1024), human (1k),
-and comma separator \(1,024).
-
-Optional arg NON-DIRS, when non-nil, then restrict to
-non-directories.
-
-Return nil."
- (let* ((max-size-len 0)
- (max-size-human-len 0)
- (max-size-comma-len 0)
- (max-gid-len 0)
- (fn (lambda ()
- (when (and (dired-move-to-filename)
- (re-search-backward
- directory-listing-before-filename-regexp)
- (or (not non-dirs)
- (not (dired-du-directory-at-current-line-p))))
- (let (size gid)
- ;; Handle human readable case: if size is\
- ;; not shown in human readable.
- ;; just comeback to the same position.
- (skip-chars-forward "^ \t")
- (backward-char 1)
- (setq size (buffer-substring-no-properties
- (1+ (point))
- (prog1
- (save-excursion
- (skip-chars-backward "^ \t")
- (point))
- (skip-chars-backward "^ \t")
- (skip-chars-backward " \t")))
- gid (buffer-substring-no-properties
- (point)
- (save-excursion
- (skip-chars-backward "^ \t")
- (point))))
- ;; If the file is a dir and `dired-du-mode'\
- ;; is enabled, then use stored size.
- (when (and (dired-du-directory-at-current-line-p)
- dired-du-mode)
- (let ((name (dired-get-filename t t)))
- (setq size
- (or (dired-du--get-value name 'size)
- (format "%d"
- (dired-du-get-recursive-dir-size))))))
- (let* ((size-num (dired-du-string-to-number size))
- (size-no-human (format "%d" size-num))
- (size-comma
- (dired-du-use-comma-separator size-num))
- (size-len (length size-no-human))
- (size-human-len
- (length (file-size-human-readable size-num)))
- (size-comma-len (length size-comma))
- (gid-len (length gid)))
- (setq max-size-len
- (max max-size-len size-len)
- max-size-human-len
- (max max-size-human-len size-human-len)
- max-size-comma-len
- (max max-size-comma-len size-comma-len)
- max-gid-len
- (max max-gid-len gid-len))) nil)))))
- (save-excursion
- (dired-goto-subdir subdir)
- (dired-du-with-saved-marks
- (save-excursion
- (dired-du-unmark-buffer)
- (dired-du-mark-subdir-files nil 'must-exist)
- (dired-du-map-over-marks (funcall fn) nil nil nil))))
- (setcar max-lens max-size-len)
- (setcdr max-lens (list max-size-human-len
- max-size-comma-len
- max-gid-len)) nil))
-
-
-;;; Change format of file sizes.
-
-(defun dired-du--revert (orig-fun &rest args)
- "Revert current dired buffer.
-Arguments IGNORE-AUTO, NOCONFIRM and PRESERVE-MODES are ignored."
- (let ((switches dired-actual-switches))
- (when (string-match "--human-readable" switches)
- (setq switches (replace-match "" t t switches)))
- (setq switches (apply #'string (delete ?h (string-to-list switches)))
- switches (if (string-match "[ \t\n\r]+\\'" switches)
- (replace-match "" t t switches)
- switches))
- (let ((dired-actual-switches switches)
- (prep (make-progress-reporter "Wait until find process finish")))
- (apply orig-fun args)
- (let ((proc (get-buffer-process (current-buffer))))
- (while (and proc (memq 'run (process-status proc)))
- (progress-reporter-update prep)
- ;; FIXME: (accept-process-output proc 1)?
- (sleep-for 1)))))
- (dired-du--replace))
-
-(defun dired-du--change-human-sizes (&optional human-readable)
- "Change the format to show the file sizes in the Dired buffer.
-Optional arg, HUMAN-READABLE has the same mean as
-`dired-du-size-format'."
- ;; To translate human readable format into default numeric format,
- ;; revert the buffer: for `find-dired' buffers ask
- ;; confirmation before revert.
- (let (revert-find res)
- (unless human-readable
- (let ((switches dired-actual-switches))
- (when (string-match "--human-readable" switches)
- (setq switches (replace-match "" t t switches)))
- (setq switches (apply #'string (delete ?h (string-to-list switches)))
- switches (if (string-match "[ \t\n\r]+\\'" switches)
- (replace-match "" t t switches)
- switches))
- (let ((dired-actual-switches switches))
- ;; (prep (make-progress-reporter "Wait until find process finish")))
- ;; Just prompt in the case of `find-dired' buffers.
- (setq revert-find
- (or (not dired-du-find-dired-buffer)
- (y-or-n-p "Change to numeric size format \
-requires revert buffer. Revert? ")))
- (when revert-find
- (revert-buffer)
- (setq res t)))))
- (unless revert-find
- (message nil))
- (when human-readable
- (setq res t)
- (save-excursion
- (let* ((max-lens (make-list 4 0))
- (subdirs (mapcar #'car dired-subdir-alist))
- (num-subdirs (length subdirs))
- (counter 0)
- (done nil)
- (prep (make-progress-reporter
- (cond ((eq human-readable t)
- "Changing to human readable sizes...")
- ((null human-readable)
- (setq done t)
- "Changing to default numeric sizes...")
- (t
- "Changing to size with thousands \
-comma separator..."))
- 0 num-subdirs)))
- (unless done
- (dolist (subdir subdirs)
- (progress-reporter-update prep counter)
- (setq counter (1+ counter))
- (save-excursion
- (dired-goto-subdir subdir)
- (dired-du--update-subdir-header subdir)
- (dired-du--get-max-gid-and-size-lengths-for-subdir
- subdir max-lens)
- (let* ((max-size-len (nth 0 max-lens))
- (max-size-human-len (nth 1 max-lens))
- (max-size-comma-len (nth 2 max-lens))
- (max-gid-len (nth 3 max-lens))
- (fn (lambda ()
- (when
- (and (dired-move-to-filename)
- (re-search-backward
-
directory-listing-before-filename-regexp))
- (let (size end-size)
- ;; Handle human readable case: if size \
- ;; is not shown in human readable
- ;; just comeback to the same position.
- (skip-chars-forward "^ \t")
- (backward-char 1)
- (setq end-size (1+ (point))
- size (buffer-substring-no-properties
- end-size
- (progn
- (skip-chars-backward "^ \t")
- (point))))
- ;; If the file is a dir and `dired-du-mode'\
- ;; is enabled, then use stored size.
- (when (and
- (dired-du-directory-at-current-line-p)
- dired-du-mode)
- (let ((name (dired-get-filename t t)))
- (setq size (dired-du--get-value name
'size))
- (cl-assert (not (null size)))))
- (let* ((size-num
(dired-du-string-to-number
- size))
- (size-human
(file-size-human-readable
- size-num))
- (size-no-human (format "%d" size-num))
- (size-comma
- (dired-du-use-comma-separator
- size-num))
- (num-blanks
- (cond ((eq t human-readable)
- (1+ max-size-human-len))
- ((null human-readable)
- (1+ max-size-len))
- (t
- (1+ max-size-comma-len))))
- (fmt (format "%%%ds" num-blanks)))
-
- (skip-chars-backward " \t") ; gid end
- (skip-chars-backward "^ \t") ; gid start
- (forward-char max-gid-len)
- (delete-region (point) end-size)
- (insert
- (format
- fmt
- (cond ((eq t human-readable) size-human)
- ((null human-readable)
size-no-human)
- (t size-comma)))))
- nil)))))
- (dired-du-with-saved-marks
- (save-excursion
- (dired-du-unmark-buffer)
- (dired-du-mark-subdir-files nil 'must-exist)
- (dired-du-map-over-marks (funcall fn) nil nil nil))))))
- (progress-reporter-done prep)))))
- res))
-
-(defun dired-du--toggle-human-readable (&optional no-message)
- "Toggle to show file sizes with human readable string in Dired buffers.
-Optional arg, NO-MESSAGE, if non-nil don't show message in the echo area."
- (interactive)
- (when (and (derived-mode-p 'dired-mode)
- dired-du-find-dired-buffer
- (not dired-du-on-find-dired-ok))
- (error "Toggle format size in `find-dired' buffers \
-is disabled; enable with %s"
- (substitute-command-keys "\\[dired-du-on-find-dired-ok-toggle\]")))
-
- (when (and (derived-mode-p 'dired-mode)
- (or (not dired-du-find-dired-buffer)
- dired-du-on-find-dired-ok))
- (let* ((options '(t nil comma))
- (pos (cl-position dired-du-size-format options))
- (idx (% (1+ pos) (length options)))
- (human (nth idx options)))
- (setq dired-du-size-format human)
- ;; If `dired-du--change-human-sizes' return nil, then means the user
- ;; has canceled the change: set `dired-du-size-format' to original
- ;; value.
- (if (not (dired-du--change-human-sizes human))
- (setq dired-du-size-format (nth pos options))
- (let ((string (cond ((eq human t)
- "Enabled human-readable units in Dired buffer")
- ((null human)
- "Enabled default numeric size \
-format in Dired buffer")
- (t
- "Enabled size with thousands comma \
-separator in Dired buffer"))))
- (let ((inhibit-read-only t))
- (dired-insert-set-properties (point-min) (point-max)))
- (unless no-message
- (message string)))))))
-
-
-;;; Functions to update `dired-du-dir-info'.
-
-(defun dired-du--delete-entry (name)
- "Delete from `dired-du-dir-info' entry for file NAME."
- (let ((glob-rel-pos (dired-du--get-position name)))
- (if (not glob-rel-pos)
- (error "Trying to delete unexistant entry for file '%s'" name)
- (let* ((glob-pos (car glob-rel-pos))
- (info (cdr (nth glob-pos dired-du-dir-info))))
- (setq info (delete (assoc name info) info))
- (setf (cdr (nth glob-pos dired-du-dir-info))
- info)
- nil))))
-
-(defun dired-du--local-update-dir-info (new-entry glob-pos)
- "Update with NEW-ENTRY position GLOB-POS of `dired-du-dir-info'.
-NEW-ENTRY is the file information for just one file.
-
-If there is an entry for the same file, it is replaced with NEW-ENTRY.
-Otherwise, NEW-ENTRY is added in front to
-\(cdr (nth GLOB-POS `dired-du-dir-info')).
-
-Return `dired-du-dir-info'."
- (let ((isdir (dired-du-alist-get 'isdir new-entry))
- (has-changed (dired-du-alist-get 'change new-entry)))
- (unless glob-pos
- (progn
- (message "called dired-du--local-update-dir-info with null glob-pos")
- (sit-for 2)
- (ding)
- (setq glob-pos (dired-du--subdir-position
- (dired-current-directory)))))
- (when (and has-changed isdir) ; Only update if has change
- ; flag non-nil and it is a directory.
- ;; Drop unnecessary info.
- (setq new-entry
- (cl-delete-if
- (lambda (x) (or
- (eq 'change (car-safe x))
- (eq 'gid (car-safe x))
- (eq 'isdir (car-safe x))))
-
- new-entry))
- (let* ((name (car new-entry))
- (glob-rel-pos (dired-du--get-position name))
- (info dired-du-dir-info)
- (replace (and glob-rel-pos (equal glob-pos
- (car glob-rel-pos)))))
- (cond (replace ; update file.
- (dired-du--delete-entry name)
- (let ((glob-pos (car glob-rel-pos)))
- (setf (cdr (nth glob-pos dired-du-dir-info))
- (push new-entry
- (cdr (nth glob-pos dired-du-dir-info))))))
- (t ; new file.
- (let ((alist (nth glob-pos info)))
- (if (not (cdr alist)) ; No records.
- (setq alist (cons (car alist) (list new-entry)))
- (let ((cdr-new (cdr alist))) ; Add new info
- (setcdr alist (push new-entry cdr-new))))
- (setf (nth glob-pos dired-du-dir-info)
- alist)))))) dired-du-dir-info))
-
-(defun dired-du--global-update-dir-info (new-info glob-pos)
- "Update with NEW-INFO position GLOB-POS of `dired-du-dir-info'.
-NEW-INFO may be the file info for one file or several.
-
-If NEW-INFO contains information for a file already present in
-`dired-du-dir-info', then the new information replaces
-the old one. Otherwise, the new information is added in front to
-\(cdr (nth GLOB-POS `dired-du-dir-info')).
-
-Return `dired-du-dir-info'."
- (dolist (new-entry new-info)
- (dired-du--local-update-dir-info new-entry glob-pos)))
-
-(defun dired-du-update-dir-info ()
- "Update recursive size for the marked files.
-This updates both, `dired-du-dir-info' and the Dired buffer.
-If no marked files, update the file at point."
- (interactive)
- (save-excursion
- (dired-du-map-over-marks
- (let ((pos (dired-du--subdir-position (dired-current-directory)))
- (info (list (dired-du-get-file-info))))
- (dired-du--global-update-dir-info info pos))
- nil))
- (funcall revert-buffer-function))
-
-(defun dired-du--drop-unexistent-files ()
- "Remove from `dired-du-dir-info' records of unexistent files."
- (when (or (not dired-du-find-dired-buffer)
- (and dired-du-find-dired-buffer
- dired-du-on-find-dired-ok))
- (let ((subdirs (mapcar #'car dired-subdir-alist)))
- (save-excursion
- (dolist (dir subdirs)
- (let* ((glob-pos (dired-du--subdir-position dir))
- (info (nth glob-pos dired-du-dir-info)))
- (when (cdr info) ; Contains records.
- (let ((entries (cdr info)))
- (dolist (entry entries)
- (let* ((name (car entry))
- (basename (file-name-nondirectory name))
- ;; (fullname (expand-file-name name
default-directory)))
- (fullname
- (if (member basename '("." ".."))
- (concat
- (file-name-as-directory
- (dired-current-directory))
- basename)
- (expand-file-name name default-directory))))
- (or (dired-goto-file fullname)
- (dired-du--delete-entry name))))))))))))
-
-(defun dired-du--reset ()
- "Reset `dired-du-dir-info' to the initial value."
- (setq dired-du-dir-info nil)
- (dired-du--create-or-check-dir-info) nil)
-
-(defun dired-du-recompute-dir-size ()
- "Revert Dired buffer and recompute dir sizes."
- (interactive)
- (dired-du-assert-dired-mode)
- (dired-du--reset)
- (revert-buffer))
-
-(defun dired-du--insert-subdir (dir)
- "Insert subdirectory DIR in `dired-du-dir-info'."
- (let ((subdir (file-name-as-directory dir)))
- (cl-pushnew subdir dired-du-dir-info :test #'equal)))
-
-
-;;; Get marks, files and directories.
-
-(defun dired-du-get-all-marks ()
- "Return list of marks in the Dired buffer."
- (let (marks)
- (save-excursion
- (dired-du-map-over-marks
- (let* ((pos (save-excursion
- (goto-char (line-beginning-position))
- (point)))
- (char (string-to-char
- (buffer-substring-no-properties pos (1+ pos)))))
- (cl-pushnew char marks)) nil nil nil nil 'all-marks)
- (delete ?\s marks))))
-
-(defun dired-du-get-all-files (&optional local)
- "Return list of files in the Dired buffer.
-Optional arg LOCAL, if non-nil, then return file name
-relative to `default-directory'. Otherwise, return fullnames.
-
-If '.' and '..' are present in the buffer, then include them as well."
- (let ((marked
- (delq nil
- (dired-du-get-marked-files
- local nil nil nil nil 'all-marks)))
- (unmarked
- (delq nil
- (dired-du-get-marked-files local nil nil nil ?\s))))
- (delete-dups
- (nconc marked unmarked))))
-
-(defun dired-du--get-all-files-type (type &optional local)
- "Return list of files of type TYPE in the Dired buffer.
-TYPE can be 'dirs, for directories, or 'non-dirs, for non directories.
-
-Optional arg LOCAL, if non-nil, then return file name relative
-to `default-directory'.
-
-If '.' and '..' are present in the buffer, then include them as well."
- (let* ((fn (lambda ()
- (cond ((eq type 'dirs)
- (when (dired-du-directory-at-current-line-p)
- (dired-get-filename local 'noerror)))
- (t
- (unless (dired-du-directory-at-current-line-p)
- (dired-get-filename local 'noerror))))))
- (files (delq nil
- (dired-du-map-over-marks
- (funcall fn) nil nil nil ?\s)))
- (files
- (nconc
- files
- (delq nil
- (dired-du-map-over-marks
- (funcall fn) nil nil nil nil 'all-marks))))
- (files (delete-dups files)))
- files))
-
-(defun dired-du-get-all-directories (&optional local)
- "Return list of directories in the Dired buffer.
-Optional arg LOCAL, if non-nil, then return file name relative
-to `default-directory'.
-
-If '.' and '..' are present in the buffer, then include them as well."
- (dired-du--get-all-files-type 'dirs local))
-
-(defun dired-du-get-all-non-directories (&optional local)
- "Return list of non directories in the Dired buffer.
-Optional arg LOCAL, if non-nil, then return file name
-relative to `default-directory'."
- (dired-du--get-all-files-type 'non-dirs local))
-
-(defun dired-du-get-all-subdir-directories (&optional local)
- "Return all directories in a subdir.
-Optional arg LOCAL, if non-nil, return file names relative to
-`default-directory'. Otherwise use the fullname.
-
-If '.' and '..' are present in the buffer, then include them as well."
- (save-restriction
- (narrow-to-region (dired-subdir-min)
- (dired-subdir-max))
- (dired-du-get-all-directories local)))
-
-(defun dired-du-get-all-subdir-non-directories (&optional local)
- "Return all non-directories in a subdir.
-Optional arg LOCAL, if non-nil, return file names relative to
-`default-directory'. Otherwise use the fullname.
-
-If '.' and '..' are present in the buffer, then include them as well."
- (save-restriction
- (narrow-to-region (dired-subdir-min)
- (dired-subdir-max))
- (dired-du-get-all-non-directories local)))
-
-
-;;; Insert recursive dir size on Dired buffer.
-
-(defun dired-du--number-as-string-p (str)
- "Return non-nil if STR represents a decimal number."
- (or (string= str "0")
- (and (not (string= str "0"))
- (/= 0 (string-to-number str)))))
-
-(defun dired-du--replace-1 (&optional glob-pos)
- "Replace recursive directory size on Dired buffer.
-Optional arg GLOB-POS, if non-nil, is the entry in
-`dired-du-dir-info' to replace. Otherwise, default to 0.
-
-Return file info for current subdir."
- (unless glob-pos (setq glob-pos 0))
- (unless (cdr dired-subdir-alist) (setq glob-pos 0))
- (unless dired-du-mode
- (error "Recursive dir sizes is disabled: Use `dired-du-mode' to enable
it"))
- (when (or (not dired-du-find-dired-buffer)
- (and dired-du-find-dired-buffer
- dired-du-on-find-dired-ok))
- (let* ((inhibit-read-only t)
- (init-pos (point))
- (cur-subdir (let ((info (nth glob-pos dired-du-dir-info)))
- (cond ((listp info) (car info))
- (t info))))
- ;; All files/dirs must exist, otherwise will fail in '/proc'.
- (all-dirs (cl-delete-if-not
- #'file-exists-p
- (dired-du-get-all-directories)))
- (all-files (cl-delete-if-not #'file-exists-p
- (dired-du-get-all-files)))
- (num-tot-files (length all-files))
- (num-tot-dirs (length all-dirs))
- (all-subdir-dirs (cl-delete-if-not
- #'file-exists-p
- (dired-du-get-all-subdir-directories 'local)))
- ;; Collect all directories not in `dired-du-dir-info'
- ;; and process them in parallel.
- (subdir-dirname-size
- (and dired-du-mode
- (let ((missing-dirs
- (cl-delete-if
- (lambda (x)
- (and (dired-du--file-in-dir-info-p
- x
- dired-du-dir-info)
- (not (member x '("." "..")))))
- all-subdir-dirs)))
- (when missing-dirs
- (if dired-du-used-space-program
- (dired-du-get-recursive-dir-size-in-parallel
- missing-dirs)
- (let (res)
- (save-excursion
- (dolist (d missing-dirs)
- (dired-goto-file
- (expand-file-name d default-directory))
- (push (list d (dired-du-get-recursive-dir-size))
- res)))))))))
- (dir-counter 0)
- (collect-str "Dired-Du collecting file info ...")
- (rep-coll
- (make-progress-reporter
- collect-str 0 num-tot-dirs nil nil 1)) ; Just dirs.
- (replace-str "Dired-Du replacing file info ...")
- (rep-rep
- (make-progress-reporter replace-str 0 num-tot-files)) ; All files.
- file-info name fullname size nblanks-gidlen
- num-blanks num-blanks-human
- num-blanks-comma max-gid-len)
- (save-excursion
- (dired-goto-subdir cur-subdir)
- (let ((fn (lambda ()
- (let (cdir isdirp new-info)
- (save-excursion
- (when (dired-move-to-filename)
- (setq cdir (dired-get-filename t t)
- isdirp (dired-du-directory-at-current-line-p))
- (when isdirp
- (save-excursion
- (goto-char init-pos)
- (progress-reporter-force-update rep-coll
- dir-counter
- collect-str)))
- ;; Use the recursive dir size if we already got it.
- (let ((dirname-size
- (cdr (assoc-string cdir
subdir-dirname-size))))
- (setq new-info
- (dired-du-get-file-info glob-pos
- nil dirname-size)
- dir-counter
- (or (and isdirp (1+ dir-counter))
- dir-counter)))))
- new-info))))
- (setq file-info
- (delq nil
- (when cur-subdir
- (dired-du-with-saved-marks
- (save-excursion
- (dired-du-mark-subdir-files ; Al files.
- nil
- 'must-exist)
- (dired-du-map-over-marks (funcall fn) nil nil
nil)))))
- nblanks-gidlen (dired-du--get-num-extra-blanks file-info)
- num-blanks (nth 0 nblanks-gidlen)
- num-blanks-human (nth 1 nblanks-gidlen)
- num-blanks-comma (nth 2 nblanks-gidlen)
- max-gid-len (nth 3 nblanks-gidlen)))
- (or (= dir-counter num-tot-dirs)
- (progress-reporter-done rep-coll))
- (let* ((replace-str (aref (cdr rep-rep) 3))
- (replace-done (concat replace-str "Done"))
- basename)
- (save-excursion
- (dired-du--update-subdir-header cur-subdir file-info)
- (dolist (finfo file-info)
- (setq name (car finfo) ;(dired-du-alist-get 'name finfo)
- size (dired-du-alist-get 'size finfo)
- basename (file-name-nondirectory name)
- fullname (if (member basename '("." ".."))
- (concat (file-name-as-directory cur-subdir)
- basename)
- (expand-file-name name default-directory)))
- (when (and (dired-goto-file fullname)
- (re-search-backward
- directory-listing-before-filename-regexp
- (line-beginning-position) t))
- ;; Handle human readable case: in other case just
- ;; comeback to the same position.
- (skip-chars-forward "^ \t")
- (backward-char 1)
- (unless num-blanks (error "The num-blanks null"))
- (unless num-blanks-human (error "The num-blanks-human null"))
- (unless max-gid-len (error "The max-gid-len null"))
- (let ((pos (1+ (point)))
- (fmt (format "%%%ds" (cond ((eq t dired-du-size-format)
- num-blanks-human)
- ((null dired-du-size-format)
- num-blanks)
- (t num-blanks-comma))))
- gid-start gid-end)
- (skip-chars-forward "^ \t")
- (skip-chars-backward "^ \t")
- (skip-chars-backward " \t")
- (setq gid-end (point))
- (skip-chars-backward "^ \t")
- (setq gid-start (point))
- ;; With numeric GID, the column is right indented; otherwise,
- ;; the column is left indented.
- (if (not (dired-du--number-as-string-p
- (buffer-substring-no-properties gid-start
gid-end)))
- (forward-char max-gid-len)
- (goto-char gid-end))
- (delete-region (point) pos)
- (insert
- (format fmt
- (cond ((eq t dired-du-size-format)
- (file-size-human-readable
- (dired-du-string-to-number size)))
- ((null dired-du-size-format)
- (format "%d" (dired-du-string-to-number
size)))
- (t
- (dired-du-use-comma-separator
- (dired-du-string-to-number size))))))))
- (forward-line 1)))
- (message replace-done)
- (message nil)
- (nreverse file-info))))))
-
-(defun dired-du--replace ()
- "Replace recursive directory size on Dired buffer."
- (dired-du-assert-dired-mode)
- (when (or (not dired-du-find-dired-buffer)
- (and dired-du-find-dired-buffer
- dired-du-on-find-dired-ok))
- (unless dired-du-mode
- (error "Recursive dir sizes is disabled: \
-Use `dired-du-mode' to enable it"))
- (let ((subdirs (mapcar #'car dired-subdir-alist))
- empty-info result)
- (dired-du-with-saved-marks
- (save-excursion
- (dired-du-unmark-buffer)
- (dolist (dir subdirs)
- (let ((glob-pos (dired-du--subdir-position dir)))
- (unless glob-pos ; Inserting a new subdir.
- (dired-du--insert-subdir dir)
- (unless (equal 0 (dired-du--subdir-position dir))
- (error "The glob-pos for dir %s not 0 (%S) %S"
- dir
- (dired-du--subdir-position dir)
- dired-du-dir-info))
- (setq glob-pos 0))
- (let ((dir-info (dired-du--replace-1 glob-pos)))
- (when dired-du-mode
- (if empty-info
- (push dir-info result)
- (dired-du--global-update-dir-info dir-info glob-pos))))))))
- ;; When empty-dir we are setting first time this directory.
- (when (and empty-info dired-du-mode)
- (setcdr dired-du-dir-info result))
- (let ((inhibit-read-only t))
- (dired-insert-set-properties (point-min) (point-max))))))
-
-
-;;; Handle sort_by_size for directories as well.
-;; Note this is only supported for `ls-lisp'.
-
-(defun dired-du--size-sorter ()
- "Return sorter by size used by `dired-du-ls-lisp-handle-switches'."
- (let ((size-fn
- (lambda (file-alist)
- (let ((file (car file-alist))
- (is-dir (eq t (cadr file-alist)))
- (attrb (cdr file-alist)))
- ;; dired-du ignores "." and ".." entries: use
`file-attribute-size' in that case.
- (if (and is-dir (not (member file '("." ".."))))
- (if (assoc file (cdar dired-du-dir-info)) ; Usea cached value
if available
- (dired-du-string-to-number (dired-du--get-value file
'size))
- (dired-du--get-recursive-dir-size file))
- (dired-du-size attrb))))))
- (lambda (x y) ; sorted on size
- ;; Make largest file come first
- (< (funcall size-fn y) (funcall size-fn x)))))
-
-(defun dired-du-ls-lisp-handle-switches (file-alist switches)
- "Advice on `ls-lisp-handle-switches to support sort_by_size on dirs.
-
-This function only has effect if you set
`ls-lisp-use-insert-directory-program' nil.
-Note that if you are using `insert-directory-program' instead, then such a
program
-is responsible to do the sorting, and it won't see the recursives sizes
-calculated by this library."
- ;; FILE-ALIST's elements are (FILE . FILE-ATTRIBUTES).
- (or (memq ?U switches) ; unsorted
- ;; Catch and ignore unexpected sorting errors
- (condition-case err
- (setq file-alist
- (let (index)
- ;; Copy file-alist in case of error
- (sort (copy-sequence file-alist) ; modifies its argument!
- (cond ((memq ?S switches)
- (dired-du--size-sorter))
- ((setq index (ls-lisp-time-index switches))
- (lambda (x y) ; sorted on time
- (time-less-p (nth index (cdr y))
- (nth index (cdr x)))))
- ((memq ?X switches)
- (lambda (x y) ; sorted on extension
- (ls-lisp-string-lessp
- (ls-lisp-extension (car x))
- (ls-lisp-extension (car y)))))
- ((memq ?v switches)
- (lambda (x y) ; sorted by version number
- (ls-lisp-version-lessp (car x) (car y))))
- (t
- (lambda (x y) ; sorted alphabetically
- (ls-lisp-string-lessp (car x) (car y))))))))
- (error (message "Unsorted (ls-lisp sorting error) - %s"
- (error-message-string err))
- (ding) (sit-for 2)))) ; to show user the message!
- (if (memq ?F switches) ; classify switch
- (setq file-alist (mapcar 'ls-lisp-classify file-alist)))
- (if ls-lisp-dirs-first
- ;; Re-sort directories first, without otherwise changing the
- ;; ordering, and reverse whole list. cadr of each element of
- ;; `file-alist' is t for directory, string (name linked to) for
- ;; symbolic link, or nil.
- (let (el dirs files)
- (while file-alist
- (if (or (eq (cadr (setq el (car file-alist))) t) ; directory
- (and (stringp (cadr el))
- (file-directory-p (cadr el)))) ; symlink to a directory
- (setq dirs (cons el dirs))
- (setq files (cons el files)))
- (setq file-alist (cdr file-alist)))
- (setq file-alist
- (if (memq ?U switches) ; unsorted order is reversed
- (nconc dirs files)
- (nconc files dirs)
- ))))
- ;; Finally reverse file alist if necessary.
- ;; (eq below MUST compare `(not (memq ...))' to force comparison of
- ;; t or nil, rather than list tails!)
- (if (eq (eq (not (memq ?U switches)) ; unsorted order is reversed
- (not (memq ?r switches))) ; reversed sort order requested
- ls-lisp-dirs-first) ; already reversed
- (nreverse file-alist)
- file-alist))
-
-
-;;; Define minor mode.
-
-;;;###autoload
-(define-minor-mode dired-du-mode
- "Toggle dired-du mode.
-Interactively with no argument, this command toggles the mode.
-A positive prefix argument enables the mode, any other prefix
-argument disables it. From Lisp, argument omitted or nil enables
-the mode, `toggle' toggles the state.
-
-Show the recursive size of directories in Dired buffers.
-Once this mode is enabled, every new Dired buffer displays
-recursive dir sizes.
-The directory size is obtained with `dired-du-used-space-program'.
-
-Note that obtaining the recursive size of all the directories
-in a Dired buffer might be slow; thus, it may significantly delay
-the time to display a new Dired buffer.
-
-Instead of enabling `dired-du-mode' by default in all Dired buffers
-you might prefer to use this mode as a convenient interface to
-the `du' program: just enable it in the current Dired buffer,
-and disable it once you have finished checking the used space."
- ;; FIXME: Is this intended to be a global or local minor-mode? The paragraph
- ;; above makes it sound like it's intended to be local, but the code below
- ;; tries to have a global effect, yet the dired-du-mode var itself is
- ;; buffer-local and you use a hook on dired-mode-hook to enable the mode
- ;; every time we enter dired-mode.
- :lighter " Dired-du"
- :variable dired-du-mode
- ;; Propagate the state to all Dired buffers.
- ;; Only the current buffer is reverted.
- ;; FIXME: I don't see any code that causes the buffer to be reverted?
- ;; FIXME: Why is the code below in `after-hook'?
- :after-hook (let ((state dired-du-mode))
- (dolist (buff dired-buffers)
- (with-current-buffer (cdr buff)
- (force-mode-line-update)
- (setq dired-du-mode state)
- (if state
- (add-function :around (local 'revert-buffer-function)
- #'dired-du--revert)
- (remove-function (local 'revert-buffer-function)
- #'dired-du--revert)))))
-
- ;; If `major-mode' not dired mode, set `dired-du-mode' nil and exit.
- (unless (derived-mode-p 'dired-mode)
- (error "Dired-Du: Buffer not a Dired buffer"))
- (cond (dired-du-mode
- (advice-add 'find-dired-sentinel :around
#'dired-du--find-dired-around)
- (advice-add 'ls-lisp-handle-switches :override
'dired-du-ls-lisp-handle-switches)
- (add-hook 'dired-before-readin-hook #'dired-du--drop-unexistent-files)
- (add-hook 'dired-after-readin-hook #'dired-du--replace 'append)
- (add-hook 'dired-du-mode-hook #'dired-du--initialize)
- (add-hook 'dired-mode-hook #'dired-du-mode))
- (t
- (advice-remove 'find-dired-sentinel #'dired-du--find-dired-around)
- (advice-remove 'ls-lisp-handle-switches
#'dired-du-ls-lisp-handle-switches)
- (remove-hook 'dired-before-readin-hook
- #'dired-du--drop-unexistent-files)
- (remove-hook 'dired-after-readin-hook #'dired-du--replace)
- (remove-hook 'dired-mode-hook #'dired-du-mode))))
-
-(defun dired-du--initialize ()
- "Called by function `dired-du-mode' to initialize the mode."
- (let ((enable-str "Dired-Du mode enabled")
- (disable-str "Dired-Du mode disabled")
- (mode-on dired-du-mode))
- (cond ((not (derived-mode-p 'dired-mode))
- (error "Major mode not dired-mode"))
- (t
- (cond (mode-on
- (when (and (null dired-du-used-space-program)
- (null dired-du--user-warned))
- (setq dired-du--user-warned t)
- (beep)
- (message "Program `dired-du-used-space-program' not found.
-Fallback to calculate recursive dir size in Lisp.
-Please, consider install a 'du' executable suitable to your platform.")
- (sit-for 1)
- (message nil))
- (message "Initializing Dired-Du mode ...")
- (dired-du--replace)
- (message "%s in Dired buffers" enable-str))
- (t
- (dired-revert)
- (message "%s in Dired buffers" disable-str)))))))
-
-
-;;; Count marked files and their sizes.
-
-(defun dired-du-distinguish-one-marked (info)
- "Return INFO without 1 marked flag.
-INFO is the output of `dired-du-get-marked-files' or
-`dired-du-map-over-marks'."
- (let ((res (cond ((not (cdr info)) nil)
- ((and (not (cddr info)) (eq (car info) t))
- (cdr info))
- (t info)))) res))
-
-(defun dired-du--cache-dir-info (&optional dir-info
- target-files
- include-dirs
- mark all-marks)
- "Update `dired-du-dir-info' and return it.
-Optional arg DIR-INFO, if non-nil, is the new value. Otherwise, it is
-obtained within this function.
-
-Optional arg TARGET-FILES, if non-nil, then is a list of the
-full name of the files to update. Otherwise use all marked files.
-
-Optional arg INCLUDE-DIRS, if non-nil, then include the size
-of the marked directories.
-
-Optional arg MARK, if non-nil, is the mark character to search.
-Otherwise use `dired-marker-char'.
-
-Optional arg ALL-MARKS, if non-nil, acept all mark characters."
- (cond (dir-info
- (setq dired-du-dir-info dir-info))
- (t
- (save-excursion
- (dired-du--create-or-check-dir-info)
- (let* ((init-pos (point))
- (files
- (cond (target-files)
- (t
- (let ((marked
- (dired-du-get-marked-files
- nil nil nil t mark 'all-marks)))
- (dired-du-distinguish-one-marked marked)))))
- (info dired-du-dir-info)
- ;; Only files which are not already in info except '.' and
'..'
- (files
- (cl-delete-if
- (lambda (x)
- (let ((basename (file-name-nondirectory x)))
- (and (dired-du--file-in-dir-info-p x info)
- (not (member basename '("." ".."))))))
- files))
- (num-files (length files))
- (collect-str "Dired-Du catching file info ...")
- (progress-reporter-collect
- (make-progress-reporter collect-str 0 num-files nil nil 1))
- (counter 0)
- (fn (lambda ()
- (let ((file (dired-get-filename nil 'noerror))
- dir isdirp glob-pos new-info)
- (save-excursion
- ;; Only those in files.
- (when (and (member file files)
- (dired-move-to-filename))
- (setq dir (file-name-directory file)
- isdirp
(dired-du-directory-at-current-line-p)
- glob-pos (dired-du--subdir-position dir)
- counter (1+ counter))
- ;; Include dirs means get recursive size for
dirs.
- (let ((dired-du-mode include-dirs))
- (setq new-info
- (list (dired-du-get-file-info
- nil 'dir-dots))))
- ;; For dirs only cache recursive size.
- ;; for non-dirs always cache.
- (when (and glob-pos new-info isdirp include-dirs)
- (dired-du--global-update-dir-info
- new-info glob-pos))))
- (when isdirp
- (save-excursion
- (goto-char init-pos)
- (progress-reporter-force-update
- progress-reporter-collect
- counter
- collect-str)))
- nil))))
- (let ((marked-files
- (dired-du-get-marked-files nil nil nil t mark all-marks)))
- (when (cdr marked-files)
- (dired-du-map-over-marks
- (funcall fn) nil nil nil mark all-marks)
- (progress-reporter-done progress-reporter-collect)))))))
- dired-du-dir-info)
-
-(defun dired-du--count-sizes-2 (mark all-marks include-dirs)
- "Helper function for `dired-du-count-sizes'.
-Return list (MARK NUM_NON_DIRS NUM_DIRS TOTAL_SIZE).
-
-If arg ALL-MARKS, non-nil, then use all character marks in the buffer.
-
-If arg INCLUDE-DIRS, if non-nil, then include the directory sizes."
- (when (and include-dirs
- (not (equal 0 (condition-case nil
- (process-file (car dired-du-used-space-program)
- nil nil nil null-device)
- (error nil))))
- (null dired-du--user-warned))
- (setq dired-du--user-warned t)
- (beep)
- (message "Program `dired-du-used-space-program' not found.
-Fallback to calculate recursive dir size in Lisp.
-Please, consider install a 'du' executable suitable to your platform.")
- (sit-for 1)
- (message nil))
- (if (eq mark ?\r)
- (progn
- (message "Mark cannot be \\r")
- (sit-for 1)
- (ding))
- (save-excursion
- (let* ((files (dired-du-get-marked-files nil nil nil t mark))
- (files (dired-du-distinguish-one-marked files))
- (num-files (length files))
- (dirs (delq nil
- (dired-du-map-over-marks
- (when (dired-du-directory-at-current-line-p)
- (dired-get-filename nil 'noerror))
- nil nil t mark all-marks)))
- (dirs (dired-du-distinguish-one-marked dirs))
- (num-dirs (length dirs))
- (num-non-dirs (- num-files num-dirs))
- (dir-info (dired-du--cache-dir-info nil
- dirs
- include-dirs
- mark all-marks))
- ;; size for all non-directories
- (non-dirs-size
- (apply
- #'+
- (mapcar
- (lambda (x)
- (dired-du-string-to-number
- (dired-du-alist-get 'size x)))
- (let* ((info
- (delq nil
- (dired-du-map-over-marks
- (unless (dired-du-directory-at-current-line-p)
- (dired-du-get-file-info))
- nil nil 'distinguish-one-marked mark
all-marks)))
- (info (dired-du-distinguish-one-marked info)))
- info))))
- ;; (info (delq nil (dired-du-map-over-marks
- ;; (if (and
(dired-du-directory-at-current-line-p)
- ;; include-dirs)
- ;; (dired-du-get-recursive-dir-size)
- ;; (dired-du-get-file-size-remote))
- ;; nil nil 'distinguish-one mark all-marks)))
- ;; (info (dired-du-distinguish-one-marked info))
- ;; (total-size (apply #'+ info))
- (total-size non-dirs-size)
- total-size-str)
- ;; Add recursive size of directories
- (when (and include-dirs
- (not (= num-dirs 0)))
- (let ((scale-factor
- (if (and dired-du-used-space-program
- (string= (cadr dired-du-used-space-program) "-sk"))
- 1024.0
- 1.0)))
- (cond (dir-info ; Cache size dir
- (let ((dirs-size
- (apply
- #'+
- (mapcar
- (lambda (name)
- (let* ((relname
-
(dired-du-filename-relative-to-default-dir
- name))
- (glob-pos
- (dired-du--fullname-to-glob-pos name))
- (size (dired-du--get-value
- relname
- 'size
- dir-info
- glob-pos)))
- (or (and size
- (dired-du-string-to-number size))
- 0)))
- dirs))))
- (setq total-size
- (+ total-size (* scale-factor dirs-size)))))
- (t ; Get size dir with `dired-du-dir-info'.
- ; Needed if dir size not cached.
- (let* ((sizes
- (mapcar
- (lambda (fullname)
- (save-excursion
- (or (and (dired-goto-file fullname)
- (dired-du-get-recursive-dir-size))
- 0)))
- dirs))
- (dirs-size (apply #'+ sizes)))
- (setq total-size
- (+ total-size (* scale-factor dirs-size))))))))
-
- (setq total-size-str
- (cond ((eq t dired-du-size-format)
- (file-size-human-readable total-size))
- ((null dired-du-size-format)
- (format "%d" total-size))
- (t
- (let ((total
- (string-to-number
- (format "%.0f" total-size))))
- (dired-du-use-comma-separator total)))))
- (list mark num-non-dirs num-dirs total-size-str)))))
-
-(defun dired-du--count-sizes-1 (mark all-marks include-dirs)
- "Helper function for `dired-du-count-sizes'.
-Return alist (MARK . TOTAL_SIZE).
-
-If arg ALL-MARKS, non-nil, then use all character marks in the buffer.
-
-If arg INCLUDE-DIRS, non-nil, then include the directory sizes."
- (unless mark (setq mark dired-marker-char))
- (let ((marks (dired-du-get-all-marks))
- mark-size-alist)
- (cond ((not all-marks)
- (setq mark-size-alist
- (list (dired-du--count-sizes-2
- mark
- nil
- include-dirs))))
- (t
- (unless marks
- (error "No marked files"))
- (dolist (cur-mark marks)
- (push (dired-du--count-sizes-2
- cur-mark
- nil
- include-dirs) mark-size-alist))))
- mark-size-alist))
-
-;;;###autoload
-(defun dired-du-count-sizes (mark &optional all-marks include-dirs)
- "Count sizes of files marked with MARK.
-If MARK evaluates nil, then use `dired-marker-char'.
-
-Optional arg ALL-MARKS, if non-nil, then accept all mark characters.
-
-Optional arg INCLUDE-DIRS, if non-nil, include the recursive size of the
-marked directories.
-If called interactively with a prefix, then prompt for previous
-args. Otherwise, all optional arguments but INCLUDE-DIRS are nil, and
-INCLUDE-DIRS is set to variable `dired-du-mode'.
-
-Directories '.' '..' are not special: if they are marked, then return
-their recursive size."
- (interactive
- (let* ((cursor-in-echo-area t)
- (askme current-prefix-arg)
- (all-marks (and askme (y-or-n-p "All marks? ")))
- (mark (or (and askme
- (not all-marks)
- (progn
- (message "Count files marked with mark: ")
- (read-char)))
- dired-marker-char))
- ;; If `dired-du-mode' is enabled include dirs; otherwise prompt user.
- (dirs (or dired-du-mode
- (and askme
- ;; (car dired-du-used-space-program)
- (y-or-n-p "Include directories? ")))))
- (list mark all-marks dirs)))
- (dired-du-assert-dired-mode)
- (save-excursion
- (let ((mark-size-alist (dired-du--count-sizes-1 mark all-marks
include-dirs))
- (out-buf (get-buffer-create "*dired-du-count-sizes*"))
- text)
- (with-current-buffer out-buf
- (erase-buffer)
- (dolist (mark-info mark-size-alist)
- (let* ((cur-mark (nth 0 mark-info))
- (num-non-dirs (nth 1 mark-info))
- (num-dirs (nth 2 mark-info))
- (size-str (nth 3 mark-info))
- (num-files (+ num-non-dirs num-dirs)))
- (setq text
- (if (= num-files 0)
- (format "No marked files with mark '%s'\n"
- (char-to-string cur-mark))
- (format "Marked with '%s' %d file%s (%d/%d dirs/files) \
-with total size %s%s%s\n"
- (char-to-string cur-mark)
- num-files
- (dired-plural-s num-files)
- num-dirs
- num-non-dirs
- size-str
- (or (and (eq t dired-du-size-format) "") " bytes")
- (or (and (not include-dirs)
- " (dirs size excluded)") ""))))
- (insert text))))
- (if (cdr mark-size-alist)
- (display-buffer out-buf)
- (message (substring text 0 -1))))))
-
-
-
-;;; Miscellaneous functions.
-
-;;;###autoload
-(defun dired-du-insert-marked-dirs ()
- "Insert all marked subdirectories."
- (interactive)
- (let ((dired-du dired-du-mode))
- (unwind-protect
- (save-excursion
- (when dired-du (dired-du-mode -1))
- (mapc #'dired-maybe-insert-subdir (dired-du-get-marked-files)))
- (when dired-du (dired-du-mode)))))
-
-(defun dired-du-drop-all-subdirs ()
- "Drop all subdirs in the current Dired buffer."
- (interactive)
- (while (cdr dired-subdir-alist)
- (dired-unsubdir (caar dired-subdir-alist)))
- (goto-char (point-min))
- (dired-revert))
-
-
-(provide 'dired-du)
-
-;;; dired-du.el ends here
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] master 0d755a1: * externals-list: Convert dired-du to :external,
Stefan Monnier <=