mousebot
/
mkv-this
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing'

This commit is contained in:
mousebot 2020-04-25 22:55:43 -03:00
parent 41816a00b5 7063c8339b
commit 36f5b25197
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mkv_this/mkv_this_dir.py
View File

@ -112,11 +112,19 @@ def main():
# write it combo!
if args.length:
<< << << < HEAD
writeshortsentence(combo_model, args.sentences,
args.outfile, args.overlap, args.length)
else:
writesentence(combo_model, args.sentences,
args.outfile, args.overlap, args.length)
=======
writeshortsentence(combo_model, args.sentences, args.outfile, args.overlap, args.length)
else:
writesentence(combo_model, args.sentences, args.outfile, args.overlap, args.length)
>>>>>>> testing
# no combining:
else:
@ -127,6 +135,7 @@ def main():
# no --newline:
else:
text_model = mkbtext(text, args.state_size, args.well_formed)
<<<<<<< HEAD
# write it!
if args.length:
@ -136,6 +145,15 @@ def main():
writesentence(text_model, args.sentences,
args.outfile, args.overlap, args.length)
=======
# write it!
if args.length:
writeshortsentence(text_model, args.sentences, args.outfile, args.overlap, args.length)
else:
writesentence(text_model, args.sentences, args.outfile, args.overlap, args.length)
>>>>>>> testing
os.unlink(batchfile)
# print('\n: The options you used are as follows:\n')
@ -149,7 +167,11 @@ def main():
print(': mkv-this ran but did NOT create an output file as requested. this is a very regrettable and dangerous situation. contact the package maintainer asap. soz!')
sys.exit()
<<<<<<< HEAD
=======
>>>>>>> testing
if __name__ == '__main__':
main()

10
setup.py
View File

@ -5,9 +5,9 @@ from os import path
this_directory = path.abspath(path.dirname(__file__))
with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
long_description = f.read()
setup(name='mkv-this',
version='0.1.39',
version='0.1.41',
description='cli wrapper for markovify: take a text file or URL, markovify, save the results.',
long_description=long_description,
long_description_content_type='text/markdown',
@ -20,12 +20,12 @@ setup(name='mkv-this',
'console_scripts': [
'mkv-this = mkv_this.mkv_this:main',
'mkv-this-dir = mkv_this.mkv_this_dir:main'
]
},
]
},
install_requires=[
'markovify',
'argparse',
'html2text',
],
zip_safe=False,
)
)