style(worker): clean up rdnn sanitizing in tests

src/worker/task/appstream/content-rating.ts

@@ -7,18 +7,28 @@ import * as cheerio from 'cheerio'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { Task } from '../task'
 
 export class AppstreamContentRating extends Task {
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**

src/worker/task/appstream/description.ts

@@ -7,18 +7,28 @@ import * as cheerio from 'cheerio'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { Task } from '../task'
 
 export class AppstreamDescription extends Task {
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**

src/worker/task/appstream/exist.md

@@ -2,7 +2,7 @@
 
 AppCenter was unable to find your appstream file. Please ensure you have an
 appstream file that is placed in `/usr/share/metainfo`. It should be named
-`<%- storage.nameDomain %>.appdata.xml`.
+`<%- name %>.appdata.xml`.
 
 ### For more information, see:
 - [The AppStream Quickstart Guide](https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html)

src/worker/task/appstream/id.ts

@@ -13,15 +13,31 @@ import { Task } from '../task'
 
 export class AppstreamId extends Task {
 
+  /**
+   * Returns what the appstream ID should be
+   *
+   * @return {string}
+   */
+  public get id () {
+    return sanitize(this.worker.context.nameDomain, '_')
+  }
+
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    const name = sanitize(this.worker.context.nameDomain, '-')
-
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${name}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**
@@ -35,18 +51,17 @@ export class AppstreamId extends Task {
     const $ = cheerio.load(raw, { xmlMode: true })
 
     const id = $('component > id')
-    const appstreamId = sanitize(this.worker.context.nameDomain, '_')
 
     if (id.length === 0) {
-      $('component').prepend(`<id>${appstreamId}</id>`)
+      $('component').prepend(`<id>${this.id}</id>`)
       await fs.writeFile(this.path, $.xml())
 
       throw new Log(Log.Level.WARN, 'Missing "id" field')
-    } else if (id.text() !== appstreamId) {
-      id.text(appstreamId)
+    } else if (id.text() !== this.id) {
+      id.text(this.id)
       await fs.writeFile(this.path, $.xml())
 
-      throw new Log(Log.Level.WARN, `"id" field should be "${appstreamId}"`)
+      throw new Log(Log.Level.WARN, `"id" field should be "${this.id}"`)
     }
   }
 }

src/worker/task/appstream/index.ts

@@ -7,6 +7,7 @@
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { WrapperTask } from '../wrapperTask'
 
@@ -59,13 +60,22 @@ export class Appstream extends WrapperTask {
     }
   }
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**
@@ -102,6 +112,7 @@ export class Appstream extends WrapperTask {
       const template = path.resolve(__dirname, 'exist.md')
 
       throw Log.template(Log.Level.ERROR, template, {
+        name: this.name,
         storage: this.worker.context
       })
     }

src/worker/task/appstream/license.ts

@@ -7,18 +7,28 @@ import * as cheerio from 'cheerio'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { Task } from '../task'
 
 export class AppstreamLicense extends Task {
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**

src/worker/task/appstream/name.ts

@@ -7,18 +7,28 @@ import * as cheerio from 'cheerio'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { Task } from '../task'
 
 export class AppstreamName extends Task {
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**

src/worker/task/appstream/release.ts

@@ -6,10 +6,11 @@
 import * as cheerio from 'cheerio'
 import * as fs from 'fs-extra'
 import * as path from 'path'
-import * as sanitize from 'sanitize-html'
+import * as sanitizeHtml from 'sanitize-html'
 import * as semver from 'semver'
 
 import markdown from '../../../lib/utility/markdown'
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { Task } from '../task'
 
@@ -33,13 +34,22 @@ export class AppstreamRelease extends Task {
     xmlMode: true
   }
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**
@@ -141,7 +151,7 @@ export class AppstreamRelease extends Task {
   protected sanitize (change) {
     const $el = cheerio.load(change, AppstreamRelease.CHEERIO_OPTS)
 
-    const sanitized = sanitize($el.xml(), {
+    const sanitized = sanitizeHtml($el.xml(), {
       allowedTags: AppstreamRelease.WHITELISTED_TAGS,
       parser: AppstreamRelease.CHEERIO_OPTS
     })

src/worker/task/appstream/screenshot.ts

@@ -7,18 +7,28 @@ import * as cheerio from 'cheerio'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { Task } from '../task'
 
 export class AppstreamScreenshot extends Task {
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**

src/worker/task/appstream/stripe.ts

@@ -7,18 +7,28 @@ import * as cheerio from 'cheerio'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { Task } from '../task'
 
 export class AppstreamStripe extends Task {
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**

src/worker/task/appstream/summary.ts

@@ -7,18 +7,28 @@ import * as cheerio from 'cheerio'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Log } from '../../log'
 import { Task } from '../task'
 
 export class AppstreamSummary extends Task {
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path the appstream file should exist at
    *
    * @return {string}
    */
   public get path () {
-    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.worker.context.nameDomain}.appdata.xml`)
+    return path.resolve(this.worker.workspace, 'package/usr/share/metainfo', `${this.name}.appdata.xml`)
   }
 
   /**

src/worker/task/appstream/validate.ts

@@ -6,6 +6,7 @@
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
+import { sanitize } from '../../../lib/utility/rdnn'
 import { Docker } from '../../docker'
 import { Log } from '../../log'
 import { Task } from '../task'
@@ -20,6 +21,15 @@ export class AppstreamValidate extends Task {
     return path.resolve(this.worker.workspace, 'appstream.log')
   }
 
+  /**
+   * Returns the main appstream file name
+   *
+   * @return {string}
+   */
+  public get name () {
+    return sanitize(this.worker.context.nameDomain, '-')
+  }
+
   /**
    * Path to folder containing the appstream file
    *
@@ -38,7 +48,7 @@ export class AppstreamValidate extends Task {
   public async run () {
     const docker = await this.docker()
 
-    const file = `${this.worker.context.nameDomain}.appdata.xml`
+    const file = `${this.name}.appdata.xml`
     const cmd = `validate ${file} --no-color`
     const exit = await docker.run(cmd)