Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Show missing file path, fix NPE on image load
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-07-02 18:10:19 GMT-0700 |
| Commit | 21ab0c77454cb150169204a0fa7b245beaf195bc |
| Parent | ad0d5d0 |
| Delta | 19 lines added, 7 lines removed, 12-line increase |
src/main/java/com/scrivenvar/processors/markdown/ImageLinkExtension.java
| import java.io.File; | ||
| +import java.io.FileNotFoundException; | ||
| import java.nio.file.Path; | ||
| +import static com.scrivenvar.Constants.DEFAULT_DIRECTORY; | ||
| import static java.lang.String.format; | ||
 | ||
| * @return The new {@link ImageLinkExtension}, never {@code null}. | ||
| */ | ||
| - public static ImageLinkExtension create( final Path path ) { | ||
| + public static ImageLinkExtension create( @NotNull final Path path ) { | ||
| return new ImageLinkExtension( path ); | ||
| } | ||
| ||
| final String imageFile = format( "%s/%s", getImagePrefix(), url ); | ||
| final String suffixes = getImageSuffixes(); | ||
| - final String editDir = getEditDirectory(); | ||
| + final Path editPath = getEditPath(); | ||
| + boolean missing = true; | ||
| for( final String ext : Splitter.on( ' ' ).split( suffixes ) ) { | ||
| final String imagePath = format( | ||
| - "%s/%s.%s", editDir, imageFile, ext ); | ||
| + "%s/%s.%s", editPath, imageFile, ext ); | ||
| final File file = new File( imagePath ); | ||
| if( file.exists() ) { | ||
| url = file.toString(); | ||
| + missing = false; | ||
| break; | ||
| } | ||
| + } | ||
| + | ||
| + if( missing ) { | ||
| + throw new FileNotFoundException( imageFile + ".*" ); | ||
| } | ||
| ||
| } | ||
| - private String getEditDirectory() { | ||
| - return mPath.getParent().toString(); | ||
| + @NotNull | ||
| + private Path getEditPath() { | ||
| + final Path p = mPath.getParent(); | ||
| + | ||
| + return p == null ? DEFAULT_DIRECTORY : p; | ||
| } | ||
| } | ||
| private final Path mPath; | ||
| - private ImageLinkExtension( final Path path ) { | ||
| + private ImageLinkExtension( @NotNull final Path path ) { | ||
| mPath = path; | ||
| } | ||
src/main/java/com/scrivenvar/processors/markdown/MarkdownProcessor.java
| import com.vladsch.flexmark.util.misc.Extension; | ||
| +import javax.validation.constraints.NotNull; | ||
| import java.nio.file.Path; | ||
| import java.util.ArrayList; | ||
| ||
| */ | ||
| public MarkdownProcessor( | ||
| - final Processor<String> successor, final Path path ) { | ||
| + final Processor<String> successor, @NotNull final Path path ) { | ||
| super( successor ); | ||