From 9e12612b88690a28eb839a88e8b81408beab3faa Mon Sep 17 00:00:00 2001 From: wassname Date: Tue, 23 May 2017 21:50:43 +0800 Subject: [PATCH] Replaced broken ombdapi with themoviedb.org --- flixrate.css | 33 ++------------- flixrate.js | 110 ++++++++++++++++++++++++-------------------------- manifest.json | 15 +++---- 3 files changed, 65 insertions(+), 93 deletions(-) diff --git a/flixrate.css b/flixrate.css index e65394e..20c6d0a 100644 --- a/flixrate.css +++ b/flixrate.css @@ -1,34 +1,9 @@ -.rottenCritic-logo-medium { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAAAURSURBVEhLrZR7UFRlGMbPCopooMttr5y9sruwLBd3YVcEFkYJEOJiMGjKSCorpCimmBeUVim1kjA1xswcZ+wPnNRq1EnNyekPCywnLUnRGBQxFHa5CWmjPL1nd5myy8Q0PTPvzDm75/t9z/u83znMWGQpkAaI5mh0ntv/T7lVpmJzhfFYVJpgMt3y3L/+d/FkccFCq00TlL829l1rftipmeWRWVKL1Jf7z/3I2DVOrWZ8jNmiSXkbjPGzq2I2F2217J33qqnt2QxFT+Em08n0lVFzkkp1Is/zY5b3tCyVMW+jsbqo1ny+ZE/i3bzNlkdzN8U/SYmXIndZ7GBhraW52BZVUVqkVy20yibSmjG552VmKgzz1hmPzt+RMLywIQWp9kRkrjPDWGTAgu0zULzH+mvJrqT2F3clnltit9SWlBgMNVart2f9X1VDMSxdoI8uW2s8uGqNqfuV5cYn5W8mgoOX7LUi/61k2N5LwZoNZhxI12N3tv5xdVlsX9lG84XiSmNuRoXax4N6Srz1ZkXULqv22NkZuqHrFt3IrRk6nH7egPJ9qVhRl4TtC6KxmDZYVZ+MT/JicEeuRluYBhcjNY/rZ0d0lKepFxdGREzw8NxqFAqDr4hl9Xe16l96LDo4MvToLDDg5AoTbPtT8MGSWHRHa3GSNqt4IxENFfHoVGngkKrRQ3WfVY+0hCo6GgME8RjNnLv4VihNvq1UdvSadbj1XCQO2mJQWW1Gmd2C3SuM6CLnvSnhuKfX4GiWAfWVZrTrtC7waNEGI1eFsnOtak8kp+jiokRmd9Ci3jQ9BopjMbTKgsHqJAxsSsZwVQIGlkxDX54BzjgdWqO0+CgnCm36p8Fc3Sf4hwHiWS7wBak04AYrb3JO06Iv14CBl+IwVJuKhw3ZeLgvB0M7ZmHwZQv650XDmUyutRr8GKlFu8YdxWi5IqFqFsj2u+JoYVnRHVbZ6TRq0Z9vwCDlN7RtJh4emoNHhwswXJeOwarp6J8f44rDQQO7x6pdNQrspvpZqkK7RIVmoeyMGxzkAUdr0JdFUZQa8YBiGN6ZjuG3M/DAnoLB5XHoL4yCk4bnUIb9CajGLYK2SpT4TqzAWQF72gVu8hMH3hTLmxzaMPRSq30EGFhqovanY3DNdAwsIyjnNj0CTjoZDpkb2kWwDnJ4g4BXCPiVSI4zglAcDBC6o2iUSn0vC9nX78tUT5wGGqA1HL05BvQVRaNvLhXF05tGUBNBVWGuHO8SsI3qKgGbCXhOwOJ4sAQH+MGPavymZtPoeK437muBLLVDorjpkIfBGa4hiA7OhHBqnSqe2qcNewjaFarGbQJeJ5eXCPqlUIYTIVIcDhJi99TAkc2T/I4VMvwprlPB6TM6GT8I2de6JMoHDm4otIErS6oeBblkVeik1n8i4Pdipavt09T2kWAx9vGDsO0Zf6z2mdiyyNvbRLjfP0pcJidCWGWLUP7+PYlqaPQIuYZDDrlpX/O4PE8uPw2R4FCgAHX+fGz09R2xeXldK/DyyihkmKdfaU5cJEf4IvaSiK27I1E6uOPDtd1KDi8T8IJIRi5ZNJLLBnJZO9kPleMnPH6Bx/t8NsMkRPwd9A/i7WQY348DxTlNQvnxS2JZd5NIPvIFAV0uKcu6KXysnzhpuNTL65s8ZtzKJIbhPvrj3Mv/XTwbw4zfyueH2v2Csur5Iavf4Qfat/hPrVnk41OaSVnGM4w/PfcPQIb5DdZKjk0CgfRZAAAAAElFTkSuQmCC'); - background-position: center center; - background-repeat: no-repeat; - display: inline-block; - height: 22px; - text-indent: -9999em; - vertical-align: baseline; - width: 22px; -} - - -.rottenUser-logo-medium{ - width: 17px; - height: 22px; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAWCAYAAAAmaHdCAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAAAUaSURBVDhPbZR5UFNXFMafVttppzPqaFFZAiJByqC2goqdqlXQtsq4FLAipYCpYaQgoliDCI8iEEDAXRrEUcQqMi4z1A0FRYEWCiGshrATEkjIy0ICBFzy9YZmav/wmzlz35t7zu+ee9/3LvUu0fTaaebg8b6cVZjm7Vl5J3Z1sYDLomlqqr+//3vm0ZL6bnG57tMfXt/nU/MgJqT69t7YzpK9TOezOJn4ES//cf7uVZW3w7aeT9+yyAyzlLwVTdNTb+YEsB8V7Nksq02vVghTjEpRFqPvK3jZWRZjUNQnMe1l+5t7yg+qSvNDUzNpnzmW0n9lpj4t3OfW+DBa0F0R18w08Y1DDZkmTUsWxvouov0PDhRVURiq5UFenWhqKz/acSvnh6UANcWCoKYU0z6stpL9ZzTiU2p1wzGTsjISox0noHuRAfmfvxJADGTPeQQSB0YYD0Vt/ETlDU7cpRPBMycJT11dP27ieGeoKhKGjNIrMEiyoar+BZq6aJKcCKYhEcOSs2Aa06AWHYaKdDNQxYO0KkZew9mQEulEfUDdtLd36Q/eJDeIL2C0SwDV3/EYFmfB0JYG+ZMw9JEwkK704mPQiI6QMQ2DFdHofZaItjCvoZOz5y2nCufNW6709BjVCaKgFaZCWvYzFDWxMPZdgK6RB1VdApT1fBg6c6BtTYOq5iCGHnOgyQ6G/HO3N4LZVtuoh5/YOvXbsYfUC12gWecJdbg3dMd9MXY7EaN346ArPgpJdhAGz4dDkxECdehXYNzdwCxwRr+dk55vZbWYKt3JmdsbsV+k3eADxmYhGFsnMHYkWM5g7Ek4OEPFYpNnEubR1nEyT7tpO6T8zPbDjo4zqIrNu2bJUtPv62NioV33DfRhEdCt+3oSol60BGo3D6id3KBmu0G3zR96bjgY58UYy7+KwSvXyum19DSq2N39I1FS6unhIzSGA0Pwuqsbxpt3wBDA2DkBTGoNRpPTof12K14JRZi4+wDqZasw9qQcYjr5MohJKa67+3Th2ZwI5kjCG61vACZaxTDeKyGQpRj9LQ+miQmM8I9Du8UPL5tbJztQrVwDQ50Qdf4BPBCfUTRFTRXmXfKVJSTpma07yGQ9DGQVlctnGDmbg9fj49AnE4+QBYziNgyfOAMl2bb66TMUrlyzyWxWs9+m1J3PXd/NPy5VbNsB7fNKaKuqoXRdBh0pGB8ZgZZOxlBAMPGOBEx8EuQ+vui78vs438vL0QyYVCVNe4izTzXI/AKhuk+2UluPAXKgTEY2RnTDUMUlYvBH4g3SycC+g5AGcVCfzO8UcLkzLAiKKg7mujTn5Jb27grBQNEtKEWNkC5dAUVKOnSMGoOHj6J/dxiULS/QG8pFTwwPVeGR92/4+X1oQVDUGe8t1sL8gqsdIdw30ouXIW9qRpfHF5AlJkOlUEBKinr2hEPe0IT2HYHoSsvEneDQY0X+/u9bEBQVZW8/sywy+mTD5u2vuk6fg4ysKPFcg+44GoP9cnRHH0JneBRk9Q1o+W4nGqMOmHK9NgYSyNuLiXyhaZcXOP9UwnJWiL4PQvf1IjStWA3JoVjIe/ogiYiGOGg3Oohvqlevx13HRdJTLJYrKf3vPpnUgfnz51y1ccgqZTnp/iL/hciBjVa2KyRLlqHF6VMIyXuFA9t0z85RljOftSfa1vbtefxf5okUKyuvPGu7vGs29k3FNvaKezYLNEU2rJ4Ca1ZFrjUrNWXuXDdz55YSIor6BwohOuxJOHbsAAAAAElFTkSuQmCC'); +.themoviedb-logo-medium{ + width: 24px; + height: 21px; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAVCAMAAABrN94UAAACrFBMVEUIHyUIICUIISYIIicIIygIJCgIJSgIJygIKCkIKSkIKioHLCsHLSsHLiwHLywHMC0HMS0HMi4HMy4HNC4HNS8HNTAHNjAHNzAHNi8IHiUIJigIJykHNS4IIiYIJikHKyoHLSwHMS4IIycHNC8IICYHJykHKCkHKSkHKioGVz0Fb0gFcEgFcUgFcUkFcUoFckoEc0oEdEoEdUoEdUsEdksEd0wEeEwEeUwEeU0FakYGQDQHMy8EgVABwWwCq2ICqWECqmECqmICrGICrGMCrWMCm1wHOzIBumkFaUUIKyoILCoILCsILSsILiwHLy0FYEEGVDwIHSQHOjEGSjgIJCcHJikHKSoHKisHKysGRjYBvGkFWz8HMi0GSzkIKSoGSTcHQDMHPjIGRzcFYEIGTjoGRTYFWT8HOTEEckkDmFoFYUIEgE8EhFEDnlwGRDYBu2kFWD4IHSUIHyYHRTUCpF8CoV4EhVECol4GVj0GQzUHOTAHQzUFbUcHQjUFZUQDmlsFZUMHKCoGQjUFVz4IHCQGUzwGSDcGSjcGOzEGODAGQTQFVj0Dh1MFWj8Di1QEhlIEek0GWz8Ed0sEf08DllkEfU4GQTUFVT0HODABumgCpmACoF0CqWIEglEFZkQCo18DkVcGUjsDiVMCn10HLisHJyoEg1EHPTIFZ0UDjlYDjFUDiVQFYkIHRDUEh1IDm1sHKCgGQDMFVDwHJygIGyQGRjcHOzEFXEAILywGUTsGWD4IMC0HJigBuWgGSTgDilQDiFMEfE4Dj1YHPzMGUjwDlFgFcEkIJScGUzsEcEkDklcCnFwEckoFa0YFaUYFX0EEcUkHPDIIGyMGSDgIHiQGRzYBvmsGTDkIGiQCsGQCsWUDkFYDklgDk1gEgFAIIScIHCMHMy0FXUD///8ULX54AAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB+EFFwwzI0v0b/cAAAHaSURBVCjPY2BkUmFUYZJVYpFTVVPXkFfg5eNXVFQWEWFgUOHU0tbW0dUzMDQ0MjY2NTUzM7ewslZmYGC2sbO3d3AEAjsgcHJ2dnZxcXUTYpBUdufg4vL08vb18+NXFBRSFpEQl7AN4GcIDHKXZI7T9I9PTEpOCQvn5ubh5eWJSuNlCEx3l2SSzsjMMsvJjVYPC48ASnHnF3BDJIoijYtLy8or1MLCQTIRYIkqoIRKdU1tnVl9A6daY2NYRIRGfrMGQ0uVe6EKm4A3X2JrW7tnTGdXKm94WH53GFiiSKin1qav32bCxEmTp0wVDgvLn97I0DJjJlBi1uw5BiF98+YvWLR40hJ1tfzpSxm2zJgZyCC9VWpb7PYZsiI+1Tt37ebYnL9pD1Bib4sk7/4DwYd2FikphYQohbCzS7kHSDFsEQdKKOccOVB6DCTBxsYmJXXc/cRxkMSWQOFDJw+ePqPCDJFhC3FfGAKWkOQ4e07owkUVZmZmoGFsbEruO5kZLoEkJAMDGSQZmJiAEmB7YBItLYFXJBmAQEWFiUlWVpbp2nUmhkszbjGsuH3o0KEFUHDqzt27h+8zMzx4+ChQshAIgBqKVFRAeu4zA21jCGS4EhgIkpAEGwWRAgIA2sSfU9qmJ4cAAAAASUVORK5CYII='); background-position: center center; background-repeat: no-repeat; display: inline-block; text-indent: -9999em; - vertical-align: baseline; } - -.imdb-logo-medium{ - width: 42px; - height: 20px; - background-image: url('data:image/png;base64,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'); - background-position: center center; - background-repeat: no-repeat; - display: inline-block; - text-indent: -9999em; - vertical-align: baseline; -} - diff --git a/flixrate.js b/flixrate.js index 46bad48..f9d540b 100644 --- a/flixrate.js +++ b/flixrate.js @@ -1,20 +1,17 @@ (function($) { 'use strict'; - + var $body = $('body'); $body.on('ratings.load',function(e, query) { - //originally needed for german amazon prime in prime-ratings - //query.t = query.t - // .replace('[dt./OV]', '') - // .replace('[OV]', '') - // .replace('[OV/OmU]', ''); - - $.getJSON('https://www.omdbapi.com/', query, function(data) { + var isTV = query['isTV'] + delete query['isTV'] + query['api_key']=localStorage['netflix-ratings-apikey']||'94351e0efb7713d0ad0f46078bff2b14' + $.getJSON('https://api.themoviedb.org/3/search/'+(isTV?'tv':'movie'), query, function(data) { $body.trigger('ratings.return', [data]); }); }); - var isDebug = false; + var isDebug = localStorage['netflix-ratings-isDebug']||false; var $body = $('body'); var lastTitle = ""; @@ -47,21 +44,22 @@ if (isDebug) { window.console.debug("Hover div detected"); } - $box = $('.meta'); + $box = $hoverbox.find('.meta'); } else { if (isDebug) { window.console.debug("No hover div detected"); } - - $box = $('.jawBonePanes').find('.meta'); + + $box = $('.jawBoneOpenContainer').find('.meta'); } if($box.find('.imdb-rating').length > 0){ var hasRating = true; - var myClass = $box.find('.imdb-rating').get(0).parent().attr("class"); - + // var myClass = $box.find('.imdb-rating').get(0).parent().attr("class"); + var myClass = $box.find('.imdb-rating').find('i').attr('class').split('-')[0] + } - + $.each(results, function(index, result) { if (hasRating) { window.console.debug("Rating was already detected: " + myClass); @@ -73,7 +71,7 @@ 'title': result.details || '' }); $list.append(''+result.label+''); - $list.append(''+result.rating+'%'); + $list.append(''+result.rating+'/10'); $list.appendTo($box); }); @@ -91,44 +89,25 @@ if (data.tomatoMeter !== 'N/A') { hasTomatoeResult = true; result.push({ - type: 'rottenCritic', - label: 'Rotten Tomatoes Critic', - rating: +data.tomatoMeter, + type: 'themoviedb', + label: 'The Movie DB', + rating: +data.results[0].vote_average, //maxRating: 100, - details: data.tomatoConsensus !== 'N/A' ? htmlNumericEntityUnescape(data.tomatoConsensus) : null - }); - } - if (data.tomatoUserMeter !== 'N/A') { - hasTomatoeResult = true; - result.push({ - type: 'rottenUser', - label: 'Rotten Tomatoes User', - rating: +data.tomatoUserMeter, - //maxRating: 100, - details: data.tomatoConsensus !== 'N/A' ? htmlNumericEntityUnescape(data.tomatoConsensus) : null - }); - } - //I don't too much care for IMDb Ratings :) - if (data.imdbID && data.imdbRating !== 'N/A' && hasTomatoeResult == false) { - result.push({ - type: 'imdb', - label: 'IMDb', - rating: +data.imdbRating, - maxRating: 10, - details: null + details: data.results[0].vote_count }); } addRating(result); }; var queries = []; - function addQueries(description, year) { + function addQueries(description, year, isTV) { + // TODO TV or MOVIE if (description && year) { queries.push(function() { return { - t: description, - y: year, - tomatoes: true + query: description, + year: year, + isTV: isTV }; }); } @@ -136,8 +115,8 @@ if (description) { queries.push(function() { return { - t: description, - tomatoes: true + query: description, + isTV: isTV }; }); } @@ -161,6 +140,14 @@ return $.trim(title.text()); } + function getIsTV(){ + return $('div.jawbone-overview-info.has-jawbone-nav-transition').find('.duration').text().includes('Season') + } + + function getHasRating(){ + return $('.jawBoneOpenContainer').find('.meta').find('.imdb-rating').length>0 + } + function fallbackQuery() { var curFn = queries.shift(); if (typeof curFn === 'function') { @@ -175,7 +162,7 @@ } $body.on('ratings.return', function(e, data) { - if (data.Response === 'True') { + if (data.results.length>0) { queries = []; // we got a hit, so reset queries if (isDebug) { window.console.debug('success', data); @@ -191,7 +178,11 @@ var description = getMovieDescription(); var year = getReleaseInfo().year; - addQueries(description, year); + var isTV = getIsTV(); + var hasRating = getHasRating(); + if (!hasRating){ + addQueries(description, year, isTV); + } // Observe a specific DOM element if it exists: var $content = $('#appMountPoint'); @@ -204,22 +195,27 @@ window.console.log('Content changed'); } //netflix dom allows diffrent dynamic element trees. check if hover div exists, or splitview (jawbone view) - var $jawBoneDescription = ($('.jawBone').find("div.title").text() != "") ? $('.jawBone').find("div.title").text() : $('div.smallTitleCard.highlighted').attr("aria-label"); - var $jawBoneYear = $('.jawBone').find("span.year").text(); + var $jawBoneDescription = ($('.jawBoneOpenContainer .jawBone').find("div.title").text() != "") ? $('.jawBoneOpenContainer .jawBone').find("div.title").text() : $('div.smallTitleCard.highlighted').attr("aria-label"); + var $jawBoneYear = $('.jawBoneOpenContainer .jawBone').find("span.year").text(); + var $isTV = $('.jawBoneOpenContainer .jawBone').find('.duration').text().includes('Season'); + var $hasRating = $('.jawBoneOpenContainer').find('.meta').find('.imdb-rating').length + var $hoverBoxDescription = $('div.hasBob.smallTitleCard').find("div.bob-title").text(); var $hoverBoxYear = $('div.hasBob.smallTitleCard').find("span.year").text(); - + var $hoverIsTv = $('div.hasBob.smallTitleCard').find('.duration').text().includes('Season'); + var $hoverHasRating = $('div.hasBob.smallTitleCard').find('.meta').find('.imdb-rating').length + //addqueries depending on dom-tree state - if($jawBoneDescription != "" && $jawBoneDescription != null) + if($jawBoneDescription != "" && $jawBoneDescription != null && !$hasRating) { - addQueries($jawBoneDescription, $jawBoneYear); + addQueries($jawBoneDescription, $jawBoneYear, $isTV); } - else if($hoverBoxDescription != "") + else if($hoverBoxDescription != "" && !$hoverHasRating) { - addQueries($hoverBoxDescription, $hoverBoxYear); + addQueries($hoverBoxDescription, $hoverBoxYear, $hoverIsTv); } - + }); } -})(window.jQuery); \ No newline at end of file +})(window.jQuery); diff --git a/manifest.json b/manifest.json index 4bd3538..7ceb27d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,21 +2,21 @@ "author": "Nils Beckmann", "manifest_version": 2, "name": "netflix-ratings", - "version": "0.3.6", + "version": "0.5.9", - "description": "This Extension adds Rotten Tomatoes Critics and User Critics to movies whenever they can be matched.", + "description": "This Extension adds themoviedb.org ratings to movies whenever they can be matched.", "icons": { "48": "icons/logo48.png", "96": "icons/logo96.png" }, - + "permissions": [ "*://www.netflix.com/*", "*://www.netflix.de/*", "*://www.netflix.co.uk/*" ], - + "content_scripts": [ { "run_at": "document_end", @@ -29,9 +29,10 @@ "css": ["flixrate.css"] } ], - + "web_accessible_resources": [ "flixrate.css" - ] + ], + "homepage_url": "https://github.com/nilsbeck/netflix-ratings" -} \ No newline at end of file +}