summaryrefslogtreecommitdiff
path: root/src/Hakyll
AgeCommit message (Collapse)AuthorFilesLines
2014-05-10Allow Emacs org-mode as markup-language in *.org filesAlbert Krewinkel1-0/+1
This closes #231.
2014-05-09Merge pull request #252 from blaenk/mod-timeJasper Van der Jeugt1-4/+3
save modification time with sub-second granularity
2014-05-09Merge branch 'master' of github.com:jaspervdj/hakyllJasper Van der Jeugt2-8/+12
2014-05-09save modification time with sub-second granularityJorge Israel Peña1-4/+3
Some systems can get the file modification time with sub-second granularity. However, Hakyll shaves off the sub-seconds, as defined in the Binary instance of BinaryTime, which poses a problem because when a file is checked to see if it was modified in `resourceModified`, it still contains the sub-seconds. This results in a file (almost) always being considered as having been modified. Example: 1. First go around, modification time is 3:45.325. This time is saved as 3:45.000 (i.e. sub-seconds are shaved off). 2. Second go around, modification time is again read as 3:45.325 and compared against the stored time, 3:45.000. 3:45.325 is more recent than 3:45.000, so the file is considered to have been modified. This change prevents the shaving off of sub-seconds. This will naturally work on systems that don't support sub-second granularity, as that 'field' will simply appear as all zeros. Closes #250
2014-04-27Minor refactor of PR #233Jorge Israel Peña1-8/+11
OS won't change mid-execution, so lets avoid the unnecessary check each time `unixFilter` is run.
2014-04-19FIX: `toSiteRoot` no considers "./" to not be relavent.Izzy Cecil1-0/+1
2014-04-11Fix tag dependency issue, slightly improve cachingJasper Van der Jeugt5-10/+15
2014-04-07Fix compilation when disabling preview serverJasper Van der Jeugt1-1/+1
2014-03-31Added imports that are missing when compiling under Windows.Dacto1-0/+2
2014-03-26Micro cleanup of pull request #233Jasper Van der Jeugt1-4/+12
2014-03-26Revert "added gloabl metadata parsing"Jasper Van der Jeugt1-45/+2
This reverts commit e0f45b29b3f5e17c04ecd054b6c26c67d71e10e4. Conflicts: src/Hakyll/Core/Provider/Metadata.hs
2014-03-26Revert "Fix loadGlobalMetadata on Windows"Jasper Van der Jeugt1-4/+4
This reverts commit e71bbd90a8fb4b5de7796498aed4b95bb7abaebb.
2014-03-26Revert "Fix root directory in directory-wise metadata and beautify code"Jasper Van der Jeugt1-14/+20
This reverts commit a6ae4eb99dd5f9957adc3b5fe4011e69b9681e4c.
2014-03-26Revert "Track metadata dependencies"Jasper Van der Jeugt4-46/+14
This reverts commit 712ffa39b5857fdc5cdae1db38a177267a430b11. Conflicts: src/Hakyll/Core/Metadata.hs src/Hakyll/Core/Rules/Default.hs
2014-03-26Revert "Added test case for global metadata"Jasper Van der Jeugt1-1/+1
This reverts commit 46b6f78da8ed814bef6972f4712d8b13e76c1122. Conflicts: tests/data/posts/metadata
2014-03-26Revert "set internalRules last, so that it can be overrided by rules"Jasper Van der Jeugt1-1/+1
This reverts commit d406db44e39d310a72ca6bb014ed882f0e883995.
2014-03-26Merge pull request #233 from rekahsoft/masterJasper Van der Jeugt1-2/+6
Fix unixFilter on Windows
2014-03-24"Serve on" should be "bind on".chrisdotcode1-1/+1
2014-03-24Add flag to bind on selected host.chrisdotcode4-21/+34
2014-03-23Fix unixFilter on WindowsCollin J. Doering1-2/+6
On windows, the 'unixFilter' function used window's 'createProcess' function to create the external process that will filter some String input. The problem with this is that it is unable to execute batch stubs (eg. anything created using 'gem install ...') even if its in $PATH. Anyways a solution to this issue is to execute the batch file explicitly using 'cmd /c batchfile' but there is no rational way to know where said batchfile is on the system. My solution is to detect windows using the System.Info module and then instead of using 'proc' to create the function, use 'shell' instead which will be able to execute everything 'proc' can + batch files. Inspired by: http://www.blaenkdenum.com/posts/the-switch-to-hakyll/#scss Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
2014-03-04Use OS threads for watch on WindowsSimonas Kazlauskas1-7/+14
2014-02-11hakyll check: return exit code of 0 on successAndres Loeh1-1/+1
The old test returns an exit code of 1 whenever the number of errors is >= 0, which should always be the case. The fix replaces this with a test whether the number of errors is strictly > 0.
2014-01-28Don't cache pandocCompilerWithTransform, refactorJasper Van der Jeugt1-10/+9
2014-01-28Merge pull request #215 from co-dan/pandoc-transfJasper Van der Jeugt1-0/+16
Added the `pandocCompilerWithTransformM` function
2014-01-26Typo in Pandoc.hsDan1-1/+1
2014-01-24Added the `pandocCompilerWithTransformM` functionDaniil Frumin1-0/+16
2014-01-23Merge pull request #190 from krsch/masterJasper Van der Jeugt4-4/+73
Implemented per-directory metadata support
2014-01-22Unified code for global and external metadataAlexey Kreshchuk3-6/+10
Didn't clean up unused code though
2014-01-21set internalRules last, so that it can be overrided by rulesAlexey Kreshchuk1-1/+1
2014-01-19Add IsString instance for TemplateJasper Van der Jeugt4-101/+94
Closes #150
2014-01-19Fix escaped quotes + wordingDaniil Frumin1-3/+3
2014-01-19Documentation for the template macrosDaniil Frumin1-0/+83
2014-01-12Haddocks for `field`, `constField`, `bodyField`, and `titleField` in ↵Daniil Frumin1-2/+8
Web.Template.Context
2014-01-11Added documentation for 'Context' and 'defaultField'Daniil Frumin1-0/+25
2014-01-03Fix issue with metadataRoute for composed routesJasper Van der Jeugt1-5/+13
2013-12-05Revert "Throw an error in case of duplicate compilers"Jasper Van der Jeugt2-19/+6
This reverts commit ffbce966075d258b16b44e6856333ef41e4487f4.
2013-11-22Throw an error in case of duplicate compilersJasper Van der Jeugt2-6/+19
2013-11-18Detect change if metadata file is deletedJasper Van der Jeugt1-1/+3
Closes #191
2013-10-18Added test case for global metadataAlexey Kreshchuk1-1/+1
2013-10-16Track metadata dependenciesAlexey Kreshchuk4-14/+44
I had to prepend some Rules to global Rules set. This might be possible to replaced by a correct Store.set call. I also had to prepend some Compile rules.
2013-10-15Fix root directory in directory-wise metadata and beautify codeAlexey Kreshchuk1-20/+14
2013-10-12Fix loadGlobalMetadata on WindowsAlexey Kreshchuk1-4/+4
2013-10-11added gloabl metadata parsingAlexey Kreshchuk1-2/+43
2013-09-29Enable Pandoc highlighting by defaultJasper Van der Jeugt1-0/+3
2013-09-18updated to work with pandoc 1.12Jorge Israel Peña1-9/+6
Pandoc 1.12 decouples citeproc-hs from itself, so there is no longer a Text.Pandoc.Biblio module in Pandoc. Further, citeproc-hs depends on pandoc-types 1.10 but Pandoc 1.12 depends on pandoc-types 1.12. To alleviate these issues, pandoc-citeproc was created which includes a copy of the citeproc-hs source made to be compatible, since the developer of citeproc-hs is apparently MIA. pandoc-citeproc is a separate module that handles the mixture of citeproc-hs and Pandoc. It includes `processCites` in Text.CSL.Pandoc, which is the new name of what used to be `processBiblio` from Text.Pandoc.Biblio Most of these changes are seamless, consisting of simple name changes in both functions and modules. However, a more direct change in the Hakyll API itself is that `readPandocBiblio`'s second parameter, the CSL, is now mandatory, i.e. not of type Maybe. This is to reflect the same change in the underlying processing function from Text.CSL.Pandoc, `processCites`, where the Style argument is now mandatory, and the style is derived from the CSL. See the old function: processBiblio :: Maybe Style -> [Reference] -> Pandoc -> Pandoc Compared to the new one: processCites :: Style -> [Reference] -> Pandoc -> Pandoc Sources: * http://hackage.haskell.org/packages/archive/pandoc/1.11.1/doc/html/Text-Pandoc-Biblio.html * http://hackage.haskell.org/packages/archive/pandoc-citeproc/0.1/doc/html/Text-CSL-Pandoc.html Similarly, there is no longer a `readerReferences` field in the reader options structure.
2013-09-16Fix incorrect output of toSiteRoot on Windows.Saeid Al-Wazzan1-1/+1
toSiteRoot uses splitPath, joinPath, and takeDirectory from the System.FilePath module. On Windows systems, the implementation of joinPath will build up a path using the Windows path separator "\\". We don't want this behavior since the paths we are working with are always URLs, so we force POSIX behavior for System.FilePath.
2013-08-29add preview port Configuration fieldJorge Israel Peña2-7/+13
Make it possible to specify the default port to listen on when the preview server is run. This is useful if another service on the system already runs on port 8000 (the default), since it's a hassle to keep providing the port overriding option. For example: ./site preview vs. ./site preview -p 4000
2013-08-28* Preview now shows the deprecation message and calls watch.Eric Stolten2-9/+10
* Details on how to disable the server in the command description.
2013-08-251. Added the WATCH_SERVER flag that is enabled by defaultEric Stolten2-30/+39
1. Added an argument to watch, --no-server which will disable the embedded server. 1. Added a deprecation message to the preview mode
2013-08-20Merge branch 'upstream-master'Eric Stolten4-4/+10