v0.7.1

v0.7.1-alpha
- Навык анекдотчика
- Изменён загрузчик новых навыков
- Изменены настройки программы
- Изменён GUI настроек

Author: Oknolaz

vasisualy.json

@@ -0,0 +1,12 @@
+{
+	"voice": "Artemiy",
+	"speed": 30,
+	"pitch": 0,
+	"wiki_sentences": 4,
+	"music": "music/",
+	"theme": "System",
+	"to_lang": "en",
+	"from_lang": "ru",
+	"weather_api": "",
+	"weather_city": "Лондон"
+}

vasisualy/core/defaults.py

@@ -1,7 +1,26 @@
+import json
+
 defaults = {
     "voice": "Artemiy",
     "speed": 30,
     "pitch": 0,
-    "sentences": 4,
-    "music": "music/"
-}
+    "wiki_sentences": 4,
+    "music": "music/",
+    "theme": "Dark Red",
+    "from_lang": "ru",
+    "to_lang": "en",
+    "weather_api": "",
+    "weather_city": "Лондон"
+}
+
+
+def get_value(param):
+    '''
+    Получение параметра из файла настройки JSON.
+    :param param: нужный параметр.
+    :return: значение, соответствующее параметру.
+    '''
+    with open("vasisualy.json", "r") as f:
+        settings = json.load(f)
+        value = settings[param]
+    return value

vasisualy/core/speak.py

@@ -1,32 +1,25 @@
 import speechd
 from . import defaults
-import os
 
 # Настройка синтезатора речи
 tts_d = speechd.SSIPClient('Vasisya')
 tts_d.set_output_module('rhvoice')
 tts_d.set_language('ru')
 try:
-    appDir = os.path.dirname(os.path.realpath(__file__))
-    os.chdir(f"{appDir}/../../")
-    config = open("vasisualy.conf", "r")
-    for line in config:
-        if "voice:" in line:
-            voice = line.replace("voice:", "")
-        elif "speed:" in line:
-            speed = int(line.replace("speed:", ""))
-        elif "pitch:" in line:
-            pitch = int(line.replace("pitch:", ""))
-except Exception:
+    voice = defaults.get_value("voice")
+    speed = defaults.get_value("speed")
+    pitch = defaults.get_value("pitch")
+except FileNotFoundError:
     voice = defaults.defaults["voice"]
     speed = defaults.defaults["speed"]
     pitch = defaults.defaults["pitch"]
 
 tts_d.set_synthesis_voice(voice)
 tts_d.set_rate(speed)
-tts_d.set_punctuation(speechd.PunctuationMode.NONE)
+tts_d.set_punctuation(speechd.PunctuationMode.SOME)
 tts_d.set_pitch(pitch)
 
+
 def speak(message, widget):
     '''Выводит сообщение пользователю и озвучивает его.
     :param message: сообщение, которое нужно вывести и озвучить (string).

vasisualy/main.py

@@ -8,11 +8,11 @@
 from qt_material import apply_stylesheet
 
 # Core
-from .core import (speak, talk, recognise)
+from .core import (speak, talk, recognise, defaults)
 import random
 
 # Skills
-from .skills import (skill_loader, time_date, exit, joke, weather, music, open, screenshot, search, poweroff, ytvideo,
+from .skills import (skill_loader, time_date, exit, weather, music, open, screenshot, search, poweroff, ytvideo,
                      resay, map, wiki, location, weather_no_city, translate, news, coin, upd_upg, shoplist, todolist,
                      netconnection, record, guess_num, rulette, math, audio, crystal_ball, random_num, timer,
                      show_about, show_settings, old_skills)
@@ -29,6 +29,27 @@
          "Ты ошибаешься.", "Я не понимаю твоего вопроса.", "Мне не понятен твой вопрос.",
          "Не могу понять о чём ты говоришь.", "Я не понимаю.", "О чём ты?", "Я не могу распознать вопрос.")
 
+styles = {
+    "Dark Amber": "dark_amber.xml",
+    "Dark Blue": "dark_blue.xml",
+    "Dark Cyan": "dark_cyan.xml",
+    "Dark Lightgreen": "dark_lightgreen.xml",
+    "Dark Pink": "dark_pink.xml",
+    "Dark Purple": "dark_purple.xml",
+    "Dark Red": "dark_red.xml",
+    "Dark Teal": "dark_teal.xml",
+    "Dark Yellow": "dark_yellow.xml",
+    "Light Amber": "light_amber.xml",
+    "Light Blue": "light_blue.xml",
+    "Light Cyan": "light_cyan.xml",
+    "Light Lightgreen": "light_lightgreen.xml",
+    "Light Pink": "light_pink.xml",
+    "Light Purple": "light_purple.xml",
+    "Light Red": "light_red.xml",
+    "Light Teal": "light_teal.xml",
+    "Light Yellow": "light_yellow.xml",
+}
+
 randnum = -1
 isGuessNum = False
 isRuLette = False
@@ -122,7 +143,14 @@ def program(self):
 def main():
     app = QtWidgets.QApplication(sys.argv)
     window = Main()
-    apply_stylesheet(app, theme='dark_red.xml')
+
+    try:
+        theme = defaults.get_value("theme")
+    except FileNotFoundError:
+        theme = defaults.defaults["theme"]
+
+    if theme != "System":
+        apply_stylesheet(app, theme=styles[theme])
     window.show()
     app.exec_()
     speak.tts_d.close()

vasisualy/skills/jokes/__init__.py

@@ -0,0 +1,30 @@
+from vasisualy.skills.vas_skill.vas_skill import Skill  # Импорт родительского класса навыков
+import requests
+from bs4 import BeautifulSoup
+import random
+
+
+class Jokes(Skill):
+    def get_jokes(self):
+        site = requests.get("http://anekdotme.ru/random")
+        bs = BeautifulSoup(site.text, "html.parser")
+        selections = bs.select(".anekdot_text")
+
+        jokes = []
+
+        for selection in selections:
+            selections = (selection.getText().strip())
+            jokes.append(selections)
+
+        return jokes
+
+    def main(self, user_message):
+        if super(Jokes, self)._is_triggered(user_message, super(Jokes, self)._get_triggers()):
+            toSpeak = random.choice(self.get_jokes())
+            return toSpeak
+        else:
+            return ''
+
+def main(user_message):
+    skill = Jokes("jokes", user_message)  # Вывод сообщения, переданного навыком, пользователю.
+    return skill.main(user_message)

vasisualy/skills/jokes/jokes.trigger

@@ -0,0 +1,28 @@
+Анекдот
+анекдот
+Смех
+смех
+Рассмеши
+рассмеши
+Расскажи анекдот
+расскажи анекдот
+Рассмеши меня
+рассмеши меня
+Смешной анекдот
+смешной анекдот
+Хочу смеяться
+хочу смеяться
+Хочу посмеяться
+хочу посмеяться
+Шутка
+шутка
+Юмор
+юмор
+Давай анекдот
+давай анекдот
+Давай шутку
+давай шутку
+Расскажи шутку
+расскажи шутку
+Смейся
+смейся

vasisualy/skills/music.py

@@ -96,13 +96,8 @@ def main(say, widget):
 def playFromDir():
     global musicIsPlayed, usrPlayer
     try:
-        appDir = os.path.dirname(os.path.realpath(__file__))
-        os.chdir(f"{appDir}/../..")
-        config = open("vasisualy.conf", "r")
-        for line in config:
-            if "music:" in line:
-                musicDir = line.replace("music:", "")
-    except Exception:
+        musicDir = defaults.get_value("music")
+    except FileNotFoundError:
         musicDir = defaults.defaults["music"]
     playlist = os.listdir(musicDir)  # Получение списка файлов из директории music в корне проекта
     if musicIsPlayed:

vasisualy/skills/old_skills.py

@@ -7,7 +7,7 @@ def old_skills_activate(user_message, widget, _cls):
     :param: user_message - сообщение пользователя (string)
     :param: widget - виджет, в который должно выводиться сообщение навыка (QWidget)
     '''
-    skills = ("time_date", "exit", "joke", "weather", "music", "open", "screenshot", "search", "poweroff",
+    skills = ("time_date", "exit", "weather", "music", "open", "screenshot", "search", "poweroff",
               "ytvideo", "resay", "map", "wiki", "location", "weather_no_city", "translate", "news", "coin",
               "upd_upg", "shoplist", "todolist", "netconnection", "record", "math", "audio", "crystal_ball",
               "random_num", "timer")

vasisualy/skills/show_settings.py

@@ -1,54 +1,65 @@
 from ..ui import settings
 from PyQt5 import QtWidgets
-import os
 from ..core import defaults
+import json
 
 
 class ShowSettingsWindow(QtWidgets.QWidget, settings.Ui_Dialog):
     def __init__(self):
         super().__init__()
         self.setupUi(self)
-        appDir = os.path.dirname(os.path.realpath(__file__))
         try:
-            os.chdir(f"{appDir}/../..")
-            config = open("vasisualy.conf", "r")
-            for line in config:
-                if "voice:" in line:
-                    voice = line.replace("voice:", "")
-                elif "speed:" in line:
-                    speed = int(line.replace("speed:", ""))
-                elif "pitch:" in line:
-                    pitch = int(line.replace("pitch:", ""))
-                elif "sentences:" in line:
-                    sentences = int(line.replace("sentences:", ""))
-                elif "music:" in line:
-                    musicDir = line.replace("music:", "")
-
+            voice = defaults.get_value("voice")
+            speed = defaults.get_value("speed")
+            pitch = defaults.get_value("pitch")
+            sentences = defaults.get_value("wiki_sentences")
+            musicDir = defaults.get_value("music")
+            theme = defaults.get_value("theme")
+            to_lang = defaults.get_value("to_lang")
+            from_lang = defaults.get_value("from_lang")
+            weather_api = defaults.get_value("weather_api")
+            weather_city = defaults.get_value("weather_city")
             self.voiceBox.setCurrentText(voice)
             self.speedSlider.setSliderPosition(speed)
             self.pitchSlider.setSliderPosition(pitch)
             self.wikiSpin.setValue(sentences)
             self.musicLoc.setText(musicDir)
+            self.themeCombo.setCurrentText(theme)
+            self.toLangCombo.setCurrentText(to_lang)
+            self.fromLangCombo.setCurrentText(from_lang)
+            self.weatherApi.setText(weather_api)
+            self.weatherCity.setText(weather_city)
         except Exception:
             config = defaults.defaults
             self.voiceBox.setCurrentText(config["voice"])
             self.speedSlider.setSliderPosition(config["speed"])
             self.pitchSlider.setSliderPosition(config["pitch"])
-            self.wikiSpin.setValue(config["sentences"])
+            self.wikiSpin.setValue(config["wiki_sentences"])
             self.musicLoc.setText(config["music"])
+            self.themeCombo.setCurrentText(config["theme"])
+            self.toLangCombo.setCurrentText(config["to_lang"])
+            self.fromLangCombo.setCurrentText(config["from_lang"])
+            self.weatherApi.setText(config["weather_api"])
+            self.weatherCity.setText(config["weather_city"])
         self.musicDir.clicked.connect(self.selectDir)
         self.buttonBox.accepted.connect(self.writeChanges)
+        self.buttonBox.rejected.connect(self.hide)
 
     def writeChanges(self):
-        appDir = os.path.dirname(os.path.realpath(__file__))
-        os.chdir(f"{appDir}/../..")
-        config = open("vasisualy.conf", "w")
-        config.write(f"voice:{self.voiceBox.currentText()}\n"
-                     f"speed:{self.speedSlider.sliderPosition()}\n"
-                     f"pitch:{self.pitchSlider.sliderPosition()}\n"
-                     f"sentences:{self.wikiSpin.value()}\n"
-                     f"music:{self.musicLoc.text()}")
-        config.close()
+        config = {
+            "voice": self.voiceBox.currentText(),
+            "speed": self.speedSlider.sliderPosition(),
+            "pitch": self.pitchSlider.sliderPosition(),
+            "wiki_sentences": self.wikiSpin.value(),
+            "music": self.musicLoc.text(),
+            "theme": self.themeCombo.currentText(),
+            "to_lang": self.toLangCombo.currentText(),
+            "from_lang": self.fromLangCombo.currentText(),
+            "weather_api": self.weatherApi.text(),
+            "weather_city": self.weatherCity.text()
+        }
+        with open("vasisualy.json", "w") as f:
+            json.dump(config, f)
         self.hide()
 
     def selectDir(self):

vasisualy/skills/skill_loader.py

@@ -52,12 +52,12 @@ def load():
 
 def run_skills(user_message, widget):
     # Активирует навыки
+    result = ''
     for skill in _relation():
         result = sys.modules[skill].main(user_message)
 
-        if result == '':
-            return None
-        else:
+        if result:
             speak.speak(result, widget)
-            return result
-            break
+            break
+
+    return result