consistent use of get_addon_preferences() function

Author: CodeFHD

operators/lol/add_local.py

@@ -32,6 +32,7 @@
 from os import listdir
 from os.path import basename, dirname, isfile, join, splitext, exists
 from ...utils.lol import utils as lol_utils
+from ...utils import get_addon_preferences
 
 from mathutils import Vector
 
@@ -77,9 +78,7 @@ def render_thumbnail(args):
     from ...utils.compatibility import run
     (context, assetfile, asset_type) = args
 
-    name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-    user_preferences = context.preferences.addons[name].preferences
-
+    user_preferences = get_addon_preferences(context)
 
     if asset_type == 'MODEL':
         luxball = 'material_thumbnail.blend'
@@ -131,8 +130,7 @@ def execute(self, context):
         ui_props = scene.luxcoreOL.ui
         upload_props = scene.luxcoreOL.upload
 
-        name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-        user_preferences = context.preferences.addons[name].preferences
+        user_preferences = get_addon_preferences(context)
 
         if len(context.selected_objects) == 0:
             return {'CANCELLED'}
@@ -243,8 +241,7 @@ def execute(self, context):
         ui_props = scene.luxcoreOL.ui
         upload_props = scene.luxcoreOL.upload
 
-        name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-        user_preferences = context.preferences.addons[name].preferences
+        user_preferences = get_addon_preferences(context)
         assetpath = join(user_preferences.global_dir, ui_props.asset_type.lower(), 'local')
 
         files = [f for f in listdir(assetpath) if isfile(join(assetpath, f))]

operators/lol/update_ToC.py

@@ -27,6 +27,7 @@
 
 from bpy.types import Operator
 from ...utils.lol import utils as utils
+from ...utils import get_addon_preferences
 
 class LOLUpdateTOC(Operator):
     bl_idname = 'scene.luxcore_ol_update_toc'
@@ -44,8 +45,7 @@ def execute(self, context):
         scene = context.scene
         ui_props = scene.luxcoreOL.ui
 
-        name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-        user_preferences = context.preferences.addons[name].preferences
+        user_preferences = get_addon_preferences(context)
         LOL_HOST_URL = user_preferences.lol_host
         LOL_VERSION = user_preferences.lol_version
         LOL_HTTP_HOST = user_preferences.lol_http_host

scripts/LOL/render_thumbnail.py

@@ -39,9 +39,6 @@ def calc_bbox(context, objects):
 
 def render_material_thumbnail(assetname, blendfile, thumbnail, samples):
     context = bpy.context
-    scene = context.scene
-    name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-    user_preferences = context.preferences.addons[name].preferences
 
     with bpy.data.libraries.load(blendfile, link=True) as (mat_from, mat_to):
         mat_to.materials = mat_from.materials
@@ -69,8 +66,6 @@ def render_material_thumbnail(assetname, blendfile, thumbnail, samples):
 def render_model_thumbnail(assetname, blendfile, thumbnail, samples):
     context = bpy.context
     scene = context.scene
-    name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-    user_preferences = context.preferences.addons[name].preferences
 
     with bpy.data.libraries.load(blendfile, link=True) as (data_from, data_to):
         data_to.objects = [name for name in data_from.objects]

utils/lol/utils.py

@@ -50,8 +50,8 @@ def load_local_TOC(context, asset_type):
 
     assets = []
 
-    name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-    user_preferences = context.preferences.addons[name].preferences
+    user_preferences = get_addon_preferences(context)
+    
 
     filepath = join(user_preferences.global_dir, 'local_assets_' + asset_type.lower() + '.json')
     if isfile(filepath):
@@ -68,8 +68,7 @@ def load_local_TOC(context, asset_type):
 
 
 def load_patreon_assets(context):
-    name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-    user_preferences = context.preferences.addons[name].preferences
+    user_preferences = get_addon_preferences(context)
     LOL_HOST_URL = user_preferences.lol_host
     LOL_VERSION = user_preferences.lol_version
     LOL_HTTP_HOST = user_preferences.lol_http_host
@@ -123,8 +122,7 @@ def download_table_of_contents(context):
     global bg_threads
     scene = context.scene
     ui_props = context.scene.luxcoreOL.ui
-    name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-    user_preferences = context.preferences.addons[name].preferences
+    user_preferences = get_addon_preferences(context)
     LOL_HOST_URL = user_preferences.lol_host
     LOL_VERSION = user_preferences.lol_version
     LOL_HTTP_HOST = user_preferences.lol_http_host
@@ -708,8 +706,7 @@ def bg_load_previews(context, asset_type):
 def bg_download_thumbnails(context, download_queue):
     import urllib.request
 
-    name = 'bl_ext.user_default.' + basename(dirname(dirname(dirname(__file__))))
-    user_preferences = context.preferences.addons[name].preferences
+    user_preferences = get_addon_preferences(context)
     LOL_HOST_URL = user_preferences.lol_host
     LOL_VERSION = user_preferences.lol_version
     LOL_HTTP_HOST = user_preferences.lol_http_host