mirror of
https://github.com/alexadam/save-as-ebook.git
synced 2025-09-10 17:34:47 +00:00
misc bug fixes
This commit is contained in:
Alex Adam
parent
5e02b1e745
commit
a7258b3c81
3 changed files with 212 additions and 226 deletions
|
|
@ -162,6 +162,33 @@ function dispatch(action, justAddToBuffer, appliedStyles) {
|
|||
active: true
|
||||
}, (tab) => {
|
||||
|
||||
isIncludeStyles((result) =>{
|
||||
let isIncludeStyle = result.includeStyle
|
||||
prepareStyles(tab, isIncludeStyle, appliedStyles, (tmpAppliedStyles) => {
|
||||
applyAction(tab, action, justAddToBuffer, isIncludeStyle, tmpAppliedStyles, () => {
|
||||
alert('done')
|
||||
})
|
||||
})
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
function isIncludeStyles(callback) {
|
||||
chrome.storage.local.get('includeStyle', (data) => {
|
||||
if (!data) {
|
||||
callback({includeStyle: false});
|
||||
} else {
|
||||
callback({includeStyle: data.includeStyle});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function prepareStyles(tab, includeStyle, appliedStyles, callback) {
|
||||
if (!includeStyle) {
|
||||
callback(appliedStyles)
|
||||
return
|
||||
}
|
||||
|
||||
chrome.storage.local.get('styles', (data) => {
|
||||
let styles = defaultStyles;
|
||||
if (data && data.styles) {
|
||||
|
|
@ -195,7 +222,6 @@ function dispatch(action, justAddToBuffer, appliedStyles) {
|
|||
allMatchingStyles.sort((a, b) => b.length - a.length);
|
||||
let selStyle = allMatchingStyles[0];
|
||||
currentStyle = styles[selStyle.index];
|
||||
// setCurrentStyle(currentStyle);
|
||||
|
||||
if (currentStyle && currentStyle.style) {
|
||||
chrome.tabs.insertCSS(tab[0].id, {code: currentStyle.style});
|
||||
|
|
@ -204,23 +230,27 @@ function dispatch(action, justAddToBuffer, appliedStyles) {
|
|||
}
|
||||
}
|
||||
|
||||
callback(appliedStyles)
|
||||
});
|
||||
}
|
||||
|
||||
function applyAction(tab, action, justAddToBuffer, includeStyle, appliedStyles, callback) {
|
||||
chrome.tabs.sendMessage(tab[0].id, {
|
||||
type: action,
|
||||
includeStyle: includeStyle,
|
||||
appliedStyles: appliedStyles
|
||||
}, (response) => {
|
||||
|
||||
if (!response) {
|
||||
isBusy = false;
|
||||
chrome.browserAction.setBadgeText({text: ""});
|
||||
resetBusy()
|
||||
chrome.tabs.sendMessage(tab[0].id, {'alert': 'Save as eBook does not work on this web site!'}, (r) => {
|
||||
console.log(r);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (response.length === 0) {
|
||||
if (response.content.trim() === '') {
|
||||
if (justAddToBuffer) {
|
||||
// FIXME does not work on chrome ?
|
||||
chrome.tabs.sendMessage(tab[0].id, {'alert': 'Cannot add an empty selection as chapter!'}, (r) => {
|
||||
console.log(r);
|
||||
});
|
||||
|
|
@ -229,37 +259,33 @@ function dispatch(action, justAddToBuffer, appliedStyles) {
|
|||
console.log(r);
|
||||
});
|
||||
}
|
||||
isBusy = false;
|
||||
chrome.browserAction.setBadgeText({text: ""});
|
||||
resetBusy()
|
||||
return;
|
||||
}
|
||||
if (!justAddToBuffer) {
|
||||
chrome.tabs.sendMessage(tab[0].id, {'shortcut': 'build-ebook', response: [response]}, (r) => {
|
||||
console.log(r);
|
||||
});
|
||||
isBusy = false;
|
||||
chrome.browserAction.setBadgeText({text: ""});
|
||||
chrome.tabs.sendMessage(tab[0].id, {'shortcut': 'build-ebook', response: [response]}, (r) => {});
|
||||
} else {
|
||||
chrome.storage.local.get('allPages', function (data) {
|
||||
chrome.storage.local.get('allPages', (data) => {
|
||||
if (!data || !data.allPages) {
|
||||
data.allPages = [];
|
||||
}
|
||||
data.allPages.push(response);
|
||||
chrome.storage.local.set({'allPages': data.allPages});
|
||||
isBusy = false;
|
||||
chrome.browserAction.setBadgeText({text: ""});
|
||||
chrome.tabs.sendMessage(tab[0].id, {'alert': 'Page or selection added as chapter!'}, (r) => {
|
||||
console.log(r);
|
||||
});
|
||||
resetBusy()
|
||||
chrome.tabs.sendMessage(tab[0].id, {'alert': 'Page or selection added as chapter!'}, (r) => {});
|
||||
})
|
||||
}
|
||||
});
|
||||
// FIXME set timeout
|
||||
// isBusy = false;
|
||||
// chrome.browserAction.setBadgeText({text: ""});
|
||||
// sendMessage(tab[0].id, action, justAddToBuffer, appliedStyles);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function resetBusy() {
|
||||
isBusy = false;
|
||||
chrome.browserAction.setBadgeText({text: ""});
|
||||
|
||||
let popups = chrome.extension.getViews({type: "popup"});
|
||||
if (popups && popups.length > 0) {
|
||||
popups[0].close()
|
||||
}
|
||||
}
|
||||
|
||||
chrome.runtime.onMessage.addListener(_execRequest);
|
||||
|
|
@ -338,5 +364,8 @@ function _execRequest(request, sender, sendResponse) {
|
|||
request.type === 'add-page' || request.type === 'add-selection') {
|
||||
executeCommand({type: request.type})
|
||||
}
|
||||
if (request.type === 'done') {
|
||||
resetBusy()
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -345,14 +345,10 @@ function jsonToCss(jsonObj) {
|
|||
return result;
|
||||
}
|
||||
|
||||
function extractCss(appliedStyles, callback) {
|
||||
|
||||
chrome.runtime.sendMessage({
|
||||
type: "get include style"
|
||||
}, function(response) {
|
||||
if (response.includeStyle) {
|
||||
$('body').find('*').each(function (i, pre) {
|
||||
var $pre = $(pre);
|
||||
function extractCss(includeStyle, appliedStyles) {
|
||||
if (includeStyle) {
|
||||
$('body').find('*').each((i, pre) => {
|
||||
let $pre = $(pre);
|
||||
|
||||
if (allowedTags.indexOf(pre.tagName.toLowerCase()) < 0) return;
|
||||
if (mathMLTags.indexOf(pre.tagName.toLowerCase()) > -1) return;
|
||||
|
|
@ -362,15 +358,15 @@ function extractCss(appliedStyles, callback) {
|
|||
} else {
|
||||
if (pre.tagName.toLowerCase() === 'svg') return;
|
||||
|
||||
var classNames = pre.getAttribute('class');
|
||||
let classNames = pre.getAttribute('class');
|
||||
if (!classNames) {
|
||||
classNames = pre.getAttribute('id');
|
||||
if (!classNames) {
|
||||
classNames = pre.tagName + '-' + Math.floor(Math.random()*100000);
|
||||
}
|
||||
}
|
||||
var tmpName = cssClassesToTmpIds[classNames];
|
||||
var tmpNewCss = tmpIdsToNewCss[tmpName];
|
||||
let tmpName = cssClassesToTmpIds[classNames];
|
||||
let tmpNewCss = tmpIdsToNewCss[tmpName];
|
||||
if (!tmpName) {
|
||||
tmpName = 'class-' + Math.floor(Math.random()*100000);
|
||||
cssClassesToTmpIds[classNames] = tmpName;
|
||||
|
|
@ -378,8 +374,8 @@ function extractCss(appliedStyles, callback) {
|
|||
if (!tmpNewCss) {
|
||||
// var style = window.getComputedStyle(pre);
|
||||
tmpNewCss = {};
|
||||
for (var cssTagName of supportedCss) {
|
||||
var cssValue = $pre.css(cssTagName);
|
||||
for (let cssTagName of supportedCss) {
|
||||
let cssValue = $pre.css(cssTagName);
|
||||
if (cssValue && cssValue.length > 0) {
|
||||
tmpNewCss[cssTagName] = cssValue;
|
||||
}
|
||||
|
|
@ -389,19 +385,17 @@ function extractCss(appliedStyles, callback) {
|
|||
pre.setAttribute('data-class', tmpName);
|
||||
}
|
||||
});
|
||||
callback(jsonToCss(tmpIdsToNewCss));
|
||||
return jsonToCss(tmpIdsToNewCss);
|
||||
} else {
|
||||
var mergedCss = '';
|
||||
let mergedCss = '';
|
||||
if (appliedStyles && appliedStyles.length > 0) {
|
||||
for (var i = 0; i < appliedStyles.length; i++) {
|
||||
for (let i = 0; i < appliedStyles.length; i++) {
|
||||
mergedCss += appliedStyles[i].style;
|
||||
}
|
||||
callback(mergedCss);
|
||||
return;
|
||||
return mergedCss;
|
||||
}
|
||||
callback();
|
||||
}
|
||||
});
|
||||
return null
|
||||
}
|
||||
|
||||
/////
|
||||
|
|
@ -424,39 +418,31 @@ function deferredAddZip(url, filename) {
|
|||
return deferred;
|
||||
}
|
||||
|
||||
chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
|
||||
var imgsPromises = [];
|
||||
var result = {};
|
||||
var pageSrc = '';
|
||||
var tmpContent = '';
|
||||
chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
|
||||
let imgsPromises = [];
|
||||
let result = {};
|
||||
let pageSrc = '';
|
||||
let tmpContent = '';
|
||||
let styleFile = null;
|
||||
|
||||
extractCss(request.appliedStyles, function (styleFile) {
|
||||
if (request.type === 'extract-page') {
|
||||
styleFile = extractCss(request.includeStyle, request.appliedStyles)
|
||||
pageSrc = document.getElementsByTagName('body')[0];
|
||||
tmpContent = getContent(pageSrc);
|
||||
} else if (request.type === 'extract-selection') {
|
||||
styleFile = extractCss(request.includeStyle, request.appliedStyles)
|
||||
pageSrc = getSelectedNodes();
|
||||
pageSrc.forEach(function (page) {
|
||||
pageSrc.forEach((page) => {
|
||||
tmpContent += getContent(page);
|
||||
});
|
||||
} else if (request.type === 'echo') {
|
||||
sendResponse({
|
||||
echo: true
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (tmpContent.trim() === '') {
|
||||
sendResponse('');
|
||||
return;
|
||||
}
|
||||
|
||||
allImages.forEach(function (tmpImg) {
|
||||
allImages.forEach((tmpImg) => {
|
||||
imgsPromises.push(deferredAddZip(tmpImg.originalUrl, tmpImg.filename));
|
||||
});
|
||||
|
||||
$.when.apply($, imgsPromises).done(function() {
|
||||
var tmpTitle = getPageTitle(document.title);
|
||||
$.when.apply($, imgsPromises).done(() => {
|
||||
let tmpTitle = getPageTitle(document.title);
|
||||
result = {
|
||||
url: getPageUrl(tmpTitle),
|
||||
title: tmpTitle,
|
||||
|
|
@ -467,9 +453,9 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
|
|||
content: tmpContent
|
||||
};
|
||||
sendResponse(result);
|
||||
}).fail(function(e) {
|
||||
}).fail((e) => {
|
||||
console.log('Error:', e);
|
||||
});
|
||||
sendResponse(null)
|
||||
});
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
var cssFileName = 'ebook.css';
|
||||
var ebookTitle = null;
|
||||
|
||||
chrome.runtime.onMessage.addListener((obj) => {
|
||||
chrome.runtime.onMessage.addListener((obj, sender, sendResponse) => {
|
||||
if (obj.shortcut && obj.shortcut === 'build-ebook') {
|
||||
buildEbook(obj.response);
|
||||
} else if (obj.alert) {
|
||||
console.log(obj.alert);
|
||||
alert(obj.alert);
|
||||
}
|
||||
return true;
|
||||
})
|
||||
|
||||
function getImagesIndex(allImages) {
|
||||
|
|
@ -178,46 +179,16 @@ function _buildEbook(allPages, fromMenu=false) {
|
|||
}
|
||||
});
|
||||
|
||||
var done = false;
|
||||
|
||||
// FIXME
|
||||
// var saveData = (function () {
|
||||
// var a = document.createElement("a");
|
||||
// document.body.appendChild(a);
|
||||
// a.style = "display: none";
|
||||
// return function (data, fileName) {
|
||||
// var wURL = window.URL || window.mozURL;
|
||||
// var blob = new Blob([data], {type: "application/epub+zip"}),
|
||||
// url = wURL.createObjectURL(blob);
|
||||
//
|
||||
// chrome.downloads.download({
|
||||
// url: url,
|
||||
// filename: fileName,
|
||||
// saveAs: true
|
||||
// });
|
||||
// };
|
||||
// }());
|
||||
|
||||
zip.generateAsync({
|
||||
type: "blob"
|
||||
})
|
||||
.then(function(content) {
|
||||
done = true;
|
||||
console.log("done !");
|
||||
saveAs(content, ebookFileName);
|
||||
|
||||
chrome.runtime.sendMessage({
|
||||
type: "done"
|
||||
}, (response) => {});
|
||||
});
|
||||
|
||||
// FIXME - remove or fix?
|
||||
setTimeout(function() {
|
||||
if (done) {
|
||||
return;
|
||||
}
|
||||
zip.generateAsync({
|
||||
type: "blob"
|
||||
})
|
||||
.then(function(content) {
|
||||
saveAs(content, ebookFileName);
|
||||
});
|
||||
}, 60000);
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue