revert: auto switching screenshot lib from #185

need more thought as it is causing fishy to no longer function
This commit is contained in:
Adam Saudagar 2024-03-14 23:32:59 +05:30
parent 0efa8138da
commit 773f05ebae
2 changed files with 6 additions and 21 deletions

View File

@ -94,26 +94,11 @@ class D3DShot(IScreenShot):
def grab(self) -> ndarray:
return self.d3.screenshot()
LIBS = [PyAutoGUI, MSS, D3DShot]
def create() -> Optional[IScreenShot]:
# Initialize a variable to hold the preferred library index
preferred_lib_index = config.get("sslib", 0)
# Create a list of library indices to try, starting with the preferred one
lib_indices = [preferred_lib_index] + [i for i in range(len(LIBS)) if i != preferred_lib_index]
for index in lib_indices:
lib = LIBS[index]
try:
lib_instance = lib()
if lib_instance.setup():
logging.debug(f"Using {lib.__name__} as the screenshot library.")
# testing grab once
ss = lib_instance.grab()
if ss:
return lib_instance
except Exception as e:
logging.warning(f"Setup failed for {lib.__name__} with error: {str(e)}. Trying next library...")
logging.error("No suitable screenshot library found. Please check your configuration.")
return None
def create() -> IScreenShot:
lib = LIBS[config.get("sslib", 0)]
logging.debug(f"Using {lib.__name__} screenshot lib")
return lib()

View File

@ -1 +1 @@
0.5.24
0.5.25