Merge lp:~michael-sheldon/webbrowser-app/ebook-mimetypes into lp:webbrowser-app

[Michael Sheldon]

Add mimetype and file extension mappings for the new EBooks ContentType.

Add mimetype and file extension mappings for the new EBooks ContentType.

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/webbrowser-app) on device or emulator?

 * Yes (minus unrelated failing 7digital SSL test)

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[Michael Sheldon (michael-sheldon)]

http://mikeasoft.com/~mike/com.ubuntu.developer.ken-vandine.hub-importer_0.2_all.click

Can be used as a test destination for EBook files (which can be found in epub and mobi/amazon format from gutenberg.org)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:801
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1257/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/119
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/119
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15687
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/82
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/82/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1257/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:801
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1260/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/126
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/126
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15697
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/88
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/88/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1260/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

=== modified file 'src/app/FileExtensionMapper.js'
--- src/app/FileExtensionMapper.js	2014-10-02 19:42:39 +0000
+++ src/app/FileExtensionMapper.js	2014-11-11 15:30:42 +0000
@@ -206,6 +206,13 @@
         case "wmls":
         case "wsc":
             return ContentType.Documents;
+        case "epub":
+        case "mobi":
+        case "lit":
+        case "fb2":
+        case "azw":
+        case "tpz":
+            return ContentType.EBooks;
         default:
             return ContentType.Unknown;
     }

=== modified file 'src/app/MimeTypeMapper.js'
--- src/app/MimeTypeMapper.js	2014-10-06 13:05:06 +0000
+++ src/app/MimeTypeMapper.js	2014-11-11 15:30:42 +0000
@@ -26,10 +26,16 @@
         return ContentType.Videos;
     } else if(mimeType.search("text/x-vcard") === 0) {
         return ContentType.Contacts;
+    } else if(mimeType.search("application/epub[+]zip") === 0
+              || mimeType.search("application/vnd\.amazon\.ebook") === 0
+              || mimeType.search("application/x-mobipocket-ebook") === 0
+              || mimeType.search("application/x-fictionbook+xml") === 0
+              || mimeType.search("application/x-ms-reader") === 0) {
+        return ContentType.EBooks; 
     } else if(mimeType.search("text/") === 0
               || mimeType.search("application/pdf") === 0
               || mimeType.search("application/x-pdf") === 0
-              || mimeType.search("application/vnd.pdf") === 0) {
+              || mimeType.search("application/vnd\.pdf") === 0) {
         return ContentType.Documents;
     } else {
         return ContentType.Unknown;