Merge branch 'master' of https://github.com/TheOneMaster/linux-undervolt

Author: TheOneMaster

README.md

@@ -1,6 +1,6 @@
 # Linux Undervolt Tool
 
-A fairly simple tool built to mimic the basic functionality of ThrottleStop on Windows. Acts as a GUI so users are able to tell what they are doing without fiddling with the terminal.
+A fairly simple GTK tool built to mimic the basic functionality of ThrottleStop on Windows. Acts as a GUI so users are able to tell what they are doing without fiddling with the terminal.
 
 Uses <a href="https://github.com/kitsunyan/intel-undervolt">intel-undervolt</a> to perform the undervolting, therefore it must be installed on the user's system. <a href="https://github.com/kitsunyan/intel-undervolt/blob/master/README.md">The guide to installing it can be found here</a>
 

build.sh

@@ -6,4 +6,4 @@ python3 setup.py --command-packages=stdeb.command bdist_deb
 cp ./deb_dist/*.deb ./builds
 
 # Delete files created by stdeb for the build
-sudo rm -f -r ./deb_dist ./dist ./linux_undervolt_tool.egg-info ./*.tar.gz
+rm -f -r ./deb_dist ./dist ./linux_undervolt_tool.egg-info ./*.tar.gz

linux_undervolt/GUI.glade

@@ -96,6 +96,7 @@
                         <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Import Settings</property>
                         <property name="use-underline">True</property>
+                        <signal name="activate" handler="importConfig" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -104,6 +105,7 @@
                         <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Export Settings</property>
                         <property name="use-underline">True</property>
+                        <signal name="activate" handler="exportConfig" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -115,6 +117,7 @@
                     <child>
                       <object class="GtkCheckMenuItem">
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can-focus">False</property>
                         <property name="tooltip-text" translatable="yes">Currently WIP</property>
                         <property name="label" translatable="yes">Advanced Options</property>
@@ -146,7 +149,9 @@
                     <child>
                       <object class="GtkMenuItem">
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes">Currently WIP</property>
                         <property name="label" translatable="yes">CPU Info</property>
                         <property name="use-underline">True</property>
                       </object>

linux_undervolt/backend.py

@@ -49,6 +49,7 @@ def createUdevRule(options: dict) -> None:
 
         # Add environment variables since the service will be run as root
         env_dir = os.path.join(tmp_dir, "temp.env")
+
         with open(env_dir, 'w') as env_file:
             env_file.write(f'HOME={HOME}\n')
 

linux_undervolt/config.py

@@ -9,7 +9,7 @@
 
 class Config:
 
-    def __init__(self, created=False, options={}):
+    def __init__(self, configFile=CONFIG_DIRECTORY):
         """
         docstring
         """
@@ -19,38 +19,34 @@ def __init__(self, created=False, options={}):
         self.undervolt_file = None
         self.active_profile = None
 
-        if created:
-            self.parser.read(CONFIG_DIRECTORY)
+        if os.path.isfile(configFile):
+            self.parser.read(configFile)
         else:
-            self.createConfig(general_options=options)
+            self.createConfig()
             self.saveChanges()
 
         self.undervolt_file = self.parser['SETTINGS']['undervolt_path']
         self.active_profile = self.parser['SETTINGS']['profile']
 
-    def createConfig(self, general_options=None) -> None:
+    def createConfig(self) -> None:
         """
         Creates the configuration file for the application. Stores the general settings as well as profile-specific
         information.
         """
 
-        undervolt_path = general_options.get("undervolt_path", "/etc/intel-undervolt.conf")
-        battery_switch = general_options.get("bat_switch", 'false')
-        battery_profile = general_options.get("bat_profile", "")
-        ac_profile = general_options.get("ac_profile", "")
-
         self.parser['SETTINGS'] = {
             'profile': 0,
-            'undervolt_path': undervolt_path,
-            'battery_switch': battery_switch,
-            'battery_profile': battery_profile,
-            'ac_profile': ac_profile
+            'undervolt_path': "/etc/intel-undervolt.conf",
+            'battery_switch': 'false',
+            'battery_profile': "",
+            'ac_profile': ""
         }
 
         profile_options = ['cpu', 'gpu', 'cpu_cache', 'sys_agent', 'analog_io']
 
         profiles = [{i: 0 for i in profile_options} for j in range(4)]
 
+        # Create default undervolt values for each profile in config file
         for index, profile in enumerate(profiles):
             self.parser[str(index)] = profile
 
@@ -123,6 +119,11 @@ def changeProfileSettings(self, settings: dict, profile=None) -> None:
     # Save & Apply changes #
     ########################
 
+    def exportConfig(self, output):
+
+        with open(output, 'w') as export_file:
+            self.parser.write(export_file)
+
     def saveChanges(self) -> None:
         """
         Save the profile settings to the config file.
@@ -209,11 +210,7 @@ def main():
     """
 
     import argparse
-    import gi
-    gi.require_version('Notify', '0.7')
-    from gi.repository import Notify
 
-    Notify.init('Linux Undervolt Tool')
     parser = argparse.ArgumentParser()
     parser.add_argument("-set-profile")
 
@@ -224,11 +221,6 @@ def main():
         temp_config = Config(created=True)
         temp_config.changeSettings('profile', new_profile)
         temp_config.applyChanges()
-
-        Notify.Notification.new(
-            summary='Profile Changed',
-            body=f'Profile {new_profile} active'
-        ).show()
 
 
 

linux_undervolt/main.py

@@ -6,6 +6,8 @@
 from gi.repository import Notify
 
 from time import sleep
+from datetime import date
+
 import os
 
 from . import config
@@ -35,7 +37,7 @@ def __init__(self):
             if return_code != gtk.ResponseType.OK:
                 return
         else:
-            self.config = config.Config(created=True)
+            self.config = config.Config()
 
         # Create template and add general signals 
         current_directory = os.path.dirname(os.path.abspath(__file__))
@@ -61,7 +63,7 @@ def __init__(self):
         window.connect("delete-event", gtk.main_quit)
         window.show()
 
-    def firstTimeSetup(self):
+    def firstTimeSetup(self) -> gtk.ResponseType:
         """
         Creates the initial files required for the application to run. This is only called the first time
         the application is run. 
@@ -70,33 +72,11 @@ def firstTimeSetup(self):
         # Check whether intel-undervolt has been installed.
 
         prereqs = config.checkPrerequisites()
-        if prereqs:
-            default_undervolt_path = '/etc/intel-undervolt.conf'
-            
-            if os.path.isfile(default_undervolt_path):
-                self.config = config.Config()
-                return gtk.ResponseType.OK
 
-            else:
-                folder_dialog = gtk.FileChooserDialog("Select intel-undervolt Config File", None, gtk.FileChooserAction.OPEN,
-                (gtk.STOCK_CLOSE, gtk.ResponseType.CLOSE, gtk.STOCK_OPEN, gtk.ResponseType.OK))
-        
-                filter_conf = gtk.FileFilter()
-                filter_conf.set_name("Configuration files")
-                filter_conf.add_pattern("*.conf")
-                folder_dialog.add_filter(filter_conf)
-
-                response = folder_dialog.run()
-
-                if response == gtk.ResponseType.OK:
-                    response = folder_dialog.get_filename()
-                    options = {'undervolt_path': response}
-                    self.config = config.Config(options=options)
-                else:
-                    folder_dialog.destroy()
+        if prereqs:
+            self.config = config.Config(configFile=None)
+            response =  gtk.ResponseType.OK
 
-                return response
-        
         else:
             dialog = gtk.MessageDialog(
                 message_type=gtk.MessageType.ERROR,
@@ -105,10 +85,10 @@ def firstTimeSetup(self):
                 required programs (intel-undervolt) properly installed."""
             )
 
-            dialog.run()
+            response = dialog.run()
             dialog.destroy()
 
-            return dialog
+        return response
 
     ##############
     # UI Changes #
@@ -272,9 +252,61 @@ def setPowerProfile(self, _):
                 text="An error occurred."
             )
 
-        dialog.run()
+            dialog.run()
+            dialog.destroy()
+
+    def importConfig(self, _):
+
+        dialog = gtk.FileChooserDialog(
+            title="Choose import file",
+            action=gtk.FileChooserAction.OPEN
+        )
+
+        dialog.add_buttons(
+            gtk.STOCK_CANCEL, gtk.ResponseType.CANCEL,
+            gtk.STOCK_OPEN, gtk.ResponseType.OK
+        )
+
+        file_filter = gtk.FileFilter()
+        file_filter.set_name("Config File")
+        file_filter.add_pattern("*.conf")
+
+        dialog.add_filter(file_filter)
+
+        response = dialog.run()
+
+        if response == gtk.ResponseType.OK:
+            filename = dialog.get_filename()
+            self.config = config.Config(filename)
+            self.config.saveChanges()
+        
+        dialog.destroy()
+
+    def exportConfig(self, _):
+        
+        dialog = gtk.FileChooserDialog(
+            title="Select export file",
+            action=gtk.FileChooserAction.SAVE
+        )
+
+        # Set default export file name
+        file_name = date.today().isoformat()
+        file_name = f"{file_name}_linux-undervolt.conf"
+        dialog.set_current_name(file_name)
+
+        dialog.add_buttons(
+            gtk.STOCK_SAVE, gtk.ResponseType.OK,
+            gtk.STOCK_CANCEL, gtk.ResponseType.CANCEL
+        )
+
+        response = dialog.run()
+
+        if response == gtk.ResponseType.OK:
+            self.config.exportConfig(dialog.get_filename())
+        
         dialog.destroy()
 
+
     def saveProfile(self, _):
         """
         Save scale values to the profile in the config