apraga/org - Change A6B5ZQUAZOPH3BPPU2TQX4FYKBKDJIC4QRJ6YWU7QKDUZD4YQ4GAC

Corrected path issue for publish. CSS styling for notes

Created by Alexis Praga on June 3, 2023

A6B5ZQUAZOPH3BPPU2TQX4FYKBKDJIC4QRJ6YWU7QKDUZD4YQ4GAC

Dependencies

In channels

main

Change contents

File move: filterOrgRoam.hs → filterOrgRoam.hs
BF:BFD[5.2] → [4.2990:3030]
BF:BF[4.3030] → [4.743:743]
[6.292]
[4.743]

Insertion in src/filterOrgRoam.hs at line 53 [4.743]

[4.2518]

-- And we add the root folder for publishing
-- FIXME this will not work locally...

Replacement in src/filterOrgRoam.hs at line 56 [4.743]

B:BD[4.2563] → [4.2563:2638]

htmlLink f pwd = makeRelative pwd (addExtension (dropExtension f) ".html")

[4.2563]

[4.2638]

htmlLink f pwd = "/" ++ makeRelative pwd (addExtension (dropExtension f) ".html")

Replacement in src/Main.hs at line 6 [8.9907]

B:BD[7.837] → [7.837:1157]

-- Hakyll does not manage org metadata. We follow @nasyxx hack mentioned here
-- https://github.com/jaspervdj/hakyll/issues/700
-- with a slight modification in cleanRouteFromTemp
-- The idea is to generate in _temp the file with YAML metada on top on org metadat
-- Then a second pass is needed to generate actual HTML

[7.837]

[7.1157]

-- Notes are in org-roam so managed outside hakelly because
-- 1. Hakyll does not manage org metadata.
-- 2. we have a custom filter to correct org-roam internal link

Deletion in src/Main.hs at line 34 [8.9907]

B:BD[9.252] → [10.10:73]

∅:D[10.73] → [11.44:113]

B:BD[11.44] → [11.44:113]

B:BD[11.113] → [12.287:364]

∅:D[12.364] → [11.190:221]

B:BD[11.190] → [11.190:221]

B:BD[11.222] → [11.222:223]

B:BD[11.223] → [13.10:81]

∅:D[13.81] → [14.816:852]

∅:D[11.265] → [14.816:852]

∅:D[9.293] → [14.816:852]

B:BD[14.816] → [14.816:852]

∅:D[14.852] → [15.1196:1229]

∅:D[7.1535] → [15.1196:1229]

B:BD[15.1196] → [15.1196:1229]

B:BD[15.1229] → [13.82:239]

∅:D[13.239] → [15.1369:1400]

B:BD[15.1369] → [15.1369:1400]

B:BD[14.1382] → [14.1382:1383]

∅:D[9.295] → [7.1536:1591]

∅:D[14.1383] → [7.1536:1591]

B:BD[8.11695] → [7.1536:1591]

B:BD[7.1591] → [13.240:789]

    match ("notes/index.org" .||. "notes/*japonais*.org") $ do
        route $ setExtension "html"
        compile $ pandocCompiler
            >>= loadAndApplyTemplate "templates/default.html" defaultContext
            >>= relativizeUrls
    match ("notes/*microbio*.org" .||. "notes/medecine/202*.org") $ do
        route $ setExtension "html"
        compile $ pandocCompiler
            -- >>= loadAndApplyTemplate "templates/post.html"    defaultContext
            >>= loadAndApplyTemplate "templates/default.html" defaultContext
            >>= relativizeUrls
    -- Don't forget to set the path to temporary files
    create ["notes/medecine.html"] $ do
        route idRoute
        compile $ do
            notes <- loadAll "notes/medecine/*"
            let notesCtx =
                    listField "notes" defaultContext (return notes) `mappend`
                    constField "title" "Notes"            `mappend`
                    defaultContext
            makeItem ""
                >>= loadAndApplyTemplate "templates/notes.html" notesCtx
                >>= loadAndApplyTemplate "templates/default.html" notesCtx
                >>= relativizeUrls

File addition: site.tar.gz (----------)
[5.2]

Replacement in notes/medecine/20230528235213-maladies_infectieuses.org at line 7 [16.3503]

B:BD[16.3665] → [2.3688:3823]

- [[./20230531000449-infections_urinaires.html][Infections urinaires]]
- [[./20230531000409-gastro_enterites.html][Gastro-entérites]]

[16.3665]

- [[id:9347af68-14c8-4bc0-b986-9dc4da51c13d][Infections urinaires]]
- [[id:a36141db-9bb2-48ff-8c48-f96bbc4aebf6][Gastro-entérites]]

Deletion in notes/index.org at line 9 [17.368291]
B:BD[13.41390] → [13.41390:41454]
B:BD[13.41454] → [2.3830:3831]
```
Virus
- [[./medecine/20230528233600-norovirus.html][Norovirus]]
```

Replacement in notes/index.org at line 10 [17.368291]

B:BD[10.232] → [10.232:277]

[[./20230511181321-japonais.html][Japonais]]

[10.232]

- [[id:ff3ddbe9-e87b-4e1b-8478-66234ebf6ab5][Japonais]]

Insertion in notes/20230511171829-haskell.org at line 86 [17.368584]

[3.856]


*Important* on n'a pas besoin de remplir les types de toutes les colonnes. Seulement celles qui nous intéressent !!

Insertion in notes/20230511171829-haskell.org at line 144 [17.368584]

[3.2572]

[18.72]

Pour chercher par clé directement (toujours org-roam avec une clé en chaine de caractère)
#+begin_src haskell
    test <- get (NodeKey "1")
    return $ (test :: Maybe Node)
#+end_src

Deletion in Shakefile.hs at line 6 [19.844]
B:BD[19.968] → [19.968:986]
```
siteExe :: String
```

Insertion in Shakefile.hs at line 7 [19.844]

[19.1017]

filterExe = "_build/filterOrgRoam"
-- Notes are managed by pandoc manually to solve org-roam links (and Hakyll does not manage org metadata)

Replacement in Shakefile.hs at line 17 [19.844]
B:BD[19.1336] → [4.3073:3110]
```
    want ["_build/notes/index.html"]
```
[19.1336]
[20.452]
```
    want ["archive", "hut"]
```
Replacement in Shakefile.hs at line 19 [19.844]
B:BD[19.1384] → [4.3111:3155]
```
    "_build/notes/index.html" %> \out -> do
```
[19.1384]
[4.3155]
```
    "_site/notes/index.html" %> \out -> do
```

Replacement in Shakefile.hs at line 21 [19.844]

B:BD[4.3191] → [4.3191:3390]

        org <- getDirectoryFiles "" ["notes/medecine/*.org"]
        let html = ["_build" </> n -<.> "html" | n <- org]
        need html
        cmd "pandoc" src "--filter ./filterOrgRoam -o" [out]

[4.3191]

[19.1495]

        -- Only org roam notes (starting with the date)
        org <- getDirectoryFiles "" ["notes/medecine/20*.org"]
        let html = ["_site" </> n -<.> "html" | n <- org]
        need $ html ++ [filterExe]
        cmd "pandoc" src "--filter " filterExe "-s  --css /css/default.css -o" [out]

Replacement in Shakefile.hs at line 27 [19.844]

B:BD[19.1496] → [4.3391:3440]

    "_build/notes/medecine/*.html" %> \out -> do

[19.1496]

[4.3440]

    "_site/notes/medecine/*.html" %> \out -> do

Replacement in Shakefile.hs at line 29 [19.844]

B:BD[4.3490] → [4.3490:3593]

        putInfo org
        putInfo out
        cmd "pandoc" [org] "--filter ./filterOrgRoam -o" [out]

[4.3490]

[4.3593]

        cmd "pandoc" [org] "--filter " filterExe "-s --css /css/default.css -o" [out]

Replacement in Shakefile.hs at line 31 [19.844]

B:BD[4.3594] → [4.3594:3623]

  --   want ["build", "hut"]

[4.3594]

[4.3623]

    siteExe  %> \out -> do
      cmd_ "ghc --make -o" [out] ["src/Main.hs"]

Replacement in Shakefile.hs at line 34 [19.844]

B:BD[4.3624] → [4.3624:3654]

  --   siteExe  %> \out -> do

[4.3624]

[4.3654]

    filterExe  %> \out -> do
      cmd_ "ghc --make -o" [out] ["src/filterOrgRoam.hs"]

Replacement in Shakefile.hs at line 37 [19.844]

B:BD[4.3655] → [4.3655:3792]

  --     let src = "src/Main.hs"
  --     need [src, "notes/20230511180745-microbiologie.org"]
  --     cmd_ "ghc --make -o" [out] [src]

[4.3655]

[4.3792]

    -- Shake cannot use directories
    phony "build" $ do
        need [siteExe]
        cmd_ siteExe "build"

Deletion in Shakefile.hs at line 42 [19.844]
B:BD[4.3793] → [4.3793:3916]
∅:D[4.3916] → [19.1599:1600]
B:BD[19.1599] → [19.1599:1600]
```
  --   -- Shake cannot use directories
  --   phony "build" $ do
  --       need [siteExe]
  --       cmd_ siteExe "build"
```

Replacement in Shakefile.hs at line 43 [19.844]

B:BD[19.1623] → [4.3917:3985]

        -- putInfo "Cleaning site "
  --       cmd_ siteExe "clean"

[19.1623]

[19.1685]

        putInfo "Cleaning _site "
        cmd_ siteExe "clean"

Replacement in Shakefile.hs at line 48 [19.844]

B:BD[19.1771] → [4.3986:4167]

  --   phony "hut" $ do
  --       putInfo "Upload to blog hosted by sourcehut"
  --       need ["archive"]
  --       cmd_ "hut pages publish _build/site.tar.gz -d scut.srht.site"

[19.1771]

[19.1951]

    phony "hut" $ do
        putInfo "Upload to blog hosted by sourcehut"
        need ["archive"]
        cmd_ "hut pages publish _build/site.tar.gz -d scut.srht.site"

Replacement in Shakefile.hs at line 53 [19.844]

B:BD[19.1952] → [4.4168:4286]

  --   phony "archive" $ do
  --       need ["build"]
  --       cmd_ "tar cvzf " ["_build/site.tar.gz"] "-C _site ."

[19.1952]

[19.2035]

    phony "archive" $ do
        need ["build", "_site/notes/index.html"]
        cmd_ "tar cvzf " ["_build/site.tar.gz"] "-C _site ."