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

1490 commits

Author SHA1 Message Date
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
079f43c644 User switch fix, part 1 2016-01-25 10:36:24 +01:00
tomkat83
613e033b48 Fix playing trailers directly via Plex Companion 2016-01-24 16:12:28 +01:00
tomkat83
b2663da584 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-24 14:28:11 +01:00
xnappo
250a893eee Convert seektime to str. 2016-01-23 12:51:39 -06:00
xnappo
07d03781a2 Lower lever changes for Krypton 
Not modifying utils.py yet, just putting in low level version
placeholders and minor music rating change for Krypton change.
 2016-01-23 09:45:31 -06: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
angelblue05
1d6556fb44 Add refresh for videonodes 
To fix home video nodes.
 2016-01-22 17:12:23 -06:00
angelblue05
55d841b0b3 Temp removal of encoding in window prop 
Causing errors in report back, etc. Will have a look after the new
version is released.
 2016-01-22 16:51:48 -06:00
angelblue05
04d7ac2f01 Missing reference to rating 
Was it moved by accident?
 2016-01-22 16:49:59 -06:00
angelblue05
395140262d Revert "Remove encode for playutils" 
This reverts commit a4a1be97f5.
 2016-01-22 15:59:31 -06:00
angelblue05
a4a1be97f5 Remove encode for playutils 
Since we encode in utils now.
 2016-01-22 15:30:33 -06:00
tomkat83
5576ef97ca Plex companion logging 2016-01-22 17:34:26 +01: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
marcelveldt
333d6b2831 fix subnodes for homevideos and photos 2016-01-22 11:10:42 +01:00
angelblue05
3caa2ae3a7 Re-add decode to unicode 
Then convert to utf-8, then ascii for the auth header.
 2016-01-21 19:19:30 -06:00
marcelveldt
af4b3bdd9e additional comments 2016-01-22 01:08:08 +01:00
marcelveldt
5176233a33 Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2016-01-21 23:46:04 +01:00
marcelveldt
0363804c8e fix music sync when directstream enabled 2016-01-21 23:45:51 +01:00
angelblue05
c28b43451f Revert useless unicode changes 
Now that the device name is normalized without special characters.
 2016-01-21 16:34:35 -06:00
angelblue05
c54108cfa7 Normalize device name 
Server is unable to display unicode correctly for device names. Luke is
aware of this.
 2016-01-21 16:32:30 -06:00
angelblue05
65be0b6262 Fixing unicode bug for device name 
Removing decode to unicode, because we use it for the downloadutils. We
need it in utf-8, not unicode.
 2016-01-21 14:35:24 -06:00
angelblue05
f3c8ba7077 New transcode method for subs 
Extract subtitles and append them to the player, rather than burning
them (burning them would result in playback failure 80% of the time)
 2016-01-21 11:10:06 -06:00
marcelveldt
cf94305743 prevent possible unicode error in window method 2016-01-21 11:15:31 +01:00
marcelveldt
a5d4c881e1 remove redundant debug logging 2016-01-21 11:10:48 +01:00
marcelveldt
8e544b4dad more improvements to music tags - add checksum when writing tags to files 2016-01-20 21:17:23 +01:00
marcelveldt
435982b741 fix typo 2016-01-20 20:44:19 +01:00
marcelveldt
79644ca3e8 additional fix to prevent doubled updated 2016-01-20 20:35:43 +01:00
marcelveldt
ae06548c9d fix: redundant userdata update for music rating 
add settings for music ratings import/export
 2016-01-20 20:21:56 +01:00
marcelveldt
7e81db596e Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2016-01-19 21:28:05 +01:00
marcelveldt
7cf615f671 simplify channel browse code 
add experimental support for live tv channels and recordings (without pvr)
 2016-01-19 21:27:58 +01:00
angelblue05
81dcd36dc3 Revert throttle 
Will have to test further with timeout scenario, before reimplementing
 2016-01-19 04:28:52 -06:00
Shaun
bfb893ad8e use standard progress dialog for progress 
and add cancel
 2016-01-19 18:59:05 +11:00
angelblue05
d14ecfdc5e Adjust playlist props 
Instead of using clearProperties, clear individually.
 2016-01-18 21:54:02 -06:00
angelblue05
f3f8c76197 Fix progress dialog 2016-01-18 19:54:20 -06:00
angelblue05
60f68610f4 Close the kodi cursor earlier 
In case music doesn't complete correctly.
 2016-01-18 17:47:16 -06:00
marcelveldt
6f72dfffe9 one more fix for the musictags 2016-01-18 21:16:11 +01:00
marcelveldt
11cf78de36 fix unicode error in urlencode 2016-01-18 20:56:10 +01:00
marcelveldt
2661c54938 fix entrypoints 2016-01-18 20:48:44 +01:00
marcelveldt
58533e1c44 fix videonodes and playlists 2016-01-18 20:17:14 +01:00
marcelveldt
3421bf88e1 add support for embedded covertart in music files 
fix typo in music tags code
 2016-01-18 19:38:53 +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
marcelveldt
5640408523 fix crash on sync when song rating is null in db (if user didn't reset the db) 
resync is advised however to make sure the rating gets scraped initially
 2016-01-18 16:31:07 +01:00
marcelveldt
72d279a3a9 Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2016-01-18 12:05:16 +01:00
marcelveldt
eae4fea76a more unicode fixes: os.path functions use unicode depending on the OS 2016-01-18 12:05:05 +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
marcelveldt
2bd1d139c1 unicode fixes 
fix for users who have redirected kodi data folders (replace open with xbmcvfs.file)
 2016-01-18 10:00:32 +01:00
marcelveldt
ca0906aaaf remove redundant logging 2016-01-18 09:47:22 +01:00
marcelveldt
b0120aefd5 fix: return emby nodes in skinshortcuts dialog 2016-01-18 09:45:39 +01:00
angelblue05
ee414472e0 Correct encoding 
Everything xbmc returns is already in utf-8
 2016-01-16 18:28:30 -06:00
angelblue05
2e5c0aa8f2 Fix music crash 2016-01-16 16:31:42 -06:00
Shaun
30a9074f71 fix percentages on thread clean up updates 2016-01-16 17:55:04 +11:00
Shaun
9e2f789e53 add a thread pool option to the image cache 2016-01-16 14:08:01 +11:00
marcelveldt
82f117222a fix exception in getSongTags when rating is none 2016-01-15 15:31:55 +01:00
tomkat83
e859a807bc Add plexbmc.helper 2016-01-15 12:12:52 +01:00
angelblue05
d7d5e8b6e1 Force transcode 720/h265 2016-01-15 03:56:53 -06:00
tomkat83
accd8f4ac4 Merge conflict playbackutils 2016-01-15 10:10:44 +01: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
angelblue05
fa826c2791 Fix websocket not restarting 
Didn't realise the method and class variable had the same name.
 2016-01-15 01:26:54 -06: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
5112500f4d Fix missing mediasources 
Also add a throttle to avoid crash if server connection times out.
 2016-01-14 03:49:03 -06:00
tomkat83
6e8bd3e7da Plex.tv sign in with 4 digit PIN 2016-01-14 10:20:19 +01:00
angelblue05
5c9e571936 Remove boxset forced sync. Manual sync is available for that purpose. 2016-01-13 15:47:31 -06:00
tomkat83
1f8eb7f2ab Trying to change Plex.tv sign in process 2016-01-13 14:56:44 +01:00
marcelveldt
0bc17ec277 small fix for photo support 2016-01-13 13:24:26 +01:00
angelblue05
10606f733d Fix crash during initial sync for songs 2016-01-12 23:09:55 -06:00
angelblue05
993ef282e7 Fix reset 
Fixes if there's a crash, unable to reset
 2016-01-12 22:52:49 -06:00
angelblue05
b9ba092e12 H265 rectification 2016-01-12 19:38:18 -06:00
marcelveldt
8e2cae3b13 fix small typos 
add delete option to context menu
 2016-01-13 01:26:07 +01:00
marcelveldt
b24e881f18 finished homevideos and photos 2016-01-13 01:03:35 +01:00
tomkat83
79f95100c5 Switch user v01 2016-01-12 17:23:55 +01:00
tomkat83
9103f0516f Small fixes 2016-01-12 15:53:06 +01:00
tomkat83
b2a9f1a453 Update logging to handly empty PMS responses 2016-01-12 14:25:12 +01:00
tomkat83
b26b679dc1 Mark movie as watched/unwatched 2016-01-12 14:14:49 +01:00
tomkat83
ca731ba41e Pass resume point back to PMS 2016-01-12 13:57:26 +01:00
tomkat83
4c54a7c319 Changed plugin hook from emby to plexkodiconnect 2016-01-12 12:14:18 +01: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
marcelveldt
b7f0f869eb fix null pointer 2016-01-11 19:26:38 +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
marcelveldt
0817085ada Add contextmenu for emby settings (used to update ratings) 
Add ratings sync for music files (get rating details from music files and sync back to emby)
 2016-01-11 16:53:41 +01:00
tomkat83
3b2176574a Video nodes finally working 2016-01-11 15:56:56 +01:00
tomkat83
21fed2dc63 Update videonodes 2016-01-11 14:54:16 +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
08a0c38704 Resolving merge conflict 2016-01-10 12:38:49 +01:00
tomkat83
0c444beab0 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-10 12:36:15 +01:00
angelblue05
2e4e983acd hevc transcode - direct stream skip 2016-01-09 21:30:24 -06:00
angelblue05
86caf21af4 HEVC transcode 
Still waiting on user feedback on this one.
 2016-01-09 21:25:17 -06:00
angelblue05
b465fe5c08 Revert "Add HEVC transcode setting" 
This reverts commit 86f4039b89.
 2016-01-09 21:11:11 -06:00
angelblue05
86f4039b89 Add HEVC transcode setting 2016-01-09 19:41:00 -06:00
tomkat83
b6128fe48c Merge conflict 2016-01-09 16:18:57 +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
950ae74939 Undo useless changes to music 
The problem was in Items class, not the Music class.
 2016-01-09 05:13:17 -06:00
angelblue05
f99efb2a83 Add settings monitor 
Prompt for reset if playback mode change is detected
 2016-01-09 04:53:04 -06:00
angelblue05
b61b8ae894 Failsafe incase view is named after existing tag 
After the initial sync already completed.
 2016-01-09 03:03:39 -06:00
angelblue05
77dd006f21 1.1.72 - Fix typo 2016-01-08 20:13:52 -06:00
angelblue05
222f6e06cb Open music cursor for albumartist 2016-01-08 12:56:21 -06: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
194467091a Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-07 20:32:48 +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
marcelveldt
fc810f7b32 fix extrafanart issues 2016-01-06 23:22:10 +01:00
shaun
5ce7e3407d fix video node window path 2016-01-06 20:08:16 +11:00
marcelveldt
6adc422936 fix next episodes emby node 2016-01-06 08:59:41 +01:00
marcelveldt
9468adfbe3 fix smart shortcuts compatability 2016-01-06 08:51:46 +01:00
tomkat83
e86b8c2358 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-01-05 17:28:27 +01:00
tomkat83
cef41188e0 Movies now direct playing. Trailers playing but always transcoding 2016-01-05 16:05:20 +01:00
angelblue05
ade63ae22f Fix typo and remove default value for network creds 2016-01-04 23:06:47 -06: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
93ad4ae0cb Movie with multiple parts now working 2016-01-03 19:17:59 +01:00
tomkat83
1970e00b16 Playbackutils now cycles correctly over XML reply; trailers thus working 2016-01-03 15:41:12 +01:00
tomkat83
7f9dfca2d6 Trailers up. BUT: first trailer is repeated indefinitely 2016-01-03 13:36:00 +01:00
tomkat83
e1eab21f7f Add settings option: number of trailers 2016-01-02 09:56:09 +01:00
tomkat83
e0ccaf16ad Fix getting Metadata for streaming 2016-01-02 09:28:31 +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
angelblue05
77de12bec8 Fix albums with same name 2016-01-01 23:24:28 -06:00
tomkat83
a134259cb5 Fix resume and runtime 2016-01-01 20:36:02 +01:00
tomkat83
5c3605ddd1 Less logs if movie diff found 2016-01-01 15:07:45 +01:00
tomkat83
5c35ce651b Add Addonname to user selection dialog 2016-01-01 14:50:51 +01:00
tomkat83
bc65b6082d Direct playing movie works 2016-01-01 14:40:40 +01:00
angelblue05
227bb3eb42 Add fix for missing key 2015-12-31 22:19:36 -06:00
angelblue05
7a19f010dc Correct reversed settings 2015-12-31 17:16:16 -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
9ad059e31f Merge remote-tracking branch 'MediaBrowser/master' 2015-12-31 10:55:08 +01:00
tomkat83
3fe10ba851 Switched metadata processing from JSON to XML 2015-12-31 10:53:22 +01:00
angelblue05
8b2bd3e30b Forgot to add filters 
For collections and trailers
 2015-12-30 21:39:10 -06:00
angelblue05
bfcf110d82 Correct string 
Will need to review strings once ready.
 2015-12-30 21:02:37 -06:00
tomkat83
f2294569e6 Syncing Movie pictures now finally works 
Had to add Plex credentials to URL
 2015-12-30 16:37:30 +01:00
tomkat83
1e7acfc927 Moving getallartworks to PlexAPI 2015-12-30 15:57:55 +01:00
tomkat83
5ea126624c Merge 2015-12-30 13:42:37 +01:00
tomkat83
25f5d65343 Movie sync working. 2015-12-30 13:25:37 +01:00
angelblue05
39ac41647e Fix AirsAfterSeason 2015-12-30 03:21:49 -06:00
angelblue05
08354b693e Fix specials ordering 2015-12-29 19:32:41 -06:00
angelblue05
50c71c70d4 Fix update music 2015-12-29 17:46:42 -06:00
tomkat83
54a20f0b13 Before recoding Plexmovies function 2015-12-29 14:13:32 +01:00
tomkat83
1b254fdd37 Fix missing to ask for Plex username 2015-12-29 10:50:50 +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
8214a858bc Merge remote-tracking branch 'MediaBrowser/master' 2015-12-29 07:24:51 +01:00
angelblue05
18c493909d Fix encoding for nodes 2015-12-28 17:58:01 -06:00
tomkat83
88f649d36d Movie Sync Alpha version 2015-12-28 18:47:16 +01:00
tomkat83
488c1a0a19 Merge remote-tracking branch 'MediaBrowser/master' 2015-12-28 13:13:26 +01:00
tomkat83
43765a6675 Fixes 2015-12-28 13:10:05 +01:00
tomkat83
ce6a9ca926 Fix getting user artwork 2015-12-28 11:04:28 +01:00
angelblue05
445469302f Fix delete 
Remove verification - option is only for deletion after playback.
 2015-12-28 03:54:46 -06:00
tomkat83
92eac70c0b Small fixes user authorization 2015-12-28 10:35:27 +01:00
tomkat83
8604fab2d4 Fixes to loading user 2015-12-28 09:17:17 +01:00
tomkat83
557c3f03a1 Code for Plex home not being used (1 user only) 2015-12-28 09:00:43 +01:00
tomkat83
d6ef04a1ce Merge remote-tracking branch 'MediaBrowser/master' 2015-12-28 08:40:34 +01:00
angelblue05
e4fb2de7c2 Prevent deleting artwork during initial sync 2015-12-27 22:51:47 -06:00
angelblue05
a7131c2867 Correct typo 2015-12-27 22:47:49 -06:00
angelblue05
601f578892 Fix dialog 2015-12-27 17:06:50 -06:00
angelblue05
e475d3366d Fix transcode h265 2015-12-27 17:04:40 -06:00
tomkat83
48a248ff59 Plex home user authentication done! 2015-12-27 17:12:46 +01:00
tomkat83
6ea38c7dfb Start user authentication 2015-12-27 16:27:49 +01:00
tomkat83
b8395b8396 Get user details AFTER other settings 2015-12-27 15:12:56 +01:00
tomkat83
f53e7e0ac2 Fix username adding (admin) 2015-12-27 14:45:51 +01:00
tomkat83
dd1e873b20 Choose Plex user. Connection fixes 2015-12-27 14:42:54 +01:00
tomkat83
01f4833042 Allow for http type "OPTIONS" 2015-12-27 13:56:07 +01:00
tomkat83
4667e4ed64 No uppercase addon name. That's ugly 2015-12-27 13:51:13 +01:00
tomkat83
6c40455ac6 Trying to fix SSL issues. Seems to be a Kodi request issue for very first calls?!? 
still get "[Errno 8] _ssl.c:510: EOF occurred in violation of protocol"
 2015-12-27 13:20:53 +01:00
tomkat83
2d84c39be5 added getServerId to allow for Plex machineIdentifier 2015-12-27 12:23:59 +01:00
tomkat83
72b3b49b6e brought downloadutils.py up to speed 2015-12-27 12:21:25 +01:00
tomkat83
ed1915ec7e Get plex login in initialsetup.py 2015-12-27 12:14:06 +01:00
tomkat83
e6db2e1b96 Added PlexAPI.py. Adjusted settings.xml 2015-12-27 12:09:07 +01:00
tomkat83
962fe6c605 Renamed to plugin.video.plexkodiconnect. Adjusted addon.xml 2015-12-27 11:49:14 +01:00
angelblue05
a116db491c Add limit to request from server 2015-12-27 01:05:51 -06:00
angelblue05
493459de33 Fix artwork cache 
Still looking into the delay with extra fanart scenario
 2015-12-26 20:07:13 -06:00
angelblue05
f472f44a40 Fix missing import 2015-12-26 17:50:38 -06:00
angelblue05
0b6b5861c7 Fix missing pdialog 2015-12-26 16:23:29 -06:00
angelblue05
c125414991 Correct path for deviceid 2015-12-26 12:39:54 -06:00
angelblue05
8d219b64b3 Revert "Correct path for deviceid" 
This reverts commit 67c4c33a5b.
 2015-12-26 12:29:38 -06:00
angelblue05
67c4c33a5b Correct path for deviceid 2015-12-26 12:19:42 -06:00
angelblue05
a5e9fb1698 Add force refresh playlist 
To correct missing tag bug.
 2015-12-26 03:42:13 -06:00
angelblue05
7b3aae2d83 Fix fanart 2015-12-26 03:09:47 -06:00
angelblue05
7b2d67a8bf Fix typo 2015-12-26 01:50:32 -06:00
angelblue05
47976c81be Fix typo 2015-12-26 01:22:25 -06:00
angelblue05
8f8cdbaa88 Fix typo 2015-12-25 21:56:15 -06:00
angelblue05
0e78089aad Fix people 
Scenario where actor doesn't have a role defined in the metadata.
 2015-12-25 21:41:28 -06:00
angelblue05
9959806f5b Fix boxset 2015-12-25 21:36:46 -06:00
angelblue05
a7a82f4ebb Fix AR 2015-12-24 18:02:31 -06:00
angelblue05
17913241a1 Fix trailer 2015-12-24 16:45:18 -06:00
angelblue05
0e15daa37a Fix user image 2015-12-24 16:16:58 -06:00
angelblue05
163881e79f Fix typo 2015-12-24 15:16:47 -06:00
angelblue05
3007f8fdac Fix typo 2015-12-24 15:07:06 -06:00
angelblue05
69884a1b54 Readd with lowercase name 2015-12-24 14:07:00 -06:00
angelblue05
9855ac4c94 Remove to readd 2015-12-24 14:06:31 -06:00
angelblue05
08f9add813 Revert "Replace" 
This reverts commit f28c9fe069.
 2015-12-24 13:56:11 -06:00
angelblue05
f28c9fe069 Replace 
Seems I have to rename the filename to lowercase manually.
 2015-12-24 13:54:34 -06:00
angelblue05
3f6fe0a9e7 Version 1.1.63 
alpha ready for beta testing
 2015-12-24 13:51:47 -06:00
angelblue05
0200df3225 Fix key error 2015-12-05 19:43:41 -06:00
marcelveldt
7b9a601735 fix issue with nextepisodes node tag filter 2015-12-04 11:10:11 +01:00
angelblue05
8a28488e58 Always show video quality settings 2015-12-02 17:06:22 -06:00
angelblue05
9f7f81fd55 Correct typo 2015-12-02 16:55:20 -06:00
angelblue05
3384124f9c Adjust delete cached artwork 
If fails, move on instead.
 2015-12-02 16:51:30 -06:00
angelblue05
73d3974e39 Convert Force transcode to an option 
Only for 1080p/H265
 2015-12-02 16:47:07 -06:00
angelblue05
d07816d7fb Correct typo 2015-12-02 05:00:00 -06:00
angelblue05
d57f8ddde3 Force transcode 1080p/h265 2015-12-02 04:58:20 -06:00
angelblue05
988d62c9ac Fix cursor staying open after marking as watched 2015-12-01 00:53:59 -06:00
angelblue05
4e2cd67946 Fix for connection 
In case status is good, but server is unreachable.
 2015-11-25 17:20:06 -06:00
Shaun
fc8c41ccf3 remove some save last sync calls 2015-11-24 15:20:12 +11:00
marcelveldt
3e1efdf824 add recommended and random nodes 2015-11-23 18:45:42 +01:00
Shaun
3c9aa10587 add messaging to sync thread exit 2015-11-20 13:52:06 +11:00
angelblue05
faa376a520 Version bump 1.1.60 
Stable release
 2015-11-12 16:32:02 -06:00
angelblue05
66a9a85fc4 Direct path setup 
Add a caution note.
 2015-11-09 21:01:31 -06:00
angelblue05
7dbc1339bb Fix directors 2015-11-09 19:59:45 -06:00
angelblue05
4da967a65c fix sources.xml 
argument not available on older python versions
 2015-11-08 08:31:49 -06:00
angelblue05
3431b5d28d Use fallback artists 
If album artists is missing
 2015-11-08 05:42:53 -06:00
angelblue05
6156557b7d Follow kodi track# convention 
disc#*2**16 + track#
 2015-11-08 00:20:40 -06:00
angelblue05
9f4584d83f Fix albumartist 2015-11-06 22:40:08 -06:00
angelblue05
d03d24d078 Making sync process more robust 
Central commit, central force update kodi library. This is to make sure
we don't have a kodi videoscan running at the same time as our syncing
process, in order to prevent the dreaded "database is locked" error.
 2015-11-05 21:11:42 -06:00
angelblue05
5a39208aa3 Correcting sources 
With elementetree instead
 2015-11-03 07:22:03 -06:00
im85288
c10cee3cb3 jarvis music db bump 2015-11-03 11:07:31 +00:00
angelblue05
158008415f Prevent invalid paths 
Strm file scenario
 2015-11-03 02:27:59 -06:00
angelblue05
6ba664037e Adjust new ask to play trailer setting 
Ask only if there should be trailers to be played.
 2015-10-26 08:49:13 -05:00
marcelveldt
a5562e896b fix crash on playback when music sync is not enabled 2015-10-25 02:13:13 +02:00
marcelveldt
4c43139765 Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2015-10-24 10:53:59 +02:00
angelblue05
d5c1bec4c6 Add music video artist link 2015-10-23 20:00:34 -05:00
marcelveldt
6950505341 Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2015-10-23 21:06:55 +02:00
marcelveldt
138a495906 close handle to file 2015-10-23 21:06:35 +02:00
angelblue05
dbf6a350c7 Fix direct path 
By the time the initial setup went thru, the class was already loaded.
Instead, load the settings in the instance.
 2015-10-23 02:21:12 -05:00
angelblue05
bcee7dde76 First try at fixing singles issue for music 2015-10-23 01:45:52 -05:00
angelblue05
1893e79014 Add option to ask to play trailers 2015-10-22 23:09:01 -05:00
angelblue05
22b62133eb Kodi database scan 
Prevent writing to database when the kodi database scan is running.
 2015-10-22 21:55:32 -05:00
angelblue05
540745e24a Fix kodi exception 
For music report playback, verify that the type we are about to process
is actually a song, otherwise we get a lot of exceptions that file is
not playing.
 2015-10-22 19:46:29 -05:00
angelblue05
56ef721836 Fix artwork for albums 
Boxrear is poster, primary is thumb instead of primary being thumb and
poster and boxrear is poster.
 2015-10-22 17:49:38 -05:00
angelblue05
d0bf205331 Database warning 
Warn the user visually of the database not found error.
 2015-10-21 22:44:40 -05:00
angelblue05
6a9eddd413 Fix unicode error 
Since we are not using self.logMsg, this is needed incase the path
contains unicode characters (window username)
 2015-10-21 16:30:52 -05:00
angelblue05
ca2b2745db Take into account coverart settings 
To disable coverart
 2015-10-21 02:40:02 -05:00
angelblue05
54f39fa58e Support report playback for music 2015-10-20 04:18:13 -05:00
angelblue05
a0347ce03d Fix error for playback report 
Take into account TypeError (nonetype), depending on the player used, it
might not return a result.
 2015-10-19 00:40:19 -05:00
angelblue05
6849c22414 Support emby tags for music videos 2015-10-18 21:15:49 -05:00
angelblue05
069379ae59 Studios modification 
Kodi only takes in one studio to display the studio logo. All of the
studios are still process, but only the first one will be added in the
movie table.
 2015-10-18 20:54:57 -05:00
im85288
5a481e7779 jarvis music db bump 2015-10-18 14:17:13 +01:00
angelblue05
a841b68ee0 Ignore channels 
Now that they are being integrated in views
 2015-10-17 18:22:41 -05:00
angelblue05
eabf94623a Allow dateAdded to be updated 
For movies, music videos, episodes.
 2015-10-16 17:38:25 -05:00
angelblue05
a3d7369576 Disable warning in downloadutils 
For insecure ssl connections
 2015-10-15 17:11:44 -05:00
angelblue05
0295291450 Fix missing argument 2015-10-15 16:47:45 -05:00
im85288
79e79eddd1 Set and Clear additional user images for use in skins 2015-10-14 19:58:32 +01:00
angelblue05
e781e9e02d Add parent album to artwork 
For parent images
 2015-10-14 08:46:46 -05:00
angelblue05
d8ae0b695c Fix typo 2015-10-13 12:22:22 -05:00
angelblue05
46d8c1d4c2 Extend the artwork method 
To grab parent artwork
 2015-10-13 10:40:21 -05:00
angelblue05
13501b42d1 Adding support for Boxrear artwork 
For albums.
 2015-10-13 06:42:15 -05:00
angelblue05
b7cf3bc15a Fix for missing fanart for albums 
Re-added old method for fanart specifically.
 2015-10-13 06:24:23 -05:00
angelblue05
5a2b8b7cfd Fix delete settings 2015-10-13 05:41:28 -05:00
angelblue05
582949e79c Fix error caused by idSeason 
Will properly skip the episode in the event the actual season is missing
it's number.
 2015-10-13 05:05:03 -05:00
angelblue05
48654801e5 Fix double report progress 
Removed stack implementation. Working with playlist and setresolvedurl.
 2015-10-13 03:00:32 -05:00
xnappo
9970a770c4 Add check for season 0 as server now returns this 2015-10-12 13:45:23 -05:00
angelblue05
32ad6cf684 Fix for collections 
Filter out trailers channel
 2015-10-12 12:44:20 -05:00
angelblue05
0fd88210b4 Fix syntax causing error on Android 2015-10-12 12:22:51 -05:00
angelblue05
4061d0b7e9 Fix lag at start up 
Prevent lag before displaying welcome message.
 2015-10-12 11:31:02 -05:00
angelblue05
ddd334f285 Fix playback 
Intros, additional parts, playlists should now be fully functional... I
hope...
 2015-10-12 11:20:50 -05:00
im85288
dfedf545ba allow option to select direct paths at startup 2015-10-12 16:29:05 +01:00
angelblue05
2d636d5b2d Fix artwork 
Prevent artwork type not supported from syncing
 2015-10-11 23:41:55 -05:00
im85288
75a877ee9e jarvis support 2015-10-11 23:50:46 +01:00
im85288
45a840e12e jarvis support 2015-10-11 22:03:59 +01:00
angelblue05
d5f3db078f Readjust playback using playlists 
Instead of fighting against Kodi, work with already set playlist and
adding items to it. Added extra comments to help understand.
 2015-10-11 09:25:10 -05:00
angelblue05
5f3f45e404 Fix playcount 2015-10-08 20:11:06 -05:00
angelblue05
06ad9ab18c New artwork method implement 
Old method still available for backward compatibility
 2015-10-08 04:18:56 -05:00
angelblue05
6c4242abeb Revert "Update artwork method" 
This reverts commit 3928b3edb7.
 2015-10-07 19:49:18 -05:00
angelblue05
3928b3edb7 Update artwork method 
In preparation for extra fanart
 2015-10-07 19:39:30 -05:00
angelblue05
91396d84e8 Preparation for new artwork method 
Moved to cache texture to limit duplicated methods (video and music).
Update backdrop instantly, should not cause any issues this time since
it only triggers if the url is different than the new one.
 2015-10-05 06:02:43 -05:00
angelblue05
3605a48933 Fix for tv show is not found on server 
When processing episodes, if the show failed to be added.
 2015-10-04 06:40:39 -05:00
angelblue05
7d9fe89806 Prevent double marking as watched 
Also removed the mark watched at: % setting. It is controlled by the
server itself.
 2015-10-04 06:05:31 -05:00
angelblue05
43494ec053 getAllArtwork 
Get all the artwork for an item at once.
 2015-10-03 03:41:39 -05:00
angelblue05
8f75f96909 Fix typo 2015-10-02 19:28:32 -05:00
angelblue05
5d74dcedc4 Fix to follow emby views 
To follow "my views" presentation
 2015-10-02 02:08:21 -05:00
angelblue05
fe5ae9386a Support Emby tags 2015-10-01 22:30:11 -05:00
angelblue05
4ab6991968 Transcode revision, stack files, playback cleanup 2015-10-01 08:08:34 -05:00
angelblue05
0294957d14 Studios convert to Kodi compatible studios 2015-10-01 03:13:39 -05:00
angelblue05
86c4db78f9 Change dialog to notification for direct play 
Still allow for playback, while letting the user know.
 2015-09-30 18:19:34 -05:00
im85288
9cb84906b1 Merge remote-tracking branch 'origin/master' 2015-09-27 22:06:30 +01:00
im85288
0c0832421b rotten tomatoes removed 2015-09-27 22:06:22 +01:00
angelblue05
3954cdddd0 Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2015-09-26 17:09:57 -05:00
angelblue05
142c5cad01 DTS-HD MA fix 2015-09-26 17:09:53 -05:00
im85288
dac614b284 video db bumped to version 97 for jarvis 2015-09-26 11:25:11 +01:00
angelblue05
a39784cb81 Fix profile switch v2 
Make sure the threads are terminated correctly. This time, verify the
profile before anything else.
 2015-09-24 06:59:26 -05:00
angelblue05
e0343891af Revert "Fix profile switching" 
This reverts commit 0e61825579.
 2015-09-24 06:48:43 -05:00
angelblue05
0e61825579 Fix profile switching 
Make sure the threads are properly terminated.
 2015-09-24 06:16:19 -05:00
angelblue05
9d86604800 Support strm file playback regardless of method 2015-09-17 16:00:58 -05:00
angelblue05
cb9aeebd3d Fix music in initial set up wizard 
Reverse the logic since music is enabled by default.
 2015-09-16 16:12:42 -05:00
angelblue05
1c4bf024fb Fix for intro 
Not very pretty but this should prevent loop when enabling intros
 2015-09-16 11:57:08 -05:00
angelblue05
05e421415f Revert "Fix for intro" 
This reverts commit 773fa19762.
 2015-09-16 11:29:51 -05:00
angelblue05
df685030d3 Revert "Final fix for intros" 
This reverts commit 97d4a99897.
 2015-09-16 11:29:39 -05:00
angelblue05
97d4a99897 Final fix for intros 2015-09-16 10:28:22 -05:00
angelblue05
3a7afedb6c Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2015-09-16 10:07:34 -05:00
angelblue05
773fa19762 Fix for intro 2015-09-16 10:07:30 -05:00
im85288
c5d5e87574 drop emby only if it exists...which should be most of the time :) 2015-09-16 16:00:54 +01:00
im85288
84096ad022 fix playback intros 2015-09-16 15:52:54 +01:00
im85288
3a392ce27f assure to drop emby table on reset 2015-09-16 09:52:48 +01:00
im85288
0a6dd94eff add library monitor to assist with embyskinhelper for data such as critcrating etc 2015-09-15 18:03:52 +01:00
angelblue05
0546dcc2f6 Move database log line 
So it only prints one time.
 2015-09-15 11:26:32 -05:00
angelblue05
ea941ed6b4 Fix for add people 2015-09-15 07:48:42 -05:00
xnappo
5496cb0667 Switch to local code for version check 2015-09-10 21:27:36 -05:00
im85288
b0592d3b02 support new jarvis version of music db 54 2015-09-10 17:16:18 +01:00
angelblue05
c92454bb92 Support mixed content and undefined collection 
Undefined collection - when rich presentation is disabled.
 2015-09-08 13:36:49 -05:00
angelblue05
09966b25bb Option to sync specials ordering 
False by default, since not everyone likes displaying them within
seasons.
 2015-09-07 10:30:25 -05:00
angelblue05
c698e39bb2 Prevent loop if user decides not to reset db yet 2015-09-07 04:12:28 -05:00
xnappo
5592429863 Missed a line at merge 2015-09-06 12:32:07 -05:00
xnappo
76bec3e846 Add library version tracking 2015-09-06 12:28:00 -05:00
shaun
2b9e352d72 user server time, add max items setting 2015-09-06 15:44:23 +10:00
im85288
5a5ff2871c bumped video db version for Jarvis 2015-09-05 10:56:00 +01:00
shaun
b923eed55d move data access to inside the try 2015-09-05 18:35:46 +10:00
angelblue05
3591d085af Follow up fix for encoding 2015-09-05 02:18:24 -05:00
Shaun
53cc2c9c74 ad some limits to the inc sync counts atm its 1K 2015-09-05 16:58:39 +10:00
angelblue05
30ea23aea0 Fix for externalsubs - direct paths 2015-09-02 23:00:29 -05:00
im85288
0eee08f0bd bumped video db version for Jarvis 2015-09-01 19:20:18 +01:00
Shaun
fc0442e0ed remove all movies from box set before updating to cacth movies that have been removed 
only sync box sets that have changed for inc sync
 2015-09-01 23:02:55 +10:00
angelblue05
63bba9d450 Fix for new rating 
UR - Not rated
 2015-08-31 22:13:42 -05:00
angelblue05
efd6b95408 Fix for dialog error when 401 2015-08-30 20:17:09 -05:00
angelblue05
67e2256c62 Change logging level for database checks 2015-08-28 03:13:06 -05:00
angelblue05
fc1344b7da Add option to sync empty tv shows 2015-08-25 22:21:31 -05:00
angelblue05
de9fe79ab8 Add setup dialog 
For music - to enable and if direct stream should be used.
 2015-08-24 06:44:23 -05:00
angelblue05
1691fd5e8b External subtitles 
Add external subtitles as tracks for direct play and direct stream.
Important to note, when direct streaming, the tracks are defined as
Unknown(external). There's no way to correct this.
 2015-08-24 05:55:37 -05:00
angelblue05
475a671d08 Set central window property 
Always have the latest properties and will clean up the code. Will
centralize the rest of the code a bit later.
 2015-08-24 02:39:19 -05:00
angelblue05
e09c209a6b Music library 
make it seemless - dependant on alternate ip to be enabled to add
pathsubstitution.
 2015-08-22 11:17:54 -05:00
angelblue05
64e413b9d1 Fix db not scanning in after reset 
Only affected by reset via add-on settings. Because the settings dialog
is open, when it closes, it overwrites every settings. So in order to
prevent this, close any dialogs open before the reset actually happens.
 2015-08-22 04:22:57 -05:00
angelblue05
41fa61ada9 Revert "Take into account item type for direct stream" 
This reverts commit 53fbbffa75.
 2015-08-20 20:51:54 -05:00
angelblue05
afa582057a Revert "Music library - remote" 
This reverts commit 88632dad60.
 2015-08-20 20:51:47 -05:00
angelblue05
53fbbffa75 Take into account item type for direct stream 
Video and audio
 2015-08-20 09:15:37 -05:00
angelblue05
e24d982c36 Prevent errors in reporting to server 
For other media that are not movies and tv shows.
 2015-08-20 07:27:29 -05:00
angelblue05
88632dad60 Music library - remote 
Trying strm files to still have plugin paths. Will require restart
because I've added a new column to hold the full path for strm in the
event we need to delete them.
 2015-08-20 06:42:40 -05:00
angelblue05
eae370c33f Fix for transcoding 
Using AC3 instead of AAC because the sound quality was very degraded
with higher audio channels.
 2015-08-19 08:26:03 -05:00
angelblue05
c3e70602c5 Fix potential local reference error 2015-08-18 23:40:03 -05:00
angelblue05
888e5f2989 Fix for userdata 
Forgot the music check for the database check.
 2015-08-17 18:24:07 -05:00
angelblue05
f290372c5d Added permanent users 
When starting the Kodi session, will automatically add users to the
session.
 2015-08-15 00:20:06 -05:00
angelblue05
db45faed24 Add userdata update only for music 
Only songs have playcount and lastplayed
 2015-08-14 22:16:38 -05:00
shaun
f87cdae256 add progress dialog to inc sync 2015-08-15 12:00:21 +10:00
angelblue05
0da02868c2 Comment out music userdata 
Not ready yet, forgot to exclude it.
 2015-08-14 05:33:40 -05:00
angelblue05
2e2448b823 Revert "Comment out music userdata as it's not ready yet." 
This reverts commit 5b81da2d96.
 2015-08-14 05:32:11 -05:00
angelblue05
5b81da2d96 Comment out music userdata as it's not ready yet. 2015-08-14 05:30:43 -05:00
angelblue05
c0f9948cf5 Convert settings to utils method for addon settings 2015-08-14 04:03:12 -05:00
angelblue05
811e91a0b5 In prep for userdata only modification 
Speed up the process. Waiting for the insertion of the kodi_file_id in
the emby database table.
 2015-08-12 05:18:07 -05:00
angelblue05
40b381de94 Set up for central addon settings 
Please start using it for new methods. I will take care of changing
older ones.
 2015-08-12 04:59:05 -05:00
Shaun
05be6eaa07 Move last sync run save time to after the updates happen 2015-08-11 09:14:22 +10:00
xnappo
c0238574b7 Updates from pünktchen 2015-08-10 09:55:57 -05:00
angelblue05
232e2d98ed Fix bug in incremental 
Due to changes in parameter, requires the full item instead of the
itemId.
 2015-08-09 21:18:26 -05:00
im85288
6ffd7fb491 added user image property for skins to use 2015-08-09 16:44:02 +01:00
angelblue05
1660a29e68 Improve network quality logging 2015-08-08 10:11:41 -05:00
angelblue05
2fc282175d Improve logging 2015-08-08 08:15:05 -05:00
angelblue05
7c4ea6ecea Quick follow up for mpaa 
Incase other rating contain the NR. To avoid mix ups.
 2015-08-08 07:18:53 -05:00
angelblue05
fee8b958de Adjust mpaa rating and quick fix for ratio 2015-08-08 07:16:51 -05:00
angelblue05
ef927d6b3b Metadata aspect ratio 
Take it into consideration
 2015-08-08 03:57:04 -05:00
angelblue05
ec6daa3a87 Fix playback key error 
For real this time.
 2015-08-07 22:29:27 -05:00
angelblue05
e7335b05a0 Fix error caused when starting from widget 
.get to avoid key error. Didn't think about the playback error from
widgets.
 2015-08-06 21:30:15 -05:00
Marcel van der Veldt
3b9d1ac02f Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2015-08-06 13:01:49 +02:00
Marcel van der Veldt
aacd72486e fixed nextepisodes updating by removing the caching 2015-08-06 13:01:33 +02:00
angelblue05
2dc0a20e0a Remove deprecated settings 2015-08-06 03:15:09 -05:00
angelblue05
ecaaa11deb Added audio/sub selection for transcoding 
Also fixed transcoding not terminating as it should and leaving the
ffmpeg running.
 2015-08-06 03:09:45 -05:00
angelblue05
68245268ba Quick follow up 
Account for when subtitles are disabled.
 2015-08-05 23:56:47 -05:00
angelblue05
08285df00f Revert "Quick follow up" 
This reverts commit 567da0114e.
 2015-08-05 23:55:55 -05:00
angelblue05
567da0114e Quick follow up 
Account for when subtitles are disabled.
 2015-08-05 23:55:20 -05:00
angelblue05
abe60aa3b8 Added remote control - audio and subtitle streams 
Fix the index of streams to properly reflect the correct ones.
 2015-08-05 23:30:33 -05:00
Marcel van der Veldt
c7c35fd442 Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi 2015-08-05 15:05:58 +02:00
Marcel van der Veldt
8e3eba858d fix extrafanart retrieval 2015-08-05 15:05:37 +02:00
Shaun
72ff484777 use new date param 2015-08-05 19:44:18 +10:00
angelblue05
e972ae2729 Clean up + encoding utf-8 
Added message when server is restarting. Optional.
 2015-08-05 03:40:54 -05:00
xnappo
7e281ecf13 Still allow full manual sync 2015-08-04 09:17:41 -05:00
angelblue05
021261617e Add season fanart 2015-08-04 04:45:26 -05:00
angelblue05
5dd607f6d2 Albums fix for latest added 
Sort by date created so the result is the same as the server.
 2015-08-04 03:45:23 -05:00
angelblue05
de0690833e Follow up - apply limit to the artists and albums 2015-08-04 02:12:58 -05:00
angelblue05
59aaa4d42b First attempt at fixing music 
Pull the list of songs in batch of 200 items to prevent timeouts.
 2015-08-04 01:07:39 -05:00
angelblue05
94055c952c Restore the 50 ids limit 2015-08-03 23:04:34 -05:00
angelblue05
a243b50f87 Revert itemtype change 
Since .getItem no longer returns None but returns an empty dictionary.
 2015-08-03 04:59:39 -05:00
angelblue05
3aa2598c79 Fix nodes - forgot the encoding 
Also replace none with empty dictionary for getItem
 2015-08-03 04:45:23 -05:00
shaun
d548ab6e27 add url encoding to time stamp 2015-08-03 18:36:35 +10:00
angelblue05
560abbcc5d Created normalize method for video nodes only 
Since no modification can happen to the theme naming.
 2015-08-02 19:28:13 -05:00
Marcel van der Veldt
a7310dc634 normalize paths in videonode building 2015-08-03 01:52:47 +02:00
shaun
c3e2d88784 Merge remote-tracking branch 'origin/master' 
Conflicts:
	resources/lib/LibrarySync.py
 2015-08-02 19:23:54 +10:00
shaun
ac80632644 fix silly bug with addon setting not being setup soon enough 2015-08-02 19:16:55 +10:00
angelblue05
6ff953df55 Fix error 2015-08-02 03:59:41 -05:00