the vanity commit (change kaylee to pollyana everywhere)

except the copyright notices, those need more care and attention

Force-Push: yes
Change-Id: Ibddfb1b7a0edbb0d4adb6cfaf0ac4239537ade2f

12 files changed, 50 insertions, 42 deletions

diff --git a/flake.nix b/flake.nix
index 3bda2c1..553f483 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,8 +17,8 @@
       default = pollyana;
 
       pollyana = pkgs.python3Packages.buildPythonPackage rec {
-        pname = "KayleeVC";
-        version = "0.1.1";
+        pname = "pollyana";
+        version = "0.1";
 
         src = ./src;
 
diff --git a/src/README.rst b/src/README.rst
index 7674312..ed97154 100644
--- a/src/README.rst
+++ b/src/README.rst
@@ -1,3 +1,10 @@
+Pollyanna
+=========
+
+Pollyanna includes a fork of KayleeVC as its main component. For now, Kaylee's
+documentation is below.
+
+
 Kaylee
 ======
 
diff --git a/src/kaylee.py b/src/pollyanna.vc
index 082d6b6..79a46bc 100755
--- a/src/kaylee.py
+++ b/src/pollyanna.vc
@@ -4,7 +4,7 @@
 # Copyright 2015-2016 Clayton G. Hobbs
 # Portions Copyright 2013 Jezra
 
-from kayleevc import kaylee
+from pollyanna import pollyanna
 
 if __name__ == '__main__':
-    kaylee.run()
+    pollyanna.run()
diff --git a/src/kayleevc/__init__.py b/src/pollyanna/__init__.py
index e69de29..e69de29 100644
--- a/src/kayleevc/__init__.py
+++ b/src/pollyanna/__init__.py
diff --git a/src/kayleevc/gui.py b/src/pollyanna/gui.py
index 27085a8..008110a 100644
--- a/src/kayleevc/gui.py
+++ b/src/pollyanna/gui.py
@@ -16,16 +16,16 @@ class GTKTrayInterface(GObject.GObject):
         'command' : (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE,
                      (GObject.TYPE_STRING,))
     }
-    idle_text = "Kaylee - Idle"
-    listening_text = "Kaylee - Listening"
+    idle_text = "Pollyanna - Idle"
+    listening_text = "Pollyanna - Listening"
 
     def __init__(self, args, continuous):
         GObject.GObject.__init__(self)
         self.continuous = continuous
 
         self.statusicon = Gtk.StatusIcon()
-        self.statusicon.set_title("Kaylee")
-        self.statusicon.set_name("Kaylee")
+        self.statusicon.set_title("Pollyanna")
+        self.statusicon.set_name("Pollyanna")
         self.statusicon.set_tooltip_text(self.idle_text)
         self.statusicon.set_has_tooltip(True)
         self.statusicon.connect("activate", self.continuous_toggle)
@@ -122,7 +122,7 @@ class GTKInterface(GObject.GObject):
         self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
         self.window.connect("delete_event", self.delete_event)
         # Give the window a name
-        self.window.set_title("Kaylee")
+        self.window.set_title("Pollyanna")
         self.window.set_resizable(False)
 
         layout = Gtk.VBox()
diff --git a/src/kayleevc/numbers.py b/src/pollyanna/numbers.py
index be0036f..be0036f 100644
--- a/src/kayleevc/numbers.py
+++ b/src/pollyanna/numbers.py
diff --git a/src/kayleevc/kaylee.py b/src/pollyanna/pollyanna.py
index 7cc927f..295a1e5 100644
--- a/src/kayleevc/kaylee.py
+++ b/src/pollyanna/pollyanna.py
@@ -9,12 +9,12 @@ import os.path
 import subprocess
 from gi.repository import GObject, GLib
 
-from kayleevc.recognizer import Recognizer
-from kayleevc.util import *
-from kayleevc.numbers import NumberParser
+from pollyanna.recognizer import Recognizer
+from pollyanna.util import *
+from pollyanna.numbers import NumberParser
 
 
-class Kaylee:
+class Pollyanna:
 
     def __init__(self):
         self.ui = None
@@ -37,9 +37,9 @@ class Kaylee:
 
         if self.options['interface']:
             if self.options['interface'] == "g":
-                from kayleevc.gui import GTKInterface as UI
+                from pollyanna.gui import GTKInterface as UI
             elif self.options['interface'] == "gt":
-                from kayleevc.gui import GTKTrayInterface as UI
+                from pollyanna.gui import GTKTrayInterface as UI
             else:
                 print("no GUI defined")
                 sys.exit()
@@ -179,8 +179,9 @@ class Kaylee:
     def load_resource(self, string):
         # TODO: Use the Config object for this path management
         local_data = os.path.join(os.path.dirname(__file__), '..',
-                                  'usr', 'share', 'kaylee')
-        paths = ["/usr/share/kaylee/", "/usr/local/share/kaylee", local_data]
+                                  'usr', 'share', 'pollyanna')
+        paths = ["/usr/share/pollyanna/", "/usr/local/share/pollyanna",
+                 local_data]
         for path in paths:
             resource = os.path.join(path, string)
             if os.path.exists(resource):
@@ -190,16 +191,16 @@ class Kaylee:
 
 
 def run():
-    # Make our kaylee object
-    kaylee = Kaylee()
+    # Make our pollyanna object
+    pollyanna = Pollyanna()
     # Init gobject threads
     GObject.threads_init()
     # We want a main loop
     main_loop = GObject.MainLoop()
     # Handle sigint
     signal.signal(signal.SIGINT, signal.SIG_DFL)
-    # Run the kaylee
-    kaylee.run()
+    # Run the pollyanna
+    pollyanna.run()
     # Start the main loop
     try:
         main_loop.run()
diff --git a/src/kayleevc/recognizer.py b/src/pollyanna/recognizer.py
index 09e14e4..09e14e4 100644
--- a/src/kayleevc/recognizer.py
+++ b/src/pollyanna/recognizer.py
diff --git a/src/kayleevc/util.py b/src/pollyanna/util.py
index 7984dc3..6229669 100644
--- a/src/kayleevc/util.py
+++ b/src/pollyanna/util.py
@@ -15,9 +15,9 @@ from gi.repository import GLib
 
 
 class Config:
-    """Keep track of the configuration of Kaylee"""
+    """Keep track of the configuration of Pollyanna"""
     # Name of the program, for later use
-    program_name = "kaylee"
+    program_name = "pollyanna"
 
     # Directories
     conf_dir = os.path.join(GLib.get_user_config_dir(), program_name)
@@ -95,7 +95,7 @@ class Config:
 
 
 class Hasher:
-    """Keep track of hashes for Kaylee"""
+    """Keep track of hashes for Pollyanna"""
 
     def __init__(self, config):
         self.config = config
diff --git a/src/setup.py b/src/setup.py
index b4c32c8..347e5cf 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -4,15 +4,15 @@ with open("README.rst") as file:
     long_description = file.read()
 
 setup(
-    name = "KayleeVC",
-    version = "0.1.1",
-    author = "Clayton G. Hobbs",
-    author_email = "clay@lakeserv.net",
-    description = ("Somewhat fancy voice command recognition software"),
+    name = "Pollyanna",
+    version = "0.1",
+    author = "Irene Knapp",
+    author_email = "ireneista@irenes.space",
+    description = ("Linux voice input experiments, with code from KayleeVC"),
     license = "GPLv3+",
     keywords = "voice speech command control",
-    url = "https://github.com/Ratfink/kaylee",
-    packages = ['kayleevc'],
+    url = "https://code.irenes.space/pollyanna/",
+    packages = ['pollyanna'],
     long_description = long_description,
     classifiers = [
         "Development Status :: 3 - Alpha",
@@ -27,15 +27,15 @@ setup(
     ],
     install_requires=["requests"],
     data_files = [
-        ("/usr/share/kaylee",
+        ("/usr/share/pollyanna",
          ["data/icon.png", "data/icon_small.png",
           "data/icon_inactive.png", "data/icon_inactive_small.png",
           "options.json.tmp"]),
-        ("/usr/lib/systemd/user", ["systemd/kaylee.service"])
+        ("/usr/lib/systemd/user", ["systemd/pollyanna.service"])
     ],
     entry_points = {
         "console_scripts": [
-            "kaylee=kayleevc.kaylee:run"
+            "pollyanna=pollyanna.pollyanna:run"
         ]
     }
 )
diff --git a/src/systemd/kaylee.service b/src/systemd/kaylee.service
deleted file mode 100644
index 51c5a04..0000000
--- a/src/systemd/kaylee.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Somewhat fancy voice command recognition software
-
-[Service]
-ExecStart=/usr/bin/kaylee
-
-[Install]
-WantedBy=default.target
diff --git a/src/systemd/pollyanna.service b/src/systemd/pollyanna.service
new file mode 100644
index 0000000..ca5a658
--- /dev/null
+++ b/src/systemd/pollyanna.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Linux voice input experiments, with code from KayleeVC
+
+[Service]
+ExecStart=/usr/bin/pollyanna
+
+[Install]
+WantedBy=default.target