misc. minor changes

berrystephenw · Jun 7, 2021 · 512e524 · 512e524
1 parent b33fc69
commit 512e524
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 31 deletions.
diff --git a/octoprint_fortune/__init__.py b/octoprint_fortune/__init__.py
@@ -159,7 +159,6 @@ def on_after_startup(self):
 
         self._logger.info("--------------------------------------------")
         self._logger.info(f"Fortune started: {self._plugin_version}")
-        self._logger.info(f"Fortune name: {self._identifier}")
         self._logger.info("--------------------------------------------")
 
     ##~~ SettingsPlugin mixin
@@ -169,7 +168,7 @@ def get_settings_defaults(self):
             "push_message": None,
             "show_navbar_button": True,
             "enable_text_fortunes": False,
-            "timeout": 1,
+            "timeout": 10,
             # put your plugin's default settings here
         }
 
@@ -204,7 +203,7 @@ def get_update_information(self):
 # If you want your plugin to be registered within OctoPrint under a different name than what you defined in setup.py
 # ("OctoPrint-PluginSkeleton"), you may define that here. Same goes for the other metadata derived from setup.py that
 # can be overwritten via __plugin_xyz__ control properties. See the documentation for that.
-__plugin_name__ = "Fortune Plugin"
+__plugin_name__ = "Fortune"
 
 # Starting with OctoPrint 1.4.0 OctoPrint will also support to run under Python 3 in addition to the deprecated
 # Python 2. New plugins should make sure to run under both versions for now. Uncomment one of the following

diff --git a/octoprint_fortune/static/js/fortune.js b/octoprint_fortune/static/js/fortune.js
@@ -25,11 +25,7 @@ $(function() {
                 url: API_BASEURL + "plugin/fortune",
                 type: "GET",
                 dataType: "json",
-                data: "test", // {
-                    //command: "test",
-                    /* token: self.settings.settings.plugins.OctoText.access_token(), */
-                    //channel: 1
-                //},
+                data: "test",
                 contentType: "application/json; charset=UTF-8",
                 success: function (response) {
                     var delayf;

diff --git a/setup.py b/setup.py
@@ -1,5 +1,3 @@
-# coding=utf-8
-
 ########################################################################################################################
 ### Do not forget to adjust the following variables to your own plugin.
 
@@ -14,7 +12,7 @@
 plugin_name = "OctoPrint-Fortune"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.0"
+plugin_version = "0.1.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module
@@ -66,31 +64,35 @@
 from setuptools import setup
 
 try:
-	import octoprint_setuptools
+    import octoprint_setuptools
 except:
-	print("Could not import OctoPrint's setuptools, are you sure you are running that under "
-	      "the same python installation that OctoPrint is installed under?")
-	import sys
-	sys.exit(-1)
+    print(
+        "Could not import OctoPrint's setuptools, are you sure you are running that under "
+        "the same python installation that OctoPrint is installed under?"
+    )
+    import sys
+
+    sys.exit(-1)
 
 setup_parameters = octoprint_setuptools.create_plugin_setup_parameters(
-	identifier=plugin_identifier,
-	package=plugin_package,
-	name=plugin_name,
-	version=plugin_version,
-	description=plugin_description,
-	author=plugin_author,
-	mail=plugin_author_email,
-	url=plugin_url,
-	license=plugin_license,
-	requires=plugin_requires,
-	additional_packages=plugin_additional_packages,
-	ignored_packages=plugin_ignored_packages,
-	additional_data=plugin_additional_data
+    identifier=plugin_identifier,
+    package=plugin_package,
+    name=plugin_name,
+    version=plugin_version,
+    description=plugin_description,
+    author=plugin_author,
+    mail=plugin_author_email,
+    url=plugin_url,
+    license=plugin_license,
+    requires=plugin_requires,
+    additional_packages=plugin_additional_packages,
+    ignored_packages=plugin_ignored_packages,
+    additional_data=plugin_additional_data,
 )
 
 if len(additional_setup_parameters):
-	from octoprint.util import dict_merge
-	setup_parameters = dict_merge(setup_parameters, additional_setup_parameters)
+    from octoprint.util import dict_merge
+
+    setup_parameters = dict_merge(setup_parameters, additional_setup_parameters)
 
 setup(**setup_parameters)