moonq/qgpg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed padding

Browse Source
This commit is contained in:
q
2024-06-26 10:19:43 +03:00
parent 723f23233c
commit 34c5232f03
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Bakefile
View File

@@ -3,6 +3,7 @@ build() {
. useve-runner . useve-runner
useve syncbin useve syncbin
python3 -m hatchling build python3 -m hatchling build
cp qgpg/__init__.py dist/qgpg.py
echo "copy dist/ to six9.net/py/qgpg/" echo "copy dist/ to six9.net/py/qgpg/"
} }
@@ -11,18 +12,18 @@ install_useve() {
set -e set -e
. useve-runner . useve-runner
py-format . py-format .
useve up qgpg useve qgpg
pip install ./
} }
test_encrypt() { test_encrypt() {
cd ~/tmp/ cd ~/tmp/
. useve-runner . useve-runner
useve qgpg useve qgpg
rm -fr key2* datadir rm -fr key2* datadir sha1sum.txt
GPGPASS=secret @ qgpg --key key2 k GPGPASS=secret @ qgpg --key key2 k
@ mkdir -p datadir/folder{1,2} @ mkdir -p datadir/folder{1,2}
@ dd if=/dev/random of=datadir/testfile bs=1024 count=102400 @ dd if=/dev/random of=datadir/testfile bs=3024 count=102400
for i in {1..10}; do for i in {1..10}; do
dd if=/dev/random of=datadir/folder1/${i}testfile bs=1024 count=10240 &> /dev/null dd if=/dev/random of=datadir/folder1/${i}testfile bs=1024 count=10240 &> /dev/null
dd if=/dev/random of=datadir/folder2/${i}testfile bs=1024 count=10240 &> /dev/null dd if=/dev/random of=datadir/folder2/${i}testfile bs=1024 count=10240 &> /dev/null

19
qgpg/__init__.py
View File

@@ -1,3 +1,5 @@
#!/usr/bin/env python3
__version__ = "1.0" __version__ = "1.0"
import argparse import argparse
@@ -8,7 +10,10 @@ import tempfile
import time import time
from getpass import getpass from getpass import getpass
import gnupg try:
import gnupg
except Exception:
raise ImportError("You need to install python package python-gnupg")
chunk_size = 1024 * 1024 * 1 # = 1 Mb chunk_size = 1024 * 1024 * 1 # = 1 Mb
@@ -73,11 +78,10 @@ class MiniProgress:
def finish(self): def finish(self):
if time.time() < self.started + self.update_frequency: if time.time() < self.started + self.update_frequency:
return return
completed = 100
elapsed = time.time() - self.started elapsed = time.time() - self.started
full_pad = self.bar_width full_pad = self.bar_width + 1
s = ( s = (
f"\r{completed: 3d}%" "\r100%"
+ ("[ ]" if self.bar_wide else "") + ("[ ]" if self.bar_wide else "")
+ full_pad * self.progress_chars[-1] + full_pad * self.progress_chars[-1]
+ self._human_eta(elapsed) + self._human_eta(elapsed)
@@ -263,7 +267,8 @@ class Processor:
return return
file_size = os.path.getsize(in_file) file_size = os.path.getsize(in_file)
self.gpg.on_data = Collector(out_file, self.opts.width, int(file_size / self.gpg.buffer_size)) if not self.opts.no_progress:
self.gpg.on_data = Collector(out_file, self.opts.width, int(file_size / self.gpg.buffer_size))
try: try:
with open(in_file, "rb") as fp: with open(in_file, "rb") as fp:
if self.opts.command == "encrypt": if self.opts.command == "encrypt":
@@ -281,3 +286,7 @@ class Processor:
def main(): def main():
Processor() Processor()
if __name__ == "__main__":
main()