Merge branch 'release/v1.0.0' into develop

Darmody · Mar 27, 2016 · 3ca20b2 · 3ca20b2
2 parents a72312e + 8bee35f
commit 3ca20b2
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 408 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,5 @@ node_modules
 dist
 release
 build
+app
+!src/**/app
diff --git a/README.md b/README.md
@@ -12,8 +12,10 @@ A beautiful mac desktop application for [Douban FM](http://douban.fm)
 
 ## Screenshots
 
-<img src="screenshots/screenshot-app.png" alt="screenshot" width="250px" />
-<img src="screenshots/screenshot-login.png" alt="screenshot" width="250px" />
+<img src="static/screenshots/demo.gif" alt="demo" width="250px" />
+<br/>
+<img src="static/screenshots/screenshot-app.png" alt="screenshot" width="250px" />
+<img src="static/screenshots/screenshot-login.png" alt="screenshot" width="250px" />
 
 ## Features
 

diff --git a/app/config.js b/app/config.js
diff --git a/app/main.js b/app/main.js
diff --git a/app/package.json b/app/package.json
diff --git a/config.js b/config.js
@@ -7,7 +7,7 @@ const config = {
       height: 728,
       resizable: true,
     },
-    url: 'app/app.html'
+    url: 'src/app.html'
   },
   production: {
     electronStorageKey: 'DOUBAN_PRODUCTION',
@@ -17,7 +17,7 @@ const config = {
       height: 644,
       resizable: false,
     },
-    url: 'app.html'
+    url: 'dist/app.html'
   },
   test: {
     electronStorageKey: 'DOUBAN_TEST',

diff --git a/main.js b/main.js
@@ -4,6 +4,7 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
 const electron = require('electron');
+const ipcMain = require('electron').ipcMain;
 const storage = require('electron-json-storage');
 const app = electron.app;
 const globalShortcut = electron.globalShortcut;
@@ -80,17 +81,30 @@ app.on('ready', () => {
     });
 
     storage.set(config.electronStorageKey, { cookies }, (error) => {
-      if (error) console.log('Douban cookie save to storage error', error);
+      if (error) console.log('Douban cookie save to storage error:', error);
     });
   };
 
+  const removeDoubanCookies = () => {
+    storage.remove(config.electronStorageKey, (error) => {
+      if (error) console.log('storage remove error:', error);
+    });
+    webContents.session.cookies.remove('http://douban.fm', 'bid', (error) => {
+      if (error) console.log('remove electron cookie error:', error);
+    });
+    webContents.session.cookies.remove('http://douban.fm', 'dbcl2', (error) => {
+      if (error) console.log('remove electron cookie error:', error);
+    });
+  };
+
+  ipcMain.on('logout', removeDoubanCookies);
   webContents.on('did-get-response-details', (event, status, newURL, originalURL, code, method, referrer, headers) => {
     setDoubanCookies(webContents, originalURL, headers);
   });
 
   getDoubanCookies(webContents);
 
-  mainWindow.loadURL(`file://${__dirname}/app/app.html`);
+  mainWindow.loadURL(`file://${__dirname}/${config.url}`);
 
   mainWindow.on('closed', () => {
     mainWindow = null;