Skip to content

Commit

Permalink
Minor tweaks to startup process and handling of quick start when star…
Browse files Browse the repository at this point in the history
…ted without args. Landing page tweaks in prep for new release.
  • Loading branch information
antonycourtney committed May 29, 2017
1 parent 80b566a commit d0d440f
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 27 deletions.
26 changes: 14 additions & 12 deletions app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ let openFilePath = null
// callback for app.makeSingleInstance:
const initApp = firstInstance => (instanceArgv, workingDirectory) => {
try {
const argv = instanceArgv.slice(1)
let argv = instanceArgv.slice(1)
let awaitingOpenEvent = false // macOS OpenWith peculiarity
// Using context menu on Windows results in invoking .exe with
// just the filename as argument, no directory passed in and
// no shell wrapper, hence the check for argv.length > 1 here.
Expand All @@ -291,6 +292,13 @@ const initApp = firstInstance => (instanceArgv, workingDirectory) => {
// npm / electron start -- passes '.' as first argument
argv.unshift('--executed-from')
}
// macOS insanity: If we're started via Open With..., we get invoked
// with -psn_0_XXXXX argument; let's just kill it:
if (process.platform === 'darwin' && argv && (argv.length > 0) &&
argv[0].startsWith('-psn_')) {
argv = argv.slice(1)
awaitingOpenEvent = true
}
const options = commandLineArgs(optionDefinitions, {argv})
let quickExit = false
if (options.help) {
Expand Down Expand Up @@ -360,24 +368,18 @@ const initApp = firstInstance => (instanceArgv, workingDirectory) => {
if (targetPath) {
appWindow.create(targetPath)
}
if (showQuickStart) {
quickStart.showQuickStart()
}
if (openFilePath) {
const openMsg = `pid ${process.pid}: Got open-file for ${openFilePath}`
log.warn(openMsg)
appWindow.create(openFilePath)
// dialog.showMessageBox({ message: openMsg })
if (showQuickStart) {
quickStart.showQuickStart()
}
} else {
if (!targetPath) {
if (!targetPath && !awaitingOpenEvent) {
app.focus()
/*
* We used to just do:
* appWindow.openDialog()
* but showing quickStart seems more useful for no-arg
* startup path:
*/
quickStart.showQuickStart()
appWindow.openDialog()
}
}
isReady = true
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"build-assets": "npm run build:html && npm run build:icon",
"build-dev": "npm run build-assets && webpack --env=dev",
"build-prod": "npm run build-assets && webpack --env=prod",
"build-site": "mkdirp doc && cp -r src/doc/site/src/* docs",
"build-site": "mkdirp docs && cp -r src/doc/site/src/* docs",
"clean": "rm -rf build/*",
"csvimport": "electron build/csvimport.bundle.js",
"dist": "build",
Expand Down
Binary file added src/doc/screenshots/tad-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/doc/screenshots/tad-windows.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 35 additions & 14 deletions src/doc/site/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,28 +90,30 @@ <h1 class="ornament">A better way to view &amp; analyze data</h1>
<div id="news" class="section news-section">
<div class="container">
<h3>News</h3>
<p class="lead">Tad 0.8.3 - April 17, 2017</p>
<p class="lead">Tad 0.8.4 - May 29, 2017</p>
<P>
An <strong>initial release</strong> of Tad for macOS is now available for download and installation.
A packaged installer for Tad is available for macOS, Linux and Windows.
<P>
This release supports basic viewing and analysis of CSV files but there are some important limitations and caveats:
<ul>
<li>This initial release is for macOS only (no Windows or Linux builds yet, sorry).
<li>This release only supports CSV files imported into an internal SQLite instance; there is no connectivity to other SQL databases.
<li>There is no cell selection or Cut / Copy / Paste.
<li>The only aggregation functions provided are those supported natively by SQLite: <code>min</code>, <code>max</code>, <code>sum</code>, <code>count</code>.
<li>There is no support for interactive filtering of data.
<li>Due to an outstanding issue, opening Tad multiple times will result in multiple instances of Tad starting (and appearing in the Dock).
</ul>
<P>This is an <emph>initial release</emph>, so there is a reasonable chance you'll encounter bugs, UI annoyances, and corner cases. Please report them via <strong>Help...Send Feedback</strong>.
Tad is still new and under development so there is a reasonable chance you'll encounter bugs, UI annoyances, and corner cases while using Tad. Please report them via <strong>Help...Send Feedback</strong>.
<P>
If you're comfortable with the above, please...
If you're comfortable with that caveat, pick your platform and install:
<P class="download">
<a id="download-latest-release" class="btn btn-default"
href="https://github.com/antonycourtney/tad/releases/download/v0.8.3/tad-0.8.3.dmg">
href="https://github.com/antonycourtney/tad/releases/download/v0.8.4/tad-0.8.4.dmg">
<span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>
Download for Mac
</a>
<a id="download-latest-release" class="btn btn-default"
href="https://github.com/antonycourtney/tad/releases/download/v0.8.4/tad_0.8.4_amd64.deb"
>
<span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>
Download for Linux
</a>
<a id="download-latest-release" class="btn btn-default"
href="https://github.com/antonycourtney/tad/releases/download/v0.8.4/Tad.Setup.0.8.4.exe">
<span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>
Download for Windows
</a>
</P>
</div>
</div>
Expand Down Expand Up @@ -151,6 +153,25 @@ <h3>Contact</h3>
<div id="relnotes" class="section relnotes-section">
<div class="container">
<h3>Release Notes</h3>
<div class="release-section">
<h4>Tad 0.8.4 - May 29, 2017</h4>
<P>
<h5>New Features</h5>
<ul>
<li>Rudimentary filters - simple list of predicates combined with AND or OR
<li>Footer showing row count information: Total Rows, Filtered Rows, Current View
<li>Cross-Platform: First release for macOS, Linux and Windows
<li>Sample CSV file included with distribution, linked in Quick Start Guide.
</ul>
<h5>Bug Fixes</h5>
<ul>
<li>Pivoting on columns containing backslashes now works.
<li>Improve error reporting of SQLITE errors when creating table during import.
<li>Allow filenames that are all digits.
<li>Correct handling of duplicate column identifiers that differ in upper/lower case.
<li>Replace auto-create of symbolic link in <code>/usr/local/bin</code>with self-serve instructions in quick start guide.
</ul>
</div>
<div class="release-section">
<h4>Tad 0.8.3 - April 17, 2017</h4>
<P>
Expand Down

0 comments on commit d0d440f

Please sign in to comment.