V3.8 (#355)

* make the script more pythony * more improvements, not working yet * a lot of fixes * add support of mullvad fixes #350 and fixes #346 * use @staticmethod * remove unused code * add editorconfig * add some comments * bump version number
bilelmoussaoui · May 21, 2017 · b4dcf51 · b4dcf51
1 parent d16a79e
commit b4dcf51
Show file tree

Hide file tree

Showing 128 changed files with 1,089 additions and 712 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/ISSUE_TEMPLATE → .github/ISSUE_TEMPLATE b/ISSUE_TEMPLATE → .github/ISSUE_TEMPLATE
diff --git a/.gitignore b/.gitignore
@@ -58,4 +58,6 @@ target/
 
 .idea/
 
-tags
+tags
+
+.vscode/
diff --git a/README.md b/README.md
@@ -1,9 +1,8 @@
-[![Code Issues](https://www.quantifiedcode.com/api/v1/project/6ebdcd35681d424285ddf9e00e74b6e2/badge.svg)](https://www.quantifiedcode.com/app/project/6ebdcd35681d424285ddf9e00e74b6e2)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/4d5c0768b874407bb1dcc2f928899ba5)](https://www.codacy.com/app/bil-elmoussaoui/Hardcode-Tray?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=bil-elmoussaoui/Hardcode-Tray&amp;utm_campaign=Badge_Grade)
+[![Build Status](https://travis-ci.org/bil-elmoussaoui/Hardcode-Tray.svg?branch=master)](https://travis-ci.org/bil-elmoussaoui/Hardcode-Tray)[![Codacy Badge](https://api.codacy.com/project/badge/Grade/4d5c0768b874407bb1dcc2f928899ba5)](https://www.codacy.com/app/bil-elmoussaoui/Hardcode-Tray?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=bil-elmoussaoui/Hardcode-Tray&amp;utm_campaign=Badge_Grade)
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/4d5c0768b874407bb1dcc2f928899ba5)](https://www.codacy.com/app/bil-elmoussaoui/Hardcode-Tray?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=bil-elmoussaoui/Hardcode-Tray&amp;utm_campaign=Badge_Coverage)
 [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/Hardcode-Tray/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
 [![Hardcode-Tray
-release](https://img.shields.io/badge/release-v3.7-blue.svg)](https://github.com/bil-elmoussaoui/Hardcode-Tray/releases)
+release](https://img.shields.io/badge/release-v3.8-blue.svg)](https://github.com/bil-elmoussaoui/Hardcode-Tray/releases)
 
 # Hardcode-Tray
 
@@ -48,7 +47,7 @@ The one click-installer can be found by following this [link](https://software.o
 #### Manual installation:
   1. Download and install the script:
   ```bash
-  cd /tmp && wget -O - https://raw.githubusercontent.com/bil-elmoussaoui/Hardcode-Tray/master/install.sh | bash
+  cd /tmp && wget -O - https://raw.githubusercontent.com/bil-elmoussaoui/Hardcode-Tray/master/data/install.sh | bash
   ```
 
   2. Install dependencies:
@@ -57,7 +56,7 @@ The one click-installer can be found by following this [link](https://software.o
    - `python3`
    - `python3-gi`
    - [`patched sni-qt`](https://github.com/bil-elmoussaoui/sni-qt) <br>
-   - 2.1. Pick your favorite conversion tool
+   - 2.1. Pick up your favorite conversion tool
        1. `python3-cairosvg`
        2. `librsvg`
        3. `inkscape`
@@ -138,6 +137,13 @@ Your favorite theme does not provide icons for all those hardcoded icons? Just u
 hardcode-tray --change-color "#FIRSTCOLOR #REPLACE_FIRST_COLOR" "#SECONDCOLOR #REPLACE_SECOND_COLOR"...
 ```
 
+- `clear-cache`
+
+Let you clear the backup cache folder
+```bash
+hardcode-tray --clear-cache
+```
+
 - `--version`
 
 You can print the version of Hardcode-Tray using
@@ -164,15 +170,15 @@ Hardcode-Tray also supports a JSON config file that can be placed under `~/.conf
 - `blacklist`: a list of applications that you don't want to be fixed.
 - `conversion-tool`: the default tool to be used everytime you use the script.
 - `icons` : An object, that contains `theme` and `size` for the Gtk icon theme and the icon size to be used.
-
+- `backup-ignore` : A boolean, to configure either you want default icons to be saved on the backup folder or not.
 An example of the config file can be found [here](https://github.com/bil-elmoussaoui/Hardcode-Tray/blob/master/config.json).
 Passing `--theme` `--conversion-tool` `--size` will overwrite the default settings.
 
 
 ### Uninstallation
 To remove the script completely from your desktop you can use
 ```bash
-cd /tmp && wget -O - https://raw.githubusercontent.com/bil-elmoussaoui/Hardcode-Tray/master/uninstall.sh | bash
+cd /tmp && wget -O - https://raw.githubusercontent.com/bil-elmoussaoui/Hardcode-Tray/master/data/uninstall.sh | bash
 ```
 
 ### Credits

diff --git a/config.json → data/config.json b/config.json → data/config.json
@@ -4,5 +4,6 @@
         "theme": "Numix",
         "size": 24
     },
-    "conversion-tool": "CairoSVG"
-}
+    "conversion-tool": "CairoSVG",
+    "backup-ignore": true
+}
diff --git a/database/anatine.json → data/database/anatine.json b/database/anatine.json → data/database/anatine.json
diff --git a/database/bitcoin.json → data/database/bitcoin.json b/database/bitcoin.json → data/database/bitcoin.json
diff --git a/database/calendar-indicator.json → data/database/calendar-indicator.json b/database/calendar-indicator.json → data/database/calendar-indicator.json
diff --git a/database/caprine.json → data/database/caprine.json b/database/caprine.json → data/database/caprine.json
diff --git a/database/caprine_ele.json → data/database/caprine_ele.json b/database/caprine_ele.json → data/database/caprine_ele.json
diff --git a/database/catch-indicator.json → data/database/catch-indicator.json b/database/catch-indicator.json → data/database/catch-indicator.json
diff --git a/database/china-weather.json → data/database/china-weather.json b/database/china-weather.json → data/database/china-weather.json
diff --git a/database/chromium.json → data/database/chromium.json b/database/chromium.json → data/database/chromium.json
diff --git a/database/cisco-anyconnect.json → data/database/cisco-anyconnect.json b/database/cisco-anyconnect.json → data/database/cisco-anyconnect.json
diff --git a/database/clementine.json → data/database/clementine.json b/database/clementine.json → data/database/clementine.json
diff --git a/database/cryptfolder-indicator.json → data/database/cryptfolder-indicator.json b/database/cryptfolder-indicator.json → data/database/cryptfolder-indicator.json
diff --git a/database/discord-canary.json → data/database/discord-canary.json b/database/discord-canary.json → data/database/discord-canary.json
diff --git a/database/discord.json → data/database/discord.json b/database/discord.json → data/database/discord.json
diff --git a/database/disper-indicator.json → data/database/disper-indicator.json b/database/disper-indicator.json → data/database/disper-indicator.json
diff --git a/database/dropbox.json → data/database/dropbox.json b/database/dropbox.json → data/database/dropbox.json
diff --git a/database/flareget.json → data/database/flareget.json b/database/flareget.json → data/database/flareget.json
diff --git a/database/franz.json → data/database/franz.json b/database/franz.json → data/database/franz.json
diff --git a/database/franz_ele.json → data/database/franz_ele.json b/database/franz_ele.json → data/database/franz_ele.json
diff --git a/database/ghetto_skype.json → data/database/ghetto_skype.json b/database/ghetto_skype.json → data/database/ghetto_skype.json
diff --git a/database/google-chrome.json → data/database/google-chrome.json b/database/google-chrome.json → data/database/google-chrome.json
diff --git a/database/google-music-manager.json → data/database/google-music-manager.json b/database/google-music-manager.json → data/database/google-music-manager.json
diff --git a/database/google-tasks-indicator.json → data/database/google-tasks-indicator.json b/database/google-tasks-indicator.json → data/database/google-tasks-indicator.json
diff --git a/database/gpmdp.json → data/database/gpmdp.json b/database/gpmdp.json → data/database/gpmdp.json
diff --git a/database/grive-tools.json → data/database/grive-tools.json b/database/grive-tools.json → data/database/grive-tools.json
diff --git a/database/guake.json → data/database/guake.json b/database/guake.json → data/database/guake.json
diff --git a/database/hangouts.json → data/database/hangouts.json b/database/hangouts.json → data/database/hangouts.json
diff --git a/database/harmony.json → data/database/harmony.json b/database/harmony.json → data/database/harmony.json
diff --git a/database/hexchat.json → data/database/hexchat.json b/database/hexchat.json → data/database/hexchat.json
diff --git a/database/hp-printing.json → data/database/hp-printing.json b/database/hp-printing.json → data/database/hp-printing.json
diff --git a/database/ibus-anthy.json → data/database/ibus-anthy.json b/database/ibus-anthy.json → data/database/ibus-anthy.json
diff --git a/database/ibus-mozc.json → data/database/ibus-mozc.json b/database/ibus-mozc.json → data/database/ibus-mozc.json
diff --git a/database/indicator-weather.json → data/database/indicator-weather.json b/database/indicator-weather.json → data/database/indicator-weather.json
diff --git a/database/jdownloader.json → data/database/jdownloader.json b/database/jdownloader.json → data/database/jdownloader.json
diff --git a/database/keepass.json → data/database/keepass.json b/database/keepass.json → data/database/keepass.json
diff --git a/database/keepassx.json → data/database/keepassx.json b/database/keepassx.json → data/database/keepassx.json
diff --git a/database/lyricfier.json → data/database/lyricfier.json b/database/lyricfier.json → data/database/lyricfier.json
diff --git a/database/megasync.json → data/database/megasync.json b/database/megasync.json → data/database/megasync.json
diff --git a/database/messenger_ele.json → data/database/messenger_ele.json b/database/messenger_ele.json → data/database/messenger_ele.json
diff --git a/database/mintupdate.json → data/database/mintupdate.json b/database/mintupdate.json → data/database/mintupdate.json
diff --git a/data/database/mullvad.json b/data/database/mullvad.json
@@ -0,0 +1,29 @@
+{
+    "name": "Mullvad",
+    "app_path": [
+        "/usr/bin/",
+        "/usr/lib/python2.7/site-packages/mullvad/"
+    ],
+    "icons_path": [
+        "/usr/lib/python2.7/site-packages/mullvad/"
+    ],
+    "is_qt": false,
+    "is_script": false,
+    "force_create_folder": false,
+    "exec_path_script": false,
+    "backup_ignore": false,
+    "icons": {
+        "error": {
+            "original": "rdot.png",
+            "theme": "mullvad-error"
+        },
+        "config": {
+            "original": "ydot.png",
+            "theme": "mullvad-config"
+        },
+        "success": {
+            "original": "gdot.png",
+            "theme": "mullvad-success"
+        }
+    }
+}
diff --git a/database/mumble.json → data/database/mumble.json b/database/mumble.json → data/database/mumble.json
diff --git a/database/museeq.json → data/database/museeq.json b/database/museeq.json → data/database/museeq.json
diff --git a/database/my-weather-indicator.json → data/database/my-weather-indicator.json b/database/my-weather-indicator.json → data/database/my-weather-indicator.json
diff --git a/database/nomachine.json → data/database/nomachine.json b/database/nomachine.json → data/database/nomachine.json
diff --git a/database/nylas.json → data/database/nylas.json b/database/nylas.json → data/database/nylas.json
diff --git a/database/overgrive.json → data/database/overgrive.json b/database/overgrive.json → data/database/overgrive.json
diff --git a/database/owncloud.json → data/database/owncloud.json b/database/owncloud.json → data/database/owncloud.json
diff --git a/database/pb-for-desktop.json → data/database/pb-for-desktop.json b/database/pb-for-desktop.json → data/database/pb-for-desktop.json
diff --git a/database/pomodoro-indicator.json → data/database/pomodoro-indicator.json b/database/pomodoro-indicator.json → data/database/pomodoro-indicator.json
diff --git a/database/prime-indicator-plus.json → data/database/prime-indicator-plus.json b/database/prime-indicator-plus.json → data/database/prime-indicator-plus.json
diff --git a/database/primeindicator.json → data/database/primeindicator.json b/database/primeindicator.json → data/database/primeindicator.json
diff --git a/database/pushbullet-indicator.json → data/database/pushbullet-indicator.json b/database/pushbullet-indicator.json → data/database/pushbullet-indicator.json
diff --git a/database/qelectrotech.json → data/database/qelectrotech.json b/database/qelectrotech.json → data/database/qelectrotech.json
diff --git a/database/radiotray.json → data/database/radiotray.json b/database/radiotray.json → data/database/radiotray.json
diff --git a/database/rambox.json → data/database/rambox.json b/database/rambox.json → data/database/rambox.json
diff --git a/database/ramme.json → data/database/ramme.json b/database/ramme.json → data/database/ramme.json
diff --git a/database/record-desktop.json → data/database/record-desktop.json b/database/record-desktop.json → data/database/record-desktop.json
diff --git a/database/rescuetime.json → data/database/rescuetime.json b/database/rescuetime.json → data/database/rescuetime.json
diff --git a/database/screencloud.json → data/database/screencloud.json b/database/screencloud.json → data/database/screencloud.json
diff --git a/database/seafile.json → data/database/seafile.json b/database/seafile.json → data/database/seafile.json
diff --git a/database/sflphone.json → data/database/sflphone.json b/database/sflphone.json → data/database/sflphone.json
diff --git a/database/skype.json → data/database/skype.json b/database/skype.json → data/database/skype.json
diff --git a/database/skypeforlinux.json → data/database/skypeforlinux.json b/database/skypeforlinux.json → data/database/skypeforlinux.json
diff --git a/database/slack.json → data/database/slack.json b/database/slack.json → data/database/slack.json
diff --git a/database/solaar.json → data/database/solaar.json b/database/solaar.json → data/database/solaar.json
diff --git a/database/spotify.json → data/database/spotify.json b/database/spotify.json → data/database/spotify.json
diff --git a/database/spotifywebplayer.json → data/database/spotifywebplayer.json b/database/spotifywebplayer.json → data/database/spotifywebplayer.json
diff --git a/database/steam.json → data/database/steam.json b/database/steam.json → data/database/steam.json
diff --git a/database/stremio.json → data/database/stremio.json b/database/stremio.json → data/database/stremio.json
diff --git a/database/teamviewer.json → data/database/teamviewer.json b/database/teamviewer.json → data/database/teamviewer.json
diff --git a/database/telegram.json → data/database/telegram.json b/database/telegram.json → data/database/telegram.json
diff --git a/database/tomahawk.json → data/database/tomahawk.json b/database/tomahawk.json → data/database/tomahawk.json
diff --git a/database/touchpad-indicator.json → data/database/touchpad-indicator.json b/database/touchpad-indicator.json → data/database/touchpad-indicator.json
diff --git a/database/trimage.json → data/database/trimage.json b/database/trimage.json → data/database/trimage.json
diff --git a/database/twitch-indicator.json → data/database/twitch-indicator.json b/database/twitch-indicator.json → data/database/twitch-indicator.json
diff --git a/database/variety.json → data/database/variety.json b/database/variety.json → data/database/variety.json
diff --git a/database/vivaldi.json → data/database/vivaldi.json b/database/vivaldi.json → data/database/vivaldi.json
diff --git a/database/wechat.json → data/database/wechat.json b/database/wechat.json → data/database/wechat.json
diff --git a/database/whatsapp.json → data/database/whatsapp.json b/database/whatsapp.json → data/database/whatsapp.json
diff --git a/database/whatsie.json → data/database/whatsie.json b/database/whatsie.json → data/database/whatsie.json
diff --git a/database/wire.json → data/database/wire.json b/database/wire.json → data/database/wire.json
diff --git a/database/wire_elec.json → data/database/wire_elec.json b/database/wire_elec.json → data/database/wire_elec.json
diff --git a/database/wiznote.json → data/database/wiznote.json b/database/wiznote.json → data/database/wiznote.json
diff --git a/database/workrave.json → data/database/workrave.json b/database/workrave.json → data/database/workrave.json
diff --git a/database/xkbmod-indicator.json → data/database/xkbmod-indicator.json b/database/xkbmod-indicator.json → data/database/xkbmod-indicator.json
diff --git a/database/yakyak.json → data/database/yakyak.json b/database/yakyak.json → data/database/yakyak.json
diff --git a/database/yd-tools.json → data/database/yd-tools.json b/database/yd-tools.json → data/database/yd-tools.json
diff --git a/database/youtube-indicator.json → data/database/youtube-indicator.json b/database/youtube-indicator.json → data/database/youtube-indicator.json
diff --git a/database/yum-extender-dnf.json → data/database/yum-extender-dnf.json b/database/yum-extender-dnf.json → data/database/yum-extender-dnf.json
diff --git a/install.sh → data/install.sh b/install.sh → data/install.sh
@@ -22,8 +22,8 @@ else
     versionnb=${version//[a-zA-Z]/}
     cd ./Hardcode-Tray-"$versionnb" || exit
 fi
-rm -rf .git ./screenshots 
-rm -f .gitignore README.md install.sh uninstall.sh
+rm -rf .git ./screenshots
+rm -f .gitignore README.md data/install.sh data/uninstall.sh
 cd ../ || exit
 if [ -d "/opt/Hardcode-Tray" ]; then
     sudo rm -rf /opt/Hardcode-Tray
@@ -34,7 +34,7 @@ else
     sudo mv Hardcode-Tray-"$versionnb"/ /opt/Hardcode-Tray
 fi
 echo "Creating symbolic link.."
-if [ -L "/usr/bin/hardcode-tray" ] || [ -f "/usr/bin/hardcode-tray" ]; 
+if [ -L "/usr/bin/hardcode-tray" ] || [ -f "/usr/bin/hardcode-tray" ];
 then
     sudo rm -f /usr/bin/hardcode-tray
 fi

diff --git a/uninstall.sh → data/uninstall.sh b/uninstall.sh → data/uninstall.sh
diff --git a/hardcode-tray b/hardcode-tray
@@ -1,5 +1,5 @@
 #!/bin/bash
-version=v3.7
+version=v3.8
 if [[ $EUID -ne 0 ]]; then
     case $1 in
         -u|--update)
@@ -23,7 +23,7 @@ if [[ $EUID -ne 0 ]]; then
             exit 0 ;;
         *)
             cd /opt/Hardcode-Tray/
-            sudo -E python3 script.py "$@"
+            sudo -E python3 hardcode-tray.py "$@"
     esac
 else
     echo "Script shouldn't be run as root"

diff --git a/script.py → hardcode-tray.py b/script.py → hardcode-tray.py
@@ -4,7 +4,7 @@
 
 Author : Bilal Elmoussaoui ([email protected])
 Contributors : Andreas Angerer, Joshua Fogg
-Version : 3.7
+Version : 3.8
 Website : https://github.com/bil-elmoussaoui/Hardcode-Tray
 Licence : The script is released under GPL, uses a modified script
      form Chromium project released under BSD license
@@ -20,23 +20,19 @@
 You should have received a copy of the GNU General Public License
 along with Hardcode-Tray. If not, see <http://www.gnu.org/licenses/>.
 """
-from os import path, geteuid
-from glob import glob
+from os import geteuid
 from argparse import ArgumentParser
-from modules.parser import Parser, ArgsParser, CONVERSION_TOOLS
-from modules.utils import parse_json, progress, get_list_of_themes
-from modules.const import DB_FOLDER, DESKTOP_ENV, CONFIG_FILE
-
+from src.utils import get_list_of_themes
+from src.const import DESKTOP_ENV
+from src.enum import Action, ConversionTools
+from src.app import App
 
 if geteuid() != 0:
     exit("You need to have root privileges to run the script.\
         \nPlease try again, this time using 'sudo'. Exiting.")
 
 parser = ArgumentParser(prog="hardcode-tray")
 THEMES_LIST = get_list_of_themes()
-config = parse_json(CONFIG_FILE)
-BLACKLIST = config.get("blacklist", [])
-
 parser.add_argument("--size", "-s", help="use a different icon size instead "
                     "of the default one.",
                     type=int, choices=[16, 22, 24])
@@ -73,95 +69,42 @@
                     help="revert fixed hardcoded tray icons")
 parser.add_argument("--conversion-tool", "-ct",
                     help="Which of conversion tool to use",
-                    type=str, choices=CONVERSION_TOOLS.keys())
+                    type=str, choices=ConversionTools.choices())
 parser.add_argument('--change-color', "-cc", type=str, nargs='+',
                     help="Replace a color with an other one, "
                     "works only with SVG.")
+parser.add_argument("--clear-cache", action="store_true",
+                    help="Clear backup files")
 args = parser.parse_args()
-args = ArgsParser(args, config)
+hardcode_tray = App.get_default(args)
 
-if (not DESKTOP_ENV or DESKTOP_ENV == "other") and not args.icon_size:
+if (not DESKTOP_ENV or DESKTOP_ENV == "other") and not App.icon_size():
     exit("You need to run the script using 'sudo -E'.\nPlease try again")
 
-def get_supported_apps(fix_only, custom_path=""):
-    """Get a list of dict, a dict for each supported application."""
-    database_files = []
-    if len(fix_only) != 0:
-        for db_file in fix_only:
-            if db_file not in BLACKLIST:
-                db_file = "{0}{1}.json".format(DB_FOLDER, db_file)
-                if path.exists(db_file):
-                    database_files.append(db_file)
-    else:
-        files = glob("{0}*.json".format(path.join(DB_FOLDER, "")))
-        for file in files:
-            if path.splitext(path.basename(file))[0] not in BLACKLIST:
-                database_files.append(file)
-    if len(fix_only) > 1 and custom_path:
-        exit("You can't use --path with more than application at once.")
-    database_files.sort()
-    supported_apps = []
-    for db_file in database_files:
-        application_data = Parser(db_file, args)
-        if application_data.is_installed():
-            supported_apps.append(application_data.get_application())
-    return supported_apps
-
-
-def apply(is_install):
-    """Fix Hardcoded Tray icons.
-    Args:
-        is_install(bool):
-            True: To apply the modifications
-            False: To revert it.
-    """
-    apps = get_supported_apps(args.only, args.path)
-    done = []
-    if len(apps) != 0:
-        cnt = 0
-        counter_total = sum(app.data.supported_icons_cnt for app in apps)
-        for i, app in enumerate(apps):
-            app_name = app.get_name()
-            if is_install:
-                app.install()
-            else:
-                app.reinstall()
-            if app.is_done:
-                cnt += app.data.supported_icons_cnt
-                if app_name not in done:
-                    progress(cnt, counter_total, app_name)
-                    done.append(app_name)
-            else:
-                counter_total -= app.data.supported_icons_cnt
-                if i == len(apps) - 1:
-                    progress(cnt, counter_total)
-    else:
-        if is_install:
-            exit("No apps to fix! Please report on GitHub if this is not the case")
-        else:
-            exit("No apps to revert!")
-
 print("Welcome to the tray icons hardcoder fixer!")
-print("Your indicator icon size is : {0}".format(args.icon_size))
+print("Your indicator icon size is : {0}".format(App.icon_size()))
 print("The detected desktop environement : {0}".format(DESKTOP_ENV.title()))
-if not isinstance(args.theme, dict):
-    print("Your current icon theme is : {0}".format(args.theme))
+if not isinstance(App.theme(), dict):
+    print("Your current icon theme is : {0}".format(App.theme()))
 else:
-    print("Your current dark icon theme is : {0}".format(args.theme["dark"]))
-    print("Your current light icon theme is : {0}".format(args.theme["light"]))
-print("Conversion tool : {0}".format(args.svgtopng))
+    print("Your current dark icon theme is : {0}".format(App.theme()["dark"]))
+    print("Your current light icon theme is : {0}".format(
+        App.theme()["light"]))
+print("Conversion tool : {0}".format(App.svg()))
 print("Applications will be fixed : ", end="")
-print(",".join(map(lambda x: x.title(), args.only)) if args.only else "All")
+print(",".join(map(lambda x: x.title(), App.only())) if App.only() else "All")
 
-choice = args.choice
-if not choice:
+# Clear backup cache
+action = App.action()
+if not action:
     print("1 - Apply")
     print("2 - Revert")
+    print("3 - Clear Backup Cache")
     has_chosen = False
     while not has_chosen:
         try:
-            choice = int(input("Please choose: "))
-            if choice not in [1, 2]:
+            action = int(input("Please choose: "))
+            if action not in [1, 2, 3]:
                 print("Please try again")
             else:
                 has_chosen = True
@@ -170,11 +113,12 @@ def apply(is_install):
         except KeyboardInterrupt:
             exit("")
 
-if choice == 1:
+if action == Action.APPLY:
     print("Applying now..\n")
-    apply(True)
-elif choice == 2:
+elif action == Action.REVERT:
     print("Reverting now..\n")
-    apply(False)
+elif action == Action.CLEAR_CACHE:
+    print("Clearing cache...\n")
+App.execute(action)
 
 print("\nDone, Thank you for using the Hardcode-Tray fixer!")