[edit] utilisation du name space + modification du merge

Backend/asset_list.py

@@ -155,10 +155,10 @@ class AssetList:
         return res
 
     @classmethod
-    def unserialize(cls, aDict, aBasePath = ""):
+    def unserialize(cls, aDict, aBasePath = "", name_space = None):
         a_l = cls(aBasePath)
         for k,v in aDict.items():
-            a_l.assets[k]=Asset(k, v, base_path=aBasePath)
+            a_l.assets[k]=Asset(k, v, base_path=aBasePath, name_space = name_space)
             a_l.set_folders(a_l.assets[k])
         return a_l
 

Backend/assets.py

@@ -99,7 +99,8 @@ class UnityFile:
         return os.path.splitext(self.path)[0]
 
     def get_full_path(self):
-        return os.path.join(self.base_path, self.path)
+        relative = os.path.join(self.base_path, self.path)
+        return os.path.abspath(relative)
 
     def is_image(self):
         return self.type == "image"
@@ -128,13 +129,13 @@ class UnityFile:
 def asset_atlas(cls):
     cls.atlas = {}
     cls.rewrite_list = {}
-    def getinstance(anid, snd_or_dico=None, img=None, txt=None, base_path="", name_space= ''):
+    def getinstance(anid, snd_or_dico=None, img=None, txt=None, base_path="", name_space= None):
         if name_space != None:
             anid = cls.check_rewrite(anid, name_space)
         if anid not in cls.atlas:
             cls.atlas[anid] = cls(anid, snd_or_dico, img, txt, base_path)#le name_space n'est pas nécessaire dans ce cas
         elif snd_or_dico != None or img != None or txt != None:
-            if not cls.atlas[anid].merge(cls(anid, snd_or_dico, img, txt, base_path)):
+            if cls.atlas[anid].merge(cls(anid, snd_or_dico, img, txt, base_path)):
                 anid = cls.rewrite_id(anid, name_space)
                 cls.atlas[anid] = cls(anid, snd_or_dico, img, txt, base_path)
         return cls.atlas[anid]
@@ -142,7 +143,7 @@ def asset_atlas(cls):
 
 @asset_atlas
 class Asset:
-    def __init__(self, anid, snd_or_dico=None, img=None, txt=None, base_path="", name_space = ''):
+    def __init__(self, anid, snd_or_dico=None, img=None, txt=None, base_path="", name_space = None):
         self.mid = anid
         self.lang = None
         self.transcript = None
@@ -302,18 +303,16 @@ class Asset:
 
     def merge(self, other):
         merged = False
-        if self != other and self.mid == other.mid:
-            if not(
-                self.txt != None or other.txt != None or
-                (self.snd != None and other.snd != None and self.snd.get_full_path() != other.snd.get_full_path()) or
-                (self.img != None and other.img != None and self.img.get_full_path() != other.img.get_full_path())
-            ): #not not mergeable
-                if self.snd == None and other.snd != None:
-                    self.snd = other.snd
-                    merged = True
-                if self.img == None and other.img != None:
-                    self.img = other.img
-                    merged = True
+        if str(self) != str(other) and self.mid == other.mid:
+            if not(self.snd != None and other.snd != None and self.snd.get_full_path() != other.snd.get_full_path()): 
+                self.snd = other.snd
+                self.set_lang(other.lang)
+                self.txt = other.txt
+                self.transcript = other.transcript
+                merged = True
+            if not(self.img != None and other.img != None and self.img.get_full_path() != other.img.get_full_path()):
+                self.img = other.img
+                merged = True
         return merged
 
     @classmethod

Backend/test.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 from Backend.asset_list import AssetList
 from Backend.sessions import Session
+from pathlib import Path
 import json
 import os
 
@@ -16,7 +17,7 @@ class Test:
                 else:
                     self.base_path = base_path
                 json_t = json.load(open(json_file_path, encoding="utf8"))
-                self.assets = AssetList.unserialize(json_t['assets'], os.path.dirname(json_file_path))
+                self.assets = AssetList.unserialize(json_t['assets'], os.path.dirname(json_file_path), name_space = Path(self.json_path).stem)
                 self.sessions = []
                 for s in json_t['sessions']:
                     self.add_session(Session.unserialize(s))