mirror of
https://github.com/TagStudioDev/TagStudio.git
synced 2024-07-30 21:27:34 +00:00
Folders to tags Cleanup + bugfix
This commit is contained in:
Creepler13
parent
0c9dd7f43b
commit
ea904da58b
1 changed files with 138 additions and 136 deletions
|
|
@ -26,6 +26,58 @@ INFO = f'[INFO]'
|
|||
logging.basicConfig(format="%(message)s", level=logging.INFO)
|
||||
|
||||
|
||||
def folders_to_tags(library:Library):
|
||||
logging.info("Converting folders to Tags")
|
||||
tree = dict(dirs={})
|
||||
def add_tag_to_tree(list:list[Tag]):
|
||||
branch = tree
|
||||
for tag in list:
|
||||
if tag.name not in branch["dirs"]:
|
||||
branch["dirs"][tag.name] = dict(dirs={},tag=tag)
|
||||
branch = branch["dirs"][tag.name]
|
||||
|
||||
def add_folders_to_tree(list:list[str])->Tag:
|
||||
branch = tree
|
||||
for folder in list:
|
||||
if folder not in branch["dirs"]:
|
||||
new_tag = Tag(-1, folder,"",[],([branch["tag"].id] if "tag" in branch else []),"")
|
||||
library.add_tag_to_library(new_tag)
|
||||
branch["dirs"][folder] = dict(dirs={},tag=new_tag)
|
||||
branch = branch["dirs"][folder]
|
||||
return branch["tag"]
|
||||
|
||||
|
||||
for tag in library.tags:
|
||||
reversed_tag = reverse_tag(library,tag,None)
|
||||
add_tag_to_tree(reversed_tag)
|
||||
|
||||
for entry in library.entries:
|
||||
folders = entry.path.split("\\")
|
||||
if len(folders)== 1 and folders[0]=="": continue
|
||||
tag = add_folders_to_tree(folders)
|
||||
if tag:
|
||||
if not entry.has_tag(library,tag.id):
|
||||
entry.add_tag(library,tag.id,6)
|
||||
|
||||
logging.info("Done")
|
||||
|
||||
def reverse_tag(library:Library,tag:Tag,list:list[Tag]) -> list[Tag]:
|
||||
if list != None:
|
||||
list.append(tag)
|
||||
else:
|
||||
list = [tag]
|
||||
|
||||
if len(tag.subtag_ids) == 0:
|
||||
list.reverse()
|
||||
return list
|
||||
else:
|
||||
for subtag_id in tag.subtag_ids:
|
||||
subtag = library.get_tag(subtag_id)
|
||||
return reverse_tag(library,subtag,list)
|
||||
|
||||
#=========== UI ===========
|
||||
|
||||
|
||||
class FoldersToTagsModal(QWidget):
|
||||
# done = Signal(int)
|
||||
def __init__(self, library:'Library', driver:'QtDriver'):
|
||||
|
|
@ -68,7 +120,7 @@ class FoldersToTagsModal(QWidget):
|
|||
|
||||
self.apply_button = QPushButton()
|
||||
self.apply_button.setText('&Apply')
|
||||
self.apply_button.clicked.connect(lambda: self.folders_to_tags(self.library))
|
||||
self.apply_button.mouseReleaseEvent = self.on_apply
|
||||
|
||||
self.showEvent = self.on_open
|
||||
|
||||
|
|
@ -76,6 +128,11 @@ class FoldersToTagsModal(QWidget):
|
|||
self.root_layout.addWidget(self.scroll_area)
|
||||
self.root_layout.addWidget(self.apply_button)
|
||||
|
||||
def on_apply(self,event):
|
||||
folders_to_tags(self.library)
|
||||
self.close()
|
||||
self.driver.preview_panel.update_widgets()
|
||||
|
||||
def on_open(self,event):
|
||||
for i in reversed(range(self.scroll_layout.count())):
|
||||
self.scroll_layout.itemAt(i).widget().setParent(None)
|
||||
|
|
@ -83,10 +140,9 @@ class FoldersToTagsModal(QWidget):
|
|||
data = self.generate_preview_data(self.library)
|
||||
|
||||
for folder in data["dirs"].values():
|
||||
test = self.TreeItemTest(folder,None)
|
||||
test = TreeItem(folder,None)
|
||||
self.scroll_layout.addWidget(test)
|
||||
|
||||
|
||||
def generate_preview_data(self,library:Library):
|
||||
tree = dict(dirs={},files=[])
|
||||
|
||||
|
|
@ -107,8 +163,7 @@ class FoldersToTagsModal(QWidget):
|
|||
return branch
|
||||
|
||||
for tag in library.tags:
|
||||
reversed_tag = self.reverse_tag(tag,None)
|
||||
logging.info(set(map(lambda tag:tag.name ,reversed_tag)))
|
||||
reversed_tag = reverse_tag(library,tag,None)
|
||||
add_tag_to_tree(reversed_tag)
|
||||
|
||||
for entry in library.entries:
|
||||
|
|
@ -131,74 +186,21 @@ class FoldersToTagsModal(QWidget):
|
|||
def cut_branches_adding_nothing(branch:dict):
|
||||
folders = set(branch["dirs"].keys())
|
||||
for folder in folders:
|
||||
logging.info(folder)
|
||||
cut = cut_branches_adding_nothing(branch["dirs"][folder])
|
||||
if cut:
|
||||
branch['dirs'].pop(folder)
|
||||
|
||||
if not "tag" in branch: return
|
||||
if branch["tag"].id == -1:#Needs to be first
|
||||
if branch["tag"].id == -1 or len(branch["files"])>0:#Needs to be first
|
||||
return False
|
||||
if len(branch["dirs"].keys()) == 0:
|
||||
return True
|
||||
|
||||
|
||||
cut_branches_adding_nothing(tree)
|
||||
|
||||
return tree
|
||||
|
||||
def folders_to_tags(self,library:Library):
|
||||
logging.info("Converting folders to Tags")
|
||||
tree = dict(dirs={})
|
||||
def add_tag_to_tree(list:list[Tag]):
|
||||
branch = tree
|
||||
for tag in list:
|
||||
if tag.name not in branch["dirs"]:
|
||||
branch["dirs"][tag.name] = dict(dirs={},tag=tag)
|
||||
branch = branch["dirs"][tag.name]
|
||||
|
||||
def add_folders_to_tree(list:list[str])->Tag:
|
||||
branch = tree
|
||||
for folder in list:
|
||||
if folder not in branch["dirs"]:
|
||||
new_tag = Tag(-1, folder,"",[],([branch["tag"].id] if "tag" in branch else []),"")
|
||||
library.add_tag_to_library(new_tag)
|
||||
branch["dirs"][folder] = dict(dirs={},tag=new_tag)
|
||||
branch = branch["dirs"][folder]
|
||||
return branch["tag"]
|
||||
|
||||
|
||||
for tag in library.tags:
|
||||
reversed_tag = self.reverse_tag(tag,None)
|
||||
add_tag_to_tree(reversed_tag)
|
||||
|
||||
for entry in library.entries:
|
||||
folders = entry.path.split("\\")
|
||||
if len(folders)== 1 and folders[0]=="": continue
|
||||
tag = add_folders_to_tree(folders)
|
||||
if tag:
|
||||
if not entry.has_tag(library,tag.id):
|
||||
entry.add_tag(library,tag.id,6)
|
||||
|
||||
self.close()
|
||||
|
||||
logging.info("Done")
|
||||
|
||||
def reverse_tag(self,tag:Tag,list:list[Tag]) -> list[Tag]:
|
||||
if list != None:
|
||||
list.append(tag)
|
||||
else:
|
||||
list = [tag]
|
||||
|
||||
if len(tag.subtag_ids) == 0:
|
||||
list.reverse()
|
||||
return list
|
||||
else:
|
||||
for subtag_id in tag.subtag_ids:
|
||||
subtag = self.library.get_tag(subtag_id)
|
||||
return self.reverse_tag(subtag,list)
|
||||
|
||||
class ModifiedTagWidget(QWidget): # Needed to be modified because the original searched the display name in the library where it wasn't added yet
|
||||
class ModifiedTagWidget(QWidget): # Needed to be modified because the original searched the display name in the library where it wasn't added yet
|
||||
def __init__(self, tag:Tag,parentTag:Tag) -> None:
|
||||
super().__init__()
|
||||
self.tag = tag
|
||||
|
|
@ -243,7 +245,7 @@ class FoldersToTagsModal(QWidget):
|
|||
|
||||
self.base_layout.addWidget(self.bg_button)
|
||||
self.setMinimumSize(50,20)
|
||||
class TreeItemTest(QWidget):
|
||||
class TreeItem(QWidget):
|
||||
def __init__(self,data:dict,parentTag:Tag):
|
||||
super().__init__()
|
||||
|
||||
|
|
@ -256,7 +258,7 @@ class FoldersToTagsModal(QWidget):
|
|||
|
||||
self.tag_layout = FlowLayout(self.test)
|
||||
|
||||
self.tag_widget = FoldersToTagsModal.ModifiedTagWidget(data["tag"],parentTag)
|
||||
self.tag_widget = ModifiedTagWidget(data["tag"],parentTag)
|
||||
self.tag_widget.bg_button.clicked.connect(lambda:self.hide_show())
|
||||
self.tag_layout.addWidget(self.tag_widget)
|
||||
|
||||
|
|
@ -271,7 +273,7 @@ class FoldersToTagsModal(QWidget):
|
|||
|
||||
def populate(self,data:dict):
|
||||
for folder in data["dirs"].values():
|
||||
item = FoldersToTagsModal.TreeItemTest(folder,data["tag"])
|
||||
item = TreeItem(folder,data["tag"])
|
||||
self.children_layout.addWidget(item)
|
||||
for file in data["files"]:
|
||||
label = QLabel()
|
||||
|
|
|
|||
Loading…
Reference in a new issue