Updates to WSOnline, and new addon module script.module.pycliper a clipboard python module.

Author: moedje

addons.xml

@@ -210,7 +210,7 @@ REQUIRED [B]Script.Module.URLResolver, Simple.Downloader, YouTubeDL, and KODIswi
   </extension>
 </addon>
 
-<addon id="plugin.video.wsonline" name="WatchSeries-Online" version="1.5.1" provider-name="moedje">
+<addon id="plugin.video.wsonline" name="WatchSeries-Online" version="1.6.0" provider-name="moedje">
     <requires>
         <import addon="xbmc.python" version="2.24.0"/>
         <import addon="script.module.requests" optional="false"/>
@@ -227,7 +227,7 @@ REQUIRED [B]Script.Module.URLResolver, Simple.Downloader, YouTubeDL, and KODIswi
         <summary>Watchseries-online TV Plugin</summary>
         <description>Get the latest TV episodes on Watchseries-Online(.pl/.nl/.la...) and search for a series, list all online
             episodes in that series, and play them from Openload.Co or VODlocker
-            [B]V1.5 2017-2-20:[/B] Parsers have been added to attempt to grab details out of the name of the show such as the date, episode number and season. Formats the listings to be standard for easy sorting and reading through including color to make date stand out. V1.2.0 2018-02-14: New playback and video file resolving fixing many bugs. Source Sorting and fave sources can be set in settings. Updated to new watchseries-online host which is currently .PL and added this as a setting that can be changed in the addon so I don't have to release an update each time they move servers.
+            [B]V1.6.0 2017-4-5:[/B] Minor fixes/changes to make Save Show and Remove show work better. Make Search Show work as currently doesn't. V1.5 2017-2-20: Parsers have been added to attempt to grab details out of the name of the show such as the date, episode number and season. Formats the listings to be standard for easy sorting and reading through including color to make date stand out. V1.2.0 2018-02-14: New playback and video file resolving fixing many bugs. Source Sorting and fave sources can be set in settings. Updated to new watchseries-online host which is currently .PL and added this as a setting that can be changed in the addon so I don't have to release an update each time they move servers.
         </description>
     </extension>
 </addon>
@@ -245,4 +245,22 @@ REQUIRED [B]Script.Module.URLResolver, Simple.Downloader, YouTubeDL, and KODIswi
                 <platform>all</platform>
         </extension>
 </addon>
+
+<addon id="script.module.pyperclip"
+       name="pyperclip"
+       version="1.5.27"
+       provider-name="moedje">
+  <requires>
+    <import addon="xbmc.python" version="2.1.0"/>
+  </requires>
+  <extension point="xbmc.python.module" library="lib"/>
+  <extension point="xbmc.addon.metadata">
+    <summary>Clipboard Python Module</summary>
+    <description>Cross Platform Python Module for interacting with the clipboard from https://github.com/asweigart/pyperclip Packaged as a module to allow XBMC / Kodi to interact with the clipboard.</description>
+    <platform>all</platform>
+    <license>Simplified BSD</license>
+    <source>https://github.com/asweigart/pyperclip.git</source>
+    <website>https://pypi.python.org/pypi/pyperclip</website>
+  </extension>
+</addon>
 </addons>

addons.xml.md5

@@ -1 +1 @@
-21a6af922d8d1f3453a8fd948baf9616
+06bbb77cf9313768333596550e57ecf7

plugin.video.wsonline/addon.py

@@ -26,10 +26,13 @@ def index():
     itemsaved = {'label': 'Saved Shows', 'path': plugin.url_for(saved), 'icon': 'DefaultFolder.png', 'thumbnail': 'DefaultFolder.png'}
     itemplay = {'label': 'Resolve URL and Play (URLresolver required)', 'path': plugin.url_for(playurl), 'icon': 'DefaultFolder.png', 'thumbnail': 'DefaultFolder.png'}
     itemlatest = {'label': 'Last 350 Episodes', 'icon': 'DefaultFolder.png', 'thumbnail': 'DefaultFolder.png', 'path': plugin.url_for(latest)}
-    itemsearch = {'label': 'Search', 'icon': __imgsearch__, 'thumbnail': __imgsearch__, 'path': plugin.url_for(search)}
+    itemsearch = {'label': 'Search', 'icon': __imgsearch__, 'thumbnail': __imgsearch__, 'path': plugin.url_for(search, paste=False)}
+    itemsearchpasted = {'label': 'Search (Paste Clipboard)', 'icon': __imgsearch__, 'thumbnail': __imgsearch__, 'path': plugin.url_for(search, paste=True)}
+
     litems.append(itemlatest)
-    litems.append(itemsearch)
     litems.append(itemsaved)
+    litems.append(itemsearch)
+    litems.append(itemsearchpasted)
     litems.append(itemplay)
     return litems
 
@@ -50,6 +53,8 @@ def loadsaved():
             return []
         for item in sitems:
             li = ListItem.from_dict(**item)
+            li.add_context_menu_items(
+                [('Remove Saved Show', 'RunPlugin("{0}")'.format(plugin.url_for(removeshow, name=li.label, link=li.label2)),)])
             litems.append(li)
     except:
         pass
@@ -116,6 +121,24 @@ def saveshow(name='', link=''):
         plugin.notify(msg="ERROR save failed for {0}".format(name), title=link)
 
 
+@plugin.route('/saveshowfromepisode/<name>/<link>')
+def saveshowfromepisode(name='', link=''):
+    '''
+    Loads the episode page and searches html for the category for the entire show not this specific episode to then save the show using the same show function used when we alreaedy know the category.
+    <span class="info-category"><a href="https://watchseries-online.pl/category/late-night-with-seth-meyers" rel="category tag">Late Night with Seth Meyers</a></span>
+    '''
+    html = DL(link)
+    matches = re.compile(ur'span class="info-category">.+?href="(http.+?[^"])".+?>(.+?[^<])</a>', re.DOTALL+re.S+re.U).findall(html)
+    litems = []
+    categorylink = ''
+    showname = ''
+    if matches is not None:
+        for showlink, catname in matches:
+            categorylink = showlink
+            showname = catname
+        saveshow(name=showname, link=categorylink)
+
+
 @plugin.route('/removeshow/<name>/<link>')
 def removeshow(name='', link=''):
     sitems = []
@@ -244,7 +267,10 @@ def episode_makeitem(episodename, episodelink):
         item.setdefault(item.keys()[0])
         li = ListItem.from_dict(**item)
         li.set_info(type='video', info_labels=infolbl)
-        li.add_context_menu_items([('Search [B]{0}[/B]'.format(eptitle), 'RunPlugin({0})'.format(plugin.url_for(query, searchquery=eptitle)),)])
+        ctxitems = [('Search [B]{0}[/B]'.format(eptitle), 'RunPlugin({0})'.format(plugin.url_for(queryshow, searchquery=eptitle)),)]
+        ctxitems.append([('Save Show', 'RunPlugin("{0}")'.format(plugin.url_for(saveshowfromepisode, name=li.label, link=episodelink)),)])
+        ctxitems.append(li.get_context_menu_items())
+        li.add_context_menu_items(items=ctxitems, replace_items=True)
     except:
         li = ListItem(label=episodename, label2=episodelink, icon=img, thumbnail=img, path=spath)
     return li
@@ -263,25 +289,45 @@ def latest():
     return litems
 
 
-@plugin.route('/search')
-def search():
+
+@plugin.route('/search/<paste>')
+def search(paste=False):
     searchtxt = ''
-    searchtxt = plugin.get_setting('lastsearch')
+    if paste:
+        try:
+            import pycliper
+            searchtxt = pycliper.clipboard.paste()
+        except:
+            searchtxt = ''
+    else:
+        searchtxt = plugin.get_setting('lastsearch')
     searchtxt = plugin.keyboard(searchtxt, 'Search All Sites', False)
     searchquery = searchtxt.replace(' ', '+')
     plugin.set_setting(key='lastsearch', val=searchtxt)
-    return query(searchquery)
+    query(searchquery)
+
+
+@plugin.route('/queryshow/<searchquery>')
+def queryshow(searchquery):
+    #plugin.add_items(items=query(searchquery))
+    plugin.clear_added_items()
+    resitems = query(searchquery)
+    return plugin.finish(items=resitems, succeeded=True, update_listing=True)
 
 
 @plugin.route('/query/<searchquery>')
 def query(searchquery):
+    searchquery = searchquery.replace(' ', '+')
     urlsearch = __BASEURL__ + '/?s={0}&search='.format(searchquery)
     html = DL(urlsearch)
     htmlres = html.partition('<div class="ddmcc">')[2].split('</div>',1)[0]
     matches = re.compile(ur'href="(http.+watchseries-online.+/category.+?[^"])".+?[^>]>(.+?[^<])<.a>', re.DOTALL + re.S + re.U).findall(htmlres)
     litems = []
     for slink, sname in matches:
         litems.append(makecatitem(sname, slink))
+    #plugin.add_items(litems)
+    plugin.notify(msg="Search {0}".format(urlsearch), title="Found: {0} {1}".format(str(len(litems)), searchquery))
+    #plugin.ad(litems, update_listing=True)
     return litems
 
 

plugin.video.wsonline/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.wsonline" name="WatchSeries-Online" version="1.5.1" provider-name="moedje">
+<addon id="plugin.video.wsonline" name="WatchSeries-Online" version="1.6.0" provider-name="moedje">
     <requires>
         <import addon="xbmc.python" version="2.24.0"/>
         <import addon="script.module.requests" optional="false"/>
@@ -16,7 +16,7 @@
         <summary>Watchseries-online TV Plugin</summary>
         <description>Get the latest TV episodes on Watchseries-Online(.pl/.nl/.la...) and search for a series, list all online
             episodes in that series, and play them from Openload.Co or VODlocker
-            [B]V1.5 2017-2-20:[/B] Parsers have been added to attempt to grab details out of the name of the show such as the date, episode number and season. Formats the listings to be standard for easy sorting and reading through including color to make date stand out. V1.2.0 2018-02-14: New playback and video file resolving fixing many bugs. Source Sorting and fave sources can be set in settings. Updated to new watchseries-online host which is currently .PL and added this as a setting that can be changed in the addon so I don't have to release an update each time they move servers.
+            [B]V1.6.0 2017-4-5:[/B] Minor fixes/changes to make Save Show and Remove show work better. Make Search Show work as currently doesn't. V1.5 2017-2-20: Parsers have been added to attempt to grab details out of the name of the show such as the date, episode number and season. Formats the listings to be standard for easy sorting and reading through including color to make date stand out. V1.2.0 2018-02-14: New playback and video file resolving fixing many bugs. Source Sorting and fave sources can be set in settings. Updated to new watchseries-online host which is currently .PL and added this as a setting that can be changed in the addon so I don't have to release an update each time they move servers.
         </description>
     </extension>
 </addon>

plugin.video.wsonline/changelog-1.6.0.txt

@@ -0,0 +1,18 @@
+V 1.6.0 (2017-04-05)
+- Bug Fixes to Save Show/Remove Show
+- Search Show Fixes
+- Save Show Adding to Main Episode List
+
+V 1.5.0 (2017-02-20)
+- Added parser to get details from the linked show
+- Added formatter to label the show name with color for details parser has found
+- Parser tries to find a date in a few formats and Season and Episode Number.
+
+V 1.2.0 (2017-02-15)
+- Added setting for favourite file sources
+- Uses sources in settings to sort them to top of list
+- Fixed problem with url request getting access denied from new .PL server by using REQUESTS module
+
+V 1.1.0 (2017-02-14)
+- Hostname changed to watchseries-online.pl
+- Added setting for addon to specify the current hostname

plugin.video.wsonline/changelog.txt

@@ -1,3 +1,8 @@
+V 1.6.0 (2017-04-05)
+- Bug Fixes to Save Show/Remove Show
+- Search Show Fixes
+- Save Show Adding to Main Episode List
+
 V 1.5.0 (2017-02-20)
 - Added parser to get details from the linked show
 - Added formatter to label the show name with color for details parser has found

plugin.video.wsonline/plugin.video.wsonline-1.5.1.zip renamed to plugin.video.wsonline/plugin.video.wsonline-1.6.0.zip

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="script.module.pyperclip"
+       name="pyperclip"
+       version="1.5.27"
+       provider-name="moedje">
+  <requires>
+    <import addon="xbmc.python" version="2.1.0"/>
+  </requires>
+  <extension point="xbmc.python.module" library="lib"/>
+  <extension point="xbmc.addon.metadata">
+    <summary>Clipboard Python Module</summary>
+    <description>Cross Platform Python Module for interacting with the clipboard from https://github.com/asweigart/pyperclip Packaged as a module to allow XBMC / Kodi to interact with the clipboard.</description>
+    <platform>all</platform>
+    <license>Simplified BSD</license>
+    <source>https://github.com/asweigart/pyperclip.git</source>
+    <website>https://pypi.python.org/pypi/pyperclip</website>
+  </extension>
+</addon>