matzman/hddfancontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move some repeatedly executed code to constructor

Browse Source
This commit is contained in:
desbma
2015-01-15 21:28:34 +01:00
parent 47e81e7471
commit 91dcbcb960
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hddfancontrol/__init__.py
+4 -3
View File
@@ -182,6 +182,9 @@ class Fan:
assert(0 <= stop_value <= 255) assert(0 <= stop_value <= 255)
self.id = id self.id = id
self.pwm_filepath = pwm_filepath self.pwm_filepath = pwm_filepath
pwm_num = int(__class__.LAST_DIGITS_REGEX.search(self.pwm_filepath).group(1))
self.fan_input_filepath = os.path.join(os.path.dirname(self.pwm_filepath),
"fan%u_input" % (pwm_num))
self.start_value = start_value self.start_value = start_value
self.stop_value = stop_value self.stop_value = stop_value
self.startup = False self.startup = False
@@ -189,9 +192,7 @@ class Fan:
def getRpm(self): def getRpm(self):
""" Read fan speed in revolutions per minute. """ """ Read fan speed in revolutions per minute. """
pwm_num = int(__class__.LAST_DIGITS_REGEX.search(self.pwm_filepath).group(1)) with open(self.fan_input_filepath, "rt") as fan_input_file:
fan_input_filepath = os.path.join(os.path.dirname(self.pwm_filepath), "fan%u_input" % (pwm_num))
with open(fan_input_filepath, "rt") as fan_input_file:
rpm = int(fan_input_file.read().strip()) rpm = int(fan_input_file.read().strip())
self.logger.debug("Rotation speed is currently %u rpm" % (rpm)) self.logger.debug("Rotation speed is currently %u rpm" % (rpm))
return rpm return rpm