Skip to content

Commit

Permalink
remove WATC support
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco Porsch committed May 1, 2014
1 parent 8fef8cb commit 67aee4f
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 270 deletions.
22 changes: 10 additions & 12 deletions AUTHORS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,23 @@ although it is currently based on the [IMDB client for iOS][1]
## BACKENDS ##

* [The Movie Database][3]
* [What's After The Credits][4]
* [Google Movies][5]
* [Google Movies][4]

## ART AND GRAPHICS ##

* [Clapperboard icon][6]
* The launcher icon was initially generated using the [Harmattan Icon Generator][7],
* [Clapperboard icon][5]
* The launcher icon was initially generated using the [Harmattan Icon Generator][6],
by Javier De San Pedro Martin.
* Launcher icons are currently created using the [Nokia Icon Toolkit][8], as instructed
in [Launcher icon templates for Nokia N9][9]
* Launcher icons are currently created using the [Nokia Icon Toolkit][7], as instructed
in [Launcher icon templates for Nokia N9][8]
* The placeholders for person and movie view have been contributed by
Tuomas Siipola.

[1]: http://itunes.apple.com/us/app/imdb-movies-tv/id342792525?mt=8
[2]: https://www.transifex.net/projects/p/butaca/
[3]: http://www.themoviedb.org
[4]: http://aftercredits.com
[5]: http://www.google.com/movies
[6]: http://commons.wikimedia.org/wiki/File:Clap_cinema.svg
[7]: http://depot.javispedro.com/nit/hicg/
[8]: http://www.developer.nokia.com/Resources/Library/Design_and_UX/designing-for-nokia-platforms/Nokia%20Icon%20Toolkit.zip
[9]: http://www.developer.nokia.com/Resources/Library/Design_and_UX/designing-for-nokia-platforms/designing-for-meego-12-harmattan/meego-launcher-icon-templates.html
[4]: http://www.google.com/movies
[5]: http://commons.wikimedia.org/wiki/File:Clap_cinema.svg
[6]: http://depot.javispedro.com/nit/hicg/
[7]: http://www.developer.nokia.com/Resources/Library/Design_and_UX/designing-for-nokia-platforms/Nokia%20Icon%20Toolkit.zip
[8]: http://www.developer.nokia.com/Resources/Library/Design_and_UX/designing-for-nokia-platforms/designing-for-meego-12-harmattan/meego-launcher-icon-templates.html
49 changes: 22 additions & 27 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,65 +7,60 @@ system running on the [Nokia N9][1]. You can use it to:

* Get all details about a movies: release date, overview, cast & crew, trailer...
* Get all details about a celebrity: birth details, biography, filmography...
* Check whether a movie has extra content during or after the credits
* Check showtimes -when available- for cinemas around you

## Get Butaca ##

Download Butaca at the [Nokia Store][10]
Download Butaca at the [Nokia Store][9]

## How does it work? ##

Butaca uses different data sources to present its content. It gets the
information about movies and celebrities from [The Movie Database][2], an open
movie database where everybody can collaborate. It shows movie showtimes -when
available- using results from [Google Showtimes][3]. And it checks if a movie
has extra content after or during the credits (also known as "stinger") using
[What's After The Credits?][4], a website which provides that kind of
information for movies, games and other media.
available- using results from [Google Showtimes][3].

## Bugs & Feedback ##

I -[Simón Pena][5]- develop Butaca on my free time. I am writing it hoping
I -[Simón Pena][4]- develop Butaca on my free time. I am writing it hoping
that you enjoy it and find it useful, but there could be bugs or things you would
expect to work in a different way. If you find issues or have ideas to improve
this application, don't hesitate to create an entry in the [bug tracker][6].
this application, don't hesitate to create an entry in the [bug tracker][5].

## Contribute! ##

Butaca is free software, licensed under the [GPL 3.0][8] license, which means
Butaca is free software, licensed under the [GPL 3.0][7] license, which means
there are several ways you can contribute to it:

* [Fork the project][7], modify the sources, and send merge requests with patches
* [Translate Butaca][9] to your language
* File bugs or write feature requests in the [bug tracker][6]
* [Fork the project][6], modify the sources, and send merge requests with patches
* [Translate Butaca][8] to your language
* File bugs or write feature requests in the [bug tracker][5]
* Spread the word, and recommend it to your friends
* Rate us on the [Nokia Store][10]
* Rate us on the [Nokia Store][9]

## Awards ##

Butaca is a proud member of the [Qt Ambassador Program][11]
Butaca is a proud member of the [Qt Ambassador Program][10]

## Known Issues ##

* Butaca uses mainly `qsTrId` for translations. As reported in [QTBUG-17327][12],
* Butaca uses mainly `qsTrId` for translations. As reported in [QTBUG-17327][11],
in `Qt 4.7.1` `lupdate` won't extract engineering translations when `//%` is used.
Newer versions work fine.
* There are a couple of `ListModels` translated manually using `Component.onCompleted`,
since as reported in [QTBUG-11403][13] and [QTBUG-16289][14], `qsTrId` cannot be
since as reported in [QTBUG-11403][12] and [QTBUG-16289][13], `qsTrId` cannot be
used inside `ListElement`

[1]: http://swipe.nokia.com/ "Nokia N9"
[2]: http://www.themoviedb.org/ "The open movie database"
[3]: http://google.com/movies "Google Movie Showtimes"
[4]: http://aftercredits.com/ "What's After The Credits?"
[5]: https://twitter.com/spenap "Simón Pena"
[6]: https://github.com/spenap/butaca/issues "Bug Tracker"
[7]: https://github.com/spenap/butaca "Butaca on GitHub"
[8]: http://www.gnu.org/licenses/gpl.html "GPL License"
[9]: https://www.transifex.net/projects/p/butaca/ "Butaca: cinema information localization"
[10]: http://store.nokia.com/content/195876 "Butaca at the Nokia Store"
[11]: http://qt.nokia.com/qt-in-use/ambassadors/project?id=a0F20000006N9pVEAS "Butaca"
[12]: https://bugreports.qt-project.org/browse/QTBUG-17327
[13]: https://bugreports.qt-project.org/browse/QTBUG-11403
[14]: https://bugreports.qt-project.org/browse/QTBUG-16289
[4]: https://twitter.com/spenap "Simón Pena"
[5]: https://github.com/spenap/butaca/issues "Bug Tracker"
[6]: https://github.com/spenap/butaca "Butaca on GitHub"
[7]: http://www.gnu.org/licenses/gpl.html "GPL License"
[8]: https://www.transifex.net/projects/p/butaca/ "Butaca: cinema information localization"
[9]: http://store.nokia.com/content/195876 "Butaca at the Nokia Store"
[10]: http://qt.nokia.com/qt-in-use/ambassadors/project?id=a0F20000006N9pVEAS "Butaca"
[11]: https://bugreports.qt-project.org/browse/QTBUG-17327
[12]: https://bugreports.qt-project.org/browse/QTBUG-11403
[13]: https://bugreports.qt-project.org/browse/QTBUG-16289
16 changes: 0 additions & 16 deletions src/qml/AboutView.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,22 +233,6 @@ Page {
onLinkActivated: Qt.openUrlExternally(link)
}

Label {
id: aboutACDisclaimer
//: Disclaimer about After Credits API usage
text: styleSheets + qsTr('This product uses <a href="http://aftercredits.com/">' +
'What\'s After The Credits?</a> API but is not ' +
'endorsed or certified by them.')
width: parent.width
horizontalAlignment: Text.AlignJustify
platformStyle: LabelStyle {
fontPixelSize: UIConstants.FONT_LSMALL
fontFamily: UIConstants.FONT_FAMILY_LIGHT
}
color: UIConstants.COLOR_SECONDARY_FOREGROUND
onLinkActivated: Qt.openUrlExternally(link)
}

Label {
id: aboutShowtimesDisclaimer
//: Disclaimer about Google Showtimes usage
Expand Down
72 changes: 0 additions & 72 deletions src/qml/MovieView.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import QtQuick 1.1
import com.nokia.meego 1.1
import 'butacautils.js' as Util
import 'aftercredits.js'as WATC
import 'moviedbwrapper.js' as TMDB
import 'constants.js' as UIConstants
import 'storage.js' as Storage
Expand Down Expand Up @@ -80,12 +79,6 @@ Page {
visible: parsedMovie.homepage
onClicked: Qt.openUrlExternally(parsedMovie.homepage)
}
MenuItem {
//: This opens a website displaying movie's extras after or during credits
text: qsTr('View extras')
visible: parsedMovie.extrasUrl
onClicked: Qt.openUrlExternally(parsedMovie.extrasUrl)
}
MenuItem {
//: This visits the Internet Movie Database page of this content (movie or person)
text: qsTr('View in IMDb')
Expand All @@ -104,7 +97,6 @@ Page {
property alias imdbId: parsedMovie.imdbId
property bool loading: false
property bool loadingExtended: false
property bool loadingExtras: false
property bool inWatchlist: tmdbId ? Storage.inWatchlist({ 'id': tmdbId }) : false

QtObject {
Expand All @@ -131,11 +123,6 @@ Page {
property int runtime: 0
property string certification: '-'
property string homepage: ''
property string extras:
//: This indicates that no extra content after or during the credits was found
qsTr('Not found')
property string extrasUrl: ''
property bool extrasFetched: false
// also available: belongs_to_collection, spoken_languages, status

// parses TMDBObject
Expand Down Expand Up @@ -202,9 +189,6 @@ Page {

Util.populateModelFromArray(crew, creditsModel)
Util.populateModelFromArray(cast, creditsModel)

if (!loadingExtras && !parsedMovie.extrasFetched)
fetchExtras()
}
}

Expand Down Expand Up @@ -239,9 +223,6 @@ Page {
'alternative_titles,credits,images,trailers,releases',
{ app_locale: appLocale }),
Util.FETCH_RESPONSE_TMDB_MOVIE)

if (imdbId && parsedMovie.originalName)
fetchExtras()
}

// Several ListModels are used.
Expand Down Expand Up @@ -641,40 +622,6 @@ Page {
}
}

Column {
id: movieExtrasSection
width: parent.width

MyEntryHeader {
width: parent.width
//: Label acting as the header for the extra information after / during credits
text: qsTr('Extras after or during credits?')

BusyIndicator {
visible: running
running: loadingExtras
anchors {
right: parent.right
rightMargin: UIConstants.DEFAULT_MARGIN
verticalCenter: parent.verticalCenter
}
platformStyle: BusyIndicatorStyle {
size: 'small'
}
}
}

Label {
width: parent.width
platformStyle: LabelStyle {
fontPixelSize: UIConstants.FONT_LSMALL
fontFamily: UIConstants.FONT_FAMILY_LIGHT
}
text: parsedMovie.extras
visible: !loadingExtras
}
}

MyModelPreviewer {
width: parent.width
previewedModel: castModel
Expand Down Expand Up @@ -754,15 +701,6 @@ Page {
handleMessage)
}

function fetchExtras() {
loadingExtras = true
Util.asyncQuery({
url: WATC.movie_extras(parsedMovie.originalName),
response_action: Util.FETCH_RESPONSE_WATC
},
handleMessage)
}

function handleMessage(messageObject) {
var objectArray = JSON.parse(messageObject.response)
if (objectArray.errors !== undefined) {
Expand All @@ -776,16 +714,6 @@ Page {
loading = loadingExtended = false
break

case Util.FETCH_RESPONSE_WATC:
parsedMovie.extrasFetched = true
var watcMovie = WATC.parseACResponse(objectArray, parsedMovie.imdbId)
if (watcMovie) {
parsedMovie.extras = watcMovie.subtitle
parsedMovie.extrasUrl = watcMovie.url
}
loadingExtras = false
break

default:
console.debug('Unknown action response: ', messageObject.action)
break
Expand Down
Loading

0 comments on commit 67aee4f

Please sign in to comment.