Merge pull request #37 from AssetFetch/0-3-0-prep

0.3.0 preparations

Author: struffel

.gitignore

@@ -155,3 +155,4 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+index.json

README.md

@@ -29,7 +29,7 @@ pip install --target ./src/lib/ -r ./requirements.txt
 # Download the latest json schema version for AssetFetch
 # Change the -b parameter to use a different branch/tag
 mkdir ./tmp
-git -C ./tmp/ clone -b '0.2' --single-branch https://github.com/AssetFetch/spec.git 
+git -C ./tmp/ clone -b '0.4' --single-branch https://github.com/AssetFetch/spec.git 
 cp -r ./tmp/spec/json-schema/ ./src/
 rm -rf ./tmp
 ```

build.ps1

@@ -0,0 +1,2 @@
+& "$ENV:ProgramFiles\Blender Foundation\Blender 4.2\blender.exe" --command extension build --source-dir $PSScriptRoot/src --verbose
+& "$ENV:ProgramFiles\Blender Foundation\Blender 4.2\blender.exe" --command extension server-generate --repo-dir $PSScriptRoot

src/__init__.py

@@ -1,17 +1,18 @@
 """This is the main module of the "AssetFetch For Blender" addon.
 It houses the main register() and unregister() functions for the addon along with required metadata.
-See also: https://docs.blender.org/manual/en/latest/advanced/scripting/addon_tutorial.html#bringing-it-all-together
 """
 
 import os, sys
 import bpy
 
-print("Loading AssetFetch for Blender v0.2.0")
+print("Loading AssetFetch for Blender v0.3.0")
 
 # Add the lib/ directory to sys.path to make it all the bundled libraries importable.
 # The addon is distributed with all its required python libraries in the /lib subdirectory.
 # This has turned out to be the most reliable since the final python environment of the user (inside Blender) does not need to have pip.
 # Check the readme.md for instructions on how to download the dependencies using pip.
+
+# TODO: With the introduction of Blender 4.2 this generates a small warning message, therefore it will likely need to be changed in the future.
 LIB_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "lib")
 if LIB_PATH not in sys.path:
 	sys.path.insert(0, LIB_PATH)
@@ -20,22 +21,8 @@
 # Like with the libraries, instructions for filling the json-schema directory for development can be found in readme.md
 SCHEMA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "json-schema")
 
-# This variable is used for the "Preferences" (bookmarks/settings) definition.
-# Normally, it is common practice to use __name__ in the preferences class to tell Blender under which name the preferences should be stored.
-# But because we don't define the preferences here in this init file we instead pipe the name over to properties/preferences.py using this variable.
-# During development the name may therefore simply be "src" but in a proper installation it will be the name of the subdirectory in the Blender addons directory.
-ADDON_NAME = __name__
-
-# Standard variable with metadata required for all Blender addons.
-bl_info = {
-	"name": "assetfetch-blender",
-	"description": "AssetFetch for Blender",
-	"author": "ambientCG / Lennart Demes",
-	"version": (0, 2),
-	"blender": (4, 0, 0),
-	"location": "View3D",
-	"category": "3D View"
-}
+ADDON_NAME = __package__
+
 
 def register():
 	"""The main registration function for the entire addon.

src/blender_manifest.toml

@@ -0,0 +1,20 @@
+schema_version = "1.0.0"
+
+id = "assetfetch"
+version = "0.3.0"
+name = "AssetFetch For Blender"
+tagline = "AssetFetch client for Blender"
+maintainer = "ambientCG <hello@ambientCG.com>"
+type = "add-on"
+website = "https://assetfetch.org/"
+tags = ["Pipeline"]
+blender_version_min = "4.0.0"
+license = [
+  "SPDX:GPL-3.0-or-later",
+]
+
+paths_exclude_pattern = [
+   "__pycache__/",
+   "/.git/",
+   "/*.zip",
+]

src/ui/provider_panel.py

@@ -16,7 +16,7 @@ def draw(self, context):
 
 		# Info Box
 		#info_box = layout.box()
-		#info_box.label(text="AssetFetch for Blender v0.2.0", icon="SETTINGS")
+		#info_box.label(text="AssetFetch for Blender v0.3.0", icon="SETTINGS")
 		#info_box.label(text=f"Icon directory: {af.ui_image_directory}")
 		#info_box.label(text="Unstable & lacking numerous features, use with caution & patience!")
 

src/util/http.py

@@ -57,7 +57,7 @@ class AF_HttpQuery:
 	"""Represents a query that the client sends to the provider"""
 
 	# The standard headers that get sent with every request (along with any auth headers)
-	default_headers = {"User-Agent": f"blender/{bpy.app.version_string} assetfetch-blender/0.2"}
+	default_headers = {"User-Agent": f"blender/{bpy.app.version_string} assetfetch-blender/0.3"}
 
 	def __init__(self, uri: str, method: str, parameters: Dict[str, str] = None, chunk_size: int = 128 * 1024 * 8):
 		self.uri = uri