small fixes
This commit is contained in:
+11
-8
@@ -15,7 +15,7 @@ from vse_toolbox.constants import (EDITS, EDIT_SUFFIXES, MOVIES, MOVIE_SUFFIXES,
|
||||
from vse_toolbox.sequencer_utils import (clean_sequencer, import_edit, import_movie,
|
||||
import_sound, get_strips, get_channel_index, get_empty_channel, scale_clip_to_fit)
|
||||
|
||||
from vse_toolbox.bl_utils import (get_scene_settings, get_addon_prefs, get_scene_settings)
|
||||
from vse_toolbox.bl_utils import (get_scene_settings, get_addon_prefs, get_scene_settings, abspath)
|
||||
from vse_toolbox.file_utils import install_module, parse, find_last, expand
|
||||
|
||||
|
||||
@@ -368,16 +368,19 @@ class VSETB_OT_import_shots(Operator):
|
||||
|
||||
channel_index += 1
|
||||
|
||||
def get_preview_dir(self):
|
||||
preview_dir = Path(bpy.app.tempdir, 'previews')
|
||||
if bpy.data.filepath:
|
||||
preview_dir = Path(bpy.data.filepath).parent / 'previews'
|
||||
return preview_dir
|
||||
# def get_preview_dir(self):
|
||||
# preview_dir = Path(bpy.app.tempdir, 'previews')
|
||||
# if bpy.data.filepath:
|
||||
# preview_dir = Path(bpy.data.filepath).parent / 'previews'
|
||||
# return preview_dir
|
||||
|
||||
def download_preview(self, task_type, shot):
|
||||
prefs = get_addon_prefs()
|
||||
tracker = prefs.tracker
|
||||
|
||||
settings = get_scene_settings()
|
||||
project = settings.active_project
|
||||
|
||||
task = tracker.get_task(task_type.id or task_type.name, entity=shot)
|
||||
last_comment = tracker.get_last_comment_with_preview(task)
|
||||
if not last_comment:
|
||||
@@ -391,7 +394,7 @@ class VSETB_OT_import_shots(Operator):
|
||||
if shot_name.startswith(sequence_name):
|
||||
shot_name = shot_name.replace(sequence_name, '', 1)
|
||||
|
||||
preview_dir = self.get_preview_dir()
|
||||
preview_dir = abspath(project.import_shots.previews_folder)#self.get_preview_dir()
|
||||
|
||||
filepath = Path(preview_dir, f'{sequence_name}{shot_name}_{task_type.name}.{ext}')
|
||||
filepath.parent.mkdir(parents=True, exist_ok=True)
|
||||
@@ -621,7 +624,7 @@ class VSETB_OT_import_shots(Operator):
|
||||
tmp_dir = Path(gettempdir(), 'reviews')
|
||||
|
||||
if bpy.data.filepath and Path(project.import_shots.previews_folder) == tmp_dir:
|
||||
tmp_dir = '//sources'
|
||||
project.import_shots.previews_folder = '//sources'
|
||||
|
||||
if not bpy.data.filepath and project.import_shots.previews_folder == '//sources':
|
||||
project.import_shots.previews_folder = str(tmp_dir)
|
||||
|
||||
Reference in New Issue
Block a user