git: 9835d0935a94 - main - net-p2p/py-ed2k-tools: improve transfers' summary printing script

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9835d0935a94064a4695f74124eef6f722e6946e

commit 9835d0935a94064a4695f74124eef6f722e6946e
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-05-18 09:04:14 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-05-18 09:04:14 +0000

    net-p2p/py-ed2k-tools: improve transfers' summary printing script
    
    - Do not hardcode terminal width, ask for it instead and fallback
      to 80 characters if cannot get it (available since Python 3.3)
    - Handle filenames with CJK characters properly, i.e. account for
      extra space they occupy when truncating strings (can be mixed)
---
 net-p2p/py-ed2k-tools/files/patch-temp__summary.py | 62 ++++++++++++++++++----
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/net-p2p/py-ed2k-tools/files/patch-temp__summary.py b/net-p2p/py-ed2k-tools/files/patch-temp__summary.py
index 358af31af085..8d100fd34870 100644
--- a/net-p2p/py-ed2k-tools/files/patch-temp__summary.py
+++ b/net-p2p/py-ed2k-tools/files/patch-temp__summary.py
@@ -1,6 +1,20 @@
 --- temp_summary.py.orig	2003-05-06 11:53:14 UTC
 +++ temp_summary.py
-@@ -15,13 +15,13 @@ if __name__ == "__main__":
+@@ -2,11 +2,9 @@
+ from ed2k_metutils import *
+ import os
+ import stat
++import unicodedata
+ 
+-# I'm really surprised there's no easy way to get the terminal
+-# width in python... :-/  I can't do external invocations to
+-# stty, etc, because they might not be there on windows... 
+-WIDTH = 80;
++WIDTH = getattr(os.get_terminal_size(), 'columns', 80)
+ 
+ if __name__ == "__main__":
+ 	# Here's an example to cut and keep.
+@@ -15,13 +13,10 @@ if __name__ == "__main__":
  	# see how much data I actually got from night to night.
  	
  	if len( sys.argv ) < 2:
@@ -15,13 +29,10 @@
 +		print()
 +		print("This program will show the amount downloaded vs. the total size")
 +		print("for the .part.met files listed on the command line.")
-+		print()
-+		print("This program assumes an 80 column display.  You can tweak this")
-+		print("by editing the script.  Change the 'WIDTH' value.")
  		sys.exit( -1 );
  	
  	total_size = total_down = 0;
-@@ -34,7 +34,7 @@ if __name__ == "__main__":
+@@ -34,7 +29,7 @@ if __name__ == "__main__":
  	
  	for met_file in mets:
  		
@@ -30,7 +41,16 @@
  		data = fh.read();
  		fh.close();
  		
-@@ -71,19 +71,19 @@ if __name__ == "__main__":
+@@ -43,7 +38,7 @@ if __name__ == "__main__":
+ 		
+ 		# We're interested in the name, the total size, and some kind of... anti-gapping.
+ 		size = met_data.FindTags( TAG_HANDLE_FILESIZE )[ 0 ].value;
+-		name = met_data.FindTags( TAG_HANDLE_FILENAME )[ 0 ].value;
++		name = met_data.FindTags(TAG_HANDLE_FILENAME)[0].value.decode()
+ 		
+ 		# Set the total downloaded to the file size.
+ 		down = size;
+@@ -71,19 +66,39 @@ if __name__ == "__main__":
  		bar = "#" * ( WIDTH - 2 );
  		for gap in gaps:
  			gap_start, gap_end = gaps[ gap ];
@@ -39,20 +59,42 @@
 +			char_gap_start = int(gap_start / bytes_per_char)
 +			char_gap_end = int(gap_end / bytes_per_char)
  			bar = bar[ : char_gap_start ] + " " * ( char_gap_end - char_gap_start ) + bar[ char_gap_end : ];
++
++		# Account for CJK characters occupy two terminal spaces
++		def char_width(c: str) -> int:
++			if not c.isprintable(): return 0
++			return 2 if unicodedata.category(c) == 'Lo' else 1
++
++		def visible_len(s: str) -> int:
++			return sum(char_width(c) for c in s)
++
++		def visible_substr_padded(s: str, l: int) -> str:
++			vislen = 0
++			cut_here = 0
++			padding = ''
++			for c in s:
++				vislen += char_width(c)
++				if (vislen <= l): cut_here += 1
++				if (vislen == l): break
++				if (vislen > l): padding = ' '; break
++			return s[:cut_here] + padding
  				
  		# Print out our summary.  Limit the filenames.
 -		sizestring = " - %s - %iK of %iK" % ( met_file.split( "/" )[ -1 ], down / 1024, size / 1024 );
 +		sizestring = " - %s - %.2fK of %.2fK" % (met_file.split("/")[-1], down / 1024, size / 1024)
  		max_name_size = WIDTH - len( sizestring );
- 		if len( name ) < max_name_size:
+-		if len( name ) < max_name_size:
 -			name += " " * ( max_name_size - len( name ) );
-+			name += b" " * (max_name_size - len(name))
++		vislen = visible_len(name)
++		if vislen < max_name_size:
++			name += " " * (max_name_size - vislen)
  		else:
- 			name = name[ : max_name_size ];
+-			name = name[ : max_name_size ];
 -		print "%s%s" % ( name, sizestring );
 -		print "[%s]" % bar;
 -		print 
-+		print("%s%s" % (name.decode(), sizestring))
++			name = visible_substr_padded(name, max_name_size)
++		print("%s%s" % (name, sizestring))
 +		print("[%s]" % bar)
 +		print()
  		del( met_data );