Merge pull request #17 from eduralph/sync/upstream-maintenance-gramps60-auto

Sync addons-source@maintenance/gramps60 with upstream (2026-05-17)

Author: eduralph

ArchiveAssist/ArchiveAssist.py

@@ -119,7 +119,7 @@ def parse_ref(text: str) -> dict:
 # Gramplet class
 # ------------------------
 class ArchiveAssist(Gramplet):
-    
+
     # I am bad at GUI. Double check...
     def init(self):
         if getattr(self, "_initialized", False):
@@ -162,7 +162,7 @@ def build_gui(self):
         vbox.pack_start(self.status_label, False, False, 0)
 
         return vbox
-    
+
     def get_or_create_repository(self, name, trans):
         for handle in self.dbstate.db.get_repository_handles():
             repo = self.dbstate.db.get_repository_from_handle(handle)
@@ -187,11 +187,11 @@ def on_create_clicked(self, widget):
         if not parsed:
             self.status_label.set_text("Could not parse the reference string.")
             return
-            
+
         # Find existing Source (by title)
         src = None
         src_handle = None
-        
+
         for handle in self.dbstate.db.get_source_handles():
             candidate = self.dbstate.db.get_source_from_handle(handle)
             for attr in candidate.get_attribute_list():
@@ -205,7 +205,7 @@ def on_create_clicked(self, widget):
 
         try:
             with DbTxn("Create Source and Citation", self.dbstate.db) as trans:
-                
+
                 # Source
                 if src:
                     self.status_label.set_text(
@@ -215,14 +215,14 @@ def on_create_clicked(self, widget):
                     src = Source()
                     src.set_title(parsed["abr"])
                     src.set_publication_info(parsed["years"])
-                
+
                     # FIXED NAD attribute
                     nad_attr = Attribute()
                     nad_attr.set_type("NAD")
                     nad_attr.set_value(parsed["NAD"])
                     src.add_attribute(nad_attr)
-                
-                    # FIXED AID attribute (if present)  
+
+                    # FIXED AID attribute (if present)
                     if parsed["AID"]:
                         aid_attr = Attribute()
                         aid_attr.set_type("AID")
@@ -231,50 +231,50 @@ def on_create_clicked(self, widget):
 
                     # First add the Source WITHOUT repo refs
                     src_handle = self.dbstate.db.add_source(src, trans)
-                    
+
                     # Now add RepoRef AFTER the source exists
                     repo_ref = RepoRef()
                     repo_handle = self.get_or_create_repository(parsed["provider"], trans)
                     repo_ref.set_reference_handle(repo_handle)
-                    
+
                     src.add_repo_reference(repo_ref)
-                    
+
                     # Persist the updated Source with its RepoRef
                     self.dbstate.db.commit_source(src, trans)
-                
+
                     # Citation
                     cit = Citation()
                     cit.set_confidence_level(2)
                     cit.set_page(parsed["page"])
-                    
+
                     years = parsed["years"]
                     cit_date = Date()
                     if years and "-" in years:
                         start_year, end_year = [y.strip() for y in years.split("-")]
                         cit_date.set(
-                            modifier=Date.MOD_RANGE, 
+                            modifier=Date.MOD_RANGE,
                             value=(0, 0, int(start_year), False, 0, 0, int(end_year), False))
                         cit.set_date_object(cit_date)
 
                     elif years:
                         cit_date.set_year(int(years.strip()))
                         cit.set_date_object(cit_date)
-                
-                    cit.set_reference_handle(src_handle)               
-                    
+
+                    cit.set_reference_handle(src_handle)
+
                     if parsed["full_AID"]:
                         AID = Attribute()
                         AID.set_type("AID")
                         AID.set_value(parsed["full_AID"])
                         cit.add_attribute(AID)
-                    
+
                     cit_handle = self.dbstate.db.add_citation(cit, trans)
-                
+
                     self.status_label.set_text(
                         f"Created Source ({src.get_gramps_id()}) and Citation ({cit.get_gramps_id()})."
                     )
 
-        except Exception as e:        
+        except Exception as e:
             LOG.error("ArchiveAssist failed: %s", str(e), exc_info=True)
             self.status_label.set_text(
-                "Failed to create Source/Citation. Check logs.")  
+                "Failed to create Source/Citation. Check logs.")

DescendantsLines/DescendantsLines.py

@@ -409,7 +409,7 @@ def __init__(self, database, options_class, user):
         # increase text pad to allow for box's line
         if STROKE_RECTANGLE:
             TEXT_PAD += RECTANGLE_TEXT_PAD
-            
+
         global FONT_NAME
         global BASE_FONT_SIZE
         FONT_NAME = self.options['FONT_NAME']
@@ -1614,12 +1614,12 @@ def add_menu_options(self, menu):
         max_note_len.set_help(_("Maximum length of an event's note field in"
                                 " a text block, '$e(n)'\n 0=no limit "))
         menu.add_option(category_name, "max_note_len", max_note_len)
-        
+
         text_font_name = StringOption(_("Font Name"),
                                 r"sans-serif")
         text_font_name.set_help(_("Name of the Font to use. On Windows enter the file name of the .ttf at /Windows/Fonts"))
         menu.add_option(category_name, "FONT_NAME", text_font_name)
-        
+
         text_font_size = NumberOption(_("Font base size"), 12, 10, 250)
         menu.add_option(category_name, "BASE_FONT_SIZE", text_font_size)
 

Form/CensusCheckQuickview.gpr.py

@@ -4,7 +4,7 @@
 #
 #------------------------------------------------------------------------
 
-register(QUICKREPORT, 
+register(QUICKREPORT,
          id    = 'censuscheckquickview',
          name  = _("CensusCheck"),
          description= _("Check whether any Census events are missing for a person and some of their descendents"),
@@ -18,7 +18,7 @@
          runfunc = 'run',
          help_url = "Addon:Census_Check"
   )
-register(QUICKREPORT, 
+register(QUICKREPORT,
          id    = 'censuscheckupquickview',
          name  = _("CensusCheckUp"),
          description= _("Check whether any Census events are missing for a person and some of their ancestors"),

GrampsChat/GrampsChat.py

@@ -26,7 +26,7 @@
 This is always needed. Examples: "ollama/deepseek-r1:1.5b", "openai/gpt-4o-mini"
 
 ```
-export GRAMPS_AI_MODEL_URL="<ENTER URL HERE>" 
+export GRAMPS_AI_MODEL_URL="<ENTER URL HERE>"
 ```
 
 This is needed if running your own LLM server. Example: "http://127.0.0.1:8000"

GrampsChat/chatbot.py

@@ -30,7 +30,7 @@
 This is always needed. Examples: "ollama/deepseek-r1:1.5b", "openai/gpt-4o-mini"
 
 ```
-export GRAMPS_AI_MODEL_URL="<ENTER URL HERE>" 
+export GRAMPS_AI_MODEL_URL="<ENTER URL HERE>"
 ```
 
 This is needed if running your own LLM server. Example: "http://127.0.0.1:8000"

GrampsWebSync/diffhandler.py

@@ -84,18 +84,18 @@ def __init__(
             (obj.handle, obj_type): obj for (obj_type, obj) in self._diff_dbs[2]
         }
         self._latest_common_timestamp = self.get_latest_common_timestamp()
-        LOG.debug("Last synced timestamp from config: %s (%s)", 
-                 last_synced, 
+        LOG.debug("Last synced timestamp from config: %s (%s)",
+                 last_synced,
                  datetime.fromtimestamp(last_synced).strftime('%Y-%m-%d %H:%M:%S %Z') if last_synced else "None")
-        LOG.debug("Latest common timestamp calculated: %s (%s)", 
-                 self._latest_common_timestamp, 
+        LOG.debug("Latest common timestamp calculated: %s (%s)",
+                 self._latest_common_timestamp,
                  datetime.fromtimestamp(self._latest_common_timestamp).strftime('%Y-%m-%d %H:%M:%S %Z'))
         if last_synced and last_synced > self._latest_common_timestamp:
             # if the last sync timestamp in the config is later than
             # the latest common timestamp, use it
             self._latest_common_timestamp = int(last_synced)
-            LOG.debug("Using last synced timestamp as cutoff: %s (%s)", 
-                     self._latest_common_timestamp, 
+            LOG.debug("Using last synced timestamp as cutoff: %s (%s)",
+                     self._latest_common_timestamp,
                      datetime.fromtimestamp(self._latest_common_timestamp).strftime('%Y-%m-%d %H:%M:%S %Z'))
 
     def get_diff_dbs(
@@ -231,11 +231,11 @@ def get_changes(self) -> Actions:
             lst.append((C_UPD_LOC, handle, obj_type, obj1, obj2))
         for (handle, obj_type), (obj1, obj2) in self.modified_in_db2.items():
             lst.append((C_UPD_REM, handle, obj_type, obj1, obj2))
-        
+
         # Log summary of sync decisions
         LOG.debug("=== SYNC DECISION SUMMARY ===")
-        LOG.debug("Cutoff timestamp used: %s (%s)", 
-                 self._latest_common_timestamp, 
+        LOG.debug("Cutoff timestamp used: %s (%s)",
+                 self._latest_common_timestamp,
                  datetime.fromtimestamp(self._latest_common_timestamp).strftime('%Y-%m-%d %H:%M:%S %Z'))
         LOG.debug("Added to local (remote objects): %d", len(self.added_to_db1))
         LOG.debug("Added to remote (local objects): %d", len(self.added_to_db2))

PhotoTaggingGramplet/PhotoTaggingGramplet.gpr.py

@@ -29,7 +29,7 @@
     name=_("Photo Tagging"),
     description=_("Gramplet for tagging people in photos"),
     authors=["Artem Glebov", "Nick Hall", "Paul Culley", "Bruce Jackson"],
-    version = '1.0.46',
+    version = '1.0.47',
     gramps_target_version="6.0",
     status=STABLE,
     fname="PhotoTaggingGramplet.py",
@@ -39,4 +39,5 @@
     navtypes=["Media"],
     help_url="Addon:Photo_Tagging_Gramplet",
     include_in_listing=True,
+    requires_gi=[("GExiv2", "0.10,0.12,0.14,0.16")],
 )

PhotoTaggingGramplet/PhotoTaggingGramplet.py

@@ -616,7 +616,7 @@ def get_xmp_regions(self, image_path):
 
             rtype = metadata.get(region_type % i)
             unit = metadata.get(region_unit % i)
-            
+
             # ensure region does not exceed bounds of image
             rect_p1 = x - (w / 2)
             if rect_p1 < 0: