All of scrython now uses threading.
This commit is contained in:
parent
a40d85419d
commit
c9dd5d7724
|
@ -1,6 +1,7 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
|
from threading import Thread
|
||||||
|
|
||||||
class CatalogsObject(object):
|
class CatalogsObject(object):
|
||||||
"""
|
"""
|
||||||
|
@ -33,8 +34,13 @@ class CatalogsObject(object):
|
||||||
async with aiohttp.ClientSession(loop=loop) as client:
|
async with aiohttp.ClientSession(loop=loop) as client:
|
||||||
self.scryfallJson = await getRequest(client, self._url)
|
self.scryfallJson = await getRequest(client, self._url)
|
||||||
|
|
||||||
loop = asyncio.get_event_loop()
|
def do_everything():
|
||||||
loop.run_until_complete(main(loop))
|
loop = asyncio.new_event_loop()
|
||||||
|
asyncio.set_event_loop(loop)
|
||||||
|
loop.run_until_complete(main(loop))
|
||||||
|
|
||||||
|
t = Thread(target=do_everything)
|
||||||
|
t.run()
|
||||||
|
|
||||||
if self.scryfallJson['object'] == 'error':
|
if self.scryfallJson['object'] == 'error':
|
||||||
raise Exception(self.scryfallJson['details'])
|
raise Exception(self.scryfallJson['details'])
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
|
from threading import Thread
|
||||||
|
|
||||||
class RulingsObject(object):
|
class RulingsObject(object):
|
||||||
"""
|
"""
|
||||||
|
@ -47,8 +48,13 @@ class RulingsObject(object):
|
||||||
async with aiohttp.ClientSession(loop=loop) as client:
|
async with aiohttp.ClientSession(loop=loop) as client:
|
||||||
self.scryfallJson = await getRequest(client, self._url)
|
self.scryfallJson = await getRequest(client, self._url)
|
||||||
|
|
||||||
loop = asyncio.get_event_loop()
|
def do_everything():
|
||||||
loop.run_until_complete(main(loop))
|
loop = asyncio.new_event_loop()
|
||||||
|
asyncio.set_event_loop(loop)
|
||||||
|
loop.run_until_complete(main(loop))
|
||||||
|
|
||||||
|
t = Thread(target=do_everything)
|
||||||
|
t.run()
|
||||||
|
|
||||||
if self.scryfallJson['object'] == 'error':
|
if self.scryfallJson['object'] == 'error':
|
||||||
raise Exception(self.scryfallJson['details'])
|
raise Exception(self.scryfallJson['details'])
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
|
from threading import Thread
|
||||||
|
|
||||||
class SetsObject(object):
|
class SetsObject(object):
|
||||||
"""
|
"""
|
||||||
|
@ -43,8 +44,13 @@ class SetsObject(object):
|
||||||
async with aiohttp.ClientSession(loop=loop) as client:
|
async with aiohttp.ClientSession(loop=loop) as client:
|
||||||
self.scryfallJson = await getRequest(client, self._url)
|
self.scryfallJson = await getRequest(client, self._url)
|
||||||
|
|
||||||
loop = asyncio.get_event_loop()
|
def do_everything():
|
||||||
loop.run_until_complete(main(loop))
|
loop = asyncio.new_event_loop()
|
||||||
|
asyncio.set_event_loop(loop)
|
||||||
|
loop.run_until_complete(main(loop))
|
||||||
|
|
||||||
|
t = Thread(target=do_everything)
|
||||||
|
t.run()
|
||||||
|
|
||||||
if self.scryfallJson['object'] == 'error':
|
if self.scryfallJson['object'] == 'error':
|
||||||
raise Exception(self.scryfallJson['details'])
|
raise Exception(self.scryfallJson['details'])
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
|
from threading import Thread
|
||||||
|
|
||||||
class SymbologyObject(object):
|
class SymbologyObject(object):
|
||||||
"""
|
"""
|
||||||
|
@ -30,8 +31,13 @@ class SymbologyObject(object):
|
||||||
async with aiohttp.ClientSession(loop=loop) as client:
|
async with aiohttp.ClientSession(loop=loop) as client:
|
||||||
self.scryfallJson = await getRequest(client, self._url)
|
self.scryfallJson = await getRequest(client, self._url)
|
||||||
|
|
||||||
loop = asyncio.get_event_loop()
|
def do_everything():
|
||||||
loop.run_until_complete(main(loop))
|
loop = asyncio.new_event_loop()
|
||||||
|
asyncio.set_event_loop(loop)
|
||||||
|
loop.run_until_complete(main(loop))
|
||||||
|
|
||||||
|
t = Thread(target=do_everything)
|
||||||
|
t.run()
|
||||||
|
|
||||||
if self.scryfallJson['object'] == 'error':
|
if self.scryfallJson['object'] == 'error':
|
||||||
raise Exception(self.scryfallJson['details'])
|
raise Exception(self.scryfallJson['details'])
|
||||||
|
|
Loading…
Reference in New Issue