From 3f67a8105aa799b8ce0d79775d143601ed4a238b Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Sat, 26 Sep 2020 02:59:44 +0200 Subject: [PATCH 1/2] feat: improved CID column - Links to direct CIDs now have ?filename= param to preserve name and content type - When page is loaded on DNSLink website (based on Host header) then there is no public gateway endpoint. As a replacement, clicking on a CID opens it at cid.ipfs.io Context: https://github.com/ipfs/dir-index-html/issues/42 Closes #42 --- dir-index.html | 4 ++-- package.json | 1 + src/dir-index.html | 2 +- test/main.go | 16 ++++++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dir-index.html b/dir-index.html index e948603bf..64bab523a 100644 --- a/dir-index.html +++ b/dir-index.html @@ -3,7 +3,7 @@ @@ -82,7 +82,7 @@ {{ if .Hash }} - + {{ .ShortHash }} {{ end }} diff --git a/package.json b/package.json index 2390a1105..858f5d011 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "license": "MIT", "releaseCmd": "git commit -a -m \"gx publish $VERSION\"", "scripts": { + "start": "cd test && go run .", "build": "npm run build:clean && npm run build:remove-style-links && npm run build:minify-wrap-css && npm run build:combine-html-css && npm run build:remove-unused", "build:clean": "rm dir-index.html", "build:remove-style-links": "sed '/ ./base-html.html", diff --git a/src/dir-index.html b/src/dir-index.html index a399152c2..81c926f71 100644 --- a/src/dir-index.html +++ b/src/dir-index.html @@ -81,7 +81,7 @@ {{ if .Hash }} - + {{ .ShortHash }} {{ end }} diff --git a/test/main.go b/test/main.go index fc3208335..c02523a9f 100644 --- a/test/main.go +++ b/test/main.go @@ -13,6 +13,7 @@ const templateFile = "../dir-index.html" // Copied from go-ipfs/core/corehttp/gateway_indexPage.go type listingTemplateData struct { GatewayURL string + DNSLink bool Listing []directoryItem Size string Path string @@ -37,18 +38,25 @@ type breadcrumb struct { var testPath = "/ipfs/QmFooBarQXB2mzChmMeKY47C43LxUdg1NDJ5MWcKMKxDu7/a/b/c" var testData = listingTemplateData{ GatewayURL: "//localhost:3000", + DNSLink: true, Listing: []directoryItem{{ Size: "25 MiB", Name: "short-film.mov", Path: testPath + "/short-film.mov", - Hash: "QmQuxBarQXB2mzChmMeKY47C43LxUdg1NDJ5MWcKMKxDu7", - ShortHash: "QmQu\u2026xDu7", + Hash: "QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR", + ShortHash: "QmbW\u2026sMnR", + }, { + Size: "23 KiB", + Name: "250pxيوسف_الوزاني_صورة_ملتقطة_بواسطة_مرصد_هابل_الفضائي_توضح_سديم_السرطان،_وهو_بقايا_مستعر_أعظم._.jpg", + Path: testPath + "/250pxيوسف_الوزاني_صورة_ملتقطة_بواسطة_مرصد_هابل_الفضائي_توضح_سديم_السرطان،_وهو_بقايا_مستعر_أعظم._.jpg", + Hash: "QmUwrKrMTrNv8QjWGKMMH5QV9FMPUtRCoQ6zxTdgxATQW6", + ShortHash: "QmUw\u2026TQW6", }, { Size: "1 KiB", Name: "this-piece-of-papers-got-47-words-37-sentences-58-words-we-wanna-know.txt", Path: testPath + "/this-piece-of-papers-got-47-words-37-sentences-58-words-we-wanna-know.txt", - Hash: "QmquXbaRQXB2mzChmMeKY47C43LxUdg1NDJ5MWcKMKxDu7", - ShortHash: "Qmqu\u2026xDu7", + Hash: "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi", + ShortHash: "bafy\u2026bzdi", }}, Size: "25 MiB", Path: testPath, From b12c35a229dbb9ecb4aa6cb9459951972155221c Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Sat, 26 Sep 2020 03:14:10 +0200 Subject: [PATCH 2/2] fix(ci): avoid uncommited changes with custom shells for some reason `-e` gets interpreted literally at CI. This removes its use making the output look the same everywhere. CI will now show diff if uncommited changes to make it easier to see what caused CI to fail. --- .github/workflows/build.yml | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f85219681..100a5af8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,10 +12,10 @@ jobs: uses: actions/setup-node@v1 with: node-version: '12.x' - - run: npm run build + - run: npm run build - name: Check working tree id: changes uses: UnicornGlobal/has-changes-action@v1.0.11 - name: Check for uncommited changes if: steps.changes.outputs.changed == 1 - run: git status && echo "Output does not match src/, uncommitted changes exist, follow build instructions from README" && exit 1 + run: git status && git --no-pager diff --patch-with-raw && echo "Output does not match src/, uncommitted changes exist, follow build instructions from README" && exit 1 diff --git a/package.json b/package.json index 858f5d011..8769b4ba5 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "build": "npm run build:clean && npm run build:remove-style-links && npm run build:minify-wrap-css && npm run build:combine-html-css && npm run build:remove-unused", "build:clean": "rm dir-index.html", "build:remove-style-links": "sed '/ ./base-html.html", - "build:minify-wrap-css": "(echo \"\") > ./minified-wrapped-style.html", + "build:minify-wrap-css": "(echo \"\") > ./minified-wrapped-style.html", "build:combine-html-css": "sed '// r ./minified-wrapped-style.html' ./base-html.html > ./dir-index.html", "build:remove-unused": "rm ./base-html.html && rm ./minified-wrapped-style.html" }