Skip to content

Commit

Permalink
1.1.7
Browse files Browse the repository at this point in the history
- merged pull request from 'kharts' with important fixes to get the
addon up again :)
- using amazon website with ssl by default
  • Loading branch information
flo-ku committed Sep 18, 2015
1 parent 05f1a84 commit d2024fb
Show file tree
Hide file tree
Showing 8 changed files with 117 additions and 7 deletions.
2 changes: 1 addition & 1 deletion addons.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addons>
<addon id="plugin.video.prime_instant" name="Amazon Prime Instant Video" version="1.1.6" provider-name="XLordKX">
<addon id="plugin.video.prime_instant" name="Amazon Prime Instant Video" version="1.1.7" provider-name="XLordKX">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.mechanize" version="0.2.6"/>
Expand Down
2 changes: 1 addition & 1 deletion addons.xml.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5e0580c58add19e2f016b9b2b454bb3e
7ea2473c4f81743f409e65e87fac5933
2 changes: 1 addition & 1 deletion plugin.video.prime_instant/addon.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="plugin.video.prime_instant" name="Amazon Prime Instant Video" version="1.1.6" provider-name="XLordKX">
<addon id="plugin.video.prime_instant" name="Amazon Prime Instant Video" version="1.1.7" provider-name="XLordKX">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.mechanize" version="0.2.6"/>
Expand Down
3 changes: 3 additions & 0 deletions plugin.video.prime_instant/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
1.1.7
- merged pull request from 'kharts' with important fixes to get the addon up again :)
- using amazon website with ssl by default
1.1.6
- deviceTypeId changed (thx to Sandmann79)
1.1.5
Expand Down
9 changes: 5 additions & 4 deletions plugin.video.prime_instant/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ def translation(id):
viewIdSeasons = addon.getSetting("viewIdSeasons")
viewIdEpisodes = addon.getSetting("viewIdEpisodes")
viewIdDetails = addon.getSetting("viewIdDetails")
urlMain = "http://www.amazon."+siteVersion
urlMainS = "https://www.amazon."+siteVersion
urlMain = urlMainS
#urlMain = "http://www.amazon."+siteVersion
addon.setSetting('email', '')
addon.setSetting('password', '')
#deviceTypeID = "A324MFXUEZFF7B"
Expand Down Expand Up @@ -1004,7 +1005,7 @@ def deleteCache():
shutil.rmtree(cacheFolder)

def getUnicodePage(url):

print url
req = opener.open(url)
content = ""
if "content-type" in req.headers and "charset=" in req.headers['content-type']:
Expand Down Expand Up @@ -1084,7 +1085,7 @@ def removeFromQueue(videoID, videoType):

def login(content = None, statusOnly = False):
if content is None:
content = getUnicodePage(urlMain)
content = getUnicodePage(urlMainS)
signoutmatch = re.compile("declare\('config.signOutText',(.+?)\);", re.DOTALL).findall(content)
if '","isPrime":1' in content: #
return "prime"
Expand Down Expand Up @@ -1116,7 +1117,7 @@ def login(content = None, statusOnly = False):
content = br.submit().read()
cj.save(cookieFile)
cj.load(cookieFile)
content = getUnicodePage(urlMain)
content = getUnicodePage(urlMainS)
signoutmatch = re.compile("declare\('config.signOutText',(.+?)\);", re.DOTALL).findall(content)
if '","isPrime":1' in content: #
return "prime"
Expand Down
103 changes: 103 additions & 0 deletions zip/plugin.video.prime_instant/changelog-1.1.7.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
1.1.7
- merged pull request from 'kharts' with important fixes to get the addon up again :)
- using amazon website with ssl by default
1.1.6
- deviceTypeId changed (thx to Sandmann79)
1.1.5
- fixed video library
- PrimeProxy removed
1.1.4
- fixed episode list
1.1.3
- missing .0 in addon.xml
1.1.2
- switched to unicode as default
- get titles for videos from other source (avoids problems with umlauts)
- maaaaaany unicode fixes
- prepared for experimental use of PrimeProxy addon
- install primeproxy addon from xlordkx repository
- make sure local ports 55910 and 55950 are useable
- in prime_instant addon activate "Use PrimeProxy"
----- PrimeProxy is highly experimental -----
use at your own risk
1.0.22
- fixed episode list in amazon originals not showing any episodes (by the6day)
1.0.21
- Streaming URL modified, will no longer use predefined hosts
1.0.20
- opening tv shows with watchlist will show all seasons (owned episodes will
become accessible)
1.0.19
- accidentally deactivated debugging output from plugin
1.0.18
- if option for pooling seasons is activated, every tv show in watchlist
shows at least one season (by loomes)

! Important note for US and UK users !
--------------------------------------------------------------------------------
I can't test this addon with US and UK accounts. Neither do I have a membership
for amazon.com nor for amazon.co.uk. Even if I would have one, geoblocking will
deny any access to the video content. It is very important for me to get log
files from kodi with activated debugging. If you are using prime instant video
in US or UK and get any errors or problems while using this addon, please tell
me and please do not forget your kodi.log! :)

1.0.17
- cleaned up code for watchlist (again...)
- added settings for watchlist tv shows:
-- pool tv show seasons or show each season
-- added order by 'recently added' or by 'title a-z'
- default.py, settings.xml, strings.xml (german, english) modified
--- please do _not_ just replace your default.py ---
1.0.16
- changed function 'debug' to log to kodi
1.0.15
- merged parseWatchListOld and parseWatchListNew (by mcflay)
- watchlist shows purchased episodes (by mcflay) (*untested*)
- changed url for recently added tv shows
- fixed script error on 'Currently on TV'
- removed cleanTitle function call in showInfo for genre (by trkodi1)
- using HTMLParser.unescape in function cleanInput,
previous code did not work properly
1.0.14
- fixed another python unicode/str problem in category 'genre' (german umlauts)
- password is now masked in keyboard at login
1.0.12
- fixed watchlist shows one season for each tvshow only
1.0.11
- fixed special characters not display properly
1.0.10
- fixed tvshow watchlist (season was treated like a movie,
now opens episode list for 'watchlisted' season
1.0.9
- added language selection for movie/tv show with multiple audio tracks
- added addon settings option for language dialog (ask or default)
- default.py, settings.xml, strings.xml (german, english) modified
--- please do _not_ just replace your default.py ---
1.0.8
- Fixed TVShows Watchlist (by trkodi1)
- Fixed ShowDetails (by trkodi1)
1.0.7
- fixed typo, sorry :(
1.0.6
- removed all rtmp-streaming
- http streaming should work for US and UK now (untested!)
1.0.5
- amazon urls with dollar-sign fixed (thanks to luggi from kodinerds.de)
1.0.4
- merged seplog's changes
1.0.3-alpha4
- Added menu entry "Only for limited time available at Prime Instant Video"
(only available for users of Amazon Germany)
1.0.3-alpha1
- Forked from AddonScriptorDE Repository
- Bug fixes
- Added translations for some dialogs
1.0.2
- Added debug output
- Fixed folder encoding issue
- Some small improvements
1.0.1
- Changed login (email and password are not stored anymore)
1.0.0
- Initial release
3 changes: 3 additions & 0 deletions zip/plugin.video.prime_instant/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
1.1.7
- merged pull request from 'kharts' with important fixes to get the addon up again :)
- using amazon website with ssl by default
1.1.6
- deviceTypeId changed (thx to Sandmann79)
1.1.5
Expand Down
Binary file not shown.

0 comments on commit d2024fb

Please sign in to comment.