From 3703ded0a347d5e1de5da9c8cb0407147028c40e Mon Sep 17 00:00:00 2001 From: Joseph Paul Date: Thu, 24 Jun 2021 23:25:30 +0200 Subject: [PATCH] Version 1.36 * [Windows] Do not maximize console window by default * [Windows] Fix maximize console bug * [Windows] Detect that program is launched by powershell.exe or explorer.exe * [UNIX] Reformat information about used inodes and partitions * [JSON] Fix bug in Ncdu export when filename contains double quotes * Show 8 biggest files by default (customizable) * Display sizes in human readable format by default (customizable) * Add Go module support --- Changelog | 10 ++ LICENSE | 339 ++++++++++++++++++++++++++++++++++++++++++++++++- README.md | 46 +++---- doc/tdu.1 | 18 +-- go.mod | 3 + tdu.go | 31 +++-- tdu_bsd.go | 2 +- tdu_export.go | 4 +- tdu_generic.go | 6 +- tdu_license.go | 2 +- tdu_linux.go | 2 +- tdu_unix.go | 29 +++-- tdu_windows.go | 170 +++++++++++++++++++++++-- 13 files changed, 589 insertions(+), 73 deletions(-) create mode 100644 go.mod diff --git a/Changelog b/Changelog index 5c6edfe..ca0ab42 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,13 @@ +2021-06-24 Version 1.36 + * [Windows] Do not maximize console window by default + * [Windows] Fix maximize console bug + * [Windows] Detect that program is launched by powershell.exe or explorer.exe + * [UNIX] Reformat information about used inodes and partitions + * [JSON] Fix bug in Ncdu export when filename contains double quotes + * Show 8 biggest files by default (customizable) + * Display sizes in human readable format by default (customizable) + * Add Go module support + 2020-06-10 Version 1.34 * Add manual in PDF * Add support for FreeBSD 11 diff --git a/LICENSE b/LICENSE index 97f2368..d159169 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,339 @@ -Please read the file 'COPYING' for the license. + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 2 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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. diff --git a/README.md b/README.md index ea042f7..da6d875 100644 --- a/README.md +++ b/README.md @@ -3,54 +3,56 @@ This command-line tool estimates the disk space occupied by all files in a given path. It displays a sorted list of the biggest items. The estimation method is similar to the `du -skx` command from GNU Coreutils package. -##Program usage +## Program usage ``` Usage: tdu [options] [directory] - -b n Number of big files shown (default 7) + -b n Number of big files shown (default 7) - -l n Number of depth1 items shown (default 15) + -l n Number of depth1 items shown (default 15) - --max Show deepest and longest paths + --max Show deepest and longest paths - -o file Export result to Ncdu JSON format - (https://dev.yorhel.nl/ncdu/jsonfmt) + -o file Export result to Ncdu JSON format + (https://dev.yorhel.nl/ncdu/jsonfmt) - -e n Number of empty directories shown (default 0) + -e n Number of empty directories shown (default 0) - -d n Number of access denied directories shown (default 0) + -d n Number of access denied directories shown (default 0) - -f n Number of character and block devices shown (default 0) + -f n Number of character and block devices shown (default 0) - -t n Number of sockets and named pipes shown (default 0) + -t n Number of sockets and named pipes shown (default 0) - -s n Number of file status errors shown (default 0) + -s n Number of file status errors shown (default 0) - --human Print sizes in human readable format - --version Program info and usage - --license Show the GNU General Public License V2 - --help Program help + --human Print sizes in human readable format (default yes) + --human=false Print sizes in kilobytes + --consolemax Maximize console window (on Windows only, default no) + --version Program info and usage + --license Show the GNU General Public License V2 + --help Program help ``` -##Quick start guide for end users +## Quick start guide for end users - If you just want to use the program on Linux or Windows x86-64, then you can download a ready-to-run binary at https://bitbucket.org/josephpaul0/tdu/downloads/ - On the "Downloads" page, you will find packages for: - Linux (386, Amd64, Armv6), including Raspberry Pi. - Windows 7, 8, 10 (386, Amd64) - - FreeBSD 11 (386, Amd64) + - FreeBSD (386, Amd64) -##Quick start guide for advanced users / developers +## Quick start guide for advanced users / developers - You need a Go compiler - Do not use Go v1.12 or v1.12.1 on Windows, because of this issue: https://github.com/golang/go/issues/30883 - Clone the git repository or download the source archive. - Run 'make' or 'build.cmd' to build the binary -##Other Operating Systems +## Other Operating Systems - If you use FreeBSD or macOS, please test the code and submit patches for supporting those operating systems. -##Project information: +## Project information: - Author: Joseph Paul -- Homepage: https://bitbucket.org/josephpaul0/tdu +- Homepage: https://github.com/josephpaul0/tdu - License: GNU General Public Licence version 2. -##Screenshot +## Screenshot ![Terminal](doc/tdu_output.png) diff --git a/doc/tdu.1 b/doc/tdu.1 index 35ba9b4..4bf0b82 100644 --- a/doc/tdu.1 +++ b/doc/tdu.1 @@ -1,4 +1,4 @@ -.TH TDU 1 "2020-06-10" "1.34" "Top Disk Usage manual" +.TH TDU 1 "2021-06-24" "1.36" "Top Disk Usage manual" .SH NAME tdu \- get information about largest files and directories @@ -22,9 +22,7 @@ or at current directory by default. .br * Counts empty directories, denied accesses, errors. .br -* Shows deepest directory path. -.br -* Shows longest file path. +* Shows deepest directory path and longest file path. .br * Displays information about the filesystem (type, mount options, size, inodes). @@ -55,13 +53,18 @@ Number of sockets and named pipes shown (default 0) Number of file status errors shown (default 0) .TP .BR \-\-human -Print sizes in human readable format (default Kb only) +Print sizes in human readable format (default). +.br +Use \-\-human=false to print sizes in kilobytes. .TP .BI \-o \ file Export result to Ncdu JSON format .br (https://dev.yorhel.nl/ncdu/jsonfmt) .TP +.BR \-\-consolemax +Maximizes console window (Windows only, default no) +.TP .BR \-\-version Program info and usage .TP @@ -76,14 +79,13 @@ Does not cross filesystem boundaries. It behaves like .B du \-skx .SH COPYRIGHT -Copyright \(co 2019,2020 Joseph Paul . +Copyright \(co 2019-2021 Joseph Paul . .br License GPLv2+: GNU GPL version 2 or later. .SH WEBSITE -https://bitbucket.org/josephpaul0/tdu +https://github.com/josephpaul0/tdu .SH "SEE ALSO" .BR du (1), .BR ncdu (1) - diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..d4f9f9c --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/josephpaul0/tdu + +go 1.10 diff --git a/tdu.go b/tdu.go index 5a2672f..8f06811 100644 --- a/tdu.go +++ b/tdu.go @@ -1,6 +1,6 @@ /* Top Disk Usage. - * Copyright (C) 2019 Joseph Paul - * https://bitbucket.org/josephpaul0/tdu + * Copyright (C) 2019-2021 Joseph Paul + * https://github.com/josephpaul0/tdu * * 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 @@ -38,14 +38,14 @@ import ( ) const ( - prg_VERSION = "1.34" + prg_VERSION = "1.36" dft_MAXSHOWNLINES = 15 dft_MAXEMPTYDIRS = 0 dft_MAXDENIEDDIRS = 0 dft_MAXSTATERROR = 0 dft_MAXSTREAMS = 0 dft_MAXDEVICES = 0 - dft_MAXBIGFILES = 7 + dft_MAXBIGFILES = 8 cst_ENDPROGRESS = "###" cst_PROGRESSBEAT = 80 // ms ) @@ -108,6 +108,7 @@ type s_scan struct { // Global variables export bool // export result to Ncdu's JSON format tty bool // stdout is on a TTY humanReadable bool // print sizes in human readable format + consoleMax bool // maximize size of console window (on Windows only) exportPath string // path to exported file exportFile *os.File // exported file deepestPath string // deepest subdirectory reached @@ -337,13 +338,15 @@ func printFileTypes(sc *s_scan) { // Summary of file types with non-zero counter fmt.Printf(", Symlink: %d", sc.nSymlinks) } if sc.nHardlinks > 0 { - fmt.Printf(", Hardlink: %d", sc.nHardlinks) + fmt.Printf(",\n Hardlink: %d", sc.nHardlinks) } if sc.nSockets > 0 { fmt.Printf(", Socket: %d", sc.nSockets) } if sc.nDenied > 0 { - fmt.Printf(", Denied: %d", sc.nDenied) + fmt.Printf(", ") + msg := fmt.Sprintf("Denied: %d", sc.nDenied) + printAlert(sc, msg) } if sc.nErrors > 0 { fmt.Printf(", Error: %d", sc.nErrors) @@ -609,7 +612,7 @@ func show(sc *s_scan, fi []file, total *file) { nf := fmt.Sprintf("%%%ds", fmtNameLen+1) cf := fmt.Sprintf("%%%ds", countDigits(total.diskUsage)+1) mf := fmt.Sprintf("%%%dd", countDigits(sc.nItems)+1) - var strfmt = "%3d." + nf + "|" + cf + "|%6.2f%%" + var strfmt = "%3d." + nf + "|" + cf + "|%6.2f%%|" i = 0 for _, f := range fi { if !f.isDir && sc.nFiles == 0 { // ignore special files @@ -629,7 +632,7 @@ func show(sc *s_scan, fi []file, total *file) { } fmt.Printf(strfmt, i, f.name, fmtSz(sc, f.diskUsage), p) if f.isDir { - fmt.Printf("|"+mf+" items", f.items) + fmt.Printf(mf+" items", f.items) } fmt.Println() } @@ -640,8 +643,8 @@ func show(sc *s_scan, fi []file, total *file) { fmt.Printf(s, "REMAINING", fmtSz(sc, rDiskUsage), p, rItems) } strfmt += "\n" - fmt.Printf(strfmt, "TOTAL", fmtSz(sc, total.diskUsage)) - fmt.Printf(strfmt, "Apparent size", fmtSz(sc, total.size)) + fmt.Printf(strfmt, "DISK SPACE", fmtSz(sc, total.diskUsage)) + fmt.Printf(strfmt, "TOTAL SIZE", fmtSz(sc, total.size)) fmt.Println() printFileTypes(sc) } @@ -669,8 +672,8 @@ func changeDir(args []string) (string, error) { func usage(sc *s_scan) []string { flag.Usage = func() { showTitle() - fmt.Println(" Copyright (c) 2020 Joseph Paul ") - fmt.Println(" https://bitbucket.org/josephpaul0/tdu") + fmt.Println(" Copyright (c) 2019-2021 Joseph Paul ") + fmt.Println(" https://github.com/josephpaul0/tdu") fmt.Println() fmt.Printf(" Usage: %s [options] [directory]\n", os.Args[0]) fmt.Println() @@ -691,7 +694,8 @@ func usage(sc *s_scan) []string { nm := flag.Bool("max", false, "Show deepest and longest paths") vs := flag.Bool("version", false, "Program info and usage") sl := flag.Bool("license", false, "Show the GNU General Public License V2") - hu := flag.Bool("human", false, "Print sizes in human readable format") + hu := flag.Bool("human", true, "Print sizes in human readable format.\nUse --human=false to print in kilobytes instead.") + cm := flag.Bool("consolemax", false, "Maximize console window (on Windows only)") flag.Parse() // NArg (int) if *sl { showLicense() @@ -736,6 +740,7 @@ func usage(sc *s_scan) []string { } sc.showMax = *nm sc.humanReadable = *hu + sc.consoleMax = *cm if *ex != "" { sc.export = true sc.exportPath = *ex diff --git a/tdu_bsd.go b/tdu_bsd.go index 5ebdd50..cfa0764 100644 --- a/tdu_bsd.go +++ b/tdu_bsd.go @@ -2,7 +2,7 @@ /* Top Disk Usage. * Copyright (C) 2019 Joseph Paul - * https://bitbucket.org/josephpaul0/tdu + * https://github.com/josephpaul0/tdu * * 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 diff --git a/tdu_export.go b/tdu_export.go index a4f2250..2012521 100644 --- a/tdu_export.go +++ b/tdu_export.go @@ -1,6 +1,6 @@ /* Top Disk Usage. * Copyright (C) 2019 Joseph Paul - * https://bitbucket.org/josephpaul0/tdu + * https://github.com/josephpaul0/tdu * * 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 @@ -79,7 +79,7 @@ func cleanName(s string) string { rs := []rune(s) rd := make([]rune, 0, len(s)) for i := 0; i < len(rs); i++ { - if rs[i] <= 31 || rs[i] == 127 { + if rs[i] <= 31 || rs[i] == 34 || rs[i] == 127 { u := []rune(fmt.Sprintf("\\u00%02X", rs[i])) rd = append(rd, u...) } else { diff --git a/tdu_generic.go b/tdu_generic.go index 971cd12..ee6b8db 100644 --- a/tdu_generic.go +++ b/tdu_generic.go @@ -4,7 +4,7 @@ /* Top Disk Usage. * Copyright (C) 2019 Joseph Paul - * https://bitbucket.org/josephpaul0/tdu + * https://github.com/josephpaul0/tdu * * 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 @@ -34,6 +34,10 @@ func getTtyWidth() int { func initTty(sc *sc_scan) {} // OS Specific +func printAlert(sc *s_scan, msg string) { + fmt.Printf(msg) +} + func printProgress(sc *s_scan) { n := sc.nErrors + sc.nItems fmt.Printf(" [.... scanning... %6d ....]\r", n) diff --git a/tdu_license.go b/tdu_license.go index 94ca274..f9677dd 100644 --- a/tdu_license.go +++ b/tdu_license.go @@ -1,6 +1,6 @@ /* Top Disk Usage. * Copyright (C) 2019 Joseph Paul - * https://bitbucket.org/josephpaul0/tdu + * https://github.com/josephpaul0/tdu * * 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 diff --git a/tdu_linux.go b/tdu_linux.go index 4ed8c92..1d73000 100644 --- a/tdu_linux.go +++ b/tdu_linux.go @@ -2,7 +2,7 @@ /* Top Disk Usage. * Copyright (C) 2019 Joseph Paul - * https://bitbucket.org/josephpaul0/tdu + * https://github.com/josephpaul0/tdu * * 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 diff --git a/tdu_unix.go b/tdu_unix.go index 6fe1c6f..bd1ae3f 100644 --- a/tdu_unix.go +++ b/tdu_unix.go @@ -2,7 +2,7 @@ /* Top Disk Usage. * Copyright (C) 2019 Joseph Paul - * https://bitbucket.org/josephpaul0/tdu + * https://github.com/josephpaul0/tdu * * 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 @@ -222,6 +222,16 @@ func colorCyan() { fmt.Printf(color_CYAN) } func colorMagenta() { fmt.Printf(color_MAGENTA) } func colorAlert() { fmt.Printf(color_ALERT) } +func printAlert(sc *s_scan, msg string) { + if sc.tty { + colorRed() + } + fmt.Printf(msg) + if sc.tty { + colorDefault() + } +} + func printProgress(sc *s_scan) { if !sc.tty { return @@ -360,10 +370,8 @@ func partInfo(sc *s_scan) { if total > 0 { avail = uint64(statfs.Ffree) used = total - avail - fmt.Printf(" Inodes :%11d ", total) - fmt.Printf("Avail:%10d ", avail) - fmt.Printf("Used:%10d (%d%%)", used, used*100/total) - fmt.Println() + fmt.Printf(" Inodes :%10d used (%2d%%) of %10d. Avail:%10d\n", + used, used*100/total, total, avail) } total = statfs.Blocks * uint64(statfs.Bsize) if total > 0 { @@ -373,13 +381,12 @@ func partInfo(sc *s_scan) { total /= 1024 avail /= 1024 used /= 1024 - fmt.Printf(" Size(kb):%11d ", total) - fmt.Printf("Avail:%10d ", avail) - fmt.Printf("Used:%10d (%d%%)\n", used, used*100/total) + fmt.Printf(" Size(kb):%10d used (%2d%%) of %10d. Avail:%10d\n", + used, used*100/total, int64(total), int64(avail)) } else { - fmt.Printf(" Size :%11s ", fmtSz(sc, int64(total))) - fmt.Printf("Avail:%10s ", fmtSz(sc, int64(avail))) - fmt.Printf("Used:%10s (%d%%)\n", fmtSz(sc, int64(used)), used*100/total) + fmt.Printf(" Size :%10s used (%2d%%) of %10s. Avail:%10s\n", + fmtSz(sc, int64(used)), used*100/total, + fmtSz(sc, int64(total)), fmtSz(sc, int64(avail))) } } fmt.Println() diff --git a/tdu_windows.go b/tdu_windows.go index b80b489..f0346d4 100644 --- a/tdu_windows.go +++ b/tdu_windows.go @@ -1,8 +1,8 @@ // +build windows /* Top Disk Usage. - * Copyright (C) 2019 Joseph Paul - * https://bitbucket.org/josephpaul0/tdu + * Copyright (C) 2019-2021 Joseph Paul + * https://github.com/josephpaul0/tdu * * 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 @@ -10,6 +10,31 @@ * (at your option) any later version. */ +/* + * The part of the code that fetches processes under Windows + * is inspired by package https://github.com/mitchellh/go-ps + * Copyright (c) 2014 Mitchell Hashimoto + * + * The MIT License (MIT) + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + package main import ( @@ -21,9 +46,32 @@ import ( "unsafe" ) +// Some constants from the Windows API +const ( + ERROR_NO_MORE_FILES = 0x12 + MAX_PATH = 260 +) + // Code inspired by termbox-go (https://github.com/nsf/termbox-go) // Code also copied from MinGW32 include files type ( + procEntry32 struct { // WinAPI struct that contains a process's information. + Size uint32 + CntUsage uint32 + ProcessID uint32 + DefaultHeapID uintptr + ModuleID uint32 + CntThreads uint32 + ParentProcessID uint32 + PriorityClassBase int32 + Flags uint32 + ExeFile [MAX_PATH]uint16 + } + winProc struct { // Process for Windows. + pid int + ppid int + exe string + } dynProc struct { fx *syscall.LazyProc name string @@ -88,6 +136,10 @@ const ( kSetConsoleScreenBufferSize = "SetConsoleScreenBufferSize" kSetConsoleTitleA = "SetConsoleTitleA" kSetConsoleWindowInfo = "SetConsoleWindowInfo" + kCloseHandle = "CloseHandle" + kCreateToolhelp32Snapshot = "CreateToolhelp32Snapshot" + kProcess32First = "Process32FirstW" + kProcess32Next = "Process32NextW" uGetMonitorInfoW = "GetMonitorInfoW" uGetSystemMetrics = "GetSystemMetrics" uMonitorFromWindow = "MonitorFromWindow" @@ -153,11 +205,11 @@ func (w *win32) call(name string, a ...uintptr) (bool, uintptr) { i := w.find(name) p := w.procs[i].fx.Addr() r, _, err := dyncall(p, a) - if r == 0 && name != uGetSystemMetrics { // ugly + if r == 0 && name != uGetSystemMetrics && name != kProcess32Next { // ugly fmt.Printf("Win32 function '%s' failed", name) fmt.Println() fmt.Println(err) - time.Sleep(6 * time.Second) + time.Sleep(4 * time.Second) } return (r != 0), r } @@ -191,6 +243,10 @@ func (w *win32) populate() { kSetConsoleScreenBufferSize, kSetConsoleTitleA, kSetConsoleWindowInfo, + kCloseHandle, + kCreateToolhelp32Snapshot, + kProcess32First, + kProcess32Next, } uProcs := []string{ uGetMonitorInfoW, @@ -272,7 +328,7 @@ func (w *win32) getWorkingArea() { // fmt.Printf("Cols = %d, Rows = %d\n", max.x, max.y) } -func (w *win32) updateConsole() bool { // Maximize Console +func (w *win32) updateConsole(sc *s_scan) bool { // Maximize Console b, r := w.getConsoleWindow() if !b { return false @@ -295,18 +351,74 @@ func (w *win32) updateConsole() bool { // Maximize Console if (w.max.x == 0) || (w.max.y == 0) { return false } - var size coord = w.max - size.y += 100 - b, r = w.setConsoleScreenBufferSize(w.hOutput, size) - if !b { - return false + if sc.consoleMax { + w.max.x += 2 + var size coord = w.max + size.y += 100 + // fmt.Printf("coord = %v\n", size) + b, r = w.setConsoleScreenBufferSize(w.hOutput, size) + if !b { + return false + } + w.maximizeWindow(w.hConsole) } - w.maximizeWindow(w.hConsole) w.eraseScreen() w.ttyWidth = int(w.max.x) return true } +func newProcess(e *procEntry32) *winProc { + // Find when the string ends for decoding + end := 0 + for { + if e.ExeFile[end] == 0 { + break + } + end++ + } + return &winProc{ + pid: int(e.ProcessID), + ppid: int(e.ParentProcessID), + exe: syscall.UTF16ToString(e.ExeFile[:end]), + } +} + +func (w *win32) findProcess(pid int) *winProc { + ps := w.listProcesses() + if ps == nil { + return nil + } + for _, p := range ps { + if p.pid == pid { + return p + } + } + return nil +} + +func (w *win32) listProcesses() []*winProc { + b, h := w.call(kCreateToolhelp32Snapshot, 0x00000002) + if !b { + return nil + } + defer w.call(kCloseHandle, h) + var entry procEntry32 + entry.Size = uint32(unsafe.Sizeof(entry)) + b, _ = w.process32First(h, &entry) + if !b { + return nil // "Error retrieving process info." + } + results := make([]*winProc, 0, 50) + for { + results = append(results, newProcess(&entry)) + b, _ = w.process32Next(h, &entry) + if !b { + break + } + } + return results +} + func (w *win32) getStdHandle(h uint32) (bool, uintptr) { invalid_handle_value := uint32(0xFFFFFFFE) b, r := w.call(kGetStdHandle, uintptr(h)) @@ -332,6 +444,14 @@ func (w *win32) getFileType(h uintptr) int { return int(r) } +func (w *win32) process32First(h uintptr, m *procEntry32) (bool, uintptr) { + return w.call(kProcess32First, h, uintptr(unsafe.Pointer(m))) +} + +func (w *win32) process32Next(h uintptr, m *procEntry32) (bool, uintptr) { + return w.call(kProcess32Next, h, uintptr(unsafe.Pointer(m))) +} + func (w *win32) getConsoleMode(h uintptr, m *uint32) (bool, uintptr) { return w.call(kGetConsoleMode, h, uintptr(unsafe.Pointer(m))) } @@ -490,12 +610,27 @@ func initTty(sc *s_scan) { break } } + if !w.fromCmdLine { + ps := w.findProcess(os.Getppid()) + if ps != nil { + //fmt.Printf(" Parent id=%d name=%s\n", process.pid, process.exe) + if ps.exe == "explorer.exe" { + w.fromCmdLine = false + } + if ps.exe == "powershell.exe" { + w.fromCmdLine = true + } + } else { + fmt.Fprintln(os.Stderr, " Fatal error, cannot find parent process?") + return + } + } if !w.fromCmdLine { fmt.Println() fmt.Println(" This program should be run from the command line.") w.pressAnyKey(" Press any key to continue...") } - sc.tty = w.updateConsole() + sc.tty = w.updateConsole(sc) sc.refreshDelay *= 3 } @@ -567,6 +702,17 @@ func (w *win32) color(attr uint16, l uint32) { } } +func printAlert(sc *s_scan, msg string) { + var c uint16 + w := sc.sys.(*win32) + c = foreground_red + if sc.tty { + w.writeColored(c|foreground_intensity, msg) + } else { + fmt.Printf(msg) + } +} + func printProgress(sc *s_scan) { var c uint16 w := sc.sys.(*win32)