From 5dea65e5351d685dc72ea2baef712c8497669f29 Mon Sep 17 00:00:00 2001 From: rany Date: Sun, 6 Jun 2021 00:49:14 +0300 Subject: [PATCH] Fixes --- .gitignore | 18 ++++---- edge-playback.sh => bin/edge-playback | 0 edge-tts.py | 1 - {example => examples}/input_example.py | 0 requirements.txt | 2 - setup.cfg | 32 +++++++++++++ setup.py | 42 +----------------- src/edgeTTS/__init__.py | 11 +++-- .../__pycache__/__init__.cpython-39.pyc | Bin 0 -> 6791 bytes 9 files changed, 50 insertions(+), 56 deletions(-) rename edge-playback.sh => bin/edge-playback (100%) delete mode 120000 edge-tts.py rename {example => examples}/input_example.py (100%) delete mode 100644 requirements.txt create mode 100644 setup.cfg create mode 100644 src/edgeTTS/__pycache__/__init__.cpython-39.pyc diff --git a/.gitignore b/.gitignore index 2447b85..af662d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,14 @@ ** -!edge-playback.sh -!edge-tts.py -!example -!example/** -!LICENSE -!README.md -!setup.py +# Directories +!bin +!bin/** +!examples +!examples/** !src !src/edgeTTS !src/edgeTTS/** -!requirements.txt +# Files +!LICENSE +!README.md +!setup.cfg +!setup.py diff --git a/edge-playback.sh b/bin/edge-playback similarity index 100% rename from edge-playback.sh rename to bin/edge-playback diff --git a/edge-tts.py b/edge-tts.py deleted file mode 120000 index cea074f..0000000 --- a/edge-tts.py +++ /dev/null @@ -1 +0,0 @@ -src/edgeTTS/__init__.py \ No newline at end of file diff --git a/example/input_example.py b/examples/input_example.py similarity index 100% rename from example/input_example.py rename to examples/input_example.py diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 37fb674..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -requests -websockets diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..57119e6 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,32 @@ +[metadata] +name = edge-tts +version = 0.0.4 +author = rany +author_email = ranygh@riseup.net +description = Microsoft Edge's TTS +long_description = file: README.md +long_description_content_type = text/markdown +url = https://github.com/rany2/edge-tts +project_urls = + Bug Tracker=https://github.com/rany2/edge-tts/issues +classifiers = + Programming Language :: Python :: 3 + License :: OSI Approved :: GNU General Public License v3 (GPLv3) + Operating System :: OS Independent + +[options] +package_dir= + = src +packages = find: +scripts = bin/edge-playback +python_requires = >=3.6 +install_requires = + requests + websockets>=9.1 + +[options.packages.find] +where=src + +[options.entry_points] +console_scripts = + edge-tts = edgeTTS.__init__:main diff --git a/setup.py b/setup.py index b73a179..a4f49f9 100644 --- a/setup.py +++ b/setup.py @@ -1,42 +1,2 @@ -import os -import shutil import setuptools - -# make edge-tts script -scripts=['build/edge-tts'] -if not os.path.exists('build'): - os.makedirs('build') -shutil.copyfile('src/edgeTTS/__init__.py', 'build/edge-tts') -if os.name == 'posix': - shutil.copyfile('edge-playback.sh', 'build/edge-playback') - scripts+=['build/edge-playback'] - -with open("README.md", "r", encoding="utf-8") as fh: - long_description = fh.read() - -with open('requirements.txt') as f: - required = f.read().splitlines() - -setuptools.setup( - name="edge-tts", - version="0.0.3", - author="rany", - author_email="ranygh@riseup.net", - description="Microsoft Edge's TTS", - long_description=long_description, - long_description_content_type="text/markdown", - url="https://github.com/rany2/edge-tts", - project_urls={ - "Bug Tracker": "https://github.com/rany2/edge-tts/issues", - }, - classifiers=[ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", - "Operating System :: OS Independent", - ], - package_dir={"": "src"}, - packages=setuptools.find_packages(where="src"), - scripts=scripts, - python_requires=">=3.6", - install_requires=required, -) +setuptools.setup() diff --git a/src/edgeTTS/__init__.py b/src/edgeTTS/__init__.py index fb5b483..dd4bbca 100755 --- a/src/edgeTTS/__init__.py +++ b/src/edgeTTS/__init__.py @@ -92,7 +92,7 @@ def _minimize(the_string, delim, max_size): else: return [the_string] -async def main(): +async def _main(): parser = argparse.ArgumentParser(description="Microsoft Edge's Online TTS Reader") group = parser.add_mutually_exclusive_group(required=True) group.add_argument('-t', '--text', help='what TTS will say') @@ -147,8 +147,11 @@ async def main(): print("%s: %s" % ("Name" if key == "ShortName" else key, voice[key])) seperator = True -if __name__ == "__main__": - def terminator(signo, stack_frame): sys.exit() +def terminator(signo, stack_frame): sys.exit() +def main(): signal.signal(signal.SIGINT, terminator) signal.signal(signal.SIGTERM, terminator) - asyncio.get_event_loop().run_until_complete(main()) + asyncio.get_event_loop().run_until_complete(_main()) + +if __name__ == "__main__": + main() diff --git a/src/edgeTTS/__pycache__/__init__.cpython-39.pyc b/src/edgeTTS/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ab4b9f5460213719be8d7e2a014be529e809cfd8 GIT binary patch literal 6791 zcmbtZ%WoVjWb`f(~{XtwRKxprC}SY zG;LFr89S@WoSjo;-p;GCU>8(bw2P|jv3pSJes81C?qdYo@cSF*>~l#=UW%;Vf)LE8Y1uZmuntSW;XM zMZ=NYkuF+UH>x>J*R~$bemFZjF+a61ySO;D@X_M)$;S&1C+8nMnfhpA{?X!8T-}YL z=}IMPx^8V_tm!+F0FAAAL4B+iHY&9+h*}L-bZ1ney+Cfbkr%ra;X2&$!xpc&yzW+Z zCO%#jtw_3j&iC9vu7+D~@HBQeq-_5Gx7Z22nj2MoFOnb2beo#mMyhRUgoo3giN+jK zbP<`J-N|Zs|Y99d#JEcmKY+mtgfz9s#P!WWVJfh+)D~T zXyDf562An%zeUnS53(AgYWJhVpIqQM8g*@-wY7QePsjH4w$9m(CWe9`sdZReKVz%2 zYoMQcDE5+KBpo56U0f_NH$yMLR2C)KuqB% z9qFz4?pzp15&Cl*j);aZCmKMeF_Y!>Jk#|e>%~tDqwk$Z)X|YgQjhp2s7P%Sk0^~p z_Vby2O`4qyXVMtb4jI#Awv%gXo&2HJDG(lj6Q*WhHq*WWG0Nu+~M`uZU&Keo{qeht zHIkOcUk()mNg+2t1*p^xv|-4)VQoL#&T>OC)i#GUkW#jt5o7IaTh)UZjAvADmS@`x zt8z&BVXckTynxa`SwxA|G}b1_JzYpy5M%Fh-22DnS1IzA_;h@?uSj$Pjw-M2HQi~a z+4MaSqZbC1C~ElkUpM@|;t>|DdJQ1lX*8$f0lTmG(vcg}G^4NBSBziHK#)0G){ZM8 zEPXmUF*ZJGVQmmS9VI~oQMbFhJGMJH7K(c1;rRGOWn%n9s6}e-wC@D=fbTrn{H!#x_VHEN`tLe$w26_vlmH_Wqs1`@9ozRDPK>g}Wr91Q4Ohv&# zsm}PUq$|c3MChelVoLY5OfqVY-J`&+NCEP(iv+k^?@b}6t)!<0c^ftqyd(#_L{8m3 zOFxCi7U8E6)l1kZ>PM!5b_T(LMR4F06Zg^cj{G56L`jiHFDh+K+Vfo?I)<#^Oda||V zNxEyf5e8wo(VVQ25Ip{fW@)QAAS`-;<4LgY0Wmu04y8^qo3eU97PQINvWa)Yc8rq}K&ZK*& zQ3#+jqump<&4*eXOsbu~0uRYTJA1%nvBkvSwX>ZbUOZ%h-p*o#p!T%0DOBFu&O*Td z2GDyCyC-Mb_P4xG^?%FzJE(Q~dEX)9=eYJ4`W2kvOT5_jw~tN;6W!v);T{v%9 zG<{n5aShx!upAfWA>!*0c(-6Z7*XVl_krqo@qb`Tl4d`$Y9!WO`BaI?V|Gl9323@? zudev=R5e6MXbLjUMQVYG%K#5F0La>io5Pw6xOy}8QD2pkJNgSg+28JM0pQzSnb|f zv3O$QHXNJ-@s?!P_M{7KipxR#Cz+Zbf|1BnNiq>6pM*d#z_IqgSrpj4r*DmwSYNaC z-AH_Z)i%^hZRac>=0q!~!XTN#jEK~Q#`5^}v&%>p8$h0>tElBs&ol81vudOwjz40> z6Mg&*8elsZRFbt|i$M2+^%Oa4`{+-t4l&h+o+c(uiIlW9t!e99rubPrh4vXf{ z*f+k?f*}){d~YMw&24?(_=y(i2>S>!kRlnsEG) z^+$;P6;ec6nG7AWQr|E_<)+RJZlccGY}4Qwo+a<%4NMu;hKB*~B5i9J@8x~c+|2NP ze(r0H5AgGEGMGst@I1)t;6rcBZVx;U@;dmnlOE-Dz~e}JXg`bJg4c3-)op%<-{tS0 zS~be=@e=>wRL_0>fS2Ft8RHc`{tlc8{*X_8-_yw+YLMaPX0EMo=K0hc7;dN)-m>Np zO88?f_Er}=Cv_&iQS}eu6)~|4bFYU#QpRBKW?!fO5UZ<&;DzdcOf$QB;hb9a26*?x`=e?faLx46M1jS z-p!%S;m+l@NvDDo{^cVr_(oolgM1qEuOeMTx{mbTL8fzq|LBnPS%%NFGnYwU+?1BQ zh0($RvCva!4+Ad1>V8h0A=eq96&ODQ2|YjbO#1fAN7`F``$q7WSalot{SW?ZKQC_| zkh3B73++7m{#xE4kF#Cq+&!fJSNlbU)sNdP|*O#^@CRc2@lbBc~vk`VL?UrPn8Yz10x)bNhWo7ur_flIMF$j9FF>5|O zQC=j#;xo2y_bEh5`vv#hqRFaQU^klU_g&6OiQ{FCIgt z)@i_Z@BXm&?gGA>0{$}2)60@G6u&qIowon)z=4Y>zFIE3${H*mTS(=#u9X-+PDhAJ zmHB8Lk68Ecx|Y{y`Yr`;T&|cL=aTeFB>>)yhfV;Kq4hn`$u3ap{h_xRrXSelTJQIB8UdN0f~eOQ2i*-E6ANwj=wT^ zJaXB7OIDAy7@vPBLJ(X;3%A@on7Ihwn9C4wcK=GNUWW&bFr6|TdlvU0B(G1fi+oGi+6QKgm0y-XtHu?w=KP6%>0(O<`Ym zIIlKZvgP>xUe$eF^IH+_SFMY%)wFwQ6l>KAB@*rY+^eP4rMcNp?V^H6!;#&y=0sj? zPB{~H0dlUYP^xf{m?W1|bKHpbB3RFaVu5I}mY5WfvAaHUl|+}aYL&ZdUrwL1dQ2nL zV;Zq9c1P%;PkO~uf|vz#I2K8Et+l@HiX^iuJn4#$F(&RIvonezVTFTx>}*Qtso_b+ zp&<33B3;6w8kyorrU?sECMKRKD)rb|b#s7LSV~Mnf%u#zGSAK72{>0-xFs6!+MK%Lbr8Kp+5fD^4D(^SxH0H(glbo@+~W%|EobAt#Ay!#_J;UetU zURGrNI=KlSz&-eY4e28&ud->RJl3aSyndR6*85CQ$gZZ-UfqxCl;)6>pGD!zLl779@K7qvABZEUT~Y>7}Xocgq7bX$llB954)Faa5E-ybgz0>FtJKgq5veX_K?Drl!9 zhsNr{tIv|01JAbRg?2wQeH8{mAQAcqoAw|%V68xU!v6(E zBNed&KKq%V>m>PV`ij+3Hs$-<1cPL_AbG2@#gehOs1#GlQrHyl(GUes1Uy;#i8 uG(z6;-DgB{(Gz6k^8W4*!Dj@)5R6vg=zMQJS1jgP@lt*${}_FlBKt4g;sX5u literal 0 HcmV?d00001