Skip to content

Commit

Permalink
update progress ui issue on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
tp7309 committed Aug 7, 2018
1 parent 206f19e commit 2719c1f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 163 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pip install ttpassgen
if you are using the windows operating system, you could just use the [release version](https://github.com/tp7309/TTPassGen/releases).

# Requirements
Python 2 (version 2.7 or later), or Python 3 (version 3.3 or later).
Python 3.5 or later.

# Quick Start
> Switch to the project's `ttpassgen` directory if you want use ttpassgen by downloaded source code.
Expand Down
156 changes: 0 additions & 156 deletions README.rst

This file was deleted.

2 changes: 1 addition & 1 deletion README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pip install ttpassgen
如果你使用的是Windows操作系统,可以直接下载[release version](https://github.com/tp7309/TTPassGen/releases),这样就不需要Python环境了。

# 使用要求
Python 2 (version 2.7 or later), or Python 3 (version 3.3 or later).
Python 3.5 or later.
如果你使用的是Windows操作系统,不需要Python环境,也可以直接下载[release version](https://github.com/tp7309/TTPassGen/releases)

# 快速使用
Expand Down
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
]

long_description = ''
with open('README.rst') as f:
with open('README.md', encoding='utf-8') as f:
long_description = f.read()

description = 'A highly flexiable and scriptable password dictionary generator.'
install_requires = ['click', 'tqdm']

setup(
name='ttpassgen',
version='1.0.2',
version='1.0.4',
description=description,
author='tp7309',
author_email='yiyou7309@gmail.com',
url='https://github.com/tp7309/TTPassGen',
license='Apache License Version 2.0',
keywords=
'python ttpassgen password-generator wordlist password-dict password-dict-generator brute-force word-combination',
'ttpassgen crunch password-generator wordlist password-dict password-dict-generator brute-force word-combination',
long_description=long_description,
packages=find_packages(exclude=['docs', 'tests*']),
include_package_data=True,
Expand All @@ -45,6 +45,9 @@
'ttpassgen = ttpassgen.ttpassgen:cli',
],
},
classifiers=(
"Programming Language :: Python :: 3",
),
)

# md2rst
Expand Down
1 change: 0 additions & 1 deletion ttpassgen/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
# coding: utf-8
5 changes: 4 additions & 1 deletion ttpassgen/ttpassgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,10 @@ def generate_dict_by_rule(mode, dictlist, rule, dict_cache, global_repeat_mode,
worker.start()
while not result[0]:
time.sleep(0.05)
pbar = tqdm(total=result[1], unit=' word')
if os.name == 'nt':
pbar = tqdm(total=result[1], unit=' word', ascii=True)
else:
pbar = tqdm(total=result[1], unit=' word')
progress = 0
while progress < pbar.total:
time.sleep(0.1)
Expand Down

0 comments on commit 2719c1f

Please sign in to comment.