Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/readPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var smarkt = require('smarkt')
var xtend = require('xtend')
var path = require('path')
var pify = require('pify')
var sizeOf = require('image-size')

var utilFile = require('../utils/file')
var defaults = require('./defaults')
Expand Down Expand Up @@ -76,6 +77,14 @@ async function readPage (pathPage, opts) {
try {
var fileMeta = pathFile + fileExtname
var pathMeta = path.join(pathPage, fileMeta)

if (fileParsed.type === 'image') {
var imageBuffer = await fs.readFile(path.join(pathPage, pathFile))
var dimentions = sizeOf(imageBuffer)
delete dimentions.type
Object.assign(fileParsed, dimentions)
}

var text = await fs.readFile(pathMeta, encoding)
// set
result[fileParsed.filename] = xtend(parse(text), fileParsed)
Expand Down
8 changes: 8 additions & 0 deletions lib/readPageSync.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var assert = require('assert')
var smarkt = require('smarkt')
var xtend = require('xtend')
var path = require('path')
var sizeOf = require('image-size')

var utilFile = require('../utils/file')
var defaults = require('./defaults')
Expand Down Expand Up @@ -69,6 +70,13 @@ function readPageSync (pathPage, opts) {
try {
var fileMeta = pathFile + fileExtname
var text = fs.readFileSync(slash(path.join(pathPage, fileMeta)), encoding)

if (fileParsed.type === 'image') {
var dimentions = sizeOf(fs.readFileSync(path.join(pathPage, pathFile)))
delete dimentions.type
Object.assign(fileParsed, dimentions)
}

// set
result[fileParsed.filename] = xtend(parse(text), fileParsed)
files.splice(files.indexOf(fileMeta), 1)
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
},
"dependencies": {
"glob": "^7.1.2",
"image-size": "^0.6.2",
"js-yaml": "^3.10.0",
"normalize-path": "^3.0.0",
"object-keys": "^1.0.11",
Expand Down
10 changes: 10 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ test('readPageSync and readPage outputs are the same', async function (t) {
t.deepEqual(syncPage, asyncPage)
})

test('readPage includes image files sizes', function (t) {
var page = hypha.readPageSync('example/content/about')
for (var file in page.files) {
if (page.files[file].type === 'image') {
t.is(page.files[file].width, 316)
t.is(page.files[file].height, 230)
}
}
})

test('readSiteSync works', function (t) {
var site = hypha.readSiteSync('example/content')
t.is(site['/example/content'].title, 'Example')
Expand Down