Skip to content

Commit b2283a5

Browse files
authored
Merge pull request #1961 from overcuriousity/main
fix bad linux filename generation
2 parents 1ed0c61 + b8c62f9 commit b2283a5

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

maigret/maigret.py

+9
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import os
99
import sys
1010
import platform
11+
import re
1112
from argparse import ArgumentParser, RawDescriptionHelpFormatter
1213
from typing import List, Tuple
1314
import os.path as path
@@ -679,25 +680,30 @@ async def main():
679680
# TODO: tests
680681
if recursive_search_enabled:
681682
extracted_ids = extract_ids_from_results(results, db)
683+
query_notify.warning(f'Extracted IDs: {extracted_ids}')
682684
usernames.update(extracted_ids)
683685

684686
# reporting for a one username
685687
if args.xmind:
688+
username = username.replace('/', '_')
686689
filename = report_filepath_tpl.format(username=username, postfix='.xmind')
687690
save_xmind_report(filename, username, results)
688691
query_notify.warning(f'XMind report for {username} saved in {filename}')
689692

690693
if args.csv:
694+
username = username.replace('/', '_')
691695
filename = report_filepath_tpl.format(username=username, postfix='.csv')
692696
save_csv_report(filename, username, results)
693697
query_notify.warning(f'CSV report for {username} saved in {filename}')
694698

695699
if args.txt:
700+
username = username.replace('/', '_')
696701
filename = report_filepath_tpl.format(username=username, postfix='.txt')
697702
save_txt_report(filename, username, results)
698703
query_notify.warning(f'TXT report for {username} saved in {filename}')
699704

700705
if args.json:
706+
username = username.replace('/', '_')
701707
filename = report_filepath_tpl.format(
702708
username=username, postfix=f'_{args.json}.json'
703709
)
@@ -715,18 +721,21 @@ async def main():
715721
username = report_context['username']
716722

717723
if args.html:
724+
username = username.replace('/', '_')
718725
filename = report_filepath_tpl.format(
719726
username=username, postfix='_plain.html'
720727
)
721728
save_html_report(filename, report_context)
722729
query_notify.warning(f'HTML report on all usernames saved in {filename}')
723730

724731
if args.pdf:
732+
username = username.replace('/', '_')
725733
filename = report_filepath_tpl.format(username=username, postfix='.pdf')
726734
save_pdf_report(filename, report_context)
727735
query_notify.warning(f'PDF report on all usernames saved in {filename}')
728736

729737
if args.graph:
738+
username = username.replace('/', '_')
730739
filename = report_filepath_tpl.format(
731740
username=username, postfix='_graph.html'
732741
)

0 commit comments

Comments
 (0)