Little things.

This commit is contained in:
JesseBrault0709 2023-06-16 18:03:26 +02:00
parent 3a1ecfe524
commit 0a230775b9
4 changed files with 20 additions and 2 deletions

View File

@ -5,9 +5,11 @@ import com.jessebrault.ssg.provider.CollectionProvider
import com.jessebrault.ssg.provider.CollectionProviders import com.jessebrault.ssg.provider.CollectionProviders
import com.jessebrault.ssg.task.TaskSpec import com.jessebrault.ssg.task.TaskSpec
import com.jessebrault.ssg.util.ExtensionUtil import com.jessebrault.ssg.util.ExtensionUtil
import groovy.transform.NullCheck
import java.util.function.Function import java.util.function.Function
@NullCheck
final class PageToHtmlSpecProviders { final class PageToHtmlSpecProviders {
static CollectionProvider<PageToHtmlSpec> from(CollectionProvider<Page> pagesProvider) { static CollectionProvider<PageToHtmlSpec> from(CollectionProvider<Page> pagesProvider) {

View File

@ -3,12 +3,14 @@ package com.jessebrault.ssg.page
import com.jessebrault.ssg.provider.CollectionProvider import com.jessebrault.ssg.provider.CollectionProvider
import com.jessebrault.ssg.provider.CollectionProviders import com.jessebrault.ssg.provider.CollectionProviders
import com.jessebrault.ssg.util.ExtensionUtil import com.jessebrault.ssg.util.ExtensionUtil
import groovy.transform.NullCheck
import org.slf4j.Logger import org.slf4j.Logger
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import java.util.function.BiPredicate import java.util.function.BiPredicate
import java.util.function.Predicate import java.util.function.Predicate
@NullCheck
final class PagesProviders { final class PagesProviders {
private static final Logger logger = LoggerFactory.getLogger(PagesProviders) private static final Logger logger = LoggerFactory.getLogger(PagesProviders)
@ -17,7 +19,11 @@ final class PagesProviders {
from(pagesDirectory, pageTypes) { file, path -> true } from(pagesDirectory, pageTypes) { file, path -> true }
} }
static CollectionProvider<Page> from(File pagesDirectory, Collection<PageType> pageTypes, BiPredicate<File, String> filter) { static CollectionProvider<Page> from(
File pagesDirectory,
Collection<PageType> pageTypes,
BiPredicate<File, String> filter
) {
CollectionProviders.fromDirectory(pagesDirectory) { file, relativePath -> CollectionProviders.fromDirectory(pagesDirectory) { file, relativePath ->
if (filter.test(file, relativePath)) { if (filter.test(file, relativePath)) {
def extension = ExtensionUtil.getExtension(relativePath) def extension = ExtensionUtil.getExtension(relativePath)

View File

@ -45,4 +45,9 @@ final class TaskFactorySpec<T extends TaskFactory> {
concat(this, other) concat(this, other)
} }
@Override
String toString() {
"TaskFactorySpec(name: ${ this.name })"
}
} }

View File

@ -69,7 +69,12 @@ abstract class AbstractBuildCommand extends AbstractSubCommand {
buildScriptBinding, buildScriptBinding,
diagnostics.&addAll diagnostics.&addAll
)) { )) {
diagnostics.each { logger.warn(it) } diagnostics.each {
logger.error(it.message)
if (it.exception != null) {
it.exception.printStackTrace()
}
}
logger.traceExit(1) logger.traceExit(1)
} else { } else {
logger.traceExit(0) logger.traceExit(0)