Skip to content

Commit b50e150

Browse files
committed
Fixed not returning False upon failure on Windows
1 parent f220f2d commit b50e150

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

screen_brightness_control/__init__.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ def set_brightness(brightness_level,force=False,raw_value=False):
1919
brightness_level=int(float(str(brightness_level)))
2020

2121
if platform.system()=='Windows':
22-
wmi.WMI(namespace='wmi').WmiMonitorBrightnessMethods()[0].WmiSetBrightness(brightness_level,0)
23-
return brightness_level
22+
try:
23+
wmi.WMI(namespace='wmi').WmiMonitorBrightnessMethods()[0].WmiSetBrightness(brightness_level,0)
24+
return brightness_level
25+
except:
26+
return False
2427
elif platform.system()=='Linux':
2528
if not force:
2629
brightness_level=str(max(1,int(brightness_level)))
@@ -80,7 +83,9 @@ def fade():
8083
val=i
8184
if start>finish:
8285
val = start - (val-finish)
83-
set_brightness(val)
86+
#if the action fails, exit now. No point consuming more resources
87+
if set_brightness(val)==False:
88+
break
8489
time.sleep(interval)
8590

8691
if get_brightness()!=finish:
@@ -121,7 +126,8 @@ def get_brightness(max_value=False,raw_value=False):
121126
if platform.system()=='Windows':
122127
if max_value:
123128
return 100
124-
return wmi.WMI(namespace='wmi').WmiMonitorBrightness()[0].CurrentBrightness
129+
try:return wmi.WMI(namespace='wmi').WmiMonitorBrightness()[0].CurrentBrightness
130+
except:return False
125131
elif platform.system()=='Linux':
126132
if not raw_value:
127133
possible_commands=["light -G","xbacklight -get"]
@@ -157,12 +163,11 @@ def get_brightness(max_value=False,raw_value=False):
157163
return False
158164
brightness_value=int(round((brightness_value/max_brightness)*100,0))
159165
return brightness_value
160-
161166
except:
162167
pass
163168
return False
164169
elif platform.system()=='Darwin':
165170
return False
166171

167-
__version__='0.1.71'
172+
__version__='0.1.72'
168173
__author__='Crozzers'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from setuptools import setup
22

33
setup(name='screen_brightness_control',
4-
version='0.1.71',
4+
version='0.1.72',
55
url='https://github.com/Crozzers/screen-brightness-control',
66
license='MIT',
77
author='Crozzers',

0 commit comments

Comments
 (0)