message improvement

.gitignore

@@ -1,5 +1,4 @@
 node_modules/
 build/
 tw5-locator/
-package.json.bak
 wget-log

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiddlywiki-ipfs",
-  "version": "v0.2.10-dev.200121360",
+  "version": "v0.2.10-dev.200121383",
   "description": "IPFS with TiddlyWiki",
   "main": "src/ipfs-saver.js",
   "directories": {

scripts/build-number.js

@@ -29,16 +29,12 @@ console.log(sourcePackage + " version: " + infoProject.version);
 if (validate(version) == false) {
   version = generate(version)
 }
-console.log("Version: " + version);
+console.log("Generated version: " + version);
 
 // update version
 infoProject.version = version;
 infoPlugin.version = version;
 
-// backup package.json
-fs.copyFile(sourcePackage, sourcePackage + ".bak", (err) => {
-  if (err) throw err;
-});
 // update package.json
 var data = JSON.stringify(infoProject, null, 2);
 fs.writeFile(sourcePackage, data, (err) => {

src/ens-actions.js

@@ -216,8 +216,7 @@ EnsActions.prototype.handlePublishToEns = async function(event) {
 
   var { error } = await this.ensWrapper.setContenthash(ensDomain, cid, web3Provider, account);
   if (error != null)  {
-    this.logger.error(error.message);
-    this.logger.alert("Unable to publish IPFS identifier to ENS...");
+    this.logger.alert(error.message);
     return false;
   }
 

src/ens-library.js

@@ -465,12 +465,8 @@ EnsLibrary.prototype.setContenthash = async function(domain, cid, web3Provider,
     await tx.wait();
     if (this.isVerbose()) this.logger.info("Processed ENS domain content...");
   } catch (error) {
-    if (error !== undefined && error !== null) {
-      if (error.message !== undefined) {
-        throw new Error(error.message);
-      } else {
-        throw new Error(error);
-      }
+    if (error.message !== undefined) {
+      this.logger.error(error.message);
     }
     throw new Error("Unable to set ENS domain content...");
   }

src/ens-wrapper.js

@@ -78,9 +78,8 @@ EnsWrapper.prototype.setContenthash = async function(domain, cid, web3Provider,
       error: null
     };
   } catch (error) {
-    this.logger.error(error.message);
     return {
-      error: new Error("Unable to set ENS domain content...")
+      error: error
     };
   }
 }

src/ipfs-logger.js

@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/ipfs/logger.js
+title: $:/core/modules/utils/logger.js
 type: application/javascript
 tags: $:/ipfs/core
 module-type: utils
@@ -65,7 +65,7 @@ A basic logging implementation
   */
   Logger.prototype.log = function(/* args */) {
     if(this.enable && console !== undefined && console.log !== undefined) {
-      return Function.apply.call(console.log, console, );
+      return Function.apply.call(console.log, console, [$tw.utils.terminalColour(this.colour),this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0)).concat($tw.utils.terminalColour()));
     }
   };
 

src/ipfs-parser.js

@@ -28,9 +28,9 @@ exports.httpGetToUint8Array = async function(url) {
           const array = new Uint8Array(this.response);
           const logger = new $tw.utils.Logger("ipfs");
           if ($tw.utils.getIpfsVerbose()) logger.info(
-            "Success/XMLHttpRequest: "
+            "XMLHttpRequest status: "
             + xhr.status
-            + ", "
+            + ",\n\t"
             + url
           );
           resolve(array);

src/ipfs-saver.js

@@ -310,7 +310,7 @@ IpfsSaver.prototype.save = async function(text, method, callback, options) {
       var { error } = await this.ensWrapper.setContenthash(ensDomain, added, web3Provider, account);
       if (error != null)  {
         // Log and continue
-        this.logger.alert("Unable to publish IPFS identifier to ENS...");
+        this.logger.alert(error.message);
         // Remove from unpin
         const index = this.toBeUnpinned.indexOf(ensContent);
         if (index !== -1) {
@@ -637,13 +637,6 @@ IpfsSaver.prototype.handleIpfsPin = async function(event) {
     this.toBeUnpinned.splice(index, 1);
   }
 
-  if (this.isVerbose()) this.logger.info(
-    "Successfully pinned: /"
-    + ipfsKeyword
-    + "/"
-    + cid
-  );
-
   return false;
 
 }
@@ -736,13 +729,6 @@ IpfsSaver.prototype.handleIpfsUnpin = async function(event) {
     this.toBeUnpinned.splice(index, 1);
   }
 
-  if (this.isVerbose()) this.logger.info(
-    "Successfully unpinned: /"
-    + ipfsKeyword
-    + "/"
-    + cid
-  );
-
   return false;
 
 }

tiddlers/plugin/language/en-GB/ControlPanel.multids

@@ -26,4 +26,5 @@ Saving/IpfsService/Policy: Policy
 Saving/IpfsService/Policy/Default/Description: Default IPFS Provider
 Saving/IpfsService/Policy/Window/Description: IPFS Companion
 Saving/IpfsService/Policy/HTTP/Description: HTTP Client
-Ipfs/Version/Prompt: IPFS version:
+Basics/Version/Prompt: ~TiddlyWiki:
+Ipfs/Version/Prompt: IPFS:

tiddlers/wiki/load/$__SplashScreen.tid

@@ -107,10 +107,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 <div class="tc-splash-text">
 <p>
-	Please wait while {{$:/SiteTitle}} is loading...
+	Please wait while <b>{{$:/SiteTitle}}</b> is loading...
 </p>
 <p>
-	<<ipfs-version>>
+	<b><<ipfs-version>></b>
 </p>
 </div>