update report

Author: suqingdong

nsfc/bin/report.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 import tempfile
 
 import click
@@ -17,18 +18,19 @@
 
 @click.command(name='report',
                epilog=__epilog__,
+               no_args_is_help=True,
                help='download the conclusion report for given project_id')
 @click.argument('project_id')
 @click.option('-t', '--tmpdir', help='the temporary directory to store pngs', default=tempfile.gettempdir(), show_default=True)
 @click.option('-o', '--outfile', help='the output filename of pdf')
 @click.option('-k', '--keep', help='do not the temporary directory after completion', is_flag=True)
 def main(**kwargs):
 
-    tmpdir = tempfile.mktemp(prefix='nsfc-report', dir=kwargs['tmpdir'])
-    Official.get_conclusion_report(kwargs['project_id'], tmpdir=tmpdir, outfile=kwargs['outfile'])
-
-    if not kwargs['keep']:
-        os.removedirs(tmpdir)
+    tmpdir = tempfile.mktemp(prefix='nsfc-report-', dir=kwargs['tmpdir'])
+    if Official.get_conclusion_report(kwargs['project_id'], tmpdir=tmpdir, outfile=kwargs['outfile']):
+        if not kwargs['keep']:
+            shutil.rmtree(tmpdir)
+            Official.logger.debug(f'tempdir deleted: {tmpdir}')
 
 
 if __name__ == "__main__":

nsfc/src/official.py

@@ -107,12 +107,14 @@ def get_conclusion_report(cls, ratify_number, tmpdir='tmp', pdf=True, outfile=No
             cls.logger.debug(f'save png: {png}')
 
         if pdf:
+            cls.logger.debug('converting *png to pdf')
             outfile = outfile or f'{ratify_number}.pdf'
             with open(outfile, 'wb') as out:
                 out.write(img2pdf.convert(pngs))
 
             size = human_readable.file_size(os.stat(outfile).st_size)
             cls.logger.info(f'save pdf: {outfile} [{size}]')
+        return True
 
     @classmethod
     def get_conclusion_report_images(cls, projectid):

requirements.txt

@@ -4,5 +4,6 @@ openpyxl
 requests
 sqlalchemy
 prettytable
+human-readable
 webrequests
 simple-loggers