Fix NFS/SMB mounting and path handling issues

- Add 'nolock' option to NFS mount commands for better compatibility
- Fix SMB path conversion when browsing (smb://server/share -> server:/share)
- Prevent local backup path reset when NFS mounts are inaccessible
- Improve error handling for remote connections

Author: Nigel

service.libreelec.backupper/resources/lib/backup_utils.py

@@ -95,18 +95,17 @@ def update_backup_location(self):
             # Create a temporary local directory for staging remote files
             self.backup_dir = os.path.join(xbmcvfs.translatePath('special://temp'), 'libreelec_backupper')
 
-        # Ensure backup directory exists
-        if self.backup_dir and not os.path.exists(self.backup_dir):
-            try:
-                os.makedirs(self.backup_dir)
-            except Exception as e:
-                xbmc.log(f"Error creating backup directory: {str(e)}", xbmc.LOGERROR)
-                # Fall back to addon profile if custom location can't be created
-                self.backup_dir = xbmcvfs.translatePath(self.addon.getAddonInfo('profile'))
-                if not os.path.exists(self.backup_dir):
+        # Ensure backup directory exists (only for remote backups where we create temp dirs)
+        if self.location_type != 0:  # Remote
+            if self.backup_dir and not os.path.exists(self.backup_dir):
+                try:
                     os.makedirs(self.backup_dir)
-                if self.location_type == 0:  # Only update setting for local backups
-                    self.addon.setSetting('backup_location', self.backup_dir)
+                except Exception as e:
+                    xbmc.log(f"Error creating backup directory: {str(e)}", xbmc.LOGERROR)
+                    # Fall back to addon profile if custom location can't be created
+                    self.backup_dir = xbmcvfs.translatePath(self.addon.getAddonInfo('profile'))
+                    if not os.path.exists(self.backup_dir):
+                        os.makedirs(self.backup_dir)
 
     def _create_webdav_session(self):
         """Create a WebDAV session with retry logic and connection pooling"""
@@ -188,9 +187,9 @@ def connect_remote(self):
                 subprocess.call(["umount", mount_point], stderr=subprocess.DEVNULL)
 
                 # Mount the NFS share with proper options
-                # Use soft mount and shorter timeout for better error handling
-                mount_options = ["-t", "nfs", "-o", "soft,timeo=10,retrans=2"]
-                result = subprocess.call(["mount"] + mount_options + [nfs_path, mount_point], 
+                # Use soft mount, shorter timeout, and nolock for better compatibility
+                mount_options = ["-t", "nfs", "-o", "soft,timeo=10,retrans=2,nolock"]
+                result = subprocess.call(["mount"] + mount_options + [nfs_path, mount_point],
                                         stderr=subprocess.PIPE, stdout=subprocess.PIPE)
 
                 if result == 0:
@@ -2176,4 +2175,4 @@ def get_next_scheduled_backup(self):
 
         except Exception as e:
             xbmc.log(f"{ADDON_ID}: Error calculating next backup time: {str(e)}", xbmc.LOGERROR)
-            return "Unknown"
+            return "Unknown"

service.libreelec.backupper/resources/lib/remote_browser.py

@@ -160,10 +160,20 @@ def browse_with_kodi_browser(self, protocol_name, mode='backup'):
                 # Remove trailing slash if present
                 if path.endswith('/'):
                     path = path[:-1]
-                
+
+                # Convert from smb://server/share format to server:/share format
+                if '/' in path:
+                    parts = path.split('/', 1)
+                    server = parts[0]
+                    share = parts[1]
+                    # Convert to the expected format: server:/share
+                    expected_path = f"{server}:{share}" if share else server
+                else:
+                    expected_path = path
+
                 # Update the remote path setting
-                self.remote_path = path
-                ADDON.setSetting('remote_path', path)
+                self.remote_path = expected_path
+                ADDON.setSetting('remote_path', expected_path)
                 # Force settings save immediately
                 xbmc.executebuiltin('UpdateLocalAddons')
                 xbmc.sleep(200)  # Brief pause to ensure settings are saved
@@ -605,7 +615,7 @@ def _test_nfs_connection(self):
             subprocess.call(["umount", mount_point], stderr=subprocess.DEVNULL)
 
             # Try to mount with proper options
-            mount_options = ["-t", "nfs", "-o", "soft,timeo=10,retrans=2"]
+            mount_options = ["-t", "nfs", "-o", "soft,timeo=10,retrans=2,nolock"]
             result = subprocess.call(["mount"] + mount_options + [self.remote_path, mount_point],
                                    stderr=subprocess.PIPE, stdout=subprocess.PIPE)
 
@@ -1253,4 +1263,4 @@ def main():
         browser.browse()
 
 if __name__ == "__main__":
-    main() 
+    main()