diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..96b0f95 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,4 @@ +template: | + ## What’s Changed + + $CHANGES \ No newline at end of file diff --git a/name_that_hash/prettifier.py b/name_that_hash/prettifier.py index 73b999d..57d0f7c 100644 --- a/name_that_hash/prettifier.py +++ b/name_that_hash/prettifier.py @@ -56,15 +56,15 @@ def pretty_print(self, objs): self.pretty_print_one(i, multi_print) def pretty_print_one(self, objs: List, multi_print: bool): - out = f"\n[bold #011627 on #ff9f1c]{objs.chash}[/bold #011627 on #ff9f1c]\n" + out = f"\n[bold magenta]{objs.chash}[/bold magenta]\n" # It didn't find any hahses. if len(objs.prototypes) == 0: - out += "[bold #2ec4b6]No hashes found.[/bold #2ec4b6]" + out += "[bold #FF0000]No hashes found.[/bold #FF0000]" console.print(out) return out - out += "\n[bold underline #2ec4b6]Most Likely[/bold underline #2ec4b6] \n" + out += "\n[bold underline #5f5fff]Most Likely[/bold underline #5f5fff] \n" start = objs.prototypes[0:4] rest = objs.prototypes[4:] @@ -78,7 +78,7 @@ def pretty_print_one(self, objs: List, multi_print: bool): # return if accessible is on if not self.a11y: - out += "\n[bold underline #2ec4b6]Least Likely[/bold underline #2ec4b6]\n" + out += "\n[bold underline #5f5fff]Least Likely[/bold underline #5f5fff]\n" for i in rest: out += self.turn_named_tuple_pretty_print(i) + " " @@ -88,7 +88,7 @@ def pretty_print_one(self, objs: List, multi_print: bool): def turn_named_tuple_pretty_print(self, nt: NamedTuple): # This colours red - out = f"[bold #e71d36]{nt['name']}[/bold #e71d36], " + out = f"[bold #ff5f00]{nt['name']}[/bold #ff5f00], " hc = nt["hashcat"] john = nt["john"] @@ -107,6 +107,6 @@ def turn_named_tuple_pretty_print(self, nt: NamedTuple): out += f"John Name: {john}." if des: # Orange - out += f"[#ff9f1c]Summary: {des}[/#ff9f1c]" + out += f"[#8787D7]Summary: {des}[/#8787D7]" return out diff --git a/name_that_hash/runner.py b/name_that_hash/runner.py index 862840c..077ee5f 100644 --- a/name_that_hash/runner.py +++ b/name_that_hash/runner.py @@ -85,12 +85,12 @@ def print_help(ctx): def banner(): text = r"""[bold blue] - _ _ _______ _ _ _ _ _ - | \ | | |__ __| | | | | | | | | | - | \| | __ _ _ __ ___ ___ ______| | | |__ __ _| |_ ______| |__| | __ _ ___| |__ - | . ` |/ _` | '_ ` _ \ / _ \______| | | '_ \ / _` | __|______| __ |/ _` / __| '_ \ - | |\ | (_| | | | | | | __/ | | | | | | (_| | |_ | | | | (_| \__ \ | | | - |_| \_|\__,_|_| |_| |_|\___| |_| |_| |_|\__,_|\__| |_| |_|\__,_|___/_| |_| + _ _ _____ _ _ _ _ _ + | \ | | |_ _| | | | | | | | | | + | \| | __ _ _ __ ___ ___ ______| | | |__ __ _| |_ ______| |_| | __ _ ___| |__ + | . ` |/ _` | '_ ` _ \ / _ \______| | | '_ \ / _` | __|______| _ |/ _` / __| '_ \ + | |\ | (_| | | | | | | __/ | | | | | | (_| | |_ | | | | (_| \__ \ | | | + \_| \_/\__,_|_| |_| |_|\___| \_/ |_| |_|\__,_|\__| \_| |_/\__,_|___/_| |_| https://twitter.com/bee_sec_san https://github.com/HashPals/Name-That-Hash [/bold blue] """ diff --git a/packages/setup.py b/packages/setup.py index c2864b8..a6d31e6 100644 --- a/packages/setup.py +++ b/packages/setup.py @@ -1,36 +1,36 @@ -# -*- coding: utf-8 -*- - -# DO NOT EDIT THIS FILE! -# This file has been autogenerated by dephell <3 -# https://github.com/dephell/dephell - -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - -readme = '' - -setup( - long_description=readme, - name='name-that-hash', - version='0.6.0', - description='The Modern Hash Identifcation System', - python_requires='==3.*,>=3.7.0', - author='brandon', - author_email='brandon@skerritt.blog', - license='GPL-3.0-or-later', - entry_points={ - "console_scripts": [ - "nth = name_that_hash.runner:main", - "name-that-hash = name_that_hash.runner:main" - ] - }, - packages=['Name_That_Hash'], - package_dir={"": "."}, - package_data={}, - install_requires=[ - 'click==7.*,>=7.1.2', 'loguru==0.*,>=0.5.3', 'rich==9.*,>=9.9.0' - ], - extras_require={"dev": ["pytest==5.*,>=5.2.0"]}, -) +# -*- coding: utf-8 -*- + +# DO NOT EDIT THIS FILE! +# This file has been autogenerated by dephell <3 +# https://github.com/dephell/dephell + +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +readme = '' + +setup( + long_description=readme, + name='name-that-hash', + version='0.6.0', + description='The Modern Hash Identifcation System', + python_requires='==3.*,>=3.7.0', + author='brandon', + author_email='brandon@skerritt.blog', + license='GPL-3.0-or-later', + entry_points={ + "console_scripts": [ + "nth = name_that_hash.runner:main", + "name-that-hash = name_that_hash.runner:main" + ] + }, + packages=['Name_That_Hash'], + package_dir={"": "."}, + package_data={}, + install_requires=[ + 'click==7.*,>=7.1.2', 'loguru==0.*,>=0.5.3', 'rich==9.*,>=9.9.0' + ], + extras_require={"dev": ["pytest==5.*,>=5.2.0"]}, +) diff --git a/pyproject.toml b/pyproject.toml index 4137264..c11dfcd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,23 +1,23 @@ -[tool.poetry] -name = "name-that-hash" -version = "0.6.0" -description = "The Modern Hash Identifcation System" -authors = ["brandon "] -license = "GPL-3.0-or-later" - -[tool.poetry.dependencies] -python = "^3.7" -click = "^7.1.2" -rich = "^9.9.0" -loguru = "^0.5.3" - -[tool.poetry.dev-dependencies] -pytest = "^5.2" - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" - -[tool.poetry.scripts] -nth = "name_that_hash.runner:main" -name-that-hash = "name_that_hash.runner:main" +[tool.poetry] +name = "name-that-hash" +version = "0.8.0" +description = "The Modern Hash Identifcation System" +authors = ["brandon "] +license = "GPL-3.0-or-later" + +[tool.poetry.dependencies] +python = "^3.7" +click = "^7.1.2" +rich = "^9.9.0" +loguru = "^0.5.3" + +[tool.poetry.dev-dependencies] +pytest = "^5.2" + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.poetry.scripts] +nth = "name_that_hash.runner:main" +name-that-hash = "name_that_hash.runner:main"