When returning index files, prefer .html and .htm files - fixes #48

[stig]

After that, fall back to the old behaviour, which might end up returning
index.php, index.JS, index.GIF or anything else.

[stig]

I tried to avoid having two first calls, but that function only accepts one argument and I didn't want to create an intermediate sequence in order to do so. This should be slightly faster than the old code, particularly for big directories, as it does not need to traverse the directory entry in the common(?) case of index.html or index.htm existing.

[stig]

I tried to avoid having two first calls, but that function only accepts one argument and I didn't want to create an intermediate sequence in order to do so. This should be slightly faster than the old code, particularly for big directories, as it does not need to traverse the directory entry in the common(?) case of index.html or index.htm existing.

[stig]

This PR (if accepted) also obsoletes PRs #114 and #208.

[stig]

This PR (if accepted) also obsoletes PRs #114 and #208.

[weavejester]

The function is getting a little large. Perhaps it would make more sense to split it up further. For example:

(defn- find-index-file [^File dir]
  (or (existing-file (File. dir "index.html"))
      (existing-file (File. dir "index.htm"))
      (find-file-starting-with dir "index.")))

[weavejester]

The function is getting a little large. Perhaps it would make more sense to split it up further. For example:

(defn- find-index-file [^File dir]
  (or (existing-file (File. dir "index.html"))
      (existing-file (File. dir "index.htm"))
      (find-file-starting-with dir "index.")))

[stig]

Sure, makes sense.

[stig]

Sure, makes sense.

[stig]

How's this? I found I couldn't use find-file because it actually uses find-index-file internally.

[stig]

How's this? I found I couldn't use find-file because it actually uses find-index-file internally.

[weavejester]

Just check whether the file exists. If it can't be read, it's better to let it throw an exception. So something more like:

(defn- existing-file [^File dir ^String name]
  (let [file (File. dir name)]
    (if (.exists file) file)))

Also, I don't think the docstrings are necessary. Really, the other private function shouldn't have them either.

[weavejester]

Just check whether the file exists. If it can't be read, it's better to let it throw an exception. So something more like:

(defn- existing-file [^File dir ^String name]
  (let [file (File. dir name)]
    (if (.exists file) file)))

Also, I don't think the docstrings are necessary. Really, the other private function shouldn't have them either.

[stig]

Thanks for the feedback! Want me to rebase the above into a single commit?

[stig]

Thanks for the feedback! Want me to rebase the above into a single commit?

[weavejester]

Yes please.

[weavejester]

Yes please.

[weavejester]

Thanks for the commit. Could you change the commit message to:

Prefer HTML index files in file-response function

I think that more succinctly describes the gist of the change. I'll merge after that.

[weavejester]

Thanks for the commit. Could you change the commit message to:

Prefer HTML index files in file-response function

I think that more succinctly describes the gist of the change. I'll merge after that.

[stig]

Done.

[stig]

Done.

[stig]

Are you having second thoughts about merging this?

[stig]

Are you having second thoughts about merging this?

[weavejester]

Nope, the notification email just slipped me by.

[weavejester]

Nope, the notification email just slipped me by.