th3r00t/pyShelf
1
0
Fork 0
mirror of https://github.com/th3r00t/pyShelf.git synced 2026-04-28 01:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed websocket testing routine.

Browse Source
This commit is contained in:
th3r00t
2020-09-12 22:45:01 -04:00
parent ed5e478f25
commit c0bff98e2a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/interface/views.py
View File

@@ -395,9 +395,12 @@ async def live(request, **kwargs):
return JsonResponse({"data": html}) return JsonResponse({"data": html})
elif hook == "import_books": elif hook == "import_books":
_host = ("127.0.0.1", 1337)
_test_count = 0 _test_count = 0
await Server(Path.absolute(Path.cwd().parent)).start() ##########################################################
await asyncio.sleep(0.01) # await Server(Path.absolute(Path.cwd().parent)).start() #
# await asyncio.sleep(0.01) #
##########################################################
async def test_connection(host, counter): async def test_connection(host, counter):
async with websockets.connect(f'ws://{host[0]}:{host[1]}') as _s: async with websockets.connect(f'ws://{host[0]}:{host[1]}') as _s:
@@ -410,6 +413,7 @@ async def live(request, **kwargs):
return False return False
async def runImport(host): async def runImport(host):
breakpoint()
async with websockets.connect(f'ws://{host[0]}:{host[1]}') as _s: async with websockets.connect(f'ws://{host[0]}:{host[1]}') as _s:
await _s.send("importBooks") await _s.send("importBooks")
data = await _s.recv() data = await _s.recv()
@@ -418,18 +422,18 @@ async def live(request, **kwargs):
else: else:
return False return False
_host = ("127.0.0.1", 1337)
_test_count = 0
try: try:
if await test_connection(_host, _test_count): if await test_connection(_host, _test_count):
config.logger.info("Connection Successful") config.logger.info("Connection Successful")
await runImport(_host) await runImport(_host)
return JsonResponse({"data": "Response sent"}, status=200) return JsonResponse({"data": "Response sent"}, status=200)
except ConnectionRefusedError as e: except ConnectionRefusedError as e:
config.logger.info(e) config.logger.info(e)
if e.errno == 111: if e.errno == 111:
await Server(Path.absolute(Path.cwd().parent)).start() await Server(Path.absolute(Path.cwd().parent)).start()
if await test_connection(_host, _test_count): if await test_connection(_host, _test_count):
await runImport(_host)
return JsonResponse({"data": "Response sent"}, status=200) return JsonResponse({"data": "Response sent"}, status=200)
elif not await test_connection(_host, _test_count) & _test_count >=4: elif not await test_connection(_host, _test_count) & _test_count >=4:
await Server(Path.absolute(Path.cwd().parent)).start() await Server(Path.absolute(Path.cwd().parent)).start()