Version 4.0.0 (#182)
* Adjust refresh behavior
* Fix favorites
* Add option to mask info
* Fix keymap delete
* Fix empty show
* Version bump 3.1.14
* Reset rescan flag
* Fix subtitles encoding
* Fix path verification
* Fix update library
Plug in remove library percentage
* Fix unauthorized behavior
Reprompt user with login
* Fix series pooling
* Version bump 3.1.15
* Fix for additional users
Return all users, not just public users
* Fix http potential errors
Prevent from going further if {server} or {userid} is requested but not filled to avoid 401 errors
* Fix extra fanart
* Fix patch
make a case insensitive search
* Version bump 3.1.16
Additional logging, fix kodi source.
* Fix library tags on update
* Version bump 3.1.17
* Fix season artwork
* Fix season artwork
* Fix logging
* Fix blank files sources
* Add backup option
* Fix userdata song
* Transfer data.txt to data.json
Use default port for webserver caching
* Fix mixed content shortcut
* Fix path encoding for patch
Hopefully this works...
* Fix source nonetype error
Just incase, wrap in a try/except because it's not important.
* Base fast sync on server time
Try to fix music video refresh to prevent cursor from moving up.
* Prep subfolders for dynamic
Support homevideos for now
* Fix empty artist, missing Title
* Version bump 3.1.18a
* Version bump for objects
171076013
* Notify user of large updates
Give option to back out if the user wants to manually update the libraries
* Fix sources.xml verification
* Prevent error in monitor
Put in place try/except in case data is None
* Remember sync position for manual triggers
Allow to resume sync on restart for manual user triggers (update, repair). Automatically refresh boxsets if movie library is selected.
use waitForAbort and emby_should_stop prop to terminate threads
* Update string for sync later
* Add subfolders for dynamic movies
* Small fixes
* Version bump 3.1.19
* Fix fast sync
try/except, default back to previous behavior.
* Fix artwork
* Change settings name
To ensure it takes default value instead of previous value set in 3.0.34
* Fix transcode
flac and live tv
* Fix episodes for series pooling
* Add live tv support
* Version bump 3.1.20
* Revert "Small fixes"
This reverts commit 9ec1fa35853352bb6c8a56da94e8c8bcc3843c07.
* Version bump 3.1.21
* Fix playback starting server connection instance
* Fix show update
* Fix boxsets
* Fix lastplayed
* Patch to support pre 3.6 libraries
* Fix slowness
* Plug in settings for threading
* Plug in settings for threading
* Adjust sleep behavior
* Version bump 3.1.22
* Fix server detection in monitor
* Version bump 3.1.23
* Fix potential error with checksum
* Fix missing new artists
* Fix library sync
Adjust lock, re-add screensaver deactivated during sync, prep compare sync, stop library updates from being processed before startup sync is completed
* Version bump 3.1.25
* Fix local trailers
* Adjust lock modification
* Check db version
* Prevent error from creating nodes
The addon automatically creates nodes at startup with prefilled information. Prevent errors in the event something goes wrong. It will fix itself down the line, after user has logged in.
* Version bump 3.1.26
* Revert "Version bump 3.1.26"
This reverts commit c583a69a4b9bb8af160cfb564485cc59da20fca7.
* Fix screensaver toggle
* Fix source selection for direct stream
* Version bump 3.1.26
* Add progress for updates
* Revise progress bar
Fix typos and subsetting
* content notification
* Remove content with update library
Now remove irrelevant content as well
* Fix slowness
* Version bump 3.1.27
* Stop trying to get items if server offline
* Fix content type for dynamic music
* Fix resume sync
Now save progress, unless exited due to path validation
* Fix artwork for shortcuts on profile switch
* Add force transcode settings
* Fix audiobooks back to video type
Add shortcuts. Audiobook can't be music type otherwise it break resume behavior and it won't play the right item. Has to be video type.
* Update general info
To finish, download and installation
* Update README.md
* Move welcome message to service
* Prevent patch loop
Try once, then let it go, to avoid locking user in a restart loop
* Review library threads
* Prep for audiobook transcode
Still need to implement universal for audio transcode
* Version bump 3.1.28
* Fix emby database locked
* Fix regression to welcome message
* Version bump 3.1.29
* Adjust playback
Allow direct play for http streams
* Ensure all threads are terminated correctly
* Fix empty results due to error 500
* Fix boxset refresh
* Fix resume sync behavior
Allow to complete the startup sync in the event user backs out of resume sync
* Version bump 3.1.30
* Update patch
Move patch from cache to addon_data. No longer need to restart Kodi to apply the first patch.
* Fix inital sync leading to fast sync
* Fix user settings
Due to api change in 3.6.0.55
* krypton update
* Adjust for resume settings
With .55 the resume setting is set per library. Instead query server to see if the item is played to offer delete
* Restart service upon check for updates
To reload the new objects module.
* Fix update library
Only do the compare when user selects update library, also add a restart service option in the add-on settings > advanced
* Version bump 3.1.31
* Update dependencies
* Update FR translation
* Update DE translation
* Add translation
* Support up next
* Small service adjustment
* Krypton update to support upnext
* Add a verification onwake
Somehow, Kodi can trigger OnWake without first trigger OnSleep.
* Fix loading if special char in path
* Add logging and small fixes
Prepare userdata by date modified
* Version bump 3.1.32
* Change default behavior of startup dialog
In case it is forced closed by Kodi, allow the sync to proceed
* Ensure deliveryurl is an actual url
* Update README.md
* Fix nextup
* Fix dynamic widgets
* Detect coreelect, etc
* Fix progress report
Silent RefreshProgress in websocket
* Follow emby settings for subtitles
* Version bump 3.1.33
* Add Italian translation
* Fix playback for server 3.6.0.61
* Version bump 3.1.34a
* Add silent catch for errors
* Adjust playback progress monitor
Only track progress report if the item is an emby item
* Fix subtitles not following server settings
* Add remove libraries, fix mixed libraries
* Fix live tv
For now, use transcode since direct play returns a 127.0.0.1 unusable address as the path.
* Allow live tv to direct stream
* Fix LiveTV
* Add setting to sync during playback
* Fix updates
* Fix encoding error
* Add optional rotten tomatoes option
* Version bump 3.1.35
* Fix emby connect auth string
Was preventing proper device detection when using emby connect, play to, etc.
* Add setup RT
* Fix audio/sub change
Only for addon playback
* Add developer mode
* Update patch
Check for updates + dev = forced grab from github
* Fix RT string
* Fix patch
Allow dev mode to redownload zip
* Fix patch
ugh sleep!!
* Verify patch connection
* Version bump 3.1.36
* Fix libraries being wiped
Catch errors to prevent false positive
* Add dateutil library
* Prep convert to local time
* Fix string
* Prep for multi db version support
* Fix service restart
* Add shortcut restart addon
Add notification
* Add database discovery
* Ensure previous playback terminated
* Update translation
New: Polish, Dutch Updated: German, French, Italian
* Version bump 3.1.37
* Quick fix for new library dateutil
* Catch error for dateutil
In the event the server has some weird date that can't be converted
* Version bump 3.1.38
* Fix dateutil import
* Fix db discovery
Ignore emby.db
* Version bump 3.1.39
* Add a delay if setup not completed
Avoid crash from everything loading at once.
* Fix database discovery
Add table verification + date modified verification
* Container optional playutils
* Version bump 3.1.40
* Adjust database discovery
Compare loaded vs discovered to avoid loading old databases by accident.
* Version bump 3.1.41
* Fix discovery toggle
* Version bump 3.1.42
* Add webservice for playback prep
* Fix service restart
* Version bump 3.1.43
* Update default sync indicator
Based on overall feedback
* Fix check update
* Fix if server is selected but unavailable
* Support songs without albums
* Fix encode and params
* Increase retry timeout
* Fix update generating duplicates
* Add manage libraries
Too many entries
* Fix database discovery
* Fixed transcode via context menu
* Fix context transcode
* Quiet webservice
* Update Krypton objects
* Fix database discovery prompt
* fixed video listitem issues for krypton
* load all item details for playlists
* Fix playlist
* Version bump 3.1.44
* Fix force hi10p transcoding behavior
Fixes the "Force Hi10p transcoding" option to only apply to h264 video codecs
* Clear playlist on player.onstop
* Don't clear playlist if busy spinner is active
* Fix case sensitive issue at calling the log function
* fix db stuff (#164)
* Reload objects upon initial setup
* Fix database discovery
ignore db-journal
* Update translation
German, Italian
* Use LastConnectionMode for server test
* Fix compare sync
* Version bump 3.1.45
* Ensure widgets get updated
Container.Refresh alone doesn't seem to work
* Update database discovery
* Re-add texture to database discovery
* Add option to enable/disable service
* Remove unused strings
* Fix object reload upon restart service
* Update Krypton objects
* Update translation
Dutch, Polish
* Version bump 3.1.46
* Adjust client api
* Adjust subtitles behavior
* Fix string typo
* Only run one full sync instance
Prevent user from launching multiple syncs and freezing the add-on.
* added "playlists" to wnodes
* Disable Audiobooks
Server doesn't have a set structure yet. This feature is broken atm.
* Version bump 4.0.0
* License GPL v3
* Update readme
2019-01-24 13:04:48 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
|
|
#################################################################################################
|
|
|
|
|
|
|
|
import logging
|
|
|
|
import urllib
|
|
|
|
import Queue
|
|
|
|
import threading
|
|
|
|
|
|
|
|
import xbmc
|
|
|
|
import xbmcvfs
|
|
|
|
|
|
|
|
import queries as QU
|
|
|
|
import queries_texture as QUTEX
|
|
|
|
from helper import window, settings
|
2019-02-01 15:16:04 +00:00
|
|
|
import requests
|
Version 4.0.0 (#182)
* Adjust refresh behavior
* Fix favorites
* Add option to mask info
* Fix keymap delete
* Fix empty show
* Version bump 3.1.14
* Reset rescan flag
* Fix subtitles encoding
* Fix path verification
* Fix update library
Plug in remove library percentage
* Fix unauthorized behavior
Reprompt user with login
* Fix series pooling
* Version bump 3.1.15
* Fix for additional users
Return all users, not just public users
* Fix http potential errors
Prevent from going further if {server} or {userid} is requested but not filled to avoid 401 errors
* Fix extra fanart
* Fix patch
make a case insensitive search
* Version bump 3.1.16
Additional logging, fix kodi source.
* Fix library tags on update
* Version bump 3.1.17
* Fix season artwork
* Fix season artwork
* Fix logging
* Fix blank files sources
* Add backup option
* Fix userdata song
* Transfer data.txt to data.json
Use default port for webserver caching
* Fix mixed content shortcut
* Fix path encoding for patch
Hopefully this works...
* Fix source nonetype error
Just incase, wrap in a try/except because it's not important.
* Base fast sync on server time
Try to fix music video refresh to prevent cursor from moving up.
* Prep subfolders for dynamic
Support homevideos for now
* Fix empty artist, missing Title
* Version bump 3.1.18a
* Version bump for objects
171076013
* Notify user of large updates
Give option to back out if the user wants to manually update the libraries
* Fix sources.xml verification
* Prevent error in monitor
Put in place try/except in case data is None
* Remember sync position for manual triggers
Allow to resume sync on restart for manual user triggers (update, repair). Automatically refresh boxsets if movie library is selected.
use waitForAbort and emby_should_stop prop to terminate threads
* Update string for sync later
* Add subfolders for dynamic movies
* Small fixes
* Version bump 3.1.19
* Fix fast sync
try/except, default back to previous behavior.
* Fix artwork
* Change settings name
To ensure it takes default value instead of previous value set in 3.0.34
* Fix transcode
flac and live tv
* Fix episodes for series pooling
* Add live tv support
* Version bump 3.1.20
* Revert "Small fixes"
This reverts commit 9ec1fa35853352bb6c8a56da94e8c8bcc3843c07.
* Version bump 3.1.21
* Fix playback starting server connection instance
* Fix show update
* Fix boxsets
* Fix lastplayed
* Patch to support pre 3.6 libraries
* Fix slowness
* Plug in settings for threading
* Plug in settings for threading
* Adjust sleep behavior
* Version bump 3.1.22
* Fix server detection in monitor
* Version bump 3.1.23
* Fix potential error with checksum
* Fix missing new artists
* Fix library sync
Adjust lock, re-add screensaver deactivated during sync, prep compare sync, stop library updates from being processed before startup sync is completed
* Version bump 3.1.25
* Fix local trailers
* Adjust lock modification
* Check db version
* Prevent error from creating nodes
The addon automatically creates nodes at startup with prefilled information. Prevent errors in the event something goes wrong. It will fix itself down the line, after user has logged in.
* Version bump 3.1.26
* Revert "Version bump 3.1.26"
This reverts commit c583a69a4b9bb8af160cfb564485cc59da20fca7.
* Fix screensaver toggle
* Fix source selection for direct stream
* Version bump 3.1.26
* Add progress for updates
* Revise progress bar
Fix typos and subsetting
* content notification
* Remove content with update library
Now remove irrelevant content as well
* Fix slowness
* Version bump 3.1.27
* Stop trying to get items if server offline
* Fix content type for dynamic music
* Fix resume sync
Now save progress, unless exited due to path validation
* Fix artwork for shortcuts on profile switch
* Add force transcode settings
* Fix audiobooks back to video type
Add shortcuts. Audiobook can't be music type otherwise it break resume behavior and it won't play the right item. Has to be video type.
* Update general info
To finish, download and installation
* Update README.md
* Move welcome message to service
* Prevent patch loop
Try once, then let it go, to avoid locking user in a restart loop
* Review library threads
* Prep for audiobook transcode
Still need to implement universal for audio transcode
* Version bump 3.1.28
* Fix emby database locked
* Fix regression to welcome message
* Version bump 3.1.29
* Adjust playback
Allow direct play for http streams
* Ensure all threads are terminated correctly
* Fix empty results due to error 500
* Fix boxset refresh
* Fix resume sync behavior
Allow to complete the startup sync in the event user backs out of resume sync
* Version bump 3.1.30
* Update patch
Move patch from cache to addon_data. No longer need to restart Kodi to apply the first patch.
* Fix inital sync leading to fast sync
* Fix user settings
Due to api change in 3.6.0.55
* krypton update
* Adjust for resume settings
With .55 the resume setting is set per library. Instead query server to see if the item is played to offer delete
* Restart service upon check for updates
To reload the new objects module.
* Fix update library
Only do the compare when user selects update library, also add a restart service option in the add-on settings > advanced
* Version bump 3.1.31
* Update dependencies
* Update FR translation
* Update DE translation
* Add translation
* Support up next
* Small service adjustment
* Krypton update to support upnext
* Add a verification onwake
Somehow, Kodi can trigger OnWake without first trigger OnSleep.
* Fix loading if special char in path
* Add logging and small fixes
Prepare userdata by date modified
* Version bump 3.1.32
* Change default behavior of startup dialog
In case it is forced closed by Kodi, allow the sync to proceed
* Ensure deliveryurl is an actual url
* Update README.md
* Fix nextup
* Fix dynamic widgets
* Detect coreelect, etc
* Fix progress report
Silent RefreshProgress in websocket
* Follow emby settings for subtitles
* Version bump 3.1.33
* Add Italian translation
* Fix playback for server 3.6.0.61
* Version bump 3.1.34a
* Add silent catch for errors
* Adjust playback progress monitor
Only track progress report if the item is an emby item
* Fix subtitles not following server settings
* Add remove libraries, fix mixed libraries
* Fix live tv
For now, use transcode since direct play returns a 127.0.0.1 unusable address as the path.
* Allow live tv to direct stream
* Fix LiveTV
* Add setting to sync during playback
* Fix updates
* Fix encoding error
* Add optional rotten tomatoes option
* Version bump 3.1.35
* Fix emby connect auth string
Was preventing proper device detection when using emby connect, play to, etc.
* Add setup RT
* Fix audio/sub change
Only for addon playback
* Add developer mode
* Update patch
Check for updates + dev = forced grab from github
* Fix RT string
* Fix patch
Allow dev mode to redownload zip
* Fix patch
ugh sleep!!
* Verify patch connection
* Version bump 3.1.36
* Fix libraries being wiped
Catch errors to prevent false positive
* Add dateutil library
* Prep convert to local time
* Fix string
* Prep for multi db version support
* Fix service restart
* Add shortcut restart addon
Add notification
* Add database discovery
* Ensure previous playback terminated
* Update translation
New: Polish, Dutch Updated: German, French, Italian
* Version bump 3.1.37
* Quick fix for new library dateutil
* Catch error for dateutil
In the event the server has some weird date that can't be converted
* Version bump 3.1.38
* Fix dateutil import
* Fix db discovery
Ignore emby.db
* Version bump 3.1.39
* Add a delay if setup not completed
Avoid crash from everything loading at once.
* Fix database discovery
Add table verification + date modified verification
* Container optional playutils
* Version bump 3.1.40
* Adjust database discovery
Compare loaded vs discovered to avoid loading old databases by accident.
* Version bump 3.1.41
* Fix discovery toggle
* Version bump 3.1.42
* Add webservice for playback prep
* Fix service restart
* Version bump 3.1.43
* Update default sync indicator
Based on overall feedback
* Fix check update
* Fix if server is selected but unavailable
* Support songs without albums
* Fix encode and params
* Increase retry timeout
* Fix update generating duplicates
* Add manage libraries
Too many entries
* Fix database discovery
* Fixed transcode via context menu
* Fix context transcode
* Quiet webservice
* Update Krypton objects
* Fix database discovery prompt
* fixed video listitem issues for krypton
* load all item details for playlists
* Fix playlist
* Version bump 3.1.44
* Fix force hi10p transcoding behavior
Fixes the "Force Hi10p transcoding" option to only apply to h264 video codecs
* Clear playlist on player.onstop
* Don't clear playlist if busy spinner is active
* Fix case sensitive issue at calling the log function
* fix db stuff (#164)
* Reload objects upon initial setup
* Fix database discovery
ignore db-journal
* Update translation
German, Italian
* Use LastConnectionMode for server test
* Fix compare sync
* Version bump 3.1.45
* Ensure widgets get updated
Container.Refresh alone doesn't seem to work
* Update database discovery
* Re-add texture to database discovery
* Add option to enable/disable service
* Remove unused strings
* Fix object reload upon restart service
* Update Krypton objects
* Update translation
Dutch, Polish
* Version bump 3.1.46
* Adjust client api
* Adjust subtitles behavior
* Fix string typo
* Only run one full sync instance
Prevent user from launching multiple syncs and freezing the add-on.
* added "playlists" to wnodes
* Disable Audiobooks
Server doesn't have a set structure yet. This feature is broken atm.
* Version bump 4.0.0
* License GPL v3
* Update readme
2019-01-24 13:04:48 +00:00
|
|
|
|
|
|
|
##################################################################################################
|
|
|
|
|
2019-02-02 13:10:33 +00:00
|
|
|
LOG = logging.getLogger("JELLYFIN."+__name__)
|
Version 4.0.0 (#182)
* Adjust refresh behavior
* Fix favorites
* Add option to mask info
* Fix keymap delete
* Fix empty show
* Version bump 3.1.14
* Reset rescan flag
* Fix subtitles encoding
* Fix path verification
* Fix update library
Plug in remove library percentage
* Fix unauthorized behavior
Reprompt user with login
* Fix series pooling
* Version bump 3.1.15
* Fix for additional users
Return all users, not just public users
* Fix http potential errors
Prevent from going further if {server} or {userid} is requested but not filled to avoid 401 errors
* Fix extra fanart
* Fix patch
make a case insensitive search
* Version bump 3.1.16
Additional logging, fix kodi source.
* Fix library tags on update
* Version bump 3.1.17
* Fix season artwork
* Fix season artwork
* Fix logging
* Fix blank files sources
* Add backup option
* Fix userdata song
* Transfer data.txt to data.json
Use default port for webserver caching
* Fix mixed content shortcut
* Fix path encoding for patch
Hopefully this works...
* Fix source nonetype error
Just incase, wrap in a try/except because it's not important.
* Base fast sync on server time
Try to fix music video refresh to prevent cursor from moving up.
* Prep subfolders for dynamic
Support homevideos for now
* Fix empty artist, missing Title
* Version bump 3.1.18a
* Version bump for objects
171076013
* Notify user of large updates
Give option to back out if the user wants to manually update the libraries
* Fix sources.xml verification
* Prevent error in monitor
Put in place try/except in case data is None
* Remember sync position for manual triggers
Allow to resume sync on restart for manual user triggers (update, repair). Automatically refresh boxsets if movie library is selected.
use waitForAbort and emby_should_stop prop to terminate threads
* Update string for sync later
* Add subfolders for dynamic movies
* Small fixes
* Version bump 3.1.19
* Fix fast sync
try/except, default back to previous behavior.
* Fix artwork
* Change settings name
To ensure it takes default value instead of previous value set in 3.0.34
* Fix transcode
flac and live tv
* Fix episodes for series pooling
* Add live tv support
* Version bump 3.1.20
* Revert "Small fixes"
This reverts commit 9ec1fa35853352bb6c8a56da94e8c8bcc3843c07.
* Version bump 3.1.21
* Fix playback starting server connection instance
* Fix show update
* Fix boxsets
* Fix lastplayed
* Patch to support pre 3.6 libraries
* Fix slowness
* Plug in settings for threading
* Plug in settings for threading
* Adjust sleep behavior
* Version bump 3.1.22
* Fix server detection in monitor
* Version bump 3.1.23
* Fix potential error with checksum
* Fix missing new artists
* Fix library sync
Adjust lock, re-add screensaver deactivated during sync, prep compare sync, stop library updates from being processed before startup sync is completed
* Version bump 3.1.25
* Fix local trailers
* Adjust lock modification
* Check db version
* Prevent error from creating nodes
The addon automatically creates nodes at startup with prefilled information. Prevent errors in the event something goes wrong. It will fix itself down the line, after user has logged in.
* Version bump 3.1.26
* Revert "Version bump 3.1.26"
This reverts commit c583a69a4b9bb8af160cfb564485cc59da20fca7.
* Fix screensaver toggle
* Fix source selection for direct stream
* Version bump 3.1.26
* Add progress for updates
* Revise progress bar
Fix typos and subsetting
* content notification
* Remove content with update library
Now remove irrelevant content as well
* Fix slowness
* Version bump 3.1.27
* Stop trying to get items if server offline
* Fix content type for dynamic music
* Fix resume sync
Now save progress, unless exited due to path validation
* Fix artwork for shortcuts on profile switch
* Add force transcode settings
* Fix audiobooks back to video type
Add shortcuts. Audiobook can't be music type otherwise it break resume behavior and it won't play the right item. Has to be video type.
* Update general info
To finish, download and installation
* Update README.md
* Move welcome message to service
* Prevent patch loop
Try once, then let it go, to avoid locking user in a restart loop
* Review library threads
* Prep for audiobook transcode
Still need to implement universal for audio transcode
* Version bump 3.1.28
* Fix emby database locked
* Fix regression to welcome message
* Version bump 3.1.29
* Adjust playback
Allow direct play for http streams
* Ensure all threads are terminated correctly
* Fix empty results due to error 500
* Fix boxset refresh
* Fix resume sync behavior
Allow to complete the startup sync in the event user backs out of resume sync
* Version bump 3.1.30
* Update patch
Move patch from cache to addon_data. No longer need to restart Kodi to apply the first patch.
* Fix inital sync leading to fast sync
* Fix user settings
Due to api change in 3.6.0.55
* krypton update
* Adjust for resume settings
With .55 the resume setting is set per library. Instead query server to see if the item is played to offer delete
* Restart service upon check for updates
To reload the new objects module.
* Fix update library
Only do the compare when user selects update library, also add a restart service option in the add-on settings > advanced
* Version bump 3.1.31
* Update dependencies
* Update FR translation
* Update DE translation
* Add translation
* Support up next
* Small service adjustment
* Krypton update to support upnext
* Add a verification onwake
Somehow, Kodi can trigger OnWake without first trigger OnSleep.
* Fix loading if special char in path
* Add logging and small fixes
Prepare userdata by date modified
* Version bump 3.1.32
* Change default behavior of startup dialog
In case it is forced closed by Kodi, allow the sync to proceed
* Ensure deliveryurl is an actual url
* Update README.md
* Fix nextup
* Fix dynamic widgets
* Detect coreelect, etc
* Fix progress report
Silent RefreshProgress in websocket
* Follow emby settings for subtitles
* Version bump 3.1.33
* Add Italian translation
* Fix playback for server 3.6.0.61
* Version bump 3.1.34a
* Add silent catch for errors
* Adjust playback progress monitor
Only track progress report if the item is an emby item
* Fix subtitles not following server settings
* Add remove libraries, fix mixed libraries
* Fix live tv
For now, use transcode since direct play returns a 127.0.0.1 unusable address as the path.
* Allow live tv to direct stream
* Fix LiveTV
* Add setting to sync during playback
* Fix updates
* Fix encoding error
* Add optional rotten tomatoes option
* Version bump 3.1.35
* Fix emby connect auth string
Was preventing proper device detection when using emby connect, play to, etc.
* Add setup RT
* Fix audio/sub change
Only for addon playback
* Add developer mode
* Update patch
Check for updates + dev = forced grab from github
* Fix RT string
* Fix patch
Allow dev mode to redownload zip
* Fix patch
ugh sleep!!
* Verify patch connection
* Version bump 3.1.36
* Fix libraries being wiped
Catch errors to prevent false positive
* Add dateutil library
* Prep convert to local time
* Fix string
* Prep for multi db version support
* Fix service restart
* Add shortcut restart addon
Add notification
* Add database discovery
* Ensure previous playback terminated
* Update translation
New: Polish, Dutch Updated: German, French, Italian
* Version bump 3.1.37
* Quick fix for new library dateutil
* Catch error for dateutil
In the event the server has some weird date that can't be converted
* Version bump 3.1.38
* Fix dateutil import
* Fix db discovery
Ignore emby.db
* Version bump 3.1.39
* Add a delay if setup not completed
Avoid crash from everything loading at once.
* Fix database discovery
Add table verification + date modified verification
* Container optional playutils
* Version bump 3.1.40
* Adjust database discovery
Compare loaded vs discovered to avoid loading old databases by accident.
* Version bump 3.1.41
* Fix discovery toggle
* Version bump 3.1.42
* Add webservice for playback prep
* Fix service restart
* Version bump 3.1.43
* Update default sync indicator
Based on overall feedback
* Fix check update
* Fix if server is selected but unavailable
* Support songs without albums
* Fix encode and params
* Increase retry timeout
* Fix update generating duplicates
* Add manage libraries
Too many entries
* Fix database discovery
* Fixed transcode via context menu
* Fix context transcode
* Quiet webservice
* Update Krypton objects
* Fix database discovery prompt
* fixed video listitem issues for krypton
* load all item details for playlists
* Fix playlist
* Version bump 3.1.44
* Fix force hi10p transcoding behavior
Fixes the "Force Hi10p transcoding" option to only apply to h264 video codecs
* Clear playlist on player.onstop
* Don't clear playlist if busy spinner is active
* Fix case sensitive issue at calling the log function
* fix db stuff (#164)
* Reload objects upon initial setup
* Fix database discovery
ignore db-journal
* Update translation
German, Italian
* Use LastConnectionMode for server test
* Fix compare sync
* Version bump 3.1.45
* Ensure widgets get updated
Container.Refresh alone doesn't seem to work
* Update database discovery
* Re-add texture to database discovery
* Add option to enable/disable service
* Remove unused strings
* Fix object reload upon restart service
* Update Krypton objects
* Update translation
Dutch, Polish
* Version bump 3.1.46
* Adjust client api
* Adjust subtitles behavior
* Fix string typo
* Only run one full sync instance
Prevent user from launching multiple syncs and freezing the add-on.
* added "playlists" to wnodes
* Disable Audiobooks
Server doesn't have a set structure yet. This feature is broken atm.
* Version bump 4.0.0
* License GPL v3
* Update readme
2019-01-24 13:04:48 +00:00
|
|
|
|
|
|
|
##################################################################################################
|
|
|
|
|
|
|
|
|
|
|
|
class Artwork(object):
|
|
|
|
|
|
|
|
def __init__(self, cursor):
|
|
|
|
|
|
|
|
self.cursor = cursor
|
|
|
|
self.enable_cache = settings('enableTextureCache.bool')
|
|
|
|
self.queue = Queue.Queue()
|
|
|
|
self.threads = []
|
|
|
|
self.kodi = {
|
|
|
|
'username': settings('webServerUser'),
|
|
|
|
'password': settings('webServerPass'),
|
|
|
|
'host': "localhost",
|
|
|
|
'port': settings('webServerPort')
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
def update(self, image_url, kodi_id, media, image):
|
|
|
|
|
|
|
|
''' Update artwork in the video database.
|
|
|
|
Only cache artwork if it changed for the main backdrop, poster.
|
|
|
|
Delete current entry before updating with the new one.
|
|
|
|
Cache fanart and poster in Kodi texture cache.
|
|
|
|
'''
|
|
|
|
if not image_url or image == 'poster' and media in ('song', 'artist', 'album'):
|
|
|
|
return
|
|
|
|
|
|
|
|
cache = False
|
|
|
|
|
|
|
|
try:
|
|
|
|
self.cursor.execute(QU.get_art, (kodi_id, media, image,))
|
|
|
|
url = self.cursor.fetchone()[0]
|
|
|
|
except TypeError:
|
|
|
|
|
|
|
|
cache = True
|
|
|
|
LOG.debug("ADD to kodi_id %s art: %s", kodi_id, image_url)
|
|
|
|
self.cursor.execute(QU.add_art, (kodi_id, media, image, image_url))
|
|
|
|
else:
|
|
|
|
if url != image_url:
|
|
|
|
cache = True
|
|
|
|
|
|
|
|
if image in ('fanart', 'poster'):
|
|
|
|
self.delete_cache(url)
|
|
|
|
|
|
|
|
LOG.info("UPDATE to kodi_id %s art: %s", kodi_id, image_url)
|
|
|
|
self.cursor.execute(QU.update_art, (image_url, kodi_id, media, image))
|
|
|
|
|
|
|
|
if cache and image in ('fanart', 'poster'):
|
|
|
|
self.cache(image_url)
|
|
|
|
|
|
|
|
def add(self, artwork, *args):
|
|
|
|
|
|
|
|
''' Add all artworks.
|
|
|
|
'''
|
|
|
|
KODI = {
|
|
|
|
'Primary': ['thumb', 'poster'],
|
|
|
|
'Banner': "banner",
|
|
|
|
'Logo': "clearlogo",
|
|
|
|
'Art': "clearart",
|
|
|
|
'Thumb': "landscape",
|
|
|
|
'Disc': "discart",
|
|
|
|
'Backdrop': "fanart"
|
|
|
|
}
|
|
|
|
|
|
|
|
for art in KODI:
|
|
|
|
|
|
|
|
if art == 'Backdrop':
|
|
|
|
self.cursor.execute(QU.get_backdrops, args + ("fanart%",))
|
|
|
|
|
|
|
|
if len(self.cursor.fetchall()) > len(artwork['Backdrop']):
|
|
|
|
self.cursor.execute(QU.delete_backdrops, args + ("fanart_",))
|
|
|
|
|
|
|
|
for index, backdrop in enumerate(artwork['Backdrop']):
|
|
|
|
|
|
|
|
if index:
|
|
|
|
self.update(*(backdrop,) + args + ("%s%s" % ("fanart", index),))
|
|
|
|
else:
|
|
|
|
self.update(*(backdrop,) + args + ("fanart",))
|
|
|
|
|
|
|
|
elif art == 'Primary':
|
|
|
|
for kodi_image in KODI['Primary']:
|
|
|
|
self.update(*(artwork['Primary'],) + args + (kodi_image,))
|
|
|
|
|
|
|
|
elif artwork.get(art):
|
|
|
|
self.update(*(artwork[art],) + args + (KODI[art],))
|
|
|
|
|
|
|
|
def delete(self, *args):
|
|
|
|
|
|
|
|
''' Delete artwork from kodi database and remove cache for backdrop/posters.
|
|
|
|
'''
|
|
|
|
self.cursor.execute(QU.get_art_url, args)
|
|
|
|
|
|
|
|
for row in self.cursor.fetchall():
|
|
|
|
if row[1] in ('poster', 'fanart'):
|
|
|
|
self.delete_cache(row[0])
|
|
|
|
|
|
|
|
def cache(self, url):
|
|
|
|
|
|
|
|
''' Cache a single image to texture cache.
|
|
|
|
'''
|
|
|
|
if not url or not self.enable_cache:
|
|
|
|
return
|
|
|
|
|
|
|
|
url = self.double_urlencode(url)
|
|
|
|
self.queue.put(url)
|
|
|
|
self.add_worker()
|
|
|
|
|
|
|
|
def double_urlencode(self, text):
|
|
|
|
|
|
|
|
text = self.single_urlencode(text)
|
|
|
|
text = self.single_urlencode(text)
|
|
|
|
|
|
|
|
return text
|
|
|
|
|
|
|
|
def single_urlencode(self, text):
|
|
|
|
|
|
|
|
''' urlencode needs a utf-string.
|
|
|
|
return the result as unicode
|
|
|
|
'''
|
|
|
|
text = urllib.urlencode({'blahblahblah': text.encode('utf-8')})
|
|
|
|
text = text[13:]
|
|
|
|
|
|
|
|
return text.decode('utf-8')
|
|
|
|
|
|
|
|
def add_worker(self):
|
|
|
|
|
|
|
|
for thread in self.threads:
|
|
|
|
if thread.is_done:
|
|
|
|
self.threads.remove(thread)
|
|
|
|
|
|
|
|
if self.queue.qsize() and len(self.threads) < 2:
|
|
|
|
|
|
|
|
new_thread = GetArtworkWorker(self.kodi, self.queue)
|
|
|
|
new_thread.start()
|
|
|
|
LOG.info("-->[ q:artwork/%s ]", id(new_thread))
|
|
|
|
self.threads.append(new_thread)
|
|
|
|
|
|
|
|
def delete_cache(self, url):
|
|
|
|
|
|
|
|
''' Delete cached artwork.
|
|
|
|
'''
|
|
|
|
from database import Database
|
|
|
|
|
|
|
|
with Database('texture') as texturedb:
|
|
|
|
|
|
|
|
try:
|
|
|
|
texturedb.cursor.execute(QUTEX.get_cache, (url,))
|
|
|
|
cached = texturedb.cursor.fetchone()[0]
|
|
|
|
except TypeError:
|
|
|
|
LOG.debug("Could not find cached url: %s", url)
|
|
|
|
else:
|
|
|
|
thumbnails = xbmc.translatePath("special://thumbnails/%s" % cached).decode('utf-8')
|
|
|
|
xbmcvfs.delete(thumbnails)
|
|
|
|
texturedb.cursor.execute(QUTEX.delete_cache, (url,))
|
|
|
|
LOG.info("DELETE cached %s", cached)
|
|
|
|
|
|
|
|
|
|
|
|
class GetArtworkWorker(threading.Thread):
|
|
|
|
|
|
|
|
is_done = False
|
|
|
|
|
|
|
|
def __init__(self, kodi, queue):
|
|
|
|
|
|
|
|
self.kodi = kodi
|
|
|
|
self.queue = queue
|
|
|
|
threading.Thread.__init__(self)
|
|
|
|
|
|
|
|
def run(self):
|
|
|
|
|
|
|
|
''' Prepare the request. Request removes the urlencode which is required in this case.
|
|
|
|
Use a session allows to use a pool of connections.
|
|
|
|
'''
|
|
|
|
with requests.Session() as s:
|
|
|
|
while True:
|
|
|
|
|
|
|
|
try:
|
|
|
|
url = self.queue.get(timeout=2)
|
|
|
|
except Queue.Empty:
|
|
|
|
|
|
|
|
self.is_done = True
|
|
|
|
LOG.info("--<[ q:artwork/%s ]", id(self))
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
try:
|
|
|
|
req = requests.Request(method='HEAD',
|
|
|
|
url="http://%s:%s/image/image://%s" % (self.kodi['host'], self.kodi['port'], url),
|
|
|
|
auth=(self.kodi['username'], self.kodi['password']))
|
|
|
|
prep = req.prepare()
|
|
|
|
prep.url = "http://%s:%s/image/image://%s" % (self.kodi['host'], self.kodi['port'], url)
|
|
|
|
s.send(prep, timeout=(0.01, 0.01))
|
|
|
|
s.content # release the connection
|
|
|
|
except Exception:
|
|
|
|
pass
|
|
|
|
|
|
|
|
self.queue.task_done()
|
|
|
|
|
|
|
|
if xbmc.Monitor().abortRequested():
|
|
|
|
break
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
|
|
#################################################################################################
|
|
|
|
|
|
|
|
import logging
|
|
|
|
import os
|
|
|
|
import urllib
|
|
|
|
from sqlite3 import OperationalError
|
|
|
|
|
|
|
|
import xbmc
|
|
|
|
import xbmcgui
|
|
|
|
import xbmcvfs
|
|
|
|
import requests
|
|
|
|
|
|
|
|
import resources.lib.image_cache_thread as image_cache_thread
|
|
|
|
from resources.lib.helper import _, window, settings, JSONRPC
|
|
|
|
from resources.lib.database import Database
|
|
|
|
from __objs__ import QU
|
|
|
|
|
|
|
|
##################################################################################################
|
|
|
|
|
2019-02-02 13:10:33 +00:00
|
|
|
log = logging.getLogger("JELLYFIN."+__name__)
|
Version 4.0.0 (#182)
* Adjust refresh behavior
* Fix favorites
* Add option to mask info
* Fix keymap delete
* Fix empty show
* Version bump 3.1.14
* Reset rescan flag
* Fix subtitles encoding
* Fix path verification
* Fix update library
Plug in remove library percentage
* Fix unauthorized behavior
Reprompt user with login
* Fix series pooling
* Version bump 3.1.15
* Fix for additional users
Return all users, not just public users
* Fix http potential errors
Prevent from going further if {server} or {userid} is requested but not filled to avoid 401 errors
* Fix extra fanart
* Fix patch
make a case insensitive search
* Version bump 3.1.16
Additional logging, fix kodi source.
* Fix library tags on update
* Version bump 3.1.17
* Fix season artwork
* Fix season artwork
* Fix logging
* Fix blank files sources
* Add backup option
* Fix userdata song
* Transfer data.txt to data.json
Use default port for webserver caching
* Fix mixed content shortcut
* Fix path encoding for patch
Hopefully this works...
* Fix source nonetype error
Just incase, wrap in a try/except because it's not important.
* Base fast sync on server time
Try to fix music video refresh to prevent cursor from moving up.
* Prep subfolders for dynamic
Support homevideos for now
* Fix empty artist, missing Title
* Version bump 3.1.18a
* Version bump for objects
171076013
* Notify user of large updates
Give option to back out if the user wants to manually update the libraries
* Fix sources.xml verification
* Prevent error in monitor
Put in place try/except in case data is None
* Remember sync position for manual triggers
Allow to resume sync on restart for manual user triggers (update, repair). Automatically refresh boxsets if movie library is selected.
use waitForAbort and emby_should_stop prop to terminate threads
* Update string for sync later
* Add subfolders for dynamic movies
* Small fixes
* Version bump 3.1.19
* Fix fast sync
try/except, default back to previous behavior.
* Fix artwork
* Change settings name
To ensure it takes default value instead of previous value set in 3.0.34
* Fix transcode
flac and live tv
* Fix episodes for series pooling
* Add live tv support
* Version bump 3.1.20
* Revert "Small fixes"
This reverts commit 9ec1fa35853352bb6c8a56da94e8c8bcc3843c07.
* Version bump 3.1.21
* Fix playback starting server connection instance
* Fix show update
* Fix boxsets
* Fix lastplayed
* Patch to support pre 3.6 libraries
* Fix slowness
* Plug in settings for threading
* Plug in settings for threading
* Adjust sleep behavior
* Version bump 3.1.22
* Fix server detection in monitor
* Version bump 3.1.23
* Fix potential error with checksum
* Fix missing new artists
* Fix library sync
Adjust lock, re-add screensaver deactivated during sync, prep compare sync, stop library updates from being processed before startup sync is completed
* Version bump 3.1.25
* Fix local trailers
* Adjust lock modification
* Check db version
* Prevent error from creating nodes
The addon automatically creates nodes at startup with prefilled information. Prevent errors in the event something goes wrong. It will fix itself down the line, after user has logged in.
* Version bump 3.1.26
* Revert "Version bump 3.1.26"
This reverts commit c583a69a4b9bb8af160cfb564485cc59da20fca7.
* Fix screensaver toggle
* Fix source selection for direct stream
* Version bump 3.1.26
* Add progress for updates
* Revise progress bar
Fix typos and subsetting
* content notification
* Remove content with update library
Now remove irrelevant content as well
* Fix slowness
* Version bump 3.1.27
* Stop trying to get items if server offline
* Fix content type for dynamic music
* Fix resume sync
Now save progress, unless exited due to path validation
* Fix artwork for shortcuts on profile switch
* Add force transcode settings
* Fix audiobooks back to video type
Add shortcuts. Audiobook can't be music type otherwise it break resume behavior and it won't play the right item. Has to be video type.
* Update general info
To finish, download and installation
* Update README.md
* Move welcome message to service
* Prevent patch loop
Try once, then let it go, to avoid locking user in a restart loop
* Review library threads
* Prep for audiobook transcode
Still need to implement universal for audio transcode
* Version bump 3.1.28
* Fix emby database locked
* Fix regression to welcome message
* Version bump 3.1.29
* Adjust playback
Allow direct play for http streams
* Ensure all threads are terminated correctly
* Fix empty results due to error 500
* Fix boxset refresh
* Fix resume sync behavior
Allow to complete the startup sync in the event user backs out of resume sync
* Version bump 3.1.30
* Update patch
Move patch from cache to addon_data. No longer need to restart Kodi to apply the first patch.
* Fix inital sync leading to fast sync
* Fix user settings
Due to api change in 3.6.0.55
* krypton update
* Adjust for resume settings
With .55 the resume setting is set per library. Instead query server to see if the item is played to offer delete
* Restart service upon check for updates
To reload the new objects module.
* Fix update library
Only do the compare when user selects update library, also add a restart service option in the add-on settings > advanced
* Version bump 3.1.31
* Update dependencies
* Update FR translation
* Update DE translation
* Add translation
* Support up next
* Small service adjustment
* Krypton update to support upnext
* Add a verification onwake
Somehow, Kodi can trigger OnWake without first trigger OnSleep.
* Fix loading if special char in path
* Add logging and small fixes
Prepare userdata by date modified
* Version bump 3.1.32
* Change default behavior of startup dialog
In case it is forced closed by Kodi, allow the sync to proceed
* Ensure deliveryurl is an actual url
* Update README.md
* Fix nextup
* Fix dynamic widgets
* Detect coreelect, etc
* Fix progress report
Silent RefreshProgress in websocket
* Follow emby settings for subtitles
* Version bump 3.1.33
* Add Italian translation
* Fix playback for server 3.6.0.61
* Version bump 3.1.34a
* Add silent catch for errors
* Adjust playback progress monitor
Only track progress report if the item is an emby item
* Fix subtitles not following server settings
* Add remove libraries, fix mixed libraries
* Fix live tv
For now, use transcode since direct play returns a 127.0.0.1 unusable address as the path.
* Allow live tv to direct stream
* Fix LiveTV
* Add setting to sync during playback
* Fix updates
* Fix encoding error
* Add optional rotten tomatoes option
* Version bump 3.1.35
* Fix emby connect auth string
Was preventing proper device detection when using emby connect, play to, etc.
* Add setup RT
* Fix audio/sub change
Only for addon playback
* Add developer mode
* Update patch
Check for updates + dev = forced grab from github
* Fix RT string
* Fix patch
Allow dev mode to redownload zip
* Fix patch
ugh sleep!!
* Verify patch connection
* Version bump 3.1.36
* Fix libraries being wiped
Catch errors to prevent false positive
* Add dateutil library
* Prep convert to local time
* Fix string
* Prep for multi db version support
* Fix service restart
* Add shortcut restart addon
Add notification
* Add database discovery
* Ensure previous playback terminated
* Update translation
New: Polish, Dutch Updated: German, French, Italian
* Version bump 3.1.37
* Quick fix for new library dateutil
* Catch error for dateutil
In the event the server has some weird date that can't be converted
* Version bump 3.1.38
* Fix dateutil import
* Fix db discovery
Ignore emby.db
* Version bump 3.1.39
* Add a delay if setup not completed
Avoid crash from everything loading at once.
* Fix database discovery
Add table verification + date modified verification
* Container optional playutils
* Version bump 3.1.40
* Adjust database discovery
Compare loaded vs discovered to avoid loading old databases by accident.
* Version bump 3.1.41
* Fix discovery toggle
* Version bump 3.1.42
* Add webservice for playback prep
* Fix service restart
* Version bump 3.1.43
* Update default sync indicator
Based on overall feedback
* Fix check update
* Fix if server is selected but unavailable
* Support songs without albums
* Fix encode and params
* Increase retry timeout
* Fix update generating duplicates
* Add manage libraries
Too many entries
* Fix database discovery
* Fixed transcode via context menu
* Fix context transcode
* Quiet webservice
* Update Krypton objects
* Fix database discovery prompt
* fixed video listitem issues for krypton
* load all item details for playlists
* Fix playlist
* Version bump 3.1.44
* Fix force hi10p transcoding behavior
Fixes the "Force Hi10p transcoding" option to only apply to h264 video codecs
* Clear playlist on player.onstop
* Don't clear playlist if busy spinner is active
* Fix case sensitive issue at calling the log function
* fix db stuff (#164)
* Reload objects upon initial setup
* Fix database discovery
ignore db-journal
* Update translation
German, Italian
* Use LastConnectionMode for server test
* Fix compare sync
* Version bump 3.1.45
* Ensure widgets get updated
Container.Refresh alone doesn't seem to work
* Update database discovery
* Re-add texture to database discovery
* Add option to enable/disable service
* Remove unused strings
* Fix object reload upon restart service
* Update Krypton objects
* Update translation
Dutch, Polish
* Version bump 3.1.46
* Adjust client api
* Adjust subtitles behavior
* Fix string typo
* Only run one full sync instance
Prevent user from launching multiple syncs and freezing the add-on.
* added "playlists" to wnodes
* Disable Audiobooks
Server doesn't have a set structure yet. This feature is broken atm.
* Version bump 4.0.0
* License GPL v3
* Update readme
2019-01-24 13:04:48 +00:00
|
|
|
|
|
|
|
##################################################################################################
|
|
|
|
|
|
|
|
|
|
|
|
class Artwork(object):
|
|
|
|
|
|
|
|
xbmc_host = 'localhost'
|
|
|
|
xbmc_port = None
|
|
|
|
xbmc_username = None
|
|
|
|
xbmc_password = None
|
|
|
|
|
|
|
|
image_cache_threads = []
|
|
|
|
image_cache_limit = 0
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, server):
|
|
|
|
|
|
|
|
self.server = server
|
|
|
|
self.enable_texture_cache = settings('enableTextureCache') == "true"
|
|
|
|
self.image_cache_limit = int(settings('imageCacheLimit')) * 5
|
|
|
|
log.debug("image cache thread count: %s", self.image_cache_limit)
|
|
|
|
|
|
|
|
if not self.xbmc_port and self.enable_texture_cache:
|
|
|
|
self._set_webserver_details()
|
|
|
|
|
|
|
|
|
|
|
|
def texture_cache_sync(self):
|
|
|
|
# This method will sync all Kodi artwork to textures13.db
|
|
|
|
# and cache them locally. This takes diskspace!
|
|
|
|
if not dialog(type_="yesno",
|
2019-02-02 13:10:33 +00:00
|
|
|
heading="{jellyfin}",
|
Version 4.0.0 (#182)
* Adjust refresh behavior
* Fix favorites
* Add option to mask info
* Fix keymap delete
* Fix empty show
* Version bump 3.1.14
* Reset rescan flag
* Fix subtitles encoding
* Fix path verification
* Fix update library
Plug in remove library percentage
* Fix unauthorized behavior
Reprompt user with login
* Fix series pooling
* Version bump 3.1.15
* Fix for additional users
Return all users, not just public users
* Fix http potential errors
Prevent from going further if {server} or {userid} is requested but not filled to avoid 401 errors
* Fix extra fanart
* Fix patch
make a case insensitive search
* Version bump 3.1.16
Additional logging, fix kodi source.
* Fix library tags on update
* Version bump 3.1.17
* Fix season artwork
* Fix season artwork
* Fix logging
* Fix blank files sources
* Add backup option
* Fix userdata song
* Transfer data.txt to data.json
Use default port for webserver caching
* Fix mixed content shortcut
* Fix path encoding for patch
Hopefully this works...
* Fix source nonetype error
Just incase, wrap in a try/except because it's not important.
* Base fast sync on server time
Try to fix music video refresh to prevent cursor from moving up.
* Prep subfolders for dynamic
Support homevideos for now
* Fix empty artist, missing Title
* Version bump 3.1.18a
* Version bump for objects
171076013
* Notify user of large updates
Give option to back out if the user wants to manually update the libraries
* Fix sources.xml verification
* Prevent error in monitor
Put in place try/except in case data is None
* Remember sync position for manual triggers
Allow to resume sync on restart for manual user triggers (update, repair). Automatically refresh boxsets if movie library is selected.
use waitForAbort and emby_should_stop prop to terminate threads
* Update string for sync later
* Add subfolders for dynamic movies
* Small fixes
* Version bump 3.1.19
* Fix fast sync
try/except, default back to previous behavior.
* Fix artwork
* Change settings name
To ensure it takes default value instead of previous value set in 3.0.34
* Fix transcode
flac and live tv
* Fix episodes for series pooling
* Add live tv support
* Version bump 3.1.20
* Revert "Small fixes"
This reverts commit 9ec1fa35853352bb6c8a56da94e8c8bcc3843c07.
* Version bump 3.1.21
* Fix playback starting server connection instance
* Fix show update
* Fix boxsets
* Fix lastplayed
* Patch to support pre 3.6 libraries
* Fix slowness
* Plug in settings for threading
* Plug in settings for threading
* Adjust sleep behavior
* Version bump 3.1.22
* Fix server detection in monitor
* Version bump 3.1.23
* Fix potential error with checksum
* Fix missing new artists
* Fix library sync
Adjust lock, re-add screensaver deactivated during sync, prep compare sync, stop library updates from being processed before startup sync is completed
* Version bump 3.1.25
* Fix local trailers
* Adjust lock modification
* Check db version
* Prevent error from creating nodes
The addon automatically creates nodes at startup with prefilled information. Prevent errors in the event something goes wrong. It will fix itself down the line, after user has logged in.
* Version bump 3.1.26
* Revert "Version bump 3.1.26"
This reverts commit c583a69a4b9bb8af160cfb564485cc59da20fca7.
* Fix screensaver toggle
* Fix source selection for direct stream
* Version bump 3.1.26
* Add progress for updates
* Revise progress bar
Fix typos and subsetting
* content notification
* Remove content with update library
Now remove irrelevant content as well
* Fix slowness
* Version bump 3.1.27
* Stop trying to get items if server offline
* Fix content type for dynamic music
* Fix resume sync
Now save progress, unless exited due to path validation
* Fix artwork for shortcuts on profile switch
* Add force transcode settings
* Fix audiobooks back to video type
Add shortcuts. Audiobook can't be music type otherwise it break resume behavior and it won't play the right item. Has to be video type.
* Update general info
To finish, download and installation
* Update README.md
* Move welcome message to service
* Prevent patch loop
Try once, then let it go, to avoid locking user in a restart loop
* Review library threads
* Prep for audiobook transcode
Still need to implement universal for audio transcode
* Version bump 3.1.28
* Fix emby database locked
* Fix regression to welcome message
* Version bump 3.1.29
* Adjust playback
Allow direct play for http streams
* Ensure all threads are terminated correctly
* Fix empty results due to error 500
* Fix boxset refresh
* Fix resume sync behavior
Allow to complete the startup sync in the event user backs out of resume sync
* Version bump 3.1.30
* Update patch
Move patch from cache to addon_data. No longer need to restart Kodi to apply the first patch.
* Fix inital sync leading to fast sync
* Fix user settings
Due to api change in 3.6.0.55
* krypton update
* Adjust for resume settings
With .55 the resume setting is set per library. Instead query server to see if the item is played to offer delete
* Restart service upon check for updates
To reload the new objects module.
* Fix update library
Only do the compare when user selects update library, also add a restart service option in the add-on settings > advanced
* Version bump 3.1.31
* Update dependencies
* Update FR translation
* Update DE translation
* Add translation
* Support up next
* Small service adjustment
* Krypton update to support upnext
* Add a verification onwake
Somehow, Kodi can trigger OnWake without first trigger OnSleep.
* Fix loading if special char in path
* Add logging and small fixes
Prepare userdata by date modified
* Version bump 3.1.32
* Change default behavior of startup dialog
In case it is forced closed by Kodi, allow the sync to proceed
* Ensure deliveryurl is an actual url
* Update README.md
* Fix nextup
* Fix dynamic widgets
* Detect coreelect, etc
* Fix progress report
Silent RefreshProgress in websocket
* Follow emby settings for subtitles
* Version bump 3.1.33
* Add Italian translation
* Fix playback for server 3.6.0.61
* Version bump 3.1.34a
* Add silent catch for errors
* Adjust playback progress monitor
Only track progress report if the item is an emby item
* Fix subtitles not following server settings
* Add remove libraries, fix mixed libraries
* Fix live tv
For now, use transcode since direct play returns a 127.0.0.1 unusable address as the path.
* Allow live tv to direct stream
* Fix LiveTV
* Add setting to sync during playback
* Fix updates
* Fix encoding error
* Add optional rotten tomatoes option
* Version bump 3.1.35
* Fix emby connect auth string
Was preventing proper device detection when using emby connect, play to, etc.
* Add setup RT
* Fix audio/sub change
Only for addon playback
* Add developer mode
* Update patch
Check for updates + dev = forced grab from github
* Fix RT string
* Fix patch
Allow dev mode to redownload zip
* Fix patch
ugh sleep!!
* Verify patch connection
* Version bump 3.1.36
* Fix libraries being wiped
Catch errors to prevent false positive
* Add dateutil library
* Prep convert to local time
* Fix string
* Prep for multi db version support
* Fix service restart
* Add shortcut restart addon
Add notification
* Add database discovery
* Ensure previous playback terminated
* Update translation
New: Polish, Dutch Updated: German, French, Italian
* Version bump 3.1.37
* Quick fix for new library dateutil
* Catch error for dateutil
In the event the server has some weird date that can't be converted
* Version bump 3.1.38
* Fix dateutil import
* Fix db discovery
Ignore emby.db
* Version bump 3.1.39
* Add a delay if setup not completed
Avoid crash from everything loading at once.
* Fix database discovery
Add table verification + date modified verification
* Container optional playutils
* Version bump 3.1.40
* Adjust database discovery
Compare loaded vs discovered to avoid loading old databases by accident.
* Version bump 3.1.41
* Fix discovery toggle
* Version bump 3.1.42
* Add webservice for playback prep
* Fix service restart
* Version bump 3.1.43
* Update default sync indicator
Based on overall feedback
* Fix check update
* Fix if server is selected but unavailable
* Support songs without albums
* Fix encode and params
* Increase retry timeout
* Fix update generating duplicates
* Add manage libraries
Too many entries
* Fix database discovery
* Fixed transcode via context menu
* Fix context transcode
* Quiet webservice
* Update Krypton objects
* Fix database discovery prompt
* fixed video listitem issues for krypton
* load all item details for playlists
* Fix playlist
* Version bump 3.1.44
* Fix force hi10p transcoding behavior
Fixes the "Force Hi10p transcoding" option to only apply to h264 video codecs
* Clear playlist on player.onstop
* Don't clear playlist if busy spinner is active
* Fix case sensitive issue at calling the log function
* fix db stuff (#164)
* Reload objects upon initial setup
* Fix database discovery
ignore db-journal
* Update translation
German, Italian
* Use LastConnectionMode for server test
* Fix compare sync
* Version bump 3.1.45
* Ensure widgets get updated
Container.Refresh alone doesn't seem to work
* Update database discovery
* Re-add texture to database discovery
* Add option to enable/disable service
* Remove unused strings
* Fix object reload upon restart service
* Update Krypton objects
* Update translation
Dutch, Polish
* Version bump 3.1.46
* Adjust client api
* Adjust subtitles behavior
* Fix string typo
* Only run one full sync instance
Prevent user from launching multiple syncs and freezing the add-on.
* added "playlists" to wnodes
* Disable Audiobooks
Server doesn't have a set structure yet. This feature is broken atm.
* Version bump 4.0.0
* License GPL v3
* Update readme
2019-01-24 13:04:48 +00:00
|
|
|
line1=_(33042)):
|
|
|
|
return
|
|
|
|
|
|
|
|
log.info("Doing Image Cache Sync")
|
|
|
|
|
|
|
|
pdialog = xbmcgui.DialogProgress()
|
|
|
|
pdialog.create(_(29999), _(33043))
|
|
|
|
|
|
|
|
# ask to rest all existing or not
|
2019-02-02 13:10:33 +00:00
|
|
|
if dialog(type_="yesno", heading="{jellyfin}", line1=_(33044)):
|
Version 4.0.0 (#182)
* Adjust refresh behavior
* Fix favorites
* Add option to mask info
* Fix keymap delete
* Fix empty show
* Version bump 3.1.14
* Reset rescan flag
* Fix subtitles encoding
* Fix path verification
* Fix update library
Plug in remove library percentage
* Fix unauthorized behavior
Reprompt user with login
* Fix series pooling
* Version bump 3.1.15
* Fix for additional users
Return all users, not just public users
* Fix http potential errors
Prevent from going further if {server} or {userid} is requested but not filled to avoid 401 errors
* Fix extra fanart
* Fix patch
make a case insensitive search
* Version bump 3.1.16
Additional logging, fix kodi source.
* Fix library tags on update
* Version bump 3.1.17
* Fix season artwork
* Fix season artwork
* Fix logging
* Fix blank files sources
* Add backup option
* Fix userdata song
* Transfer data.txt to data.json
Use default port for webserver caching
* Fix mixed content shortcut
* Fix path encoding for patch
Hopefully this works...
* Fix source nonetype error
Just incase, wrap in a try/except because it's not important.
* Base fast sync on server time
Try to fix music video refresh to prevent cursor from moving up.
* Prep subfolders for dynamic
Support homevideos for now
* Fix empty artist, missing Title
* Version bump 3.1.18a
* Version bump for objects
171076013
* Notify user of large updates
Give option to back out if the user wants to manually update the libraries
* Fix sources.xml verification
* Prevent error in monitor
Put in place try/except in case data is None
* Remember sync position for manual triggers
Allow to resume sync on restart for manual user triggers (update, repair). Automatically refresh boxsets if movie library is selected.
use waitForAbort and emby_should_stop prop to terminate threads
* Update string for sync later
* Add subfolders for dynamic movies
* Small fixes
* Version bump 3.1.19
* Fix fast sync
try/except, default back to previous behavior.
* Fix artwork
* Change settings name
To ensure it takes default value instead of previous value set in 3.0.34
* Fix transcode
flac and live tv
* Fix episodes for series pooling
* Add live tv support
* Version bump 3.1.20
* Revert "Small fixes"
This reverts commit 9ec1fa35853352bb6c8a56da94e8c8bcc3843c07.
* Version bump 3.1.21
* Fix playback starting server connection instance
* Fix show update
* Fix boxsets
* Fix lastplayed
* Patch to support pre 3.6 libraries
* Fix slowness
* Plug in settings for threading
* Plug in settings for threading
* Adjust sleep behavior
* Version bump 3.1.22
* Fix server detection in monitor
* Version bump 3.1.23
* Fix potential error with checksum
* Fix missing new artists
* Fix library sync
Adjust lock, re-add screensaver deactivated during sync, prep compare sync, stop library updates from being processed before startup sync is completed
* Version bump 3.1.25
* Fix local trailers
* Adjust lock modification
* Check db version
* Prevent error from creating nodes
The addon automatically creates nodes at startup with prefilled information. Prevent errors in the event something goes wrong. It will fix itself down the line, after user has logged in.
* Version bump 3.1.26
* Revert "Version bump 3.1.26"
This reverts commit c583a69a4b9bb8af160cfb564485cc59da20fca7.
* Fix screensaver toggle
* Fix source selection for direct stream
* Version bump 3.1.26
* Add progress for updates
* Revise progress bar
Fix typos and subsetting
* content notification
* Remove content with update library
Now remove irrelevant content as well
* Fix slowness
* Version bump 3.1.27
* Stop trying to get items if server offline
* Fix content type for dynamic music
* Fix resume sync
Now save progress, unless exited due to path validation
* Fix artwork for shortcuts on profile switch
* Add force transcode settings
* Fix audiobooks back to video type
Add shortcuts. Audiobook can't be music type otherwise it break resume behavior and it won't play the right item. Has to be video type.
* Update general info
To finish, download and installation
* Update README.md
* Move welcome message to service
* Prevent patch loop
Try once, then let it go, to avoid locking user in a restart loop
* Review library threads
* Prep for audiobook transcode
Still need to implement universal for audio transcode
* Version bump 3.1.28
* Fix emby database locked
* Fix regression to welcome message
* Version bump 3.1.29
* Adjust playback
Allow direct play for http streams
* Ensure all threads are terminated correctly
* Fix empty results due to error 500
* Fix boxset refresh
* Fix resume sync behavior
Allow to complete the startup sync in the event user backs out of resume sync
* Version bump 3.1.30
* Update patch
Move patch from cache to addon_data. No longer need to restart Kodi to apply the first patch.
* Fix inital sync leading to fast sync
* Fix user settings
Due to api change in 3.6.0.55
* krypton update
* Adjust for resume settings
With .55 the resume setting is set per library. Instead query server to see if the item is played to offer delete
* Restart service upon check for updates
To reload the new objects module.
* Fix update library
Only do the compare when user selects update library, also add a restart service option in the add-on settings > advanced
* Version bump 3.1.31
* Update dependencies
* Update FR translation
* Update DE translation
* Add translation
* Support up next
* Small service adjustment
* Krypton update to support upnext
* Add a verification onwake
Somehow, Kodi can trigger OnWake without first trigger OnSleep.
* Fix loading if special char in path
* Add logging and small fixes
Prepare userdata by date modified
* Version bump 3.1.32
* Change default behavior of startup dialog
In case it is forced closed by Kodi, allow the sync to proceed
* Ensure deliveryurl is an actual url
* Update README.md
* Fix nextup
* Fix dynamic widgets
* Detect coreelect, etc
* Fix progress report
Silent RefreshProgress in websocket
* Follow emby settings for subtitles
* Version bump 3.1.33
* Add Italian translation
* Fix playback for server 3.6.0.61
* Version bump 3.1.34a
* Add silent catch for errors
* Adjust playback progress monitor
Only track progress report if the item is an emby item
* Fix subtitles not following server settings
* Add remove libraries, fix mixed libraries
* Fix live tv
For now, use transcode since direct play returns a 127.0.0.1 unusable address as the path.
* Allow live tv to direct stream
* Fix LiveTV
* Add setting to sync during playback
* Fix updates
* Fix encoding error
* Add optional rotten tomatoes option
* Version bump 3.1.35
* Fix emby connect auth string
Was preventing proper device detection when using emby connect, play to, etc.
* Add setup RT
* Fix audio/sub change
Only for addon playback
* Add developer mode
* Update patch
Check for updates + dev = forced grab from github
* Fix RT string
* Fix patch
Allow dev mode to redownload zip
* Fix patch
ugh sleep!!
* Verify patch connection
* Version bump 3.1.36
* Fix libraries being wiped
Catch errors to prevent false positive
* Add dateutil library
* Prep convert to local time
* Fix string
* Prep for multi db version support
* Fix service restart
* Add shortcut restart addon
Add notification
* Add database discovery
* Ensure previous playback terminated
* Update translation
New: Polish, Dutch Updated: German, French, Italian
* Version bump 3.1.37
* Quick fix for new library dateutil
* Catch error for dateutil
In the event the server has some weird date that can't be converted
* Version bump 3.1.38
* Fix dateutil import
* Fix db discovery
Ignore emby.db
* Version bump 3.1.39
* Add a delay if setup not completed
Avoid crash from everything loading at once.
* Fix database discovery
Add table verification + date modified verification
* Container optional playutils
* Version bump 3.1.40
* Adjust database discovery
Compare loaded vs discovered to avoid loading old databases by accident.
* Version bump 3.1.41
* Fix discovery toggle
* Version bump 3.1.42
* Add webservice for playback prep
* Fix service restart
* Version bump 3.1.43
* Update default sync indicator
Based on overall feedback
* Fix check update
* Fix if server is selected but unavailable
* Support songs without albums
* Fix encode and params
* Increase retry timeout
* Fix update generating duplicates
* Add manage libraries
Too many entries
* Fix database discovery
* Fixed transcode via context menu
* Fix context transcode
* Quiet webservice
* Update Krypton objects
* Fix database discovery prompt
* fixed video listitem issues for krypton
* load all item details for playlists
* Fix playlist
* Version bump 3.1.44
* Fix force hi10p transcoding behavior
Fixes the "Force Hi10p transcoding" option to only apply to h264 video codecs
* Clear playlist on player.onstop
* Don't clear playlist if busy spinner is active
* Fix case sensitive issue at calling the log function
* fix db stuff (#164)
* Reload objects upon initial setup
* Fix database discovery
ignore db-journal
* Update translation
German, Italian
* Use LastConnectionMode for server test
* Fix compare sync
* Version bump 3.1.45
* Ensure widgets get updated
Container.Refresh alone doesn't seem to work
* Update database discovery
* Re-add texture to database discovery
* Add option to enable/disable service
* Remove unused strings
* Fix object reload upon restart service
* Update Krypton objects
* Update translation
Dutch, Polish
* Version bump 3.1.46
* Adjust client api
* Adjust subtitles behavior
* Fix string typo
* Only run one full sync instance
Prevent user from launching multiple syncs and freezing the add-on.
* added "playlists" to wnodes
* Disable Audiobooks
Server doesn't have a set structure yet. This feature is broken atm.
* Version bump 4.0.0
* License GPL v3
* Update readme
2019-01-24 13:04:48 +00:00
|
|
|
log.info("Resetting all cache data first")
|
|
|
|
self.delete_cache()
|
|
|
|
|
|
|
|
# Cache all entries in video DB
|
|
|
|
self._cache_all_video_entries(pdialog)
|
|
|
|
# Cache all entries in music DB
|
|
|
|
self._cache_all_music_entries(pdialog)
|
|
|
|
|
|
|
|
pdialog.update(100, "%s %s" % (_(33046), len(self.image_cache_threads)))
|
|
|
|
log.info("Waiting for all threads to exit")
|
|
|
|
|
|
|
|
while len(self.image_cache_threads):
|
|
|
|
for thread in self.image_cache_threads:
|
|
|
|
if thread.is_finished:
|
|
|
|
self.image_cache_threads.remove(thread)
|
|
|
|
pdialog.update(100, "%s %s" % (_(33046), len(self.image_cache_threads)))
|
|
|
|
log.info("Waiting for all threads to exit: %s", len(self.image_cache_threads))
|
|
|
|
xbmc.sleep(500)
|
|
|
|
|
|
|
|
pdialog.close()
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def delete_cache(cls):
|
|
|
|
# Remove all existing textures first
|
|
|
|
path = xbmc.translatePath('special://thumbnails/').decode('utf-8')
|
|
|
|
if xbmcvfs.exists(path):
|
|
|
|
dirs, ignore_files = xbmcvfs.listdir(path)
|
|
|
|
for directory in dirs:
|
|
|
|
ignore_dirs, files = xbmcvfs.listdir(path + directory)
|
|
|
|
for file_ in files:
|
|
|
|
|
|
|
|
if os.path.supports_unicode_filenames:
|
|
|
|
filename = os.path.join(path + directory.decode('utf-8'),
|
|
|
|
file_.decode('utf-8'))
|
|
|
|
else:
|
|
|
|
filename = os.path.join(path.encode('utf-8') + directory, file_)
|
|
|
|
|
|
|
|
xbmcvfs.delete(filename)
|
|
|
|
log.debug("deleted: %s", filename)
|
|
|
|
|
|
|
|
# remove all existing data from texture DB
|
|
|
|
with DatabaseConn('texture') as cursor_texture:
|
|
|
|
cursor_texture.execute('SELECT tbl_name FROM sqlite_master WHERE type="table"')
|
|
|
|
rows = cursor_texture.fetchall()
|
|
|
|
for row in rows:
|
|
|
|
table_name = row[0]
|
|
|
|
if table_name != "version":
|
|
|
|
cursor_texture.execute("DELETE FROM " + table_name)
|
|
|
|
|
|
|
|
def _cache_all_video_entries(self, pdialog):
|
|
|
|
|
|
|
|
with Database('video') as cursor_video:
|
|
|
|
|
|
|
|
cursor_video.execute("SELECT url FROM art WHERE media_type != 'actor'") # dont include actors
|
|
|
|
result = cursor_video.fetchall()
|
|
|
|
total = len(result)
|
|
|
|
log.info("Image cache sync about to process %s images", total)
|
|
|
|
cursor_video.close()
|
|
|
|
|
|
|
|
count = 0
|
|
|
|
for url in result:
|
|
|
|
|
|
|
|
if pdialog.iscanceled():
|
|
|
|
break
|
|
|
|
|
|
|
|
percentage = int((float(count) / float(total))*100)
|
|
|
|
message = "%s of %s (%s)" % (count, total, len(self.image_cache_threads))
|
|
|
|
pdialog.update(percentage, "%s %s" % (_(33045), message))
|
|
|
|
self.cache_texture(url[0])
|
|
|
|
count += 1
|
|
|
|
|
|
|
|
def _cache_all_music_entries(self, pdialog):
|
|
|
|
|
|
|
|
with Database('music') as cursor_music:
|
|
|
|
|
|
|
|
cursor_music.execute("SELECT url FROM art")
|
|
|
|
result = cursor_music.fetchall()
|
|
|
|
total = len(result)
|
|
|
|
|
|
|
|
log.info("Image cache sync about to process %s images", total)
|
|
|
|
|
|
|
|
count = 0
|
|
|
|
for url in result:
|
|
|
|
|
|
|
|
if pdialog.iscanceled():
|
|
|
|
break
|
|
|
|
|
|
|
|
percentage = int((float(count) / float(total))*100)
|
|
|
|
message = "%s of %s" % (count, total)
|
|
|
|
pdialog.update(percentage, "%s %s" % (_(33045), message))
|
|
|
|
self.cache_texture(url[0])
|
|
|
|
count += 1
|
|
|
|
|
|
|
|
"""
|
|
|
|
|