Skip to content

Commit

Permalink
Few changes
Browse files Browse the repository at this point in the history
  • Loading branch information
SoSaymon committed Jun 8, 2023
1 parent b07056f commit 02e53c7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 26 deletions.
6 changes: 1 addition & 5 deletions dice.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,5 @@ def concat_all_numbers(num_array: list[int]) -> str:
return ''.join(str(i) for i in num_array)


def main(number_of_numbers=5) -> str:
def generate_string_of_numbers(number_of_numbers=5) -> str:
return concat_all_numbers(generate_numbers(number_of_numbers))


if __name__ == "__main__":
print(main())
11 changes: 4 additions & 7 deletions diceware.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@ def interactive_cli() -> (int, str):


def main():
parser = argparse.ArgumentParser(prog="diceware.py", usage="python3 %(prog)s [-h] [-w NUMBER OF WORDS] ["
"--wordlist=wordlist.txt]", description="Passphrase "
"generator "
"based on "
"diceware "
"method")
parser = argparse.ArgumentParser(prog="diceware.py",
usage="python3 %(prog)s [-h] [-w NUMBER OF WORDS] [--wordlist=wordlist.txt]",
description="Passphrase generator based on diceware method")
parser.add_argument("-w", "--words", type=int, help="Number of words in passphrase")
parser.add_argument("--wordlist", type=str, default="wordlist.txt", help="Wordlist used to generate the passphrase")

Expand All @@ -29,7 +26,7 @@ def main():
if wordlist == "":
wordlist = "wordlist.txt"

passgen.main(number_of_words, wordlist)
passgen.passphrase_generation(number_of_words, wordlist)


if __name__ == '__main__':
Expand Down
14 changes: 5 additions & 9 deletions passgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,27 @@
import wordlist_loader


def find_index(wordlist: str, number: int) -> int:
def find_index(wordlist: list[dict[str, str]], number: str) -> int:
for index, element in enumerate(wordlist):
if isinstance(element, dict) and element.get("number") == number:
return index

return -1


def get_word(wordlist: list[{str, str}], index: int) -> str:
def get_word(wordlist: list[dict[str, str]], index: int) -> str:
tmp = wordlist[index]
return tmp.get("word")


def main(number_of_words: int, wordlist_name: int):
wordlist = wordlist_loader.main(wordlist_name)
def passphrase_generation(number_of_words: int, wordlist_name: str):
wordlist = wordlist_loader.wordlist_maker(wordlist_name)
passphrase = ""

for i in range(number_of_words):
number = dice.main()
number = dice.generate_string_of_numbers()
index = find_index(wordlist, number)
word = get_word(wordlist, index).capitalize()
passphrase += word

print(passphrase)


if __name__ == '__main__':
main(5, "wordlist.txt")
6 changes: 1 addition & 5 deletions wordlist_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ def make_wordlist(wordlist: list[str]) -> list[dict[str, str]]:
return dict_list


def main(filename: str) -> list[dict[str, str]]:
def wordlist_maker(filename: str) -> list[dict[str, str]]:
tmp = load_wordlist(filename)
return make_wordlist(tmp)


if __name__ == "__main__":
print(main("wordlist.txt"))

0 comments on commit 02e53c7

Please sign in to comment.