From 60707e7ad59fa835a8e5662a0663e33fdacaead8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 15 Nov 2024 22:30:12 +0100
Subject: [PATCH] auto pkg fixes: remove sources?

---
 src/packages/Packages.jl | 65 +++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 76ceeadba..63284fa9b 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -475,34 +475,57 @@ function _resolve(notebook::Notebook, iolistener::IOListener)
 end
 
 
+struct AutoFix
+    fix::Function
+    name::String
+end
+
+
+
+const auto_fixes = [
+    AutoFix("Updating registries") do notebook
+        PkgCompat.update_registries(; force=true)
+    end,
+    AutoFix("Removing Manifest") do notebook
+        reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
+        notebook.nbpkg_ctx_instantiated = false
+    end,
+    AutoFix("Removing sourcesssss") do notebook
+        # reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
+        # PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
+        # notebook.nbpkg_ctx_instantiated = false
+    end,
+    AutoFix("Removing Project compat entries and Manifest") do notebook
+        reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
+        PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
+        notebook.nbpkg_ctx_instantiated = false
+    end,
+]
+
+
+
+
+
+
+
 """
 Run `f` (e.g. `Pkg.instantiate`) on the notebook's package environment. Keep trying more and more invasive strategies to fix problems until the operation succeeds.
 """
-function with_auto_fixes(f::Function, notebook::Notebook)
-    try
-        f()
-    catch e
-        @info "Operation failed. Updating registries and trying again..." exception=e
-        
-        PkgCompat.update_registries(; force=true)
+function with_auto_fixes(f::Function, notebook::Notebook, index::Int=1)
+    
+    if index > length(auto_fixes)
+        return f()
+    else
         try
             f()
         catch e
-            @warn "Operation failed. Removing Manifest and trying again..." exception=e
+            fix = auto_fixes[index]
+            exception = index < length(auto_fixes) ? e : (e, catch_backtrace())
             
-            reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
-            notebook.nbpkg_ctx_instantiated = false
-            try
-                f()
-            catch e
-                @warn "Operation failed. Removing Project compat entries and Manifest and trying again..." exception=(e, catch_backtrace())
-                
-                reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
-                PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
-                notebook.nbpkg_ctx_instantiated = false
-                
-                f()
-            end
+            @info "Operation failed. $(fix.name) and trying again..." exception
+            
+            fix.fix(notebook)
+            with_auto_fixes(f, notebook, index + 1)
         end
     end
 end