Merge pull request #9 from jason-kane/beta

iterating installation a bit

.gitignore

@@ -1,6 +1,8 @@
 clip_library/
 clip_library_saved/
 raw_data/
+venv_backup/
+cache/
 
 eleven_labs.key
 config.json

config.json.default

@@ -0,0 +1,11 @@
+{
+    "npc_engine_primary": "Windows TTS",
+    "npc_engine_secondary": "Windows TTS",
+    "npc_engine_normalize": false,
+    "player_engine_primary": "Windows TTS",
+    "player_engine_secondary": "Windows TTS",
+    "player_engine_normalize": false,
+    "system_engine_primary": "Windows TTS",
+    "system_engine_secondary": "Windows TTS",
+    "system_engine_normalize": false
+}

dirty.bat

@@ -1,2 +1,3 @@
 rmdir /s /q venv
-rename venv_backup venv
+rename venv_backup venv
+copy /Y config.json.backup config.json

fresh.bat

@@ -1,5 +1,8 @@
 powershell Invoke-PS2EXE .\win_install.ps1 .\win_install.exe
 rename venv venv_backup
+copy /Y config.json config.json.backup
+copy /Y config.json.default config.json
+
 py -m venv --clear venv
 copy /Y win_venv_mover\activate.bat venv\Scripts\activate.bat
 copy /Y win_venv_mover\Activate.ps1 venv\Scripts\Activate.ps1

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coh_npc_voices"
-version = "1.1.0"
+version = "2.0.0"
 authors = [
   { name="Jason Kane" },
 ]
@@ -16,19 +16,20 @@ classifiers = [
     "Operating System :: Microsoft :: Windows"
 ]
 dependencies = [
+    "alembic",
+    "elevenlabs",
+    "google-cloud-texttospeech",
+    "matplotlib",
+    "pyfiglet",
     "pypiwin32",
+    "setuptools",
+    "sqlalchemy-utils",
+    "sqlalchemy",
     "tts @ git+https://github.com/DeepHorizons/tts@master#11cabe8",
-    "voicebox-tts[google-cloud-tts]",
-    "google-cloud-texttospeech",
     "voicebox-tts",
+    "voicebox-tts[elevenlabs]",
+    "voicebox-tts[google-cloud-tts]",
     "wheel",
-    "setuptools",
-    "matplotlib",
-    "sqlalchemy",
-    "sqlalchemy-utils",
-    "alembic",
-    "elevenlabs",
-    "voicebox-tts[elevenlabs]"
 ]
 
 [build-system]

src/coh_npc_voices/sidekick.py

@@ -1,30 +1,28 @@
 """
 There is more awesome to be had.
 """
+import ctypes
 import logging
-from logging.config import dictConfig
-import matplotlib.dates as md
 import multiprocessing
-from datetime import datetime, timedelta
+import os
 import sys
 import tkinter as tk
+from datetime import datetime, timedelta
+from logging.config import dictConfig
 from tkinter import ttk
-from sqlalchemy import func, select
-import models
+
+import engines
+import matplotlib.dates as md
 import matplotlib.dates as mdates
-import matplotlib.pyplot as pyplot
-import voice_editor
+import models
 import npc_chatter
 import numpy as np
 import settings
-import engines
-
-from matplotlib.figure import Figure 
-from matplotlib.backends.backend_tkagg import (
-    FigureCanvasTkAgg
-) 
+import voice_editor
+from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg
+from matplotlib.figure import Figure
+from sqlalchemy import func, select
 
-import ctypes
 # this unlinks us from python so windows will
 # use our icon instead of the python icon in the
 # taskbar.
@@ -487,8 +485,12 @@ def change_elevenlabs_key(self, a, b, c):
             h.write(self.elevenlabs_key.get())
 
     def get_elevenlabs_key(self):
-        with open('eleven_labs.key', 'r') as h:
-            value = h.read()
+        keyfile = 'eleven_labs.key'
+        value = None
+
+        if os.path.exists(keyfile):
+            with open(keyfile, 'r') as h:
+                value = h.read()
         return value
 
     def change_default_engine(self, a, b, c):

windows_installation.iss

@@ -3,11 +3,11 @@
 
 #define SourcePath "\\?\Volume{cc498e86-0000-0000-0000-602200000000}\Users\jason\Desktop\coh_npc_voices"
 #define MyAppName "Sidekick"
-#define MyAppVersion "1.0"
+#define MyAppVersion "2.0"
 #define MyAppPublisher "Jason Kane"
 #define MyAppURL "https://github.com/jason-kane/coh_npc_voices"
 #define MyAppExeName "Sidekick.bat"
-#define MyAppIcon "sidekick.ico
+#define MyAppIcon "sidekick.ico"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@@ -42,10 +42,12 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Source: "{#SourcePath}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}\aliases.json"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}\all_npcs.json"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#SourcePath}\config.json"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}\sidekick.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}\requirements.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}\win_install.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SourcePath}\src\coh_npc_voices\__init__.py"; DestDir: "{app}\src\coh_npc_voices\"; Flags: ignoreversion
+Source: "{#SourcePath}\src\coh_npc_voices\audio.py"; DestDir: "{app}\src\coh_npc_voices\"; Flags: ignoreversion
 Source: "{#SourcePath}\src\coh_npc_voices\db.py"; DestDir: "{app}\src\coh_npc_voices\"; Flags: ignoreversion
 Source: "{#SourcePath}\src\coh_npc_voices\effects.py"; DestDir: "{app}\src\coh_npc_voices\"; Flags: ignoreversion
 Source: "{#SourcePath}\src\coh_npc_voices\engines.py"; DestDir: "{app}\src\coh_npc_voices\"; Flags: ignoreversion