griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Extensions: use "extensions" category for operator

Browse Source 
Replace use of "bl_pkg" operator category with "extensions",
this naming was used while the functionality was experimental,
not intended to be used once extensions was moved out of experimental.
This commit is contained in:
Campbell Barton
2024-05-31 10:32:01 +10:00
parent 7b8cfc862f
commit 24abd35d14
8 changed files with 142 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/addons_core/bl_pkg/__init__.py
View File

@@ -10,7 +10,7 @@ bl_info = {
"location": "Edit -> Preferences -> Extensions",
"description": "Extension repository support for remote repositories",
"warning": "",
# "doc_url": "{BLENDER_MANUAL_URL}/addons/bl_pkg/bl_pkg.html",
# "doc_url": "",
"support": 'OFFICIAL',
"category": "System",
}
@@ -229,7 +229,7 @@ def extenion_repos_sync(*_):
stdout = io.StringIO()
with redirect_stdout(stdout):
bpy.ops.bl_pkg.repo_sync_all('INVOKE_DEFAULT', use_active_only=True)
bpy.ops.extensions.repo_sync_all('INVOKE_DEFAULT', use_active_only=True)
if text := stdout.getvalue():
repo_status_text.from_message("Sync \"{:s}\"".format(active_repo.name), text)
@@ -249,7 +249,7 @@ def extenion_repos_upgrade(*_):
stdout = io.StringIO()
with redirect_stdout(stdout):
bpy.ops.bl_pkg.pkg_upgrade_all('INVOKE_DEFAULT', use_active_only=True)
bpy.ops.extensions.package_upgrade_all('INVOKE_DEFAULT', use_active_only=True)
if text := stdout.getvalue():
repo_status_text.from_message("Upgrade \"{:s}\"".format(active_repo.name), text)

14
scripts/addons_core/bl_pkg/bl_extension_cli.py
View File

@@ -91,7 +91,7 @@ class subcmd_utils:
) -> bool:
import bpy
try:
bpy.ops.bl_pkg.repo_sync_all()
bpy.ops.extensions.repo_sync_all()
if show_done:
sys.stdout.write("Done...\n\n")
except Exception:
@@ -282,7 +282,7 @@ class subcmd_pkg:
import bpy
try:
bpy.ops.bl_pkg.pkg_upgrade_all()
bpy.ops.extensions.package_upgrade_all()
except RuntimeError:
return False # The error will have been printed.
return True
@@ -308,13 +308,13 @@ class subcmd_pkg:
import bpy
for repo_index, pkg_id in repos_and_packages:
bpy.ops.bl_pkg.pkg_mark_set(
bpy.ops.extensions.package_mark_set(
repo_index=repo_index,
pkg_id=pkg_id,
)
try:
bpy.ops.bl_pkg.pkg_install_marked(enable_on_install=enable_on_install)
bpy.ops.extensions.package_install_marked(enable_on_install=enable_on_install)
except RuntimeError:
return False # The error will have been printed.
@@ -339,10 +339,10 @@ class subcmd_pkg:
import bpy
for repo_index, pkg_id in repos_and_packages:
bpy.ops.bl_pkg.pkg_mark_set(repo_index=repo_index, pkg_id=pkg_id)
bpy.ops.extensions.package_mark_set(repo_index=repo_index, pkg_id=pkg_id)
try:
bpy.ops.bl_pkg.pkg_uninstall_marked()
bpy.ops.extensions.package_uninstall_marked()
except RuntimeError:
return False # The error will have been printed.
@@ -365,7 +365,7 @@ class subcmd_pkg:
filepath = os.path.abspath(filepath)
try:
bpy.ops.bl_pkg.pkg_install_files(
bpy.ops.extensions.package_install_files(
filepath=filepath,
repo=repo_id,
enable_on_install=enable_on_install,

2
scripts/addons_core/bl_pkg/bl_extension_notify.py
View File

@@ -475,7 +475,7 @@ def splash_draw_status_fn(self, context):
text, icon, update_count = notify.ui_text()
row = self.layout.row(align=True)
if update_count > 0:
row.operator("bl_pkg.extensions_show_for_update", text=text, icon=icon)
row.operator("extensions.userpref_show_for_update", text=text, icon=icon)
else:
row.label(text=text, icon=icon)

189
scripts/addons_core/bl_pkg/bl_extension_ops.py
View File

@@ -484,7 +484,7 @@ def _preferences_ensure_sync():
for win in wm.windows:
win.cursor_set('WAIT')
try:
bpy.ops.bl_pkg.repo_sync_all()
bpy.ops.extensions.repo_sync_all()
except Exception as ex:
print("Sync failed:", ex)
@@ -920,7 +920,7 @@ def _repo_dir_and_index_get(repo_index, directory, report_fn):
# Public Repository Actions
#
class _BlPkgCmdMixIn:
class _ExtCmdMixIn:
"""
Utility to execute mix-in.
@@ -937,7 +937,7 @@ class _BlPkgCmdMixIn:
@classmethod
def __init_subclass__(cls) -> None:
for attr in ("exec_command_iter", "exec_command_finish"):
if getattr(cls, attr) is getattr(_BlPkgCmdMixIn, attr):
if getattr(cls, attr) is getattr(_ExtCmdMixIn, attr):
raise Exception("Subclass did not define 'exec_command_iter'!")
def exec_command_iter(self, is_modal):
@@ -974,10 +974,10 @@ class _BlPkgCmdMixIn:
return result
class BlPkgDummyProgress(Operator, _BlPkgCmdMixIn):
bl_idname = "bl_pkg.dummy_progress"
class EXTENSIONS_OT_dummy_progress(Operator, _ExtCmdMixIn):
bl_idname = "extensions.dummy_progress"
bl_label = "Ext Demo"
__slots__ = _BlPkgCmdMixIn.cls_slots
__slots__ = _ExtCmdMixIn.cls_slots
def exec_command_iter(self, is_modal):
return bl_extension_utils.CommandBatch(
@@ -994,10 +994,10 @@ class BlPkgDummyProgress(Operator, _BlPkgCmdMixIn):
_preferences_ui_redraw()
class BlPkgRepoSync(Operator, _BlPkgCmdMixIn):
bl_idname = "bl_pkg.repo_sync"
class EXTENSIONS_OT_repo_sync(Operator, _ExtCmdMixIn):
bl_idname = "extensions.repo_sync"
bl_label = "Ext Repo Sync"
__slots__ = _BlPkgCmdMixIn.cls_slots
__slots__ = _ExtCmdMixIn.cls_slots
repo_directory: rna_prop_directory
repo_index: rna_prop_repo_index
@@ -1061,11 +1061,11 @@ class BlPkgRepoSync(Operator, _BlPkgCmdMixIn):
_preferences_ui_redraw()
class BlPkgRepoSyncAll(Operator, _BlPkgCmdMixIn):
class EXTENSIONS_OT_repo_sync_all(Operator, _ExtCmdMixIn):
"""Refresh the list of extensions for all the remote repositories"""
bl_idname = "bl_pkg.repo_sync_all"
bl_idname = "extensions.repo_sync_all"
bl_label = "Check for Updates"
__slots__ = _BlPkgCmdMixIn.cls_slots
__slots__ = _ExtCmdMixIn.cls_slots
use_active_only: BoolProperty(
name="Active Only",
@@ -1156,11 +1156,12 @@ class BlPkgRepoSyncAll(Operator, _BlPkgCmdMixIn):
_preferences_ui_redraw()
class BlPkgPkgUpgradeAll(Operator, _BlPkgCmdMixIn):
class EXTENSIONS_OT_package_upgrade_all(Operator, _ExtCmdMixIn):
"""Upgrade all the extensions to their latest version for all the remote repositories"""
bl_idname = "bl_pkg.pkg_upgrade_all"
bl_idname = "extensions.package_upgrade_all"
bl_label = "Ext Package Upgrade All"
__slots__ = _BlPkgCmdMixIn.cls_slots + (
__slots__ = (
*_ExtCmdMixIn.cls_slots,
"_repo_directories",
)
@@ -1316,10 +1317,11 @@ class BlPkgPkgUpgradeAll(Operator, _BlPkgCmdMixIn):
_preferences_ui_refresh_addons()
class BlPkgPkgInstallMarked(Operator, _BlPkgCmdMixIn):
bl_idname = "bl_pkg.pkg_install_marked"
class EXTENSIONS_OT_package_install_marked(Operator, _ExtCmdMixIn):
bl_idname = "extensions.package_install_marked"
bl_label = "Ext Package Install_marked"
__slots__ = _BlPkgCmdMixIn.cls_slots + (
__slots__ = (
*_ExtCmdMixIn.cls_slots,
"_repo_directories",
"_repo_map_packages_addon_only",
)
@@ -1427,10 +1429,11 @@ class BlPkgPkgInstallMarked(Operator, _BlPkgCmdMixIn):
_preferences_ui_refresh_addons()
class BlPkgPkgUninstallMarked(Operator, _BlPkgCmdMixIn):
bl_idname = "bl_pkg.pkg_uninstall_marked"
bl_label = "Ext Package Uninstall_marked"
__slots__ = _BlPkgCmdMixIn.cls_slots + (
class EXTENSIONS_OT_package_uninstall_marked(Operator, _ExtCmdMixIn):
bl_idname = "extensions.package_uninstall_marked"
bl_label = "Ext Package Uninstall Marked"
__slots__ = (
*_ExtCmdMixIn.cls_slots,
"_repo_directories",
)
@@ -1522,11 +1525,12 @@ class BlPkgPkgUninstallMarked(Operator, _BlPkgCmdMixIn):
_preferences_ui_refresh_addons()
class BlPkgPkgInstallFiles(Operator, _BlPkgCmdMixIn):
class EXTENSIONS_OT_package_install_files(Operator, _ExtCmdMixIn):
"""Install an extension from a file into a locally managed repository"""
bl_idname = "bl_pkg.pkg_install_files"
bl_idname = "extensions.package_install_files"
bl_label = "Install from Disk"
__slots__ = _BlPkgCmdMixIn.cls_slots + (
__slots__ = (
*_ExtCmdMixIn.cls_slots,
"repo_directory",
"pkg_id_sequence"
)
@@ -1795,11 +1799,11 @@ class BlPkgPkgInstallFiles(Operator, _BlPkgCmdMixIn):
layout.prop(self, "enable_on_install", text=rna_prop_enable_on_install_type_map[pkg_type])
class BlPkgPkgInstall(Operator, _BlPkgCmdMixIn):
class EXTENSIONS_OT_package_install(Operator, _ExtCmdMixIn):
"""Download and install the extension"""
bl_idname = "bl_pkg.pkg_install"
bl_idname = "extensions.package_install"
bl_label = "Install Extension"
__slots__ = _BlPkgCmdMixIn.cls_slots
__slots__ = _ExtCmdMixIn.cls_slots
_drop_variables = None
@@ -1991,10 +1995,10 @@ class BlPkgPkgInstall(Operator, _BlPkgCmdMixIn):
layout.prop(self, "enable_on_install", text=rna_prop_enable_on_install_type_map[item_remote["type"]])
class BlPkgPkgUninstall(Operator, _BlPkgCmdMixIn):
bl_idname = "bl_pkg.pkg_uninstall"
class EXTENSIONS_OT_package_uninstall(Operator, _ExtCmdMixIn):
bl_idname = "extensions.package_uninstall"
bl_label = "Ext Package Uninstall"
__slots__ = _BlPkgCmdMixIn.cls_slots
__slots__ = _ExtCmdMixIn.cls_slots
repo_directory: rna_prop_directory
repo_index: rna_prop_repo_index
@@ -2074,9 +2078,9 @@ class BlPkgPkgUninstall(Operator, _BlPkgCmdMixIn):
_preferences_ui_refresh_addons()
class BlPkgPkgDisable_TODO(Operator):
class EXTENSIONS_OT_package_disable(Operator):
"""Turn off this extension"""
bl_idname = "bl_pkg.extension_disable"
bl_idname = "extensions.package_disable"
bl_label = "Disable extension"
def execute(self, _context):
@@ -2084,9 +2088,9 @@ class BlPkgPkgDisable_TODO(Operator):
return {'CANCELLED'}
class BlPkgPkgThemeEnable(Operator):
class EXTENSIONS_OT_package_theme_enable(Operator):
"""Turn off this theme"""
bl_idname = "bl_pkg.extension_theme_enable"
bl_idname = "extensions.package_theme_enable"
bl_label = "Enable theme extension"
pkg_id: rna_prop_pkg_id
@@ -2100,9 +2104,9 @@ class BlPkgPkgThemeEnable(Operator):
return {'FINISHED'}
class BlPkgPkgThemeDisable(Operator):
class EXTENSIONS_OT_package_theme_disable(Operator):
"""Turn off this theme"""
bl_idname = "bl_pkg.extension_theme_disable"
bl_idname = "extensions.package_theme_disable"
bl_label = "Disable theme extension"
pkg_id: rna_prop_pkg_id
@@ -2125,8 +2129,8 @@ class BlPkgPkgThemeDisable(Operator):
# NOTE: create/destroy might not be best names.
class BlPkgDisplayErrorsClear(Operator):
bl_idname = "bl_pkg.pkg_display_errors_clear"
class EXTENSIONS_OT_status_clear_errors(Operator):
bl_idname = "extensions.status_clear_errors"
bl_label = "Clear Status"
def execute(self, _context):
@@ -2136,8 +2140,8 @@ class BlPkgDisplayErrorsClear(Operator):
return {'FINISHED'}
class BlPkgStatusClear(Operator):
bl_idname = "bl_pkg.pkg_status_clear"
class EXTENSIONS_OT_status_clear(Operator):
bl_idname = "extensions.status_clear"
bl_label = "Clear Status"
def execute(self, _context):
@@ -2147,8 +2151,8 @@ class BlPkgStatusClear(Operator):
return {'FINISHED'}
class BlPkgPkgMarkSet(Operator):
bl_idname = "bl_pkg.pkg_mark_set"
class EXTENSIONS_OT_package_mark_set(Operator):
bl_idname = "extensions.package_mark_set"
bl_label = "Mark Package"
pkg_id: rna_prop_pkg_id
@@ -2161,8 +2165,8 @@ class BlPkgPkgMarkSet(Operator):
return {'FINISHED'}
class BlPkgPkgMarkClear(Operator):
bl_idname = "bl_pkg.pkg_mark_clear"
class EXTENSIONS_OT_package_mark_clear(Operator):
bl_idname = "extensions.package_mark_clear"
bl_label = "Mark Package"
pkg_id: rna_prop_pkg_id
@@ -2175,8 +2179,8 @@ class BlPkgPkgMarkClear(Operator):
return {'FINISHED'}
class BlPkgPkgShowSet(Operator):
bl_idname = "bl_pkg.pkg_show_set"
class EXTENSIONS_OT_package_show_set(Operator):
bl_idname = "extensions.package_show_set"
bl_label = "Show Package Set"
pkg_id: rna_prop_pkg_id
@@ -2189,8 +2193,8 @@ class BlPkgPkgShowSet(Operator):
return {'FINISHED'}
class BlPkgPkgShowClear(Operator):
bl_idname = "bl_pkg.pkg_show_clear"
class EXTENSIONS_OT_package_show_clear(Operator):
bl_idname = "extensions.package_show_clear"
bl_label = "Show Package Clear"
pkg_id: rna_prop_pkg_id
@@ -2203,8 +2207,8 @@ class BlPkgPkgShowClear(Operator):
return {'FINISHED'}
class BlPkgPkgShowSettings(Operator):
bl_idname = "bl_pkg.pkg_show_settings"
class EXTENSIONS_OT_package_show_settings(Operator):
bl_idname = "extensions.package_show_settings"
bl_label = "Show Settings"
pkg_id: rna_prop_pkg_id
@@ -2220,10 +2224,9 @@ class BlPkgPkgShowSettings(Operator):
# Testing Operators
#
class BlPkgObsoleteMarked(Operator):
class EXTENSIONS_OT_package_obselete_marked(Operator):
"""Zeroes package versions, useful for development - to test upgrading"""
bl_idname = "bl_pkg.obsolete_marked"
bl_idname = "extensions.package_obsolete_marked"
bl_label = "Obsolete Marked"
def execute(self, _context):
@@ -2282,9 +2285,9 @@ class BlPkgObsoleteMarked(Operator):
return {'FINISHED'}
class BlPkgRepoLock(Operator):
class EXTENSIONS_OT_repo_lock(Operator):
"""Lock repositories - to test locking"""
bl_idname = "bl_pkg.repo_lock"
bl_idname = "extensions.repo_lock"
bl_label = "Lock Repository (Testing)"
lock = None
@@ -2305,9 +2308,9 @@ class BlPkgRepoLock(Operator):
return {'FINISHED'}
class BlPkgRepoUnlock(Operator):
class EXTENSIONS_OT_repo_unlock(Operator):
"""Unlock repositories - to test unlocking"""
bl_idname = "bl_pkg.repo_unlock"
bl_idname = "extensions.repo_unlock"
bl_label = "Unlock Repository (Testing)"
def execute(self, _context):
@@ -2330,9 +2333,9 @@ class BlPkgRepoUnlock(Operator):
# NOTE: this is a modified version of `PREFERENCES_OT_addon_show`.
# It would make most sense to extend this operator to support showing extensions to upgrade (eventually).
class BlPkgShowUpgrade(Operator):
class EXTENSIONS_OT_userpref_show_for_update(Operator):
"""Open extensions preferences"""
bl_idname = "bl_pkg.extensions_show_for_update"
bl_idname = "extensions.userpref_show_for_update"
bl_label = ""
bl_options = {'INTERNAL'}
@@ -2354,9 +2357,9 @@ class BlPkgShowUpgrade(Operator):
# NOTE: this is a wrapper for `SCREEN_OT_userpref_show`.
# It exists *only* to add a poll function which sets a message when offline mode is forced.
class BlPkgShowOnlinePreference(Operator):
class EXTENSIONS_OT_userpref_show_online(Operator):
"""Show system preferences "Network" panel to allow online access"""
bl_idname = "bl_pkg.extensions_show_online_prefs"
bl_idname = "extensions.userpref_show_online"
bl_label = ""
bl_options = {'INTERNAL'}
@@ -2373,11 +2376,11 @@ class BlPkgShowOnlinePreference(Operator):
return {'FINISHED'}
# NOTE: this is a wrapper for `bl_pkg.extensions_show_online_prefs`.
# NOTE: this is a wrapper for `extensions.show_online_prefs`.
# It exists *only* show a dialog.
class BlPkgShowOnlinePreferencePopup(Operator):
class EXTENSIONS_OT_userpref_show_online_popup(Operator):
"""Show system preferences "Network" panel to allow online access"""
bl_idname = "bl_pkg.extensions_show_online_prefs_popup"
bl_idname = "extensions.userpref_show_online_popup"
bl_label = ""
bl_options = {'INTERNAL'}
@@ -2421,9 +2424,9 @@ class BlPkgShowOnlinePreferencePopup(Operator):
col.label(text=line)
class BlPkgEnableNotInstalled(Operator):
class EXTENSIONS_OT_package_enable_not_installed(Operator):
"""Turn on this extension"""
bl_idname = "bl_pkg.extensions_enable_not_installed"
bl_idname = "extensions.package_enable_not_installed"
bl_label = "Enable Extension"
@classmethod
@@ -2441,43 +2444,43 @@ class BlPkgEnableNotInstalled(Operator):
# Register
#
classes = (
BlPkgRepoSync,
BlPkgRepoSyncAll,
EXTENSIONS_OT_repo_sync,
EXTENSIONS_OT_repo_sync_all,
BlPkgPkgInstallFiles,
BlPkgPkgInstall,
BlPkgPkgUninstall,
BlPkgPkgDisable_TODO,
EXTENSIONS_OT_package_install_files,
EXTENSIONS_OT_package_install,
EXTENSIONS_OT_package_uninstall,
EXTENSIONS_OT_package_disable,
BlPkgPkgThemeEnable,
BlPkgPkgThemeDisable,
EXTENSIONS_OT_package_theme_enable,
EXTENSIONS_OT_package_theme_disable,
BlPkgPkgUpgradeAll,
BlPkgPkgInstallMarked,
BlPkgPkgUninstallMarked,
EXTENSIONS_OT_package_upgrade_all,
EXTENSIONS_OT_package_install_marked,
EXTENSIONS_OT_package_uninstall_marked,
# UI only operator (to select a package).
BlPkgDisplayErrorsClear,
BlPkgStatusClear,
BlPkgPkgShowSet,
BlPkgPkgShowClear,
BlPkgPkgMarkSet,
BlPkgPkgMarkClear,
BlPkgPkgShowSettings,
EXTENSIONS_OT_status_clear_errors,
EXTENSIONS_OT_status_clear,
EXTENSIONS_OT_package_show_set,
EXTENSIONS_OT_package_show_clear,
EXTENSIONS_OT_package_mark_set,
EXTENSIONS_OT_package_mark_clear,
EXTENSIONS_OT_package_show_settings,
BlPkgObsoleteMarked,
BlPkgRepoLock,
BlPkgRepoUnlock,
EXTENSIONS_OT_package_obselete_marked,
EXTENSIONS_OT_repo_lock,
EXTENSIONS_OT_repo_unlock,
BlPkgShowUpgrade,
BlPkgShowOnlinePreference,
BlPkgShowOnlinePreferencePopup,
EXTENSIONS_OT_userpref_show_for_update,
EXTENSIONS_OT_userpref_show_online,
EXTENSIONS_OT_userpref_show_online_popup,
# Dummy, just shows a message.
BlPkgEnableNotInstalled,
EXTENSIONS_OT_package_enable_not_installed,
# Dummy commands (for testing).
BlPkgDummyProgress,
EXTENSIONS_OT_dummy_progress,
)

54
scripts/addons_core/bl_pkg/bl_extension_ui.py
View File

@@ -279,7 +279,7 @@ class display_errors:
row.label(text="Repository Access Errors:", icon='ERROR')
rowsub = row.row(align=True)
rowsub.alignment = 'RIGHT'
rowsub.operator("bl_pkg.pkg_display_errors_clear", text="", icon='X', emboss=False)
rowsub.operator("extensions.status_clear_errors", text="", icon='X', emboss=False)
box_contents = box_header.box()
for err in display_errors.errors_curr:
@@ -351,7 +351,7 @@ def extensions_panel_draw_online_extensions_request_impl(
# The only reason to prefer this over `screen.userpref_show`
# is it will be disabled when `--offline-mode` is forced with a useful error for why.
row.operator("bl_pkg.extensions_show_online_prefs", text="Go to System")
row.operator("extensions.show_online_prefs", text="Go to System")
def extensions_panel_draw_impl(
@@ -543,9 +543,9 @@ def extensions_panel_draw_impl(
row = colsub.row(align=True)
# row.label
if show:
props = row.operator("bl_pkg.pkg_show_clear", text="", icon='DISCLOSURE_TRI_DOWN', emboss=False)
props = row.operator("extensions.package_show_clear", text="", icon='DISCLOSURE_TRI_DOWN', emboss=False)
else:
props = row.operator("bl_pkg.pkg_show_set", text="", icon='DISCLOSURE_TRI_RIGHT', emboss=False)
props = row.operator("extensions.package_show_set", text="", icon='DISCLOSURE_TRI_RIGHT', emboss=False)
props.pkg_id = pkg_id
props.repo_index = repo_index
del props
@@ -560,7 +560,7 @@ def extensions_panel_draw_impl(
).module = addon_module_name
elif is_theme:
props = row.operator(
"bl_pkg.extension_theme_disable" if is_enabled else "bl_pkg.extension_theme_enable",
"extensions.package_theme_disable" if is_enabled else "extensions.package_theme_enable",
icon='CHECKBOX_HLT' if is_enabled else 'CHECKBOX_DEHLT',
text="",
emboss=False,
@@ -572,20 +572,20 @@ def extensions_panel_draw_impl(
# Use a place-holder checkbox icon to avoid odd text alignment when mixing with installed add-ons.
# Non add-ons have no concept of "enabled" right now, use installed.
row.operator(
"bl_pkg.extension_disable",
"extensions.package_disabled",
text="",
icon='CHECKBOX_HLT',
emboss=False,
)
else:
# Not installed, always placeholder.
row.operator("bl_pkg.extensions_enable_not_installed", text="", icon='CHECKBOX_DEHLT', emboss=False)
row.operator("extensions.package_enable_not_installed", text="", icon='CHECKBOX_DEHLT', emboss=False)
if show_development:
if mark:
props = row.operator("bl_pkg.pkg_mark_clear", text="", icon='RADIOBUT_ON', emboss=False)
props = row.operator("extensions.package_mark_clear", text="", icon='RADIOBUT_ON', emboss=False)
else:
props = row.operator("bl_pkg.pkg_mark_set", text="", icon='RADIOBUT_OFF', emboss=False)
props = row.operator("extensions.package_mark_set", text="", icon='RADIOBUT_OFF', emboss=False)
props.pkg_id = pkg_id
props.repo_index = repo_index
del props
@@ -602,7 +602,7 @@ def extensions_panel_draw_impl(
if is_installed:
# Include uninstall below.
if is_outdated:
props = row_right.operator("bl_pkg.pkg_install", text="Update")
props = row_right.operator("extensions.package_install", text="Update")
props.repo_index = repo_index
props.pkg_id = pkg_id
del props
@@ -611,7 +611,7 @@ def extensions_panel_draw_impl(
row_right.label(text="Installed ")
row_right.active = False
else:
props = row_right.operator("bl_pkg.pkg_install", text="Install")
props = row_right.operator("extensions.package_install", text="Install")
props.repo_index = repo_index
props.pkg_id = pkg_id
del props
@@ -678,7 +678,7 @@ def extensions_panel_draw_impl(
if is_installed:
rowsub = col_b.row()
rowsub.alignment = 'RIGHT'
props = rowsub.operator("bl_pkg.pkg_uninstall", text="Uninstall")
props = rowsub.operator("extensions.package_uninstall", text="Uninstall")
props.repo_index = repo_index
props.pkg_id = pkg_id
del props, rowsub
@@ -742,7 +742,7 @@ def extensions_panel_draw_impl(
layout_topmost.label(text="")
class USERPREF_PT_extensions_bl_pkg_filter(Panel):
class USERPREF_PT_extensions_filter(Panel):
bl_label = "Extensions Filter"
bl_space_type = 'TOPBAR' # dummy.
@@ -769,7 +769,7 @@ class USERPREF_PT_extensions_bl_pkg_filter(Panel):
sub.prop(wm, "extension_show_legacy_addons", text="Legacy Add-ons")
class USERPREF_MT_extensions_bl_pkg_settings(Menu):
class USERPREF_MT_extensions_settings(Menu):
bl_label = "Extension Settings"
def draw(self, context):
@@ -779,12 +779,12 @@ class USERPREF_MT_extensions_bl_pkg_settings(Menu):
addon_prefs = prefs.addons[__package__].preferences
layout.operator("bl_pkg.repo_sync_all", text="Check for Updates", icon='FILE_REFRESH')
layout.operator("extensions.repo_sync_all", text="Check for Updates", icon='FILE_REFRESH')
layout.separator()
layout.operator("bl_pkg.pkg_upgrade_all", text="Install Available Updates", icon='IMPORT')
layout.operator("bl_pkg.pkg_install_files", text="Install from Disk")
layout.operator("extensions.package_upgrade_all", text="Install Available Updates", icon='IMPORT')
layout.operator("extensions.package_install_files", text="Install from Disk")
layout.operator("preferences.addon_install", text="Install Legacy Add-on")
if prefs.experimental.use_extension_utils:
@@ -800,14 +800,14 @@ class USERPREF_MT_extensions_bl_pkg_settings(Menu):
layout.operator("preferences.addon_refresh", text="Refresh (file-system)", icon='FILE_REFRESH')
layout.separator()
layout.operator("bl_pkg.pkg_install_marked", text="Install Marked", icon='IMPORT')
layout.operator("bl_pkg.pkg_uninstall_marked", text="Uninstall Marked", icon='X')
layout.operator("bl_pkg.obsolete_marked")
layout.operator("extensions.package_install_marked", text="Install Marked", icon='IMPORT')
layout.operator("extensions.package_uninstall_marked", text="Uninstall Marked", icon='X')
layout.operator("extensions.package_obsolete_marked")
layout.separator()
layout.operator("bl_pkg.repo_lock")
layout.operator("bl_pkg.repo_unlock")
layout.operator("extensions.repo_lock")
layout.operator("extensions.repo_unlock")
def extensions_panel_draw(panel, context):
@@ -830,13 +830,13 @@ def extensions_panel_draw(panel, context):
row_a.prop(wm, "extension_search", text="", icon='VIEWZOOM')
row_b = row.row(align=True)
row_b.prop(wm, "extension_type", text="")
row_b.popover("USERPREF_PT_extensions_bl_pkg_filter", text="", icon='FILTER')
row_b.popover("USERPREF_PT_extensions_filter", text="", icon='FILTER')
row_b.separator()
row_b.popover("USERPREF_PT_extensions_repos", text="Repositories")
row_b.separator()
row_b.menu("USERPREF_MT_extensions_bl_pkg_settings", text="", icon='DOWNARROW_HLT')
row_b.menu("USERPREF_MT_extensions_settings", text="", icon='DOWNARROW_HLT')
del row, row_a, row_b
if show_development_reports:
@@ -861,7 +861,7 @@ def extensions_panel_draw(panel, context):
if show_development_reports:
rowsub = row.row(align=True)
rowsub.alignment = 'RIGHT'
rowsub.operator("bl_pkg.pkg_status_clear", text="", icon='X', emboss=False)
rowsub.operator("extensions.status_clear", text="", icon='X', emboss=False)
boxsub = box.box()
for ty, msg in repo_status_text.log:
if ty == 'STATUS':
@@ -915,8 +915,8 @@ def extensions_panel_draw(panel, context):
classes = (
# Pop-overs.
USERPREF_PT_extensions_bl_pkg_filter,
USERPREF_MT_extensions_bl_pkg_settings,
USERPREF_PT_extensions_filter,
USERPREF_MT_extensions_settings,
)

2
scripts/addons_core/bl_pkg/bl_extension_utils.py
View File

@@ -535,7 +535,7 @@ def dummy_progress(
) -> Generator[InfoItemSeq, bool, None]:
"""
Implementation:
``bpy.ops.ext.dummy_progress()``.
``bpy.ops.extensions.dummy_progress()``.
"""
yield from command_output_from_json_0(["dummy-progress", "--time-duration=1.0"], use_idle=use_idle)
yield [COMPLETE_ITEM]

8
scripts/addons_core/bl_pkg/tests/test_blender.py
View File

@@ -134,18 +134,18 @@ def blender_test_run(temp_dir_local: str) -> None:
remote_url=remote_url,
)
bpy.ops.bl_pkg.dummy_progress()
bpy.ops.extensions.dummy_progress()
bpy.ops.bl_pkg.repo_sync(
bpy.ops.extensions.repo_sync(
repo_directory=temp_dir_local,
)
bpy.ops.bl_pkg.pkg_install(
bpy.ops.extensions.package_install(
repo_directory=temp_dir_local,
pkg_id="blue",
)
bpy.ops.bl_pkg.pkg_uninstall(
bpy.ops.extensions.package_uninstall(
repo_directory=temp_dir_local,
pkg_id="blue",
)

5
source/blender/editors/space_userpref/userpref_ops.cc
View File

@@ -865,11 +865,12 @@ static int preferences_extension_url_drop_invoke(bContext *C, wmOperator *op, co
/* NOTE: searching for hard-coded add-on name isn't great.
* Needed since #WM_dropbox_add expects the operator to exist on startup. */
const char *idname_external = url_is_remote ? "bl_pkg.pkg_install" : "bl_pkg.pkg_install_files";
const char *idname_external = url_is_remote ? "extensions.package_install" :
"extensions.package_install_files";
bool use_url = true;
if (url_is_online && (G.f & G_FLAG_INTERNET_ALLOW) == 0) {
idname_external = "bl_pkg.extensions_show_online_prefs_popup";
idname_external = "extensions.userpref_show_online_popup";
use_url = false;
}