kitbash 1.9.0__tar.gz → 1.10.0__tar.gz

{kitbash-1.9.0 → kitbash-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kitbash
-Version: 1.9.0
+Version: 1.10.0
 Summary: Provides universal settings, styles, cached icons, and pixmaps, and the base
 Author-email: Leon Dionne <ldionne@dridesign.sh.cn>
 Description-Content-Type: text/markdown
@@ -11,7 +11,7 @@ Requires-Dist: qt_liquid_pool >= 1.2.0
 Requires-Dist: recent_items_list >= 1.1.2
 Requires-Dist: sfzen >= 2.3.2
 Requires-Dist: soso_qt_extras >= 1.7.0
-Requires-Dist: xdg_soso >= 0.2.0
+Requires-Dist: xdg_soso >= 1.0.2
 Project-URL: Home, https://github.com/Zen-Master-SoSo/kitbash
 
 # KitBash

{kitbash-1.9.0 → kitbash-1.10.0}/kitbash/__init__.py

@@ -29,7 +29,7 @@ from PyQt5.QtCore import QSettings
 from PyQt5.QtWidgets import QApplication, QSplitter
 from qt_extras import DevilBox
 
-__version__ = "1.9.0"
+__version__ = "1.10.0"
 
 APPLICATION_NAME			= "kitbash"
 PACKAGE_DIR					= dirname(__file__)

{kitbash-1.9.0 → kitbash-1.10.0}/kitbash/__main__.py

@@ -21,19 +21,36 @@
 kitbash is a program you can use to combine parts of various SFZ files into a
 new SFZ with instruments "borrowed" from the originals.
 """
-import sys, os, argparse, logging
-from PyQt5.QtWidgets import QApplication, QErrorMessage
+import sys, logging
+from os import environ, getlogin
+from argparse import ArgumentParser
+from PyQt5.QtWidgets import QApplication
 from qt_extras import exceptions_hook
+from xdg_soso import is_xdg
+from kitbash.install import KitbashSetup
 from kitbash.gui.main_window import MainWindow
 
 
 def main():
-	p = argparse.ArgumentParser()
-	p.epilog = __doc__
-	p.add_argument('Filename', type=str, nargs='?', help='SFZ file[s] to include at startup')
-	p.add_argument("--log-file", "-l", type=str, help="Log to this file")
-	p.add_argument("--verbose", "-v", action="store_true", help="Show more detailed debug information")
-	options = p.parse_args()
+	parser = ArgumentParser()
+	parser.epilog = __doc__
+	parser.add_argument('Filename', type=str, nargs='?',
+		help='SFZ file[s] to include at startup')
+	parser.add_argument("--log-file", "-l", type=str,
+		help="Log to this file")
+	if is_xdg():
+		parser.add_argument('--install', '-i', action = 'store_true',
+			help = """Install this application into your desktop
+environment. This will create a desktop launcher so you can start KitBash from
+your menu or Dash, and associate KitBash with SFZ files.""")
+		parser.add_argument('--uninstall', '-u', action = 'store_true',
+			help = """Remove KitBash from your desktop environment.
+The program will still be on your computer, and can be called from the command
+line as "kitbash", but you won't be able to see it in your desktop applications
+menu.""")
+	parser.add_argument("--verbose", "-v", action="store_true",
+		help="Show more detailed debug information")
+	options = parser.parse_args()
 
 	log_level = logging.DEBUG if options.verbose else logging.ERROR
 	log_format = "[%(filename)24s:%(lineno)4d] %(levelname)-8s %(message)s"
@@ -50,11 +67,21 @@ def main():
 			format = log_format
 		)
 
+	if is_xdg() and (options.install or options.uninstall):
+		installer = KitbashSetup()
+		if options.install:
+			installer.install()
+			print(f'Successfully installed KitBash for {getlogin()} on this machine.')
+		else:
+			installer.uninstall()
+			print(f'Successfully uninstalled KitBash for {getlogin()} on this machine.')
+		return 0
+
 	#-----------------------------------------------------------------------
 	# Annoyance fix per:
 	# https://stackoverflow.com/questions/986964/qt-session-management-error
 	try:
-		del os.environ['SESSION_MANAGER']
+		del environ['SESSION_MANAGER']
 	except KeyError:
 		pass
 	#-----------------------------------------------------------------------

{kitbash-1.9.0 → kitbash-1.10.0}/kitbash/gui/main_window.py

@@ -46,7 +46,6 @@ from kitbash import (
 from kitbash.worker_threads import KitLoader, KitBasher
 from kitbash.gui.drumkit_widget import DrumkitWidget
 from kitbash.gui.kit_save_dialog import KitSaveDialog
-from kitbash.install import install
 
 
 UPDATES_DEBOUNCE = 680
@@ -123,7 +122,6 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.audio.connect()
 		if self.options.Filename:
 			self.load_project(self.options.Filename)
-		install()
 
 	def setup_kits_area(self):
 		self.drumkit_widgets = VListLayout(end_space = 10)

{kitbash-1.9.0 → kitbash-1.10.0}/kitbash/install.py

@@ -22,21 +22,23 @@ Install phoney-dictate as an application on XDG-compliant systems (like gnome).
 """
 import logging
 from os.path import dirname, join
-from xdg_soso import XDGSetup, is_xdg
+from xdg_soso import XDGSetup
 
-def install():
-	if is_xdg():
-		xdg = XDGSetup('kitbash', 'Kitbash')
-		xdg.comment = "Bash together new .SFZ drumkits from pieces of existing ones."
-		xdg.application_icon = join(dirname(__file__), 'res', 'kitbash-icon.svg')
-		xdg.categories = ['AudioVideo', 'Audio']
-		xdg.keywords = ['Audio', 'Sound', 'midi', 'SFZ', 'Drumkit']
-		xdg.install()
+class KitbashSetup(XDGSetup):
+
+	def __init__(self):
+		super().__init__('kitbash', 'Kitbash')
+		self._comment = "Bash together new .SFZ drumkits from pieces of existing ones."
+		self._vendor_name = 'zen_soso'
+		self._application_icon = join(dirname(__file__), 'res', 'kitbash-icon.svg')
+		self._categories = ['AudioVideo', 'Audio']
+		self._keywords = ['Audio', 'Sound', 'midi', 'SFZ', 'Drumkit']
 
 if __name__ == '__main__':
-	log_format = "[%(filename)24s:%(lineno)4d] %(levelname)-8s %(message)s"
-	logging.basicConfig(level = logging.DEBUG, format = log_format)
-	install()
+	logging.basicConfig(level = logging.DEBUG,
+		format = "[%(filename)24s:%(lineno)4d] %(levelname)-8s %(message)s")
+	installer = KitbashSetup()
+	installer.install()
 
 
 #  end kitbash/kitbash/install.py

{kitbash-1.9.0 → kitbash-1.10.0}/pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
 	"recent_items_list >= 1.1.2",
 	"sfzen >= 2.3.2",
 	"soso_qt_extras >= 1.7.0",
-	"xdg_soso >= 0.2.0"
+	"xdg_soso >= 1.0.2"
 ]
 
 [project.urls]
@@ -27,7 +27,7 @@ requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
 
 [bumpver]
-current_version = "1.9.0"
+current_version = "1.10.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "Bump version {old_version} -> {new_version}"
 commit = true