forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some stuff

This commit is contained in:
Adam D. Ruppe 2024-01-01 20:01:24 -05:00
parent 6c06540e11
commit 4c5265202d
3 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -8,13 +8,13 @@ There will be no further public updates with supported compatibility with WB's D
This is a collection of modules that I've released over the years (the oldest module in here was originally written in 2006, pre-D1!) for a wide variety of purposes. Most of them stand alone, or have just one or two dependencies in here, so you don't have to download this whole repo. Feel free to email me, destructionator@gmail.com or ping me as `adam_d_ruppe` on the #d IRC channel if you want to ask me anything.
I'm always adding to it, but my policy on dependencies means you can ignore what you don't need. I am also committed to long-term support. Even the obsolete modules I haven't used for years I usually keep compiling at least, and the ones I do use I am very hesitant to break backward compatibility on. My semver increases are *very* conservative.
I'm always adding to it, but my policy on dependencies means you can ignore what you don't need. I am also committed to long-term support for OpenD users. Even the obsolete modules I haven't used for years I usually keep compiling at least, and the ones I do use I am very hesitant to break backward compatibility on. My semver increases are *very* conservative.
See the full list of (at least slightly) documented module here: http://arsd-official.dpldocs.info/arsd.html and refer to https://code.dlang.org/packages/arsd-official for the list of `dub`-enabled subpackages.
See the full list of (at least slightly) documented module here: http://arsd-official.dpldocs.info/arsd.html and refer to https://code.dlang.org/packages/arsd-official for the list of `dub`-enabled subpackages. Please note that `dub` is no longer officially supported, but it may work for you anyway.
## Links
I have [a patreon](https://www.patreon.com/adam_d_ruppe) and my (almost) [weekly blog](http://dpldocs.info/this-week-in-d/) you can check out if you'd like to financially support this work or see the updates and tips I write about.
I have [a patreon](https://www.patreon.com/adam_d_ruppe) and my (almost) [weekly blog](http://dpldocs.info/this-week-in-arsd/) you can check out if you'd like to financially support this work or see the updates and tips I write about.
# Breaking Changelog

3
cgi.d
View File

@ -11905,6 +11905,9 @@ auto serveStaticFileDirectory(string urlPrefix, string directory = null, bool re
return false;
}
if(file.length == 0)
return false;
auto contentType = contentTypeFromFileExtension(file);
auto fn = details.directory ~ file;

38
webtemplate.d
View File

@ -585,8 +585,14 @@ template WebPresenterWithTemplateSupport(CTRP) {
import arsd.cgi;
class WebPresenterWithTemplateSupport : WebPresenter!(CTRP) {
override Element htmlContainer() {
try {
auto skeleton = renderTemplate("generic.html", var.emptyObject, var.emptyObject, "skeleton.html", templateLoader());
return skeleton.requireSelector("main");
} catch(Exception e) {
auto document = new Document("<html><body><p>generic.html trouble: <span id=\"ghe\"></span></p> <main></main></body></html>");
document.requireSelector("#ghe").textContent = e.msg;
return document.requireSelector("main");
}
}
static struct Meta {
@ -673,25 +679,49 @@ template WebPresenterWithTemplateSupport(CTRP) {
/++
Serves up a directory of template files as html. This is meant to be used for some near-static html in the midst of an application, giving you a little bit of dynamic content and conveniences with the ease of editing files without recompiles.
Parameters:
urlPrefix = the url prefix to trigger this handler, relative to the current dispatcher base
directory = the directory, under the template directory, to find the template files
skeleton = the name of the skeleton file inside the template directory
extension = the file extension to add to the url name to get the template name
To get the filename of the template from the url, it will:
1) Strip the url prefixes off to get just the filename
2) Concatenate the directory with the template directory
3) Add the extension to the givenname
$(PITFALL
The `templateDirectory` parameter may be removed or changed in the near future.
)
History:
Added July 28, 2021 (documented dub v11.0)
+/
auto serveTemplateDirectory()(string urlPrefix, string directory = null, string skeleton = null, string extension = ".html") {
auto serveTemplateDirectory()(string urlPrefix, string directory = null, string skeleton = null, string extension = ".html", string templateDirectory = "templates/") {
import arsd.cgi;
import std.file;
assert(urlPrefix[0] == '/');
assert(urlPrefix[$-1] == '/');
assert(templateDirectory[$-1] == '/');
static struct DispatcherDetails {
string directory;
string skeleton;
string extension;
string templateDirectory;
}
if(directory is null)
directory = urlPrefix[1 .. $];
if(directory.length == 0)
directory = "./";
assert(directory[$-1] == '/');
static bool internalHandler(string urlPrefix, Cgi cgi, Object presenter, DispatcherDetails details) {
@ -699,10 +729,10 @@ auto serveTemplateDirectory()(string urlPrefix, string directory = null, string
if(file.indexOf("/") != -1 || file.indexOf("\\") != -1)
return false;
auto fn = "templates/" ~ details.directory ~ file ~ details.extension;
auto fn = details.templateDirectory ~ details.directory ~ file ~ details.extension;
if(std.file.exists(fn)) {
cgi.setCache(true);
auto doc = renderTemplate(fn["templates/".length.. $]);
auto doc = renderTemplate(fn[details.templateDirectory.length.. $], var.emptyObject, var.emptyObject, details.skeleton, TemplateLoader.forDirectory(details.templateDirectory));
cgi.gzipResponse = true;
cgi.write(doc.toString, true);
return true;
@ -711,5 +741,5 @@ auto serveTemplateDirectory()(string urlPrefix, string directory = null, string
}
}
return DispatcherDefinition!(internalHandler, DispatcherDetails)(urlPrefix, false, DispatcherDetails(directory, skeleton, extension));
return DispatcherDefinition!(internalHandler, DispatcherDetails)(urlPrefix, false, DispatcherDetails(directory, skeleton, extension, templateDirectory));
}