[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix: restore video derivatives

2017-12-04 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395084 )

Change subject: Fix: restore video derivatives
..


Fix: restore video derivatives

Video derivatives were no longer being included in the media response,
probably because of a rebase error.

Change-Id: Ic948c00bddcd98d7cef5cf5c523bdb23aed79cb6
---
M lib/media.js
M test/diff/results/page_media-enwiki-Hummingbird.json
2 files changed, 104 insertions(+), 3 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/media.js b/lib/media.js
index bf6c6a5..24a5a18 100644
--- a/lib/media.js
+++ b/lib/media.js
@@ -83,8 +83,8 @@
 type: source.getAttribute('type'),
 title: source.getAttribute('data-title'),
 short_title: source.getAttribute('data-shorttitle'),
-width: source.getAttribute('data-file-width'),
-height: source.getAttribute('data-file-height')
+width: source.getAttribute('data-file-width') || 
undefined,
+height: source.getAttribute('data-file-height') || 
undefined
 };
 });
 }
@@ -144,7 +144,6 @@
 size: info.size
 },
 duration: meta && (meta.length || meta.playtime_seconds) || 
undefined,
-derivatives: info.derivatives,
 artist: ext && ext.Artist && ext.Artist.value,
 credit: ext && ext.Credit && ext.Credit.value,
 license: ext && ext.LicenseShortName && ext.LicenseShortName.value,
diff --git a/test/diff/results/page_media-enwiki-Hummingbird.json 
b/test/diff/results/page_media-enwiki-Hummingbird.json
index 851503a..a022bdd 100644
--- a/test/diff/results/page_media-enwiki-Hummingbird.json
+++ b/test/diff/results/page_media-enwiki-Hummingbird.json
@@ -187,6 +187,40 @@
   "type": "video",
   "caption_html": "Slow motion video of hummingbirds feeding",
   "caption_text": "Slow motion video of hummingbirds feeding",
+  "derivatives": [
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/2/21/Hummingbird_feeding_closeup_2000fps.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Original WebM file, 864 × 480 (955 kbps)",
+  "short_title": "WebM source",
+  "width": "864",
+  "height": "480"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.160p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Low bandwidth WebM (160P)",
+  "short_title": "WebM 160P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.240p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Small WebM (240P)",
+  "short_title": "WebM 240P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.360p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "WebM (360P)",
+  "short_title": "WebM 360P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.480p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "SD WebM (480P)",
+  "short_title": "WebM 480P"
+}
+  ],
   "thumb": {
 "source": 
"https://upload.wikimedia.org/wikipedia/commons/thumb/2/21/Hummingbird_feeding_closeup_2000fps.webm/864px--Hummingbird_feeding_closeup_2000fps.webm.jpg;,
 "width": 864,
@@ -256,6 +290,40 @@
   "type": "video",
   "caption_html": "Hummingbird in Copiapó, Chile: The apparent slow movement of its 
wings is a result of the stroboscopic effect.",
   "caption_text": "Hummingbird in Copiapó, Chile: The apparent slow 
movement of its wings is a result of the stroboscopic effect.",
+  "derivatives": [
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/d/db/Hummingbird.ogv;,
+  "type": "video/ogg; codecs=\"theora, vorbis\"",
+  "title": "Original Ogg file, 854 × 480 (2.55 Mbps)",
+  "short_title": "Ogg source",
+  "width": "854",
+  "height": "480"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/d/db/Hummingbird.ogv/Hummingbird.ogv.160p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix: restore video derivatives

2017-12-04 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395084 )

Change subject: Fix: restore video derivatives
..

Fix: restore video derivatives

Video derivatives were no longer being included in the media response,
probably because of a rebase error.

Change-Id: Ic948c00bddcd98d7cef5cf5c523bdb23aed79cb6
---
M lib/media.js
M test/diff/results/page_media-enwiki-Hummingbird.json
2 files changed, 104 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/84/395084/1

diff --git a/lib/media.js b/lib/media.js
index bf6c6a5..24a5a18 100644
--- a/lib/media.js
+++ b/lib/media.js
@@ -83,8 +83,8 @@
 type: source.getAttribute('type'),
 title: source.getAttribute('data-title'),
 short_title: source.getAttribute('data-shorttitle'),
-width: source.getAttribute('data-file-width'),
-height: source.getAttribute('data-file-height')
+width: source.getAttribute('data-file-width') || 
undefined,
+height: source.getAttribute('data-file-height') || 
undefined
 };
 });
 }
@@ -144,7 +144,6 @@
 size: info.size
 },
 duration: meta && (meta.length || meta.playtime_seconds) || 
undefined,
-derivatives: info.derivatives,
 artist: ext && ext.Artist && ext.Artist.value,
 credit: ext && ext.Credit && ext.Credit.value,
 license: ext && ext.LicenseShortName && ext.LicenseShortName.value,
diff --git a/test/diff/results/page_media-enwiki-Hummingbird.json 
b/test/diff/results/page_media-enwiki-Hummingbird.json
index 851503a..a022bdd 100644
--- a/test/diff/results/page_media-enwiki-Hummingbird.json
+++ b/test/diff/results/page_media-enwiki-Hummingbird.json
@@ -187,6 +187,40 @@
   "type": "video",
   "caption_html": "Slow motion video of hummingbirds feeding",
   "caption_text": "Slow motion video of hummingbirds feeding",
+  "derivatives": [
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/2/21/Hummingbird_feeding_closeup_2000fps.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Original WebM file, 864 × 480 (955 kbps)",
+  "short_title": "WebM source",
+  "width": "864",
+  "height": "480"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.160p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Low bandwidth WebM (160P)",
+  "short_title": "WebM 160P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.240p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Small WebM (240P)",
+  "short_title": "WebM 240P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.360p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "WebM (360P)",
+  "short_title": "WebM 360P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.480p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "SD WebM (480P)",
+  "short_title": "WebM 480P"
+}
+  ],
   "thumb": {
 "source": 
"https://upload.wikimedia.org/wikipedia/commons/thumb/2/21/Hummingbird_feeding_closeup_2000fps.webm/864px--Hummingbird_feeding_closeup_2000fps.webm.jpg;,
 "width": 864,
@@ -256,6 +290,40 @@
   "type": "video",
   "caption_html": "Hummingbird in Copiapó, Chile: The apparent slow movement of its 
wings is a result of the stroboscopic effect.",
   "caption_text": "Hummingbird in Copiapó, Chile: The apparent slow 
movement of its wings is a result of the stroboscopic effect.",
+  "derivatives": [
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/d/db/Hummingbird.ogv;,
+  "type": "video/ogg; codecs=\"theora, vorbis\"",
+  "title": "Original Ogg file, 854 × 480 (2.55 Mbps)",
+  "short_title": "Ogg source",
+  "width": "854",
+  "height": "480"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/d/db/Hummingbird.ogv/Hummingbird.ogv.160p.webm;,
+  "type": "video/webm; codecs=\"vp8,