Skip to content

Commit

Permalink
removed #37 from 0.0.34
Browse files Browse the repository at this point in the history
  • Loading branch information
raffis committed Dec 6, 2017
1 parent 21078f9 commit 94e74e1
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 741 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
## 0.0.34
**Maintainer**: balloon-team <opensource@gyselroth.net>\
**Date**: Mon November 27 17:02:33 CET 2017
**Date**: Wed Dezember 06 08:50:23 CET 2017

* CORE: [FIX] fixed multi sync threads running #34
* CORE: [FIX] fixed regex bug in sync library and resolve various network problems, bumping sync lib to 0.0.29 #34
* CORE: [FIX] added http request timeout, configurable via requestTimeout, default 10s, #29
* CORE: [FIX] client now checks the api server in a 5s interval after a sync request resulted in a network error #39
* CORE: [FIX] client does not unlink instance anymore if started with no connection to the server #40
* CORE: [FEATURE] open node-settings window (edit tags) by context menu entry (mac/windows) #37
* UI: [FIX] startup/auth wizard now show correctly an error message if server can not be reached, added loader gifs #40


Expand Down
26 changes: 1 addition & 25 deletions app/lib/fs-utility.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module.exports = {

this.setDirIcon(balloonDir);
this.setDirShortcut(balloonDir, homeDir);
this.createContextMenu(balloonDir, homeDir);

callback(null);
});
Expand Down Expand Up @@ -67,7 +66,7 @@ module.exports = {
}
},

setDirShortcut: function(balloonDir, homeDir) {
setDirShortcut: function(balloonDir, homeDir) {
var resourcesPath;
if(process.defaultApp) {
resourcesPath = path.resolve(__dirname, '../../');
Expand Down Expand Up @@ -109,29 +108,6 @@ module.exports = {
}
},

createContextMenu: function (balloonDir, homeDir) {
var resourcesPath = process.defaultApp ? path.resolve(__dirname, '../../') : path.resolve(process.resourcesPath);

if(process.platform === 'win32') {
var balloonContextMenuCommand = path.resolve(resourcesPath, 'resources/context_menu/win32/contextmenu.cmd');
var balloonIcon = path.resolve(resourcesPath, 'resources/diricon/icon.ico');
var balloonAppliesTo = 'System.ItemFolderPathDisplay:"*\Balloon*"';

var cmd = [
balloonContextMenuCommand,
balloonAppliesTo,
balloonIcon
].join(' ');

logger.debug('add context menu to win32 registry', {
category: 'fsutility',
cmd: cmd
});

exec(cmd)
}
},

mkdirp: function(dir, callback) {
mkdirp(dir, {fs}, callback);
},
Expand Down
35 changes: 1 addition & 34 deletions app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ const AuthCtrl = require('./lib/auth/controller.js');
const AutoUpdateCtrl = require('./lib/auto-update/controller.js');
const FeedbackCtrl = require('./ui/feedback/controller.js');
const AboutCtrl = require('./ui/about/controller.js');
const NodeSettingsCtrl = require('./ui/node-settings/controller.js');
const setMenu = require('./lib/menu.js');
const net = require('net');

const logger = require('./lib/logger.js');
const loggerFactory = require('./lib/logger-factory.js');
Expand All @@ -37,7 +35,7 @@ process.on('uncaughtException', function(exception) {
category: 'bootstrap',
error: {
message: exception.message
}
}
});
});

Expand Down Expand Up @@ -260,8 +258,6 @@ ipcMain.on('about-open', (event) => {
about.open();
});

initNodeSettingsClose()

ipcMain.on('unlink-account', (event) => {
logger.info('logout requested', {category: 'bootstrap'});
unlinkAccount();
Expand Down Expand Up @@ -402,32 +398,3 @@ function startSync() {
function endSync(scheduleNextSync) {
sync.end(scheduleNextSync);
}

if(process.platform === 'win32') {
var addr = '\\\\?\\pipe\\balloon-client';
net.createServer(function(client) {
logger.info('start named pipe', {
category: 'bootstrap',
pipe: addr
});

client.on('data', function(data) {
var string = data.toString('utf8').replace(/(\r\n|\n|\r)/gm,"").trim();

logger.debug('received data on named pipe', {
category: 'bootstrap',
data: string
});

var path = string.replace(clientConfig.get('balloonDir'), '');
NodeSettingsCtrl(env).open(path);
});
}.bind(this)).listen(addr);
}

function initNodeSettingsClose () {
ipcMain.on('node-settings-close', (event, nodePath) => {
console.log(nodePath);
NodeSettingsCtrl(env).close(nodePath)
})
}
28 changes: 0 additions & 28 deletions app/migrations/v0.0.34.js

This file was deleted.

0 comments on commit 94e74e1

Please sign in to comment.