Skip to content

Always export valid CSV #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Always export valid CSV #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b5018e
Do JSON export instead of CSV
Feb 24, 2017
de0c7b9
Create valid CSV export
Feb 28, 2017
5bc0b91
Remove old CSV code and remove logs
Feb 28, 2017
789e0be
Refactor
Feb 28, 2017
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
6 changes: 6 additions & 0 deletions extension/assets/papaparse.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion extension/devtools/devtools_scraper_panel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<link rel="stylesheet" href="../assets/jquery.bootstrapvalidator/bootstrapValidator.css">
<link rel="stylesheet" href="devtools_scraper_panel.css">
<script src="../assets/jquery-2.0.3.js"></script>
<script src="../assets/papaparse.min.js"></script>
<script src="../assets/pouchdb-nightly.min.js"></script>
<script src="../assets/bootstrap-3.0.0/js/bootstrap.js"></script>
<script src="../assets/d3.v3.js" charset="UTF-8"></script>
Expand Down Expand Up @@ -36,4 +37,4 @@
<script src="../scripts/App.js"></script>
</head>
<body></body>
</html>
</html>
3 changes: 2 additions & 1 deletion extension/devtools/views/SitemapExportDataCSV.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<div id="console">Console</div>
<p>
Export {{_id}} data as CSV. <br /> Waiting for the download button to appear. >
<span class="download-button" href="#"><a>Download now!</a></span>
</p>
</p>
10 changes: 6 additions & 4 deletions extension/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"manifest_version": 2,
"version": "0.2.0.10",
"name": "Web Scraper",
"short_name": "Web Scraper",
"version": "0.2.1.0",
"name": "Web Scraper Dev",
"short_name": "Web Scraper Dev",
"description": "Tool for data extraction from websites",
"permissions": ["<all_urls>", "tabs", "notifications", "storage", "unlimitedStorage", "downloads"],
"icons": {
Expand All @@ -24,7 +24,9 @@
"background": {
"scripts": [
"assets/jquery-2.0.3.js",
"assets/papaparse.min.js",
"assets/jquery.whencallsequentially.js",
"assets/papaparse.min.js",
"assets/pouchdb-nightly.min.js",
"assets/base64.js",
"scripts/Selector.js",
Expand Down Expand Up @@ -64,9 +66,9 @@
"matches": ["*://*/*"],
"js": [
"assets/jquery-2.0.3.js",
"assets/papaparse.min.js",
"assets/jquery.whencallsequentially.js",
"assets/sugar-1.4.1.js",
"assets/css-selector/lib/CssSelector.js",
"assets/base64.js",
"scripts/DataExtractor.js",
"scripts/ContentSelector.js",
Expand Down
1 change: 1 addition & 0 deletions extension/options_page/options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<title>Web Scraper</title>
<link rel="stylesheet" href="../assets/bootstrap-3.0.0/css/bootstrap.min.css">
<script src="../assets/jquery-2.0.3.js"></script>
<script src="../assets/papaparse.min.js"></script>
<script src="../assets/bootstrap-3.0.0/js/bootstrap.min.js"></script>
<script src="../scripts/Config.js"></script>
<script src="options_page.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion extension/scripts/Controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ SitemapController.prototype = {
this.store.getSitemapData(sitemap, function (data) {
var blob = sitemap.getDataExportCsvBlob(data);
$(".download-button a").attr("href", window.URL.createObjectURL(blob));
$(".download-button a").attr("download", sitemap._id + ".csv");
$(".download-button a").attr("download", sitemap._id + ".csv");
$(".download-button").show();
}.bind(this));

Expand Down
16 changes: 6 additions & 10 deletions extension/scripts/Sitemap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,13 @@ Sitemap.prototype = {
},
getDataExportCsvBlob: function (data) {

var columns = this.getDataColumns(),
delimiter = ',',
newline = "\n",
csvData = ['\ufeff']; // utf-8 bom char
var columns = this.getDataColumns();

// header
csvData.push(columns.join(delimiter) + newline)
var jsonData = [];

// data
data.forEach(function (row) {
var rowData = [];
var jsonRow = {};
columns.forEach(function (column) {
var cellData = row[column];
if (cellData === undefined) {
Expand All @@ -196,12 +192,12 @@ Sitemap.prototype = {
cellData = JSON.stringify(cellData);
}

rowData.push('"' + cellData.replace(/"/g, '""').trim() + '"');
jsonRow[column] = cellData;
});
csvData.push(rowData.join(delimiter) + newline);
jsonData.push(jsonRow);
});

return new Blob(csvData, {type: 'text/csv'});
return new Blob([Papa.unparse(jsonData)], {type: 'text/csv'});
},
getSelectorById: function (selectorId) {
return this.selectors.getSelectorById(selectorId);
Expand Down
3 changes: 2 additions & 1 deletion playgrounds/extension/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="stylesheet" href="../../extension/content_script/content_script.css">
<link rel="stylesheet" href="webpage.css">
<script src="../../extension/assets/jquery-2.0.3.js"></script>
<script src="../../extension/assets/papaparse.min.js"></script>
<script src="../../extension/assets/pouchdb-nightly.min.js"></script>
<script src="../../extension/assets/bootstrap-3.0.0/js/bootstrap.js"></script>
<script src="../../extension/assets/d3.v3.js"></script>
Expand Down Expand Up @@ -243,4 +244,4 @@ <h2>Heading</h2>
<!--/.container-->
</div>
</body>
</html>
</html>
1 change: 1 addition & 0 deletions tests/SpecRunner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<script type="text/javascript" src="../jasmine-standalone/lib/jasmine-1.3.1/jasmine-html.js"></script>

<script type="text/javascript" src="../extension/assets/jquery-2.0.3.js"></script>
<script type="text/javascript" src="../extension/assets/papaparse.min.js"></script>
<script src="../extension/assets/jquery.whencallsequentially.js"></script>
<script>
// breaks sugar.js
Expand Down