[plugin.video.thinktv] 3.0.11

12 files changed, 820 insertions, 0 deletions

diff --git a/plugin.video.thinktv/LICENSE.txt b/plugin.video.thinktv/LICENSE.txt
new file mode 100644
index 0000000..4f8e8eb
--- /dev/null
+++ b/plugin.video.thinktv/LICENSE.txt
@@ -0,0 +1,282 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+-------------------------------------------------------------------------
diff --git a/plugin.video.thinktv/README.txt b/plugin.video.thinktv/README.txt
new file mode 100644
index 0000000..b12c853
--- /dev/null
+++ b/plugin.video.thinktv/README.txt
@@ -0,0 +1,17 @@
+plugin.video.thinktv
+================
+
+Kodi Video Addon for PBS ThinkTV
+For Kodi Isengard and above releases
+
+version 3.0.11 website change, use inputstream.adaptive to speed stream selection, needs Krypton or above
+version 3.0.10 quick fix for website change
+version 3.0.9 fix for website change, add episode search
+version 3.0.8 fix for website change
+version 3.0.7 fix for episode, clip and preview counts
+version 3.0.6 fix for API bug when station is empty
+Version 3.0.5 fix for Passport / user id
+Version 3.0.4 fix for 1080, ecnt bug
+Version 3.0.3 cleanup
+Version 3.0.1 separate scraper for future functions
+
diff --git a/plugin.video.thinktv/addon.xml b/plugin.video.thinktv/addon.xml
new file mode 100644
index 0000000..bd73f5d
--- /dev/null
+++ b/plugin.video.thinktv/addon.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="plugin.video.thinktv"
+       name="PBS ThinkTV"
+       version="3.0.11"
+       provider-name="t1m">
+  <requires>
+    <import addon="xbmc.python" version="2.25.0"/>
+    <import addon="script.module.t1mlib" version="1.0.18"/>
+    <import addon="inputstream.adaptive" version="2.0.0"/>
+  </requires>
+  <extension point="xbmc.python.pluginsource"
+            library="default.py">
+        <provides>video</provides>
+  </extension>
+  <extension point="xbmc.addon.metadata">
+    <summary lang="en_GB">PBS ThinkTV</summary>
+    <description lang="en_GB">PBS ThinkTV</description>
+    <disclaimer lang="en_GB">Feel free to use this script. For information visit the wiki.</disclaimer>
+    <platform>all</platform>
+    <language>en</language>
+    <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+    <forum>http://forum.kodi.tv/showthread.php?tid=216810</forum>
+    <website>video.thinktv.org</website>
+    <email></email>
+    <source>https://github.com/learningit/repo-plugins</source>
+  </extension>
+</addon>
diff --git a/plugin.video.thinktv/changelog.txt b/plugin.video.thinktv/changelog.txt
new file mode 100644
index 0000000..ce9e3fe
--- /dev/null
+++ b/plugin.video.thinktv/changelog.txt
@@ -0,0 +1,10 @@
+version 3.0.11 website change, use inputstream.adaptive to speed stream selection, needs Krypton or above
+version 3.0.10 quick fix for website change
+version 3.0.9 fix for website change, add episode search
+version 3.0.8 fix for website change
+version 3.0.7 fix for episode, clip and preview counts
+version 3.0.6 fix for API bug when station is empty
+Version 3.0.5 fix for Passport / user id
+Version 3.0.4 fix for 1080, ecnt bug
+Version 3.0.3 cleanup
+Version 3.0.1 Separate scraper for future functions
\ No newline at end of file
diff --git a/plugin.video.thinktv/default.py b/plugin.video.thinktv/default.py
new file mode 100644
index 0000000..414fdef
--- /dev/null
+++ b/plugin.video.thinktv/default.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# KodiAddon 
+#
+from resources.lib.scraper import myAddon
+import re
+import sys
+
+# Start of Module
+
+addonName = re.search('plugin\://plugin.video.(.+?)/',str(sys.argv[0])).group(1)
+ma = myAddon(addonName)
+ma.processAddonEvent()
+
diff --git a/plugin.video.thinktv/fanart.jpg b/plugin.video.thinktv/fanart.jpg
new file mode 100644
index 0000000..610b9a2
--- /dev/null
+++ b/plugin.video.thinktv/fanart.jpg
diff --git a/plugin.video.thinktv/icon.png b/plugin.video.thinktv/icon.png
new file mode 100644
index 0000000..fa8cc7a
--- /dev/null
+++ b/plugin.video.thinktv/icon.png
diff --git a/plugin.video.thinktv/resources/__init__.py b/plugin.video.thinktv/resources/__init__.py
new file mode 100644
index 0000000..7986681
--- /dev/null
+++ b/plugin.video.thinktv/resources/__init__.py
@@ -0,0 +1 @@
+__author__ = 't1m'
diff --git a/plugin.video.thinktv/resources/language/resource.language.en_gb/strings.po b/plugin.video.thinktv/resources/language/resource.language.en_gb/strings.po
new file mode 100644
index 0000000..fd1964c
--- /dev/null
+++ b/plugin.video.thinktv/resources/language/resource.language.en_gb/strings.po
@@ -0,0 +1,134 @@
+# XBMC Media Center language file
+msgid ""
+msgstr ""
+"Project-Id-Version: XBMC-Addons\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: 2016-03-28 13:35+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+msgctxt "#30000"
+msgid "Video Resolution"
+msgstr ""
+
+msgctxt "#30001"
+msgid "SD"
+msgstr ""
+
+msgctxt "#30002"
+msgid "HD"
+msgstr ""
+
+msgctxt "#30003"
+msgid "1080"
+msgstr ""
+
+msgctxt "#30004"
+msgid "PBS Favorites"
+msgstr ""
+
+msgctxt "#30005"
+msgid "PBS Watchlist"
+msgstr ""
+
+msgctxt "#30006"
+msgid "Remove from PBS Favorites"
+msgstr ""
+
+msgctxt "#30007"
+msgid "Add to PBS Favorites"
+msgstr ""
+
+msgctxt "#30008"
+msgid "Add to PBS Watchlist"
+msgstr ""
+
+msgctxt "#30009"
+msgid "Remove from PBS Watchlist"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Sub-Titles"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Enable Sub-Titles"
+msgstr ""
+
+msgctxt "#30012"
+msgid "Meta Data Cache"
+msgstr ""
+
+msgctxt "#30013"
+msgid "Enable Metadata Cache"
+msgstr ""
+
+msgctxt "#30014"
+msgid "Reset Metadata Cache"
+msgstr ""
+
+msgctxt "#30015"
+msgid "PBS Login"
+msgstr ""
+
+msgctxt "#30016"
+msgid "User Email"
+msgstr ""
+
+msgctxt "#30017"
+msgid "User Password"
+msgstr ""
+
+msgctxt "#30018"
+msgid "Enable Login"
+msgstr ""
+
+msgctxt "#30019"
+msgid "PBS Station"
+msgstr ""
+
+msgctxt "#30040"
+msgid "Metadata"
+msgstr ""
+
+msgctxt "#30041"
+msgid "Initialize Metadata Next Start"
+msgstr ""
+
+msgctxt "#30042"
+msgid "Initializing ...."
+msgstr ""
+
+msgctxt "#30045"
+msgid "Episodes"
+msgstr ""
+
+msgctxt "#30046"
+msgid "Clips"
+msgstr ""
+
+msgctxt "#30047"
+msgid "Previews"
+msgstr ""
+
+msgctxt "#30048"
+msgid "Local PBS Programs"
+msgstr ""
+
+msgctxt "#30049"
+msgid "Video Expired or requires Passport Membership"
+msgstr ""
+
+msgctxt "#30050"
+msgid "Next Page"
+msgstr ""
+
+msgctxt "#30051"
+msgid "PBS Episode Search"
+msgstr ""
diff --git a/plugin.video.thinktv/resources/lib/__init__.py b/plugin.video.thinktv/resources/lib/__init__.py
new file mode 100644
index 0000000..7986681
--- /dev/null
+++ b/plugin.video.thinktv/resources/lib/__init__.py
@@ -0,0 +1 @@
+__author__ = 't1m'
diff --git a/plugin.video.thinktv/resources/lib/scraper.py b/plugin.video.thinktv/resources/lib/scraper.py
new file mode 100644
index 0000000..735f691
--- /dev/null
+++ b/plugin.video.thinktv/resources/lib/scraper.py
@@ -0,0 +1,316 @@
+# -*- coding: utf-8 -*-
+# KodiAddon PBS ThinkTV
+#
+from t1mlib import t1mAddon
+import json
+import re
+import os
+import urllib
+import urllib2
+import cookielib
+import xbmcplugin
+import datetime
+import xbmc
+import xbmcgui
+import HTMLParser
+import sys
+
+h = HTMLParser.HTMLParser()
+UTF8 = 'utf-8'
+showsPerPage = 24 # number of shows returned per page by PBS
+
+class myAddon(t1mAddon):
+
+ def doPBSLogin(self):
+    if self.addon.getSetting('enable_login') != 'true':
+        return
+
+    profile = self.addon.getAddonInfo('profile').decode(UTF8)
+    pdir  = xbmc.translatePath(profile).decode(UTF8)
+    if not os.path.isdir(pdir):
+        os.makedirs(pdir)
+    cjFile = xbmc.translatePath(os.path.join(profile, 'PBSCookies.dat')).decode(UTF8)
+    cj = cookielib.LWPCookieJar()
+    badCookie = True
+    try:
+        cj.load(cjFile)
+    except:
+        cj=[]
+    for cookie in cj:
+        if cookie.name == 'sessionid':
+            badCookie = cookie.is_expired()
+    if self.addon.getSetting('first_run_done') != 'true':
+        badCookie = True
+    if badCookie:
+       cj = cookielib.LWPCookieJar(cjFile)
+       opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
+       urllib2.install_opener(opener)
+       html = self.getRequest('http://www.pbs.org/shows/')
+       clientId = re.compile('id="signInServiceList".+?client_id=(.+?)"', re.DOTALL).search(html).group(1)
+       html = self.getRequest('https://account.pbs.org/oauth2/login/')
+       lcsr, lnext = re.compile("name='csrfmiddlewaretoken'.+?value='(.+?)'.+?"+'name="next".+?value="(.+?)"', re.DOTALL).search(html).groups()
+       username = self.addon.getSetting('login_name')
+       password = self.addon.getSetting('login_pass')
+       if username !='' and password !='':
+           url1  = ('https://account.pbs.org/oauth2/login/')
+           xheaders = self.defaultHeaders.copy()
+           xheaders["Referer"] = "https://account.pbs.org/oauth2/login/"
+           xheaders["Host"] = "account.pbs.org"
+           xheaders["Origin"] = "https://account.pbs.org"
+           xheaders["Connection"] = "keep-alive"
+           xheaders["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"
+           xheaders["Content-Type"] = "application/x-www-form-urlencoded"
+           udata = urllib.urlencode({'csrfmiddlewaretoken' : lcsr, 'next' : lnext, 'email' : username, 'password' : password})
+           html = self.getRequest(url1, udata, xheaders)
+           html = self.getRequest('https://account.pbs.org/oauth2/authorize/?scope=account&redirect_uri=http://www.pbs.org/login/&response_type=code&client_id=%s&confirmed=1' % clientId)
+           for cookie in cj:
+               if cookie.name == 'pbsol.station':
+                   self.addon.setSetting('pbsol', cookie.value)
+               elif cookie.name == 'pbs_uid':
+                   self.addon.setSetting('pbs_uid', cookie.value)
+           self.addon.setSetting('first_run_done', 'true')
+           cj.save()
+    else:
+        opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
+        urllib2.install_opener(opener)
+        return
+
+
+ def getAddonMenu(self,url,ilist):
+    addonLanguage  = self.addon.getLocalizedString
+    self.doPBSLogin()
+    xheaders = self.defaultHeaders.copy()
+    xheaders["Referer"] = "http://www.pbs.org/shows/?genre=All&title=&station=false&alphabetically=true&layout=grid"
+    xheaders["X-Requested-With"] = "XMLHttpRequest"
+    html = self.getRequest('http://www.pbs.org/shows-page/0/?genre=&title=&callsign=&alphabetically=true', None, xheaders)
+    a = json.loads(html)
+    for b in a['genres'][1:]:
+        ilist = self.addMenuItem(b['title'],'GS', ilist, str(b['id'])+'|0', self.addonIcon, self.addonFanart, None, isFolder=True)
+    if self.addon.getSetting('enable_login') == 'true':
+        pbsol = self.addon.getSetting('pbsol')
+        if pbsol != '':
+           xheaders = self.defaultHeaders.copy()
+           xheaders['X-Requested-With'] = 'XMLHttpRequest'
+           html = self.getRequest('http://www.pbs.org/shows-page/0/?genre=&title=&callsign=%s&alphabetically=true' % pbsol, None, xheaders)
+           if len(html) > 0:
+               a = json.loads(html)
+               if len(a['results']['content']) > 0:
+                   ilist = self.addMenuItem(addonLanguage(30048) ,'GS', ilist, 'localpbs' , self.addonIcon, self.addonFanart, None, isFolder=True)
+    html = self.getRequest('http://www.pbs.org/favorite-shows-page/1/')
+    if len(html) > 0:
+        a = json.loads(html)
+        if a['totalResults'] > 0:
+            ilist = self.addMenuItem(addonLanguage(30004),'GS', ilist, 'favorites' , self.addonIcon, self.addonFanart, None, isFolder=True)
+    xheaders = self.defaultHeaders.copy()
+    xheaders['X-Requested-With'] = 'XMLHttpRequest'
+    html = self.getRequest('http://www.pbs.org/watchlist/page/1/', None, xheaders)
+    if len(html) > 0:
+        a = json.loads(html)
+        if a.get('videos') is not None:
+            if len(a['videos']) > 0:
+                ilist = self.addMenuItem(addonLanguage(30005) ,'GM', ilist, 'pbswatchlist' , self.addonIcon, self.addonFanart, None, isFolder=True)
+    ilist = self.addMenuItem(addonLanguage(30051) ,'GS', ilist, 'pbssearch' , self.addonIcon, self.addonFanart, None, isFolder=True)
+    return ilist
+
+
+ def getAddonShows(self,url,ilist):
+    pgNum = ''
+    addonLanguage  = self.addon.getLocalizedString
+    self.doPBSLogin()
+    gsurl = url
+    if gsurl == 'favorites':
+        html = self.getRequest('http://www.pbs.org/favorite-shows-page/1/')
+        a = json.loads(html)
+        cats = a['content']
+    elif gsurl == 'localpbs':
+        xheaders = self.defaultHeaders.copy()
+        xheaders['X-Requested-With'] = 'XMLHttpRequest'
+        pbsol = self.addon.getSetting('pbsol')
+        html = self.getRequest('http://www.pbs.org/shows-page/0/?genre=&title=&callsign=%s&alphabetically=true' % (pbsol), None, xheaders)
+        a = json.loads(html)
+        cats = a['results']['content']
+    elif gsurl == 'pbssearch':
+        keyb = xbmc.Keyboard(self.addon.getSetting('last_search'), addonLanguage(30051))
+        keyb.doModal()
+        if (keyb.isConfirmed()):
+           answer = keyb.getText()
+           if len(answer) == 0: 
+              return (ilist)
+        self.addon.setSetting('last_search', answer)
+        answer = answer.replace(' ','+')
+        xheaders = self.defaultHeaders.copy()
+        xheaders['X-Requested-With'] = 'XMLHttpRequest'
+        html = self.getRequest('http://www.pbs.org/search-videos/?callsign=WNET&page=1&q=%s&rank=relevance' % (answer), None, xheaders)
+        a = json.loads(html)
+        cats = a['results']['articles']
+    else:
+        genreUrl, pgNum = url.split('|',1) 
+        xheaders = self.defaultHeaders.copy()
+        xheaders['X-Requested-With'] = 'XMLHttpRequest'
+        html = self.getRequest('http://www.pbs.org/shows-page/%s/?genre=%s&title=&callsign=&alphabetically=true' % (pgNum, genreUrl), None, xheaders)
+        a = json.loads(html)
+        cats = a['results']['content']
+    for i, (b) in list(enumerate(cats, start=1)):
+        if gsurl == 'pbssearch':
+            url = b['url']
+        else:
+            url = b.get('cid')
+            if url is None:
+                url = b['id']
+        name   = b['title']
+        thumb  = b['image']
+        if thumb == None :
+            thumb = self.addonIcon
+        fanart = b['image']
+        if fanart == None:
+            fanart = self.addonFanart
+        infoList = {}
+        infoList['TVShowTitle'] = name
+        infoList['Title']       = name
+        infoList['Studio'] = b.get('producer')
+        genres = b.get('genre_titles')
+        if genres != [] and genres is not None:
+            infoList['Genre'] = genres[0]
+        infoList['Episode'] = b.get('video_count')
+        infoList['Plot'] = b.get('description')
+        if self.addon.getSetting('enable_login') == 'true':
+            if gsurl == 'favorites':
+                contextMenu = [(addonLanguage(30006),'XBMC.Container.Update(%s?mode=DF&url=RF%s)' % (sys.argv[0], url))]
+            else:
+                contextMenu = [(addonLanguage(30007),'XBMC.RunPlugin(%s?mode=DF&url=AF%s)' % (sys.argv[0], url))]
+        else:
+            contextMenu = None
+        if gsurl == 'pbssearch':
+            infoList['mediatype'] = 'episode'
+            ilist = self.addMenuItem(name,'GV', ilist, url, thumb, fanart, infoList, isFolder=False)
+        else:
+            infoList['mediatype'] = 'tvshow'
+            ilist = self.addMenuItem(name,'GC', ilist, url, thumb, fanart, infoList, isFolder=True, cm=contextMenu)
+    if pgNum != '':
+        ilist = self.addMenuItem('[COLOR blue]%s[/COLOR]' % addonLanguage(30050),'GS', ilist, genreUrl+'|'+str(int(pgNum)+1), self.addonIcon, self.addonFanart, None, isFolder=True)
+    return(ilist)
+
+
+ def getAddonCats(self,url,ilist):
+    addonLanguage  = self.addon.getLocalizedString
+    self.doPBSLogin()
+    thumb = xbmc.getInfoLabel('ListItem.Art(thumb)')
+    fanart = xbmc.getInfoLabel('ListItem.Art(fanart)')
+    infoList = {}
+    infoList['TVShowTitle'] = xbmc.getInfoLabel('ListItem.TVShowTitle')
+    infoList['Title'] = infoList['TVShowTitle']
+    infoList['mediatype'] = 'tvshow'
+    ilist = self.addMenuItem('%s' % (addonLanguage(30045)),'GE', ilist, '%s|%s|1' %(url, 'episodes'), thumb, fanart, infoList, isFolder=True)
+    ilist = self.addMenuItem('%s' % (addonLanguage(30046)),'GE', ilist, '%s|%s|1' %(url, 'clips'), thumb, fanart, infoList, isFolder=True)
+    ilist = self.addMenuItem('%s' % (addonLanguage(30047)),'GE', ilist, '%s|%s|1' %(url, 'previews'), thumb, fanart, infoList, isFolder=True)
+    return(ilist)
+
+
+ def getAddonEpisodes(self,url,ilist):
+    self.doPBSLogin()
+    addonLanguage = self.addon.getLocalizedString
+    url, stype, pageNum = url.split('|',2)
+    sname = url
+    html = self.getRequest('http://www.pbs.org/show/%s/%s/?page=%s' % (url, stype, pageNum))
+#    epis = re.compile('<article class="video-summary">.+?data-srcset="(.+?)".+?alt="(.+?)".+?class="description">(.+?)<.+?data-video-id="(.+?)"',re.DOTALL).findall(html)
+    epis = re.compile('<article class="video-summary">.+?data-srcset="(.+?)".+?alt="(.+?)".+?class="description">(.+?)<.+?data-video-slug="(.+?)"',re.DOTALL).findall(html)
+    if len(epis) == 0:
+#        epis = re.compile('<div class="video-summary">.+?data-srcset="(.+?)".+?alt="(.+?)".+?class="description">(.+?)<.+?data-video-id="(.+?)"',re.DOTALL).findall(html)
+        epis = re.compile('<div class="video-summary">.+?data-srcset="(.+?)".+?alt="(.+?)".+?class="description">(.+?)<.+?data-video-slug="(.+?)"',re.DOTALL).findall(html)
+    for i, (imgs, name, plot, url)  in list(enumerate(epis, start=1)):
+        name = h.unescape(name.decode(UTF8))
+        name = name.replace('Video thumbnail: ','',1)
+        plot=plot.strip()
+        infoList = {}
+        imgs = imgs.split(',')
+        thumb = '%s.jpg' % (imgs[2].split('.jpg',1)[0].strip())
+        fanart = '%s.jpg' % (imgs[len(imgs)-1].split('.jpg',1)[0].strip())
+        infoList['Title'] = name
+        infoList['Plot'] = h.unescape(plot.decode(UTF8))
+        infoList['mediatype'] = 'episode'
+        infoList['TVShowTitle'] = xbmc.getInfoLabel('ListItem.TVShowTitle')
+        if self.addon.getSetting('enable_login') == 'true': 
+            contextMenu = [(addonLanguage(30008),'XBMC.RunPlugin(%s?mode=DF&url=AW%s)' % (sys.argv[0], url))]
+        else:
+            contextMenu = None
+        ilist = self.addMenuItem(name,'GV', ilist, url, thumb, fanart, infoList, isFolder=False, cm=contextMenu)
+        if i >= showsPerPage:
+            ilist = self.addMenuItem('[COLOR blue]%s[/COLOR]' % addonLanguage(30050),'GE', ilist, '%s|%s|%s' %(sname, stype, str(int(pageNum)+1)), self.addonIcon, self.addonFanart, None, isFolder=True)
+    return(ilist)
+
+
+ def getAddonMovies(self,url,ilist):
+    addonLanguage  = self.addon.getLocalizedString
+    xbmcplugin.setContent(int(sys.argv[1]), 'episodes')
+    self.doPBSLogin()
+    xheaders = self.defaultHeaders.copy()
+    xheaders['X-Requested-With'] = 'XMLHttpRequest'
+    html = self.getRequest('http://www.pbs.org/watchlist/page/1/', None, xheaders)
+    a = json.loads(html)
+    epis = a['videos']
+    for i, b  in list(enumerate(epis, start=1)):
+        infoList = {}
+        name = b['title']
+        plot = b['description']
+        duration = b['duration']
+        t = 0
+        for dur in duration.split(':'):
+            if dur.strip().isdigit(): 
+                t = t*60 + int(dur.strip())
+        if t != 0:
+            infoList['duration'] = t
+        thumb = b['image']
+        fanart = b['image']
+        infoList['TVShowTitle'] = b['show']['title']
+        infoList['Title'] = name
+        infoList['Plot'] = plot
+        infoList['mediatype'] = 'episode'
+        url = str(b['id'])
+        contextMenu = [(addonLanguage(30009),'XBMC.Container.Update(%s?mode=DF&url=RW%s)' % (sys.argv[0], url))]
+        ilist = self.addMenuItem(name,'GV', ilist, url, thumb, fanart, infoList, isFolder=False, cm=contextMenu)
+    return(ilist)
+
+ def doFunction(self, url):
+    self.doPBSLogin()
+    func = url[0:2]
+    url  = url[2:]
+    if func == 'AW':
+        html = self.getRequest('http://www.pbs.org/profile/addFavoriteVideo/%s/' % url)
+    elif func == 'AF':
+        html = self.getRequest('http://www.pbs.org/profile/addFavoriteProgram/%s/' % url)
+    elif   func == 'RW':
+        html = self.getRequest('http://www.pbs.org/profile/removeFavoriteVideo/%s/' % url)
+    elif func == 'RF':
+        html = self.getRequest('http://www.pbs.org/profile/removeFavoriteProgram/%s/' % url)
+    try:
+        a = json.loads(html)
+        xbmc.executebuiltin('XBMC.Notification("%s", "%s", %s)' % ( self.addonName, a['errorMessage'] , 4000) )
+    except: pass
+       
+
+ def getAddonVideo(self,url):
+    xheaders = self.defaultHeaders.copy()
+    xheaders['X-Requested-With'] = 'XMLHttpRequest'
+    html = self.getRequest('http://www.pbs.org/video/%s/' % (url), None, xheaders)
+    url = re.compile("id: '(.+?)'", re.DOTALL).search(html).group(1)
+    addonLanguage = self.addon.getLocalizedString
+    pbs_uid = self.addon.getSetting('pbs_uid')
+    pg = self.getRequest('https://player.pbs.org/viralplayer/%s/?uid=%s' % (url, pbs_uid))
+    urls = re.compile("PBS.videoData =.+?recommended_encoding.+?'url'.+?'(.+?)'.+?'closed_captions_url'.+?'(.+?)'", re.DOTALL).search(pg)
+    if urls is not None:
+        url,suburl = urls.groups()
+        pg = self.getRequest('%s?format=json' % url)
+        url = json.loads(pg)['url']
+    else:
+        xbmc.executebuiltin('XBMC.Notification("%s", "%s", %s)' % ( self.addonName, addonLanguage(30049) , 4000) )
+        return
+
+    if 'mp4:' in url:
+        url = 'http://ga.video.cdn.pbs.org/%s' % url.split('mp4:',1)[1]
+    liz = xbmcgui.ListItem(path = url)
+    subfile = self.procConvertSubtitles(suburl)
+    liz.setSubtitles([(subfile)])
+    if ('.m3u8' in url):
+        liz.setProperty('inputstreamaddon','inputstream.adaptive')
+        liz.setProperty('inputstream.adaptive.manifest_type','hls')
+    xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, liz)
diff --git a/plugin.video.thinktv/resources/settings.xml b/plugin.video.thinktv/resources/settings.xml
new file mode 100644
index 0000000..6950b6f
--- /dev/null
+++ b/plugin.video.thinktv/resources/settings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+
+	<category label="30015">
+		<setting type="sep" />
+		<setting id="enable_login" type ="bool" label="30018" default="false"/>
+  	     <setting id="login_name" type="text" label="30016" enable="!eq(-1,false)" default=""/>
+	     <setting id="login_pass" type="text" label="30017" enable="!eq(-1,)" option="hidden" default=""/>
+	     <setting id="pbsol" type="text" label="30019" enable="false" default=""/>
+		<setting type="sep" />
+	</category>
+
+	<category label="30000">
+		<setting type="sep" />
+     		<setting id="vid_res" type="enum" label="30000" lvalues="30001|30002|30003" default="2" />
+		<setting type="sep" />
+	</category>
+
+</settings>