Skip to content
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.

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

Remove Pinning and add Add By Path #655

Merged
merged 11 commits into from
Sep 5, 2018
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
17 changes: 6 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,20 @@ Click on the IPFS icon in the menubar to open the app.
|:---:|:---:|
| ![](https://ipfs.io/ipfs/QmPBMMG4HUB1U1kLfwWvr6zQhGMcuvWYtGEFeTqBjG2jxW) | ![](https://ipfs.io/ipfs/QmSL8L5kMevXWDZguBwiwDVsQX6qkRFt1yTCDdnA1LmyR9) |

| Pin Hashes | See connected Peers |
| | See connected Peers |
|:---:|:---:|
| ![](https://ipfs.io/ipfs/QmTUS8rRufkXQp7ePRogMFLMxmf6YziYcb8HnDrVCvC2DF)| ![](https://ipfs.io/ipfs/QmW1SWU1aALf8sqSvEFGUtzK8oqX9BGNA6r4bzS8MPg94B) |
| | ![](https://ipfs.io/ipfs/QmW1SWU1aALf8sqSvEFGUtzK8oqX9BGNA6r4bzS8MPg94B) |

## Features

| Stats and Information | Files | Other |
|-----------------------|-------------------------|---------------------------------|
| Peer ID | Add by drag'n'drop | Easy access to the WebUI |
| Location | Add entire directories | Easy access to Node Settings |
| Addresses | Delete files | Pin hashes with labels |
| Public Key | Copy and share links | Optional launch on startup |
| Repository Size | | Auto add screenshots |
| Bandwidth Usage | | Download copied hash |
| Addresses | Delete files | Optional launch on startup |
| Public Key | Copy and share links | Auto add screenshots |
| Repository Size | | Download copied hash |
| Bandwidth Usage | |
| Down/Up Speeds | |
| Peers | |

Expand Down Expand Up @@ -174,11 +174,6 @@ The components are classes exported with CamelCase names. The corresponding file
+ [**KeyCombo**](./src/js/components/view/key-combo.js) is a key combination.
+ [**Key**](./src/js/components/view/key.js) is a key.
+ [**MenuOption**](./src/js/components/view/menu-option.js) is a menu option to show within a menu bar.
+ [**PinnedHash**](./src/js/components/view/pinned-hash.js) is a pinned hash.

#### [Statefull Components](./src/js/components/logic)

+ [**NewPinnedHash**](./src/js/components/view/new-pinned-hash.js) is a new pinned hash form.

## Contribute

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"bl": "^2.0.1",
"electron-compile": "^6.4.3",
"electron-menubar": "^1.0.1",
"electron-prompt": "^1.1.0-1",
"electron-squirrel-startup": "^1.0.0",
"electron-store": "^2.0.0",
"file-extension": "^4.0.5",
Expand Down
127 changes: 0 additions & 127 deletions src/components/NewPinnedHash.js

This file was deleted.

45 changes: 0 additions & 45 deletions src/components/PinnedHash.js

This file was deleted.

18 changes: 18 additions & 0 deletions src/controls/main/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,31 @@ function move (opts) {
}
}

function addByPath (opts) {
const { ipfs } = opts

return async (_, hash, path) => {
if (!hash.startsWith('/ipfs') && !hash.startsWith('/ipns')) {
hash = `/ipfs/${hash}`
}

try {
await ipfs().files.cp([hash, path])
listAndSend(opts, basename(path))
} catch (e) {
logger.error(e.stack)
}
}
}

export default function (opts) {
const { menubar } = opts

ipcMain.on('request-files', list(opts))
ipcMain.on('create-directory', createDirectory(opts))
ipcMain.on('remove-file', remove(opts))
ipcMain.on('move-file', move(opts))
ipcMain.on('add-by-path', addByPath(opts))

ipcMain.on('drop-files', uploadFiles(opts))
menubar.tray.on('drop-files', uploadFiles(opts))
Expand Down
Loading