Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3580 commits 11 branches 455 tags 38 MiB
Commit graph

356 commits

Author SHA1 Message Date
tomkat83
044f1a5550 Don't import read_embyserver 2016-09-02 17:32:03 +02:00
tomkat83
bb96dda1d4 Merge conflicts librarysync.py 2016-09-01 19:07:28 +02:00
tomkat83
8119acfa52 Revert "New setting to lower #PMS items to cache" 
This reverts commit d039840c80.
 2016-08-18 16:54:41 +02:00
tomkat83
d039840c80 New setting to lower #PMS items to cache 
- Should fix #91
 2016-08-16 18:17:11 +02:00
croneter
445b97a2ac Merge pull request #81 from milaq/fullsyncmessage 
sync: dont force show "full library sync finished"
 2016-08-11 22:29:03 +02:00
tomkat83
a2693b3485 Optimize player and playlist instances 2016-08-07 15:33:36 +02:00
milaq
ca1a101975 sync: dont force show "full library sync finished" 
if the user deselects "show library sync progress" positive sync messages shouldnt be shown at all
 2016-08-01 16:26:26 +02:00
tomkat83
eff7d7b68b Use 1 PKC xbmc.player instance 2016-07-23 18:06:47 +02:00
tomkat83
8a2fdec248 Don't let PMS crash: download one item at a time 
- PMS can currently not handle concurrent connections asking for
metadata (several PKC threads)
- Might also fix #75
 2016-07-17 13:57:50 +02:00
tomkat83
fcf6948735 Improvements to resume points 
- Plex sometimes tells time in milliseconds instead of seconds
- Fixes #49
 2016-06-05 18:39:26 +02:00
tomkat83
7402d076b0 Revert "Fix PKC resume points set way too high" 
This reverts commit e9f7c49587.
 2016-06-05 17:57:30 +02:00
tomkat83
5d8b423bd6 Groundworks for Plex photos 2016-06-04 18:48:22 +02:00
tomkat83
e9f7c49587 Fix PKC resume points set way too high 
- Fixes #49
 2016-06-04 16:04:25 +02:00
tomkat83
9901935b83 Background sync: don't try to process infinitely 2016-05-31 19:30:12 +02:00
tomkat83
a92146abc2 Remove emby references 2016-05-31 08:06:42 +02:00
tomkat83
42f24e1688 Correctly update views on server switch 2016-05-29 16:58:54 +02:00
tomkat83
e80f38c690 Initialize Kodi DBs only once 2016-05-29 16:52:38 +02:00
tomkat83
c47fc7f25f Fix PKC not telling Kodi timing 
- Episodes should now correctly be marked as watched
 2016-05-16 21:07:17 +02:00
tomkat83
5bf1a5a8e0 Fix new episodes not being detected 
- Set standard safety margin to 60 seconds. Otherwise, you might get
many screen refreshes
- Fixes #23
 2016-05-12 21:46:50 +02:00
tomkat83
df38786638 Account for string.encode() not allowing args 
- E.g. Android TV
 2016-05-07 13:15:02 +02:00
tomkat83
97c261bc4d Tune advancedsettings.xml 
- Only set backgroundupdate to false for music library, if music is
enabled
 2016-04-22 12:34:35 +02:00
tomkat83
2d2dd0fa12 Fix KeyError: 'librarySectionID' during syncPMStime 2016-04-17 13:44:45 +02:00
tomkat83
c5b76d1a38 New setting: I own this PMS 
- Needed if someone enters PMS IP manually, would not catch this info
otherwise
- Background: needed to choose correct background sync procedure
 2016-04-15 09:44:42 +02:00
tomkat83
f34900ae6e Sync Music playstates on full sync 2016-04-13 16:51:53 +02:00
tomkat83
722dce78d2 More logging 2016-04-13 16:26:09 +02:00
tomkat83
0b1a53e839 More logging 2016-04-13 16:19:24 +02:00
tomkat83
a594daeb68 Assume its us playing if the PMS is not ours 2016-04-13 15:27:02 +02:00
tomkat83
98f52d3b5e ProcessMetadata thread: sleep now unnecessary 2016-04-13 12:23:36 +02:00
tomkat83
adbeb4d48f Shutdown lib sync threads correctly on user switch 2016-04-11 09:21:40 +02:00
tomkat83
89fe2565d2 Try to shutdown more cleanly 2016-04-09 16:57:45 +02:00
tomkat83
9528577aab Delete music items in full sync if not found on PMS 2016-04-08 14:11:50 +02:00
tomkat83
24bb637606 Don't show Kodi popup when scanning Music 2016-04-08 13:57:55 +02:00
tomkat83
d3e27d9797 Use Plex library for timesync 
- No need for Kodi elements
 2016-04-08 10:52:15 +02:00
tomkat83
55cbf5824d Kill sync threads if library gets suspended 
- E.g. user switch
 2016-04-08 09:24:28 +02:00
tomkat83
4a63e03615 Shut down sync more cleanly if interrupted 2016-04-08 09:11:03 +02:00
tomkat83
5289619792 Deal with PMS reply 401 under too much strain 
- Sync should now abort pretty much instantly
 2016-04-07 18:29:23 +02:00
tomkat83
2ec6bff388 Update playstate if owner plays for single user PMS 2016-04-07 17:37:53 +02:00
tomkat83
ceedba4f46 Increase path hack stability 
- What happens if there are no movies or shows?
 2016-04-07 16:17:57 +02:00
tomkat83
88b581f756 Clear playlists and video nodes on user switch 
- And not on fullsync (widgets might brake)
 2016-04-07 16:13:02 +02:00
tomkat83
ae51e43145 Use 1 xbmcgui dialog instance in librarysync 2016-04-07 15:33:01 +02:00
tomkat83
fdb42c1f26 Fix Kodi information screen not working 2016-04-07 13:49:05 +02:00
tomkat83
79349ce4af Fix Library Repair Sync 2016-04-07 11:57:34 +02:00
tomkat83
9781131cd2 Also clear video nodes and playlists on full sync 
- Called e.g. when switching Plex user
 2016-04-07 09:02:52 +02:00
tomkat83
783fad33f1 Don't change Kodi settings xml if music is enabled 
- Because Music is yet unstable
 2016-04-07 08:55:49 +02:00
tomkat83
9dec68f6d9 Do background sync while playing 
But no full sync
 2016-03-29 19:45:32 +02:00
tomkat83
c401cd9835 No websocket message logging 2016-03-28 14:43:35 +02:00
tomkat83
43a7886eae Fix time sync for Music items 2016-03-28 10:51:38 +02:00
tomkat83
fb1bc7c555 Cleanup background sync 2016-03-27 19:06:36 +02:00
tomkat83
1e49e9dea9 Background sync using websockets 2016-03-27 16:57:35 +02:00
tomkat83
5949988b68 Plex websockets - groundworks 2 2016-03-24 18:52:02 +01:00
tomkat83
3a4349e647 Disable SSL warning in Log, clean Futurewarnings 2016-03-23 16:57:49 +01:00
tomkat83
2806c8002a Cleaned out https checks 
- Disabled HTTP certificate warnings in log
 2016-03-23 16:07:09 +01:00
tomkat83
feb01b748f Switch from xml.etree.cElementTree to .ElementTree 
cElementTree has issues, e.g. during Kodi user profile switch
 2016-03-23 09:42:59 +01:00
tomkat83
cffe8acb69 Deactivate info "Gathering information from files" 
However, Kodi STILL tries to gather info from music files unsuccessfully
(PMS http folder cannot be accessed)
 2016-03-22 13:25:30 +01:00
tomkat83
8d9620b408 Only remind once that direct paths are unverified 2016-03-21 17:54:04 +01:00
tomkat83
8dee81c6a2 Fix potential time sync problems 2016-03-17 16:03:02 +01:00
tomkat83
2c0312a035 Fix music libraries being scanned twice 2016-03-17 15:18:57 +01:00
tomkat83
574d2e061e Fix potential crash for fast sync 2016-03-17 14:30:47 +01:00
tomkat83
71492af87f Fix removing Plex libraries on PMS side 2016-03-17 12:16:44 +01:00
tomkat83
aa40307408 Hotfix db comparison 2016-03-14 18:10:36 +01:00
tomkat83
d8378584a2 Limit max number of items requested from PMS 
Otherwise, slow NAS PMS may lead to timeouts - and thus empty libraries
 2016-03-14 14:51:49 +01:00
tomkat83
d300cc60d6 Fix tv show season posters not showing 2016-03-13 16:06:54 +01:00
tomkat83
ae9d4924c2 Redesign fast sync 2016-03-11 14:42:14 +01:00
tomkat83
7a86909357 Redesigned incremential sync 2016-03-10 18:34:11 +01:00
tomkat83
a5d37caef0 Show dialog if some items could not be processed 2016-03-10 09:51:35 +01:00
tomkat83
3ccc588945 Optimize notifications for library syncs 2016-03-10 08:51:24 +01:00
tomkat83
e635f43845 Improve sync resiliance and GDM discovery 
Improve sync resiliance to bad connections (e.g. behind a firewall)
 2016-03-08 17:41:07 +01:00
tomkat83
e5e6f2208e Much shorter download timeouts 
This should hopefully solve the stuck library sync
 2016-03-08 15:28:59 +01:00
tomkat83
d5aae4934b Clean out library sync 2016-03-08 12:13:47 +01:00
tomkat83
b05ec9746a Remove obsolete check for method in processing metadata 2016-03-08 11:58:14 +01:00
tomkat83
8ab99b5036 Language strings for library sync 2016-03-08 11:47:46 +01:00
tomkat83
0b4736b01b Clean-up library sync loop 2016-03-08 11:20:11 +01:00
tomkat83
68e91b192b Setting to turn off constant background sync 2016-03-07 17:22:55 +01:00
tomkat83
398ef64d96 More encoding fixes for dialogs 2016-03-07 13:38:45 +01:00
tomkat83
e784dab578 Overhaul userclient 2016-03-04 13:34:30 +01:00
tomkat83
4e44579c1f General bug squishing 2016-03-03 15:28:44 +01:00
tomkat83
9e9f61f9ba Added refresh Playlist and videonodes. Removed some Setting topics 2016-03-03 10:11:32 +01:00
tomkat83
cc3c55e038 Wait for lib sync to finish when switching user 2016-03-03 09:35:35 +01:00
tomkat83
ccdaaf5b4e Fixed video nodes 2016-03-03 09:04:15 +01:00
tomkat83
c8004d3dbf Prevent sleep 2016-03-03 08:10:06 +01:00
tomkat83
89b0bc3796 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-03-02 19:01:55 +01:00
tomkat83
525c59c75b Attempt to fix video nodes. 
Still getting

18:55:33 T:7956   ERROR: XFILE::CDirectory::GetDirectory - Error getting
library://video/Plex-1/1_sets.xml/
18:55:33 T:7956   ERROR:
CGUIMediaWindow::GetDirectory(library://video/Plex-1/1_sets.xml/) failed
 2016-03-02 18:56:42 +01:00
tomkat83
e10bc84bf3 Librarysync overhaul 2016-03-02 17:27:21 +01:00
angelblue05
77a553b7f7 Fix logic for nodes 
Was accidentally overwriting freshly created nodes
 2016-03-01 18:59:08 -06:00
angelblue05
4cdf5c3c4d Fix grouped views 
Something changed in the emby returned paths so the verification was
failing. For now, we are getting one item from the media folder and
comparing using the user view to make sure we are referring to the
correct one with the tag name. Asked Luke for an api that would do this.
 2016-03-01 18:00:19 -06:00
angelblue05
bd093e6783 Terminate thread if outdated 
Temporary fix since 1.1.62 is incompatible. To be reconsidered when
minimum version changes again.
 2016-03-01 10:49:16 -06:00
tomkat83
065169aa31 Try to prevent sleep from happening 2016-03-01 16:52:09 +01:00
tomkat83
9465939397 Simplify sync messages 2016-03-01 13:36:12 +01:00
tomkat83
edba27d11d Allow for Kodi music library update 2016-03-01 13:31:35 +01:00
tomkat83
a2251a3482 More merge conflicts 2016-03-01 12:10:09 +01:00
tomkat83
954e78db55 Allow for view deletion 2016-03-01 11:26:46 +01:00
tomkat83
4360b6b7de Merge conflicts 2016-03-01 10:40:30 +01:00
tomkat83
4704d8e983 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-03-01 10:10:11 +01:00
angelblue05
c3d78c871e Follow ordered views 
This affects the node numbering.
 2016-02-24 22:28:42 -06:00
angelblue05
dc7473bfae Fix typo 2016-02-24 18:39:21 -06:00
angelblue05
60a178165d Fix pictures 2016-02-24 18:34:50 -06:00
angelblue05
dc74bf42aa Remove old saved views 2016-02-23 00:27:49 -06:00
angelblue05
81ea279319 Create video nodes/playlist using the id 
Prevent errors with special characters that have no ascii replacement
 2016-02-23 00:00:24 -06:00
angelblue05
3207f5a2c1 notification dialog follow progress on screen 
For initial/manual/repair sync
 2016-02-22 00:16:32 -06:00
angelblue05
20ca36d95a Prevent sleep 
Remove flag if initial sync terminates prematurely
 2016-02-21 17:45:56 -06:00
angelblue05
6100faadda Try to prevent sleep from happening 
During the initial sync or any major sync, manual or repair.
 2016-02-21 17:43:46 -06:00
angelblue05
1388f4b27b Fix views duplicate at the root 2016-02-19 18:06:36 -06:00
angelblue05
2f3d9c4a60 Fix views 
Alright get rid of the duplicate in the add-on entrypoint
 2016-02-19 17:34:22 -06:00
angelblue05
663fe1f563 Fix dialog in manual sync 2016-02-19 15:50:19 -06:00
tomkat83
e7f7269a5b Merge conflicts 2016-02-19 20:03:06 +01:00
tomkat83
50d142ad0b Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-02-19 18:47:09 +01:00
angelblue05
2ef213b4e3 Fix for proxy 2016-02-18 22:06:33 -06:00
angelblue05
06cd0e981c Hide manual sync when ran at start-up 2016-02-18 19:16:49 -06:00
angelblue05
52a5d35295 Update for strings 2016-02-17 02:13:37 -06:00
tomkat83
bcbbb1b42f Plex Music! 
Playing does not work yet, but Lib sync is up
 2016-02-12 16:53:49 +01:00
tomkat83
f162b6ea8a Adjust librarysync notifications 2016-02-11 14:44:11 +01:00
tomkat83
fa8c6e49b8 Fix UpdateLibrary(video) 2016-02-11 14:07:52 +01:00
tomkat83
e8900b0a4a Again, big clean-up 2016-02-11 14:03:04 +01:00
tomkat83
c451a236e7 More cleanup of librarysync 2016-02-11 12:56:57 +01:00
tomkat83
5334a38754 Cleaning up librarysync 2016-02-11 12:54:15 +01:00
tomkat83
413e48e19c Fix userdata not correctly syncing 2016-02-11 12:44:12 +01:00
tomkat83
28517b509a Small improvements lib sync 2016-02-11 10:56:01 +01:00
tomkat83
97b8083562 Fix embydb 2016-02-10 11:00:32 +01:00
tomkat83
75644de696 added GetEmbyDB to get to emby_db more securely 2016-02-10 10:04:49 +01:00
tomkat83
9beac817fe Increase lib thread stability 2016-02-10 09:14:31 +01:00
tomkat83
9d50e8ef30 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-02-10 09:09:36 +01:00
angelblue05
afcc92686e Remove duplicate logging 2016-02-09 22:55:28 -06:00
angelblue05
15e0f92092 Update video library fix 
This is to stop music-only update from updating the video library for no
reason.
 2016-02-09 22:50:31 -06:00
tomkat83
0f14019e5b Overhaul Plex Companion 2016-02-07 12:38:50 +01:00
angelblue05
256d98c6f3 Fix datetime error 
Known kodi/python issue where datetime.strptime throws a Nonetype error
for no reason, after being used once.
 2016-02-04 19:09:47 -06:00
Shaun
d75af5009b fix map error when new server plugin is not installed 2016-02-05 10:02:57 +11:00
tomkat83
125daea6ef Transcoding up 2016-02-04 20:23:04 +01:00
tomkat83
0578020cb9 Revert "Deactivate fast sync for now" 
This reverts commit fd8d6007db.
 2016-02-04 13:28:24 +01:00
tomkat83
5aa88bdca8 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-02-04 13:08:57 +01:00
angelblue05
4df6bb68d3 Fix typo in manual sync 2016-02-04 04:06:28 -06:00
Shaun
95ed199218 use retention date from server 2016-02-04 17:10:20 +11:00
tomkat83
fd8d6007db Deactivate fast sync for now 2016-02-03 14:51:15 +01:00
tomkat83
bf45cd5e13 Fix userdata 2016-02-03 14:44:11 +01:00
tomkat83
fa0003a5eb Overhaul PlexAPI. Only using XMLs now, no JSONs 2016-02-01 10:33:33 +01:00
angelblue05
a2e6a362c5 Adjust for manual sync at start up 2016-01-31 23:12:44 -06:00
tomkat83
87f9c9ef61 Revert lib thread changes 2016-01-30 08:43:28 +01:00
tomkat83
8912a0b601 Overhaul Part 1 2016-01-29 20:07:21 +01:00
tomkat83
99895ec49f Redesign library sync loops 2016-01-27 20:41:28 +01:00
tomkat83
40c8b6f683 Moved many functions to PlexFunctions.py 2016-01-27 16:33:02 +01:00
tomkat83
e5311981b4 Small fixes 2016-01-27 15:14:30 +01:00
tomkat83
42bd570187 Plex home user switch working 2016-01-27 12:18:54 +01:00
tomkat83
0d4c8ae53e Added logging decorator 2016-01-26 17:20:13 +01:00
tomkat83
aa849f7457 Added decorators for threads 2016-01-26 15:13:03 +01:00
tomkat83
e0330c1a28 Fixed plex companion headers and resume point 2016-01-23 15:53:24 +01:00
tomkat83
58020021fa Merge conflicts 2016-01-23 12:05:56 +01:00
tomkat83
c98e7ad60c Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-23 11:55:31 +01:00
tomkat83
6efd9a52be Plex instead of Emby references in librarysync 2016-01-23 11:45:14 +01:00
angelblue05
049c304f8b Clear property 
So artwork can be deleted when needed, after the initial sync has
completed
 2016-01-23 02:32:51 -06:00
angelblue05
6653b1a929 Move manual sync to own class 
It's better to separate the code to gain more control over the manual
sync rather than working around the full sync and doing "if compare" all
over the place.
 2016-01-23 02:29:30 -06:00
tomkat83
0d2664320b Cleaned librarysync 2016-01-22 17:03:24 +01:00
tomkat83
06dd13eb07 Merge conflicts 2016-01-22 16:32:36 +01:00
tomkat83
80e1957d25 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-22 15:57:22 +01:00
tomkat83
48ba7f0869 Plex Companien (Plexbmc helper) version 0.1 2016-01-22 15:37:20 +01:00
marcelveldt
01db164dc9 do not create playlists for homevideos or photos 2016-01-22 11:41:12 +01:00
angelblue05
60f68610f4 Close the kodi cursor earlier 
In case music doesn't complete correctly.
 2016-01-18 17:47:16 -06:00
marcelveldt
58533e1c44 fix videonodes and playlists 2016-01-18 20:17:14 +01:00
marcelveldt
eab0b7d3d9 remove widgetreload. Is entirely handled by skinhelper now. 
leaving it in means doubled widget refreshes = slower
 2016-01-18 17:12:57 +01:00
angelblue05
08581dbc18 Add progress dialog for gathering 
It's not very precise since we gather in batch, but better than nothing.
 2016-01-18 03:24:00 -06:00
tomkat83
c1c19cbc68 Merge conflicts sync 2016-01-15 10:04:47 +01:00
tomkat83
332e64729a Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-15 09:12:08 +01:00
tomkat83
0f73bf1840 Enable library sync threads to crash correctly 2016-01-15 08:53:16 +01:00
tomkat83
40c02395a2 Added UpdateUserdata to Movies and TV Shows 2016-01-14 16:17:24 +01:00
tomkat83
eddfa23a71 Plex home user switch finally working 2016-01-14 14:47:34 +01:00
angelblue05
993ef282e7 Fix reset 
Fixes if there's a crash, unable to reset
 2016-01-12 22:52:49 -06:00
tomkat83
57e6d40af2 Plex trailers directly playable now 2016-01-12 11:47:48 +01:00
tomkat83
0b38176fa9 Fixed initial sync 2016-01-12 10:30:28 +01:00
tomkat83
4332d08292 Cleaned multi threading 2016-01-12 09:50:15 +01:00
marcelveldt
ee9f08080e work in progress - move home videos to plugin listing 2016-01-11 22:20:34 +01:00
tomkat83
1697e38342 Switch to xbmc.sleep 2016-01-11 20:24:14 +01:00
tomkat83
eb1c2cf64c No sync if updatelist is empty 2016-01-11 17:42:42 +01:00
tomkat83
5e8fd41938 Checksum for season 2016-01-11 17:37:01 +01:00
tomkat83
a959ee118c Fixes regarding video node sync 2016-01-11 14:38:01 +01:00
tomkat83
c854ee621e videonodes v0.1 2016-01-11 09:57:45 +01:00
tomkat83
5645e451cc Cleaning up logs 2016-01-11 08:10:36 +01:00
tomkat83
de3a058463 Sped up initial sync 2016-01-11 07:55:22 +01:00
tomkat83
9f3db90a7c TV Shows sync up and running 2016-01-10 15:16:59 +01:00
tomkat83
7e09253477 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-09 16:18:04 +01:00
tomkat83
5da6b4153e TV shows sync v0.1 2016-01-09 16:14:02 +01:00
angelblue05
b11e9c2902 Fix grouped view 2016-01-08 12:25:22 -06:00
tomkat83
b3f588fd71 Fixed int instead of str in ThreadedShowSyncInfo() 2016-01-07 20:36:20 +01:00
tomkat83
81f4b514fa New abstract function GetAndProcessXMLs() to be called by all itemtypes while syncing 2016-01-07 20:31:25 +01:00
tomkat83
8c18879271 Switch to threaded Movie metadata processing 2016-01-07 17:27:48 +01:00
tomkat83
e86b8c2358 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-05 17:28:27 +01:00
angelblue05
2c7a0c0b65 Define the music cursor 
Make sure we use the proper cursor for music when using the incremental
sync. Fix for artist table not found database error.
 2016-01-04 21:58:45 -06:00
angelblue05
22f71efaf5 Fix view order bug 
Make sure we get the default grouped view and not a view, when we are
looking at grouped folders.
 2016-01-04 21:48:30 -06:00
tomkat83
7f9dfca2d6 Trailers up. BUT: first trailer is repeated indefinitely 2016-01-03 13:36:00 +01:00
tomkat83
3e1d3ff1cc Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-02 08:58:13 +01:00
angelblue05
84532ce3f8 Remove "!" from prompts 2016-01-01 23:38:26 -06:00
tomkat83
5c3605ddd1 Less logs if movie diff found 2016-01-01 15:07:45 +01:00
angelblue05
227bb3eb42 Add fix for missing key 2015-12-31 22:19:36 -06:00
tomkat83
681e57b350 Fix getting Stream metadata 2015-12-31 12:46:41 +01:00
tomkat83
927c8bf36f Sped up sync 2015-12-31 11:42:10 +01:00
tomkat83
3fe10ba851 Switched metadata processing from JSON to XML 2015-12-31 10:53:22 +01:00
tomkat83
25f5d65343 Movie sync working. 2015-12-30 13:25:37 +01:00
tomkat83
54a20f0b13 Before recoding Plexmovies function 2015-12-29 14:13:32 +01:00
tomkat83
d82774cfa9 Small fixes 2015-12-29 10:36:16 +01:00
tomkat83
a64e0cea2d Websocket URL 2015-12-29 08:38:51 +01:00
tomkat83
88f649d36d Movie Sync Alpha version 2015-12-28 18:47:16 +01:00
tomkat83
43765a6675 Fixes 2015-12-28 13:10:05 +01:00
tomkat83
d6ef04a1ce Merge remote-tracking branch 'MediaBrowser/master' 2015-12-28 08:40:34 +01:00