mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-12-27 03:06:10 +00:00
bab67ddf9b
* 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 commit9ec1fa3585
. * 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 commitc583a69a4b
. * 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
487 lines
17 KiB
Python
487 lines
17 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
"""
|
|
Compatibility code to be able to use `cookielib.CookieJar` with requests.
|
|
|
|
requests.utils imports from here, so be careful with imports.
|
|
"""
|
|
|
|
import copy
|
|
import time
|
|
import calendar
|
|
import collections
|
|
from .compat import cookielib, urlparse, urlunparse, Morsel
|
|
|
|
try:
|
|
import threading
|
|
# grr, pyflakes: this fixes "redefinition of unused 'threading'"
|
|
threading
|
|
except ImportError:
|
|
import dummy_threading as threading
|
|
|
|
|
|
class MockRequest(object):
|
|
"""Wraps a `requests.Request` to mimic a `urllib2.Request`.
|
|
|
|
The code in `cookielib.CookieJar` expects this interface in order to correctly
|
|
manage cookie policies, i.e., determine whether a cookie can be set, given the
|
|
domains of the request and the cookie.
|
|
|
|
The original request object is read-only. The client is responsible for collecting
|
|
the new headers via `get_new_headers()` and interpreting them appropriately. You
|
|
probably want `get_cookie_header`, defined below.
|
|
"""
|
|
|
|
def __init__(self, request):
|
|
self._r = request
|
|
self._new_headers = {}
|
|
self.type = urlparse(self._r.url).scheme
|
|
|
|
def get_type(self):
|
|
return self.type
|
|
|
|
def get_host(self):
|
|
return urlparse(self._r.url).netloc
|
|
|
|
def get_origin_req_host(self):
|
|
return self.get_host()
|
|
|
|
def get_full_url(self):
|
|
# Only return the response's URL if the user hadn't set the Host
|
|
# header
|
|
if not self._r.headers.get('Host'):
|
|
return self._r.url
|
|
# If they did set it, retrieve it and reconstruct the expected domain
|
|
host = self._r.headers['Host']
|
|
parsed = urlparse(self._r.url)
|
|
# Reconstruct the URL as we expect it
|
|
return urlunparse([
|
|
parsed.scheme, host, parsed.path, parsed.params, parsed.query,
|
|
parsed.fragment
|
|
])
|
|
|
|
def is_unverifiable(self):
|
|
return True
|
|
|
|
def has_header(self, name):
|
|
return name in self._r.headers or name in self._new_headers
|
|
|
|
def get_header(self, name, default=None):
|
|
return self._r.headers.get(name, self._new_headers.get(name, default))
|
|
|
|
def add_header(self, key, val):
|
|
"""cookielib has no legitimate use for this method; add it back if you find one."""
|
|
raise NotImplementedError("Cookie headers should be added with add_unredirected_header()")
|
|
|
|
def add_unredirected_header(self, name, value):
|
|
self._new_headers[name] = value
|
|
|
|
def get_new_headers(self):
|
|
return self._new_headers
|
|
|
|
@property
|
|
def unverifiable(self):
|
|
return self.is_unverifiable()
|
|
|
|
@property
|
|
def origin_req_host(self):
|
|
return self.get_origin_req_host()
|
|
|
|
@property
|
|
def host(self):
|
|
return self.get_host()
|
|
|
|
|
|
class MockResponse(object):
|
|
"""Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
|
|
|
|
...what? Basically, expose the parsed HTTP headers from the server response
|
|
the way `cookielib` expects to see them.
|
|
"""
|
|
|
|
def __init__(self, headers):
|
|
"""Make a MockResponse for `cookielib` to read.
|
|
|
|
:param headers: a httplib.HTTPMessage or analogous carrying the headers
|
|
"""
|
|
self._headers = headers
|
|
|
|
def info(self):
|
|
return self._headers
|
|
|
|
def getheaders(self, name):
|
|
self._headers.getheaders(name)
|
|
|
|
|
|
def extract_cookies_to_jar(jar, request, response):
|
|
"""Extract the cookies from the response into a CookieJar.
|
|
|
|
:param jar: cookielib.CookieJar (not necessarily a RequestsCookieJar)
|
|
:param request: our own requests.Request object
|
|
:param response: urllib3.HTTPResponse object
|
|
"""
|
|
if not (hasattr(response, '_original_response') and
|
|
response._original_response):
|
|
return
|
|
# the _original_response field is the wrapped httplib.HTTPResponse object,
|
|
req = MockRequest(request)
|
|
# pull out the HTTPMessage with the headers and put it in the mock:
|
|
res = MockResponse(response._original_response.msg)
|
|
jar.extract_cookies(res, req)
|
|
|
|
|
|
def get_cookie_header(jar, request):
|
|
"""Produce an appropriate Cookie header string to be sent with `request`, or None."""
|
|
r = MockRequest(request)
|
|
jar.add_cookie_header(r)
|
|
return r.get_new_headers().get('Cookie')
|
|
|
|
|
|
def remove_cookie_by_name(cookiejar, name, domain=None, path=None):
|
|
"""Unsets a cookie by name, by default over all domains and paths.
|
|
|
|
Wraps CookieJar.clear(), is O(n).
|
|
"""
|
|
clearables = []
|
|
for cookie in cookiejar:
|
|
if cookie.name != name:
|
|
continue
|
|
if domain is not None and domain != cookie.domain:
|
|
continue
|
|
if path is not None and path != cookie.path:
|
|
continue
|
|
clearables.append((cookie.domain, cookie.path, cookie.name))
|
|
|
|
for domain, path, name in clearables:
|
|
cookiejar.clear(domain, path, name)
|
|
|
|
|
|
class CookieConflictError(RuntimeError):
|
|
"""There are two cookies that meet the criteria specified in the cookie jar.
|
|
Use .get and .set and include domain and path args in order to be more specific."""
|
|
|
|
|
|
class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
|
|
"""Compatibility class; is a cookielib.CookieJar, but exposes a dict
|
|
interface.
|
|
|
|
This is the CookieJar we create by default for requests and sessions that
|
|
don't specify one, since some clients may expect response.cookies and
|
|
session.cookies to support dict operations.
|
|
|
|
Requests does not use the dict interface internally; it's just for
|
|
compatibility with external client code. All requests code should work
|
|
out of the box with externally provided instances of ``CookieJar``, e.g.
|
|
``LWPCookieJar`` and ``FileCookieJar``.
|
|
|
|
Unlike a regular CookieJar, this class is pickleable.
|
|
|
|
.. warning:: dictionary operations that are normally O(1) may be O(n).
|
|
"""
|
|
def get(self, name, default=None, domain=None, path=None):
|
|
"""Dict-like get() that also supports optional domain and path args in
|
|
order to resolve naming collisions from using one cookie jar over
|
|
multiple domains.
|
|
|
|
.. warning:: operation is O(n), not O(1)."""
|
|
try:
|
|
return self._find_no_duplicates(name, domain, path)
|
|
except KeyError:
|
|
return default
|
|
|
|
def set(self, name, value, **kwargs):
|
|
"""Dict-like set() that also supports optional domain and path args in
|
|
order to resolve naming collisions from using one cookie jar over
|
|
multiple domains."""
|
|
# support client code that unsets cookies by assignment of a None value:
|
|
if value is None:
|
|
remove_cookie_by_name(self, name, domain=kwargs.get('domain'), path=kwargs.get('path'))
|
|
return
|
|
|
|
if isinstance(value, Morsel):
|
|
c = morsel_to_cookie(value)
|
|
else:
|
|
c = create_cookie(name, value, **kwargs)
|
|
self.set_cookie(c)
|
|
return c
|
|
|
|
def iterkeys(self):
|
|
"""Dict-like iterkeys() that returns an iterator of names of cookies
|
|
from the jar. See itervalues() and iteritems()."""
|
|
for cookie in iter(self):
|
|
yield cookie.name
|
|
|
|
def keys(self):
|
|
"""Dict-like keys() that returns a list of names of cookies from the
|
|
jar. See values() and items()."""
|
|
return list(self.iterkeys())
|
|
|
|
def itervalues(self):
|
|
"""Dict-like itervalues() that returns an iterator of values of cookies
|
|
from the jar. See iterkeys() and iteritems()."""
|
|
for cookie in iter(self):
|
|
yield cookie.value
|
|
|
|
def values(self):
|
|
"""Dict-like values() that returns a list of values of cookies from the
|
|
jar. See keys() and items()."""
|
|
return list(self.itervalues())
|
|
|
|
def iteritems(self):
|
|
"""Dict-like iteritems() that returns an iterator of name-value tuples
|
|
from the jar. See iterkeys() and itervalues()."""
|
|
for cookie in iter(self):
|
|
yield cookie.name, cookie.value
|
|
|
|
def items(self):
|
|
"""Dict-like items() that returns a list of name-value tuples from the
|
|
jar. See keys() and values(). Allows client-code to call
|
|
``dict(RequestsCookieJar)`` and get a vanilla python dict of key value
|
|
pairs."""
|
|
return list(self.iteritems())
|
|
|
|
def list_domains(self):
|
|
"""Utility method to list all the domains in the jar."""
|
|
domains = []
|
|
for cookie in iter(self):
|
|
if cookie.domain not in domains:
|
|
domains.append(cookie.domain)
|
|
return domains
|
|
|
|
def list_paths(self):
|
|
"""Utility method to list all the paths in the jar."""
|
|
paths = []
|
|
for cookie in iter(self):
|
|
if cookie.path not in paths:
|
|
paths.append(cookie.path)
|
|
return paths
|
|
|
|
def multiple_domains(self):
|
|
"""Returns True if there are multiple domains in the jar.
|
|
Returns False otherwise."""
|
|
domains = []
|
|
for cookie in iter(self):
|
|
if cookie.domain is not None and cookie.domain in domains:
|
|
return True
|
|
domains.append(cookie.domain)
|
|
return False # there is only one domain in jar
|
|
|
|
def get_dict(self, domain=None, path=None):
|
|
"""Takes as an argument an optional domain and path and returns a plain
|
|
old Python dict of name-value pairs of cookies that meet the
|
|
requirements."""
|
|
dictionary = {}
|
|
for cookie in iter(self):
|
|
if (domain is None or cookie.domain == domain) and (path is None
|
|
or cookie.path == path):
|
|
dictionary[cookie.name] = cookie.value
|
|
return dictionary
|
|
|
|
def __getitem__(self, name):
|
|
"""Dict-like __getitem__() for compatibility with client code. Throws
|
|
exception if there are more than one cookie with name. In that case,
|
|
use the more explicit get() method instead.
|
|
|
|
.. warning:: operation is O(n), not O(1)."""
|
|
|
|
return self._find_no_duplicates(name)
|
|
|
|
def __setitem__(self, name, value):
|
|
"""Dict-like __setitem__ for compatibility with client code. Throws
|
|
exception if there is already a cookie of that name in the jar. In that
|
|
case, use the more explicit set() method instead."""
|
|
|
|
self.set(name, value)
|
|
|
|
def __delitem__(self, name):
|
|
"""Deletes a cookie given a name. Wraps ``cookielib.CookieJar``'s
|
|
``remove_cookie_by_name()``."""
|
|
remove_cookie_by_name(self, name)
|
|
|
|
def set_cookie(self, cookie, *args, **kwargs):
|
|
if hasattr(cookie.value, 'startswith') and cookie.value.startswith('"') and cookie.value.endswith('"'):
|
|
cookie.value = cookie.value.replace('\\"', '')
|
|
return super(RequestsCookieJar, self).set_cookie(cookie, *args, **kwargs)
|
|
|
|
def update(self, other):
|
|
"""Updates this jar with cookies from another CookieJar or dict-like"""
|
|
if isinstance(other, cookielib.CookieJar):
|
|
for cookie in other:
|
|
self.set_cookie(copy.copy(cookie))
|
|
else:
|
|
super(RequestsCookieJar, self).update(other)
|
|
|
|
def _find(self, name, domain=None, path=None):
|
|
"""Requests uses this method internally to get cookie values. Takes as
|
|
args name and optional domain and path. Returns a cookie.value. If
|
|
there are conflicting cookies, _find arbitrarily chooses one. See
|
|
_find_no_duplicates if you want an exception thrown if there are
|
|
conflicting cookies."""
|
|
for cookie in iter(self):
|
|
if cookie.name == name:
|
|
if domain is None or cookie.domain == domain:
|
|
if path is None or cookie.path == path:
|
|
return cookie.value
|
|
|
|
raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
|
|
|
|
def _find_no_duplicates(self, name, domain=None, path=None):
|
|
"""Both ``__get_item__`` and ``get`` call this function: it's never
|
|
used elsewhere in Requests. Takes as args name and optional domain and
|
|
path. Returns a cookie.value. Throws KeyError if cookie is not found
|
|
and CookieConflictError if there are multiple cookies that match name
|
|
and optionally domain and path."""
|
|
toReturn = None
|
|
for cookie in iter(self):
|
|
if cookie.name == name:
|
|
if domain is None or cookie.domain == domain:
|
|
if path is None or cookie.path == path:
|
|
if toReturn is not None: # if there are multiple cookies that meet passed in criteria
|
|
raise CookieConflictError('There are multiple cookies with name, %r' % (name))
|
|
toReturn = cookie.value # we will eventually return this as long as no cookie conflict
|
|
|
|
if toReturn:
|
|
return toReturn
|
|
raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
|
|
|
|
def __getstate__(self):
|
|
"""Unlike a normal CookieJar, this class is pickleable."""
|
|
state = self.__dict__.copy()
|
|
# remove the unpickleable RLock object
|
|
state.pop('_cookies_lock')
|
|
return state
|
|
|
|
def __setstate__(self, state):
|
|
"""Unlike a normal CookieJar, this class is pickleable."""
|
|
self.__dict__.update(state)
|
|
if '_cookies_lock' not in self.__dict__:
|
|
self._cookies_lock = threading.RLock()
|
|
|
|
def copy(self):
|
|
"""Return a copy of this RequestsCookieJar."""
|
|
new_cj = RequestsCookieJar()
|
|
new_cj.update(self)
|
|
return new_cj
|
|
|
|
|
|
def _copy_cookie_jar(jar):
|
|
if jar is None:
|
|
return None
|
|
|
|
if hasattr(jar, 'copy'):
|
|
# We're dealing with an instance of RequestsCookieJar
|
|
return jar.copy()
|
|
# We're dealing with a generic CookieJar instance
|
|
new_jar = copy.copy(jar)
|
|
new_jar.clear()
|
|
for cookie in jar:
|
|
new_jar.set_cookie(copy.copy(cookie))
|
|
return new_jar
|
|
|
|
|
|
def create_cookie(name, value, **kwargs):
|
|
"""Make a cookie from underspecified parameters.
|
|
|
|
By default, the pair of `name` and `value` will be set for the domain ''
|
|
and sent on every request (this is sometimes called a "supercookie").
|
|
"""
|
|
result = dict(
|
|
version=0,
|
|
name=name,
|
|
value=value,
|
|
port=None,
|
|
domain='',
|
|
path='/',
|
|
secure=False,
|
|
expires=None,
|
|
discard=True,
|
|
comment=None,
|
|
comment_url=None,
|
|
rest={'HttpOnly': None},
|
|
rfc2109=False,)
|
|
|
|
badargs = set(kwargs) - set(result)
|
|
if badargs:
|
|
err = 'create_cookie() got unexpected keyword arguments: %s'
|
|
raise TypeError(err % list(badargs))
|
|
|
|
result.update(kwargs)
|
|
result['port_specified'] = bool(result['port'])
|
|
result['domain_specified'] = bool(result['domain'])
|
|
result['domain_initial_dot'] = result['domain'].startswith('.')
|
|
result['path_specified'] = bool(result['path'])
|
|
|
|
return cookielib.Cookie(**result)
|
|
|
|
|
|
def morsel_to_cookie(morsel):
|
|
"""Convert a Morsel object into a Cookie containing the one k/v pair."""
|
|
|
|
expires = None
|
|
if morsel['max-age']:
|
|
try:
|
|
expires = int(time.time() + int(morsel['max-age']))
|
|
except ValueError:
|
|
raise TypeError('max-age: %s must be integer' % morsel['max-age'])
|
|
elif morsel['expires']:
|
|
time_template = '%a, %d-%b-%Y %H:%M:%S GMT'
|
|
expires = calendar.timegm(
|
|
time.strptime(morsel['expires'], time_template)
|
|
)
|
|
return create_cookie(
|
|
comment=morsel['comment'],
|
|
comment_url=bool(morsel['comment']),
|
|
discard=False,
|
|
domain=morsel['domain'],
|
|
expires=expires,
|
|
name=morsel.key,
|
|
path=morsel['path'],
|
|
port=None,
|
|
rest={'HttpOnly': morsel['httponly']},
|
|
rfc2109=False,
|
|
secure=bool(morsel['secure']),
|
|
value=morsel.value,
|
|
version=morsel['version'] or 0,
|
|
)
|
|
|
|
|
|
def cookiejar_from_dict(cookie_dict, cookiejar=None, overwrite=True):
|
|
"""Returns a CookieJar from a key/value dictionary.
|
|
|
|
:param cookie_dict: Dict of key/values to insert into CookieJar.
|
|
:param cookiejar: (optional) A cookiejar to add the cookies to.
|
|
:param overwrite: (optional) If False, will not replace cookies
|
|
already in the jar with new ones.
|
|
"""
|
|
if cookiejar is None:
|
|
cookiejar = RequestsCookieJar()
|
|
|
|
if cookie_dict is not None:
|
|
names_from_jar = [cookie.name for cookie in cookiejar]
|
|
for name in cookie_dict:
|
|
if overwrite or (name not in names_from_jar):
|
|
cookiejar.set_cookie(create_cookie(name, cookie_dict[name]))
|
|
|
|
return cookiejar
|
|
|
|
|
|
def merge_cookies(cookiejar, cookies):
|
|
"""Add cookies to cookiejar and returns a merged CookieJar.
|
|
|
|
:param cookiejar: CookieJar object to add the cookies to.
|
|
:param cookies: Dictionary or CookieJar object to be added.
|
|
"""
|
|
if not isinstance(cookiejar, cookielib.CookieJar):
|
|
raise ValueError('You can only merge into CookieJar')
|
|
|
|
if isinstance(cookies, dict):
|
|
cookiejar = cookiejar_from_dict(
|
|
cookies, cookiejar=cookiejar, overwrite=False)
|
|
elif isinstance(cookies, cookielib.CookieJar):
|
|
try:
|
|
cookiejar.update(cookies)
|
|
except AttributeError:
|
|
for cookie_in_jar in cookies:
|
|
cookiejar.set_cookie(cookie_in_jar)
|
|
|
|
return cookiejar
|