fixed CRLF on windows

JerryI · JerryI · commit eb6f8f4a3e9e · 2026-04-25T16:50:58.000+02:00
diff --git a/Components/ExtendedTopbar.wlx b/Components/ExtendedTopbar.wlx
@@ -50,7 +50,7 @@ timedSaveButton[client_, localController_, controls_, parameters_] := With[{clon
 
     taskFile = SetInterval[(
       EventFire[controls, "CheckFileHash", <|"Client"->client|>];
-    ), 3000];
+    ), 4000];
 
     EventHandler[clonedControls, {"Save" -> Function[Null,
       EventFire[localController, "Reset", <|"Client"->client|>];
diff --git a/Components/Topbar.wlx b/Components/Topbar.wlx
@@ -48,7 +48,7 @@ timedSaveButton[client_, localController_, controls_, parameters_] := With[{clon
 
     taskFile = SetInterval[(
       EventFire[controls, "CheckFileHash", <|"Client"->client|>];
-    ), 3000];
+    ), 4000];
 
     reset;
 
diff --git a/Kernel/FileFormat.wl b/Kernel/FileFormat.wl
@@ -3,7 +3,9 @@ BeginPackage["CoffeeLiqueur`Notebook`FileFormat`"];
 readNotebook;
 writeNotebook;
 
-endOfLine = EndOfLine;
+endOfLine = EndOfLine | "\r";
+newLine[1] = "\n" | "\r\n";
+newLine[2] = "\n\n" | "\r\n\r\n";
 
 Begin["`Private`"];
 
@@ -301,7 +303,7 @@ readNotebook[stream_, timeout_:10] := Module[
     With[
         {
             testIfEnd = Function[p,
-                StringMatchQ[ReadString[file, "\n", TimeConstraint -> timeout], StartOfString ~~ p ~~ "%" ~~ ___]
+                StringMatchQ[ReadString[file, newLine[1], TimeConstraint -> timeout], StartOfString ~~ p ~~ "%" ~~ ___]
             ]
         }
         ,
@@ -341,7 +343,7 @@ readNotebook[stream_, timeout_:10] := Module[
             ReadString[
                 file
                 ,
-                StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ "Cells" ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"..
+                StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ "Cells" ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]..
                 ,
                 TimeConstraint -> timeout
             ]
@@ -355,7 +357,7 @@ readNotebook[stream_, timeout_:10] := Module[
             ReadString[
                 file
                 ,
-                StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"
+                StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]
                 ,
                 TimeConstraint -> timeout
             ]
@@ -366,7 +368,7 @@ readNotebook[stream_, timeout_:10] := Module[
              Return[$Failed]
         ];
         temp = parseMiniYAML[StringTrim[temp]];
-        buffer = ReadString[file, "\n\n" ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];
+        buffer = ReadString[file, newLine[2] ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];
         If[FailureQ[buffer],
              Return[$Failed]
         ];
@@ -378,7 +380,7 @@ readNotebook[stream_, timeout_:10] := Module[
                 ReadString[
                     file
                     ,
-                    StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"
+                    StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]
                     ,
                     TimeConstraint -> timeout
                 ]
@@ -389,7 +391,7 @@ readNotebook[stream_, timeout_:10] := Module[
                  Return[$Failed]
             ];
             temp = parseMiniYAML[StringTrim[temp]];
-            buffer = ReadString[file, "\n\n" ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];
+            buffer = ReadString[file, newLine[2] ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];
             If[FailureQ[buffer],
                  Return[$Failed]
             ];
@@ -408,7 +410,7 @@ readNotebook[stream_, timeout_:10] := Module[
                     ReadString[
                         file
                         ,
-                        StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ field ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"..
+                        StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ field ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]..
                         ,
                         TimeConstraint -> timeout
                     ]
@@ -422,7 +424,7 @@ readNotebook[stream_, timeout_:10] := Module[
                     ReadString[
                         file
                         ,
-                        (StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n") | (StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%EndOf" ~~ field ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n")
+                        (StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]) | (StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%EndOf" ~~ field ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1])
                         ,
                         TimeConstraint -> timeout
                     ]
@@ -436,7 +438,7 @@ readNotebook[stream_, timeout_:10] := Module[
                     keys[field] = Association[]; Continue[];
                 ];
                 temp = parseMiniYAML[StringTrim[temp]];
-                buffer = ReadString[file, "\n\n" ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];
+                buffer = ReadString[file, newLine[2] ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];
                 If[FailureQ[buffer],
                      Return[$Failed]
                 ];
@@ -448,7 +450,7 @@ readNotebook[stream_, timeout_:10] := Module[
                         ReadString[
                             file
                             ,
-                            StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"
+                            StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]
                             ,
                             TimeConstraint -> timeout
                         ]
@@ -459,7 +461,7 @@ readNotebook[stream_, timeout_:10] := Module[
                          Return[$Failed]
                     ];
                     temp = parseMiniYAML[StringTrim[temp]];
-                    buffer = ReadString[file, "\n\n" ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];
+                    buffer = ReadString[file, newLine[2] ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];
                     If[FailureQ[buffer],
                          Return[$Failed]
                     ];
diff --git a/modules/wljs-editor/src/RemoteCells.wl b/modules/wljs-editor/src/RemoteCells.wl
@@ -27,7 +27,7 @@ createNotebook[uid_] := With[{notebook = nb`NotebookObj["Hash" -> uid]},
 ]
 
 createNotebook[uid_, kernel_] := With[{notebook = nb`NotebookObj["Hash" -> uid]},
-    notebook["Evaluator"] = kernel["Container"];
+    notebook["AutoconnectKernel"] = kernel["Hash"];
     saveNotebook[Null, uid]
 ]
 
@@ -65,6 +65,28 @@ exportNotebook[notebook_, savingPath_, "wln"] := With[{stream = OpenWrite[saving
     Close[stream];
 ]
 
+saveNotebook[path_, uid_, kernelDir_] := With[{
+    notebook = nb`HashMap[uid]
+},
+{
+    savingPath = If[path === Null,
+            If[StringQ[notebook["Path"] ], 
+                notebook["Path"], 
+                FileNameJoin[{$TemporaryDirectory, ((Internal`NoWR`RandomWord[])<>(Internal`NoWR`RandomWord[]))<>".wln"}]
+            ]
+        ,
+            path
+    ]
+},
+    SetDirectory[kernelDir];
+    With[{res = exportNotebook[notebook, savingPath, FileExtension[savingPath] ] },
+        ResetDirectory[];
+        res
+    ]
+]
+
+saveNotebook[path_, uid_, Null] := saveNotebook[path, uid]
+
 saveNotebook[path_, uid_] := With[{
     notebook = nb`HashMap[uid]
 },
@@ -293,10 +315,10 @@ EventHandler[NotebookEditorChannel // EventClone,
         ],
 
         "CreateNotebook" -> Function[assoc,
-           With[{  uid = assoc["Hash"]},
+           With[{  uid = assoc["Hash"], kernel = GenericKernel`HashMap[assoc["Kernel"] ]},
             Echo["Creating notebook..."];
                 With[{},
-                    createNotebook[uid];
+                    createNotebook[uid, kernel];
                     saveNotebook[Null, uid];
                 ]
  
@@ -327,10 +349,10 @@ EventHandler[NotebookEditorChannel // EventClone,
         ],
 
         "SaveNotebook" -> Function[assoc,
-           With[{  uid = assoc["Hash"], path = assoc["Path"]},
+           With[{  uid = assoc["Hash"], path = assoc["Path"], kernelDir = Lookup[assoc, "KernelDirectory", Null]},
             Echo["Saving notebook..."];
                 With[{},
-                    saveNotebook[path, uid];
+                    saveNotebook[path, uid, kernelDir];
                 ]
  
             ];      
diff --git a/modules/wljs-editor/src/RemoteCellsKernel.wl b/modules/wljs-editor/src/RemoteCellsKernel.wl
@@ -232,19 +232,19 @@ NotebookOpen[path_ | File[path_], opts: OptionsPattern[] ] := With[{notebook = W
 Options[NotebookOpen] = {"Window" :> CurrentWindow[], Visible->True}
 
 NotebookSave[RemoteNotebook[uid_] ] := (
-    EventFire[Internal`Kernel`CommunicationChannel, "SaveNotebook", <|"Hash"->uid, "Path"->Null|>];
+    EventFire[Internal`Kernel`CommunicationChannel, "SaveNotebook", <|"Hash"->uid, "Path"->Null, "KernelDirectory"->Directory[]|>];
     RemoteNotebook[uid]
 )
 
 CreateNotebook[_] := CreateNotebook[]
 
 CreateNotebook[] := With[{uid = CreateUUID[]},
-    EventFire[Internal`Kernel`CommunicationChannel, "CreateNotebook", <|"Hash"->uid, "Path"->Null|>];
+    EventFire[Internal`Kernel`CommunicationChannel, "CreateNotebook", <|"Hash"->uid, "Path"->Null, "Kernel"->Internal`Kernel`Hash|>];
     RemoteNotebook[uid]
 ]
 
 NotebookSave[RemoteNotebook[uid_], path_String | File[path_String] ] := (
-    EventFire[Internal`Kernel`CommunicationChannel, "SaveNotebook", <|"Hash"->uid, "Path"->path|>];
+    EventFire[Internal`Kernel`CommunicationChannel, "SaveNotebook", <|"Hash"->uid, "Path"->path, "KernelDirectory"->Directory[]|>];
     RemoteNotebook[uid]
 )
 

Original file line number	Diff line number	Diff line change
@@ -3,7 +3,9 @@ BeginPackage["CoffeeLiqueur`Notebook`FileFormat`"];
`3`	`3`	`readNotebook;`
`4`	`4`	`writeNotebook;`
`5`	`5`
`6`		`-endOfLine = EndOfLine;`
	`6`	`+endOfLine = EndOfLine \| "\r";`
	`7`	`+newLine[1] = "\n" \| "\r\n";`
	`8`	`+newLine[2] = "\n\n" \| "\r\n\r\n";`
`7`	`9`
`8`	`10`	Begin["`Private`"];
`9`	`11`
`@@ -301,7 +303,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`301`	`303`	`With[`
`302`	`304`	`{`
`303`	`305`	`testIfEnd = Function[p,`
`304`		`- StringMatchQ[ReadString[file, "\n", TimeConstraint -> timeout], StartOfString ~~ p ~~ "%" ~~ ___]`
	`306`	`+ StringMatchQ[ReadString[file, newLine[1], TimeConstraint -> timeout], StartOfString ~~ p ~~ "%" ~~ ___]`
`305`	`307`	`]`
`306`	`308`	`}`
`307`	`309`	`,`
`@@ -341,7 +343,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`341`	`343`	`ReadString[`
`342`	`344`	`file`
`343`	`345`	`,`
`344`		`- StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ "Cells" ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"..`
	`346`	`+ StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ "Cells" ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]..`
`345`	`347`	`,`
`346`	`348`	`TimeConstraint -> timeout`
`347`	`349`	`]`
`@@ -355,7 +357,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`355`	`357`	`ReadString[`
`356`	`358`	`file`
`357`	`359`	`,`
`358`		`- StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"`
	`360`	`+ StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]`
`359`	`361`	`,`
`360`	`362`	`TimeConstraint -> timeout`
`361`	`363`	`]`
`@@ -366,7 +368,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`366`	`368`	`Return[$Failed]`
`367`	`369`	`];`
`368`	`370`	`temp = parseMiniYAML[StringTrim[temp]];`
`369`		`- buffer = ReadString[file, "\n\n" ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];`
	`371`	`+ buffer = ReadString[file, newLine[2] ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];`
`370`	`372`	`If[FailureQ[buffer],`
`371`	`373`	`Return[$Failed]`
`372`	`374`	`];`
`@@ -378,7 +380,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`378`	`380`	`ReadString[`
`379`	`381`	`file`
`380`	`382`	`,`
`381`		`- StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"`
	`383`	`+ StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]`
`382`	`384`	`,`
`383`	`385`	`TimeConstraint -> timeout`
`384`	`386`	`]`
`@@ -389,7 +391,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`389`	`391`	`Return[$Failed]`
`390`	`392`	`];`
`391`	`393`	`temp = parseMiniYAML[StringTrim[temp]];`
`392`		`- buffer = ReadString[file, "\n\n" ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];`
	`394`	`+ buffer = ReadString[file, newLine[2] ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];`
`393`	`395`	`If[FailureQ[buffer],`
`394`	`396`	`Return[$Failed]`
`395`	`397`	`];`
`@@ -408,7 +410,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`408`	`410`	`ReadString[`
`409`	`411`	`file`
`410`	`412`	`,`
`411`		`- StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ field ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"..`
	`413`	`+ StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ field ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]..`
`412`	`414`	`,`
`413`	`415`	`TimeConstraint -> timeout`
`414`	`416`	`]`
`@@ -422,7 +424,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`422`	`424`	`ReadString[`
`423`	`425`	`file`
`424`	`426`	`,`
`425`		`- (StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n") \| (StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%EndOf" ~~ field ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n")`
	`427`	`+ (StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]) \| (StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%EndOf" ~~ field ~~ "%" ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1])`
`426`	`428`	`,`
`427`	`429`	`TimeConstraint -> timeout`
`428`	`430`	`]`
`@@ -436,7 +438,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`436`	`438`	`keys[field] = Association[]; Continue[];`
`437`	`439`	`];`
`438`	`440`	`temp = parseMiniYAML[StringTrim[temp]];`
`439`		`- buffer = ReadString[file, "\n\n" ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];`
	`441`	`+ buffer = ReadString[file, newLine[2] ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];`
`440`	`442`	`If[FailureQ[buffer],`
`441`	`443`	`Return[$Failed]`
`442`	`444`	`];`
`@@ -448,7 +450,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`448`	`450`	`ReadString[`
`449`	`451`	`file`
`450`	`452`	`,`
`451`		`- StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ "\n"`
	`453`	`+ StartOfLine ~~ "%" ~~ Repeated["-", {17, 100}] ~~ Repeated["-", {17, 100}] ~~ "%" ~~ endOfLine ~~ newLine[1]`
`452`	`454`	`,`
`453`	`455`	`TimeConstraint -> timeout`
`454`	`456`	`]`
`@@ -459,7 +461,7 @@ readNotebook[stream_, timeout_:10] := Module[`
`459`	`461`	`Return[$Failed]`
`460`	`462`	`];`
`461`	`463`	`temp = parseMiniYAML[StringTrim[temp]];`
`462`		`- buffer = ReadString[file, "\n\n" ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];`
	`464`	`+ buffer = ReadString[file, newLine[2] ~~ StartOfLine ~~ "%" ~~ Repeated["-", {16, 100}] ~~ "%", TimeConstraint -> timeout];`
`463`	`465`	`If[FailureQ[buffer],`
`464`	`466`	`Return[$Failed]`
`465`	`467`	`];`
Original file line number	Diff line number	Diff line change
`@@ -232,19 +232,19 @@ NotebookOpen[path_ \| File[path_], opts: OptionsPattern[] ] := With[{notebook = W`
`232`	`232`	`Options[NotebookOpen] = {"Window" :> CurrentWindow[], Visible->True}`
`233`	`233`
`234`	`234`	`NotebookSave[RemoteNotebook[uid_] ] := (`
`235`		- EventFire[Internal`Kernel`CommunicationChannel, "SaveNotebook", <\|"Hash"->uid, "Path"->Null\|>];
	`235`	+ EventFire[Internal`Kernel`CommunicationChannel, "SaveNotebook", <\|"Hash"->uid, "Path"->Null, "KernelDirectory"->Directory[]\|>];
`236`	`236`	`RemoteNotebook[uid]`
`237`	`237`	`)`
`238`	`238`
`239`	`239`	`CreateNotebook[_] := CreateNotebook[]`
`240`	`240`
`241`	`241`	`CreateNotebook[] := With[{uid = CreateUUID[]},`
`242`		- EventFire[Internal`Kernel`CommunicationChannel, "CreateNotebook", <\|"Hash"->uid, "Path"->Null\|>];
	`242`	+ EventFire[Internal`Kernel`CommunicationChannel, "CreateNotebook", <\|"Hash"->uid, "Path"->Null, "Kernel"->Internal`Kernel`Hash\|>];
`243`	`243`	`RemoteNotebook[uid]`
`244`	`244`	`]`
`245`	`245`
`246`	`246`	`NotebookSave[RemoteNotebook[uid_], path_String \| File[path_String] ] := (`
`247`		- EventFire[Internal`Kernel`CommunicationChannel, "SaveNotebook", <\|"Hash"->uid, "Path"->path\|>];
	`247`	+ EventFire[Internal`Kernel`CommunicationChannel, "SaveNotebook", <\|"Hash"->uid, "Path"->path, "KernelDirectory"->Directory[]\|>];
`248`	`248`	`RemoteNotebook[uid]`
`249`	`249`	`)`
`250`	`250`