>",
+ html,
+ )
+ h2t = HTML2Text()
+ h2t.body_width = 0
+ h2t.single_line_break = True
+ h2t.emphasis_mark = "*"
+ return h2t.handle(html)
+
+
+class LubimyCzytac(Metadata):
+ __name__ = "LubimyCzytac.pl"
+ __id__ = "lubimyczytac"
+
+ BASE_URL = "https://lubimyczytac.pl"
+
+ BOOK_SEARCH_RESULT_XPATH = (
+ "*//div[@class='listSearch']//div[@class='authorAllBooks__single']"
+ )
+ SINGLE_BOOK_RESULT_XPATH = ".//div[contains(@class,'authorAllBooks__singleText')]"
+ TITLE_PATH = "/div/a[contains(@class,'authorAllBooks__singleTextTitle')]"
+ TITLE_TEXT_PATH = f"{TITLE_PATH}//text()"
+ URL_PATH = f"{TITLE_PATH}/@href"
+ AUTHORS_PATH = "/div/a[contains(@href,'autor')]//text()"
+
+ SIBLINGS = "/following-sibling::dd"
+
+ CONTAINER = "//section[@class='container book']"
+ PUBLISHER = f"{CONTAINER}//dt[contains(text(),'Wydawnictwo:')]{SIBLINGS}/a/text()"
+ LANGUAGES = f"{CONTAINER}//dt[contains(text(),'Język:')]{SIBLINGS}/text()"
+ DESCRIPTION = f"{CONTAINER}//div[@class='collapse-content']"
+ SERIES = f"{CONTAINER}//span/a[contains(@href,'/cykl/')]/text()"
+
+ DETAILS = "//div[@id='book-details']"
+ PUBLISH_DATE = "//dt[contains(@title,'Data pierwszego wydania"
+ FIRST_PUBLISH_DATE = f"{DETAILS}{PUBLISH_DATE} oryginalnego')]{SIBLINGS}[1]/text()"
+ FIRST_PUBLISH_DATE_PL = f"{DETAILS}{PUBLISH_DATE} polskiego')]{SIBLINGS}[1]/text()"
+ TAGS = "//nav[@aria-label='breadcrumb']//a[contains(@href,'/ksiazki/k/')]/text()"
+
+ RATING = "//meta[@property='books:rating:value']/@content"
+ COVER = "//meta[@property='og:image']/@content"
+ ISBN = "//meta[@property='books:isbn']/@content"
+ META_TITLE = "//meta[@property='og:description']/@content"
+
+ SUMMARY = "//script[@type='application/ld+json']//text()"
+
+ def search(
+ self, query: str, generic_cover: str = "", locale: str = "en"
+ ) -> Optional[List[MetaRecord]]:
+ if self.active:
+ try:
+ result = requests.get(self._prepare_query(title=query))
+ result.raise_for_status()
+ except Exception as e:
+ log.warning(e)
+ return None
+ root = fromstring(result.text)
+ lc_parser = LubimyCzytacParser(root=root, metadata=self)
+ matches = lc_parser.parse_search_results()
+ if matches:
+ with ThreadPool(processes=10) as pool:
+ final_matches = pool.starmap(
+ lc_parser.parse_single_book,
+ [(match, generic_cover, locale) for match in matches],
+ )
+ return final_matches
+ return matches
+
+ def _prepare_query(self, title: str) -> str:
+ query = ""
+ characters_to_remove = "\?()\/"
+ pattern = "[" + characters_to_remove + "]"
+ title = re.sub(pattern, "", title)
+ title = title.replace("_", " ")
+ if '"' in title or ",," in title:
+ title = title.split('"')[0].split(",,")[0]
+
+ if "/" in title:
+ title_tokens = [
+ token for token in title.lower().split(" ") if len(token) > 1
+ ]
+ else:
+ title_tokens = list(self.get_title_tokens(title, strip_joiners=False))
+ if title_tokens:
+ tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+ query = query + "%20".join(tokens)
+ if not query:
+ return ""
+ return f"{LubimyCzytac.BASE_URL}/szukaj/ksiazki?phrase={query}"
+
+
+class LubimyCzytacParser:
+ PAGES_TEMPLATE = "Książka ma {0} stron(y).
"
+ PUBLISH_DATE_TEMPLATE = "Data pierwszego wydania: {0}
"
+ PUBLISH_DATE_PL_TEMPLATE = (
+ "Data pierwszego wydania w Polsce: {0}
"
+ )
+
+ def __init__(self, root: HtmlElement, metadata: Metadata) -> None:
+ self.root = root
+ self.metadata = metadata
+
+ def parse_search_results(self) -> List[MetaRecord]:
+ matches = []
+ results = self.root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
+ for result in results:
+ title = self._parse_xpath_node(
+ root=result,
+ xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+ f"{LubimyCzytac.TITLE_TEXT_PATH}",
+ )
+
+ book_url = self._parse_xpath_node(
+ root=result,
+ xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+ f"{LubimyCzytac.URL_PATH}",
+ )
+ authors = self._parse_xpath_node(
+ root=result,
+ xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+ f"{LubimyCzytac.AUTHORS_PATH}",
+ take_first=False,
+ )
+ if not all([title, book_url, authors]):
+ continue
+ matches.append(
+ MetaRecord(
+ id=book_url.replace(f"/ksiazka/", "").split("/")[0],
+ title=title,
+ authors=[strip_accents(author) for author in authors],
+ url=LubimyCzytac.BASE_URL + book_url,
+ source=MetaSourceInfo(
+ id=self.metadata.__id__,
+ description=self.metadata.__name__,
+ link=LubimyCzytac.BASE_URL,
+ ),
+ )
+ )
+ return matches
+
+ def parse_single_book(
+ self, match: MetaRecord, generic_cover: str, locale: str
+ ) -> MetaRecord:
+ try:
+ response = requests.get(match.url)
+ response.raise_for_status()
+ except Exception as e:
+ log.warning(e)
+ return None
+ self.root = fromstring(response.text)
+ match.cover = self._parse_cover(generic_cover=generic_cover)
+ match.description = self._parse_description()
+ match.languages = self._parse_languages(locale=locale)
+ match.publisher = self._parse_publisher()
+ match.publishedDate = self._parse_from_summary(attribute_name="datePublished")
+ match.rating = self._parse_rating()
+ match.series, match.series_index = self._parse_series()
+ match.tags = self._parse_tags()
+ match.identifiers = {
+ "isbn": self._parse_isbn(),
+ "lubimyczytac": match.id,
+ }
+ return match
+
+ def _parse_xpath_node(
+ self,
+ xpath: str,
+ root: HtmlElement = None,
+ take_first: bool = True,
+ strip_element: bool = True,
+ ) -> Optional[Union[str, List[str]]]:
+ root = root if root is not None else self.root
+ node = root.xpath(xpath)
+ if not node:
+ return None
+ return (
+ (node[0].strip() if strip_element else node[0])
+ if take_first
+ else [x.strip() for x in node]
+ )
+
+ def _parse_cover(self, generic_cover) -> Optional[str]:
+ return (
+ self._parse_xpath_node(xpath=LubimyCzytac.COVER, take_first=True)
+ or generic_cover
+ )
+
+ def _parse_publisher(self) -> Optional[str]:
+ return self._parse_xpath_node(xpath=LubimyCzytac.PUBLISHER, take_first=True)
+
+ def _parse_languages(self, locale: str) -> List[str]:
+ languages = list()
+ lang = self._parse_xpath_node(xpath=LubimyCzytac.LANGUAGES, take_first=True)
+ if lang:
+ if "polski" in lang:
+ languages.append("pol")
+ if "angielski" in lang:
+ languages.append("eng")
+ return [get_language_name(locale, language) for language in languages]
+
+ def _parse_series(self) -> Tuple[Optional[str], Optional[Union[float, int]]]:
+ series_index = 0
+ series = self._parse_xpath_node(xpath=LubimyCzytac.SERIES, take_first=True)
+ if series:
+ if "tom " in series:
+ series_name, series_info = series.split(" (tom ", 1)
+ series_info = series_info.replace(" ", "").replace(")", "")
+ # Check if book is not a bundle, i.e. chapter 1-3
+ if "-" in series_info:
+ series_info = series_info.split("-", 1)[0]
+ if series_info.replace(".", "").isdigit() is True:
+ series_index = get_int_or_float(series_info)
+ return series_name, series_index
+ return None, None
+
+ def _parse_tags(self) -> List[str]:
+ tags = self._parse_xpath_node(xpath=LubimyCzytac.TAGS, take_first=False)
+ return [
+ strip_accents(w.replace(", itd.", " itd."))
+ for w in tags
+ if isinstance(w, str)
+ ]
+
+ def _parse_from_summary(self, attribute_name: str) -> Optional[str]:
+ value = None
+ summary_text = self._parse_xpath_node(xpath=LubimyCzytac.SUMMARY)
+ if summary_text:
+ data = json.loads(summary_text)
+ value = data.get(attribute_name)
+ return value.strip() if value is not None else value
+
+ def _parse_rating(self) -> Optional[str]:
+ rating = self._parse_xpath_node(xpath=LubimyCzytac.RATING)
+ return round(float(rating.replace(",", ".")) / 2) if rating else rating
+
+ def _parse_date(self, xpath="first_publish") -> Optional[datetime.datetime]:
+ options = {
+ "first_publish": LubimyCzytac.FIRST_PUBLISH_DATE,
+ "first_publish_pl": LubimyCzytac.FIRST_PUBLISH_DATE_PL,
+ }
+ date = self._parse_xpath_node(xpath=options.get(xpath))
+ return parser.parse(date) if date else None
+
+ def _parse_isbn(self) -> Optional[str]:
+ return self._parse_xpath_node(xpath=LubimyCzytac.ISBN)
+
+ def _parse_description(self) -> str:
+ description = ""
+ description_node = self._parse_xpath_node(
+ xpath=LubimyCzytac.DESCRIPTION, strip_element=False
+ )
+ if description_node is not None:
+ for source in self.root.xpath('//p[@class="source"]'):
+ source.getparent().remove(source)
+ description = tostring(description_node, method="html")
+ description = sanitize_comments_html(description)
+
+ else:
+ description_node = self._parse_xpath_node(xpath=LubimyCzytac.META_TITLE)
+ if description_node is not None:
+ description = description_node
+ description = sanitize_comments_html(description)
+ description = self._add_extra_info_to_description(description=description)
+ return description
+
+ def _add_extra_info_to_description(self, description: str) -> str:
+ pages = self._parse_from_summary(attribute_name="numberOfPages")
+ if pages:
+ description += LubimyCzytacParser.PAGES_TEMPLATE.format(pages)
+
+ first_publish_date = self._parse_date()
+ if first_publish_date:
+ description += LubimyCzytacParser.PUBLISH_DATE_TEMPLATE.format(
+ first_publish_date.strftime("%d.%m.%Y")
+ )
+
+ first_publish_date_pl = self._parse_date(xpath="first_publish_pl")
+ if first_publish_date_pl:
+ description += LubimyCzytacParser.PUBLISH_DATE_PL_TEMPLATE.format(
+ first_publish_date_pl.strftime("%d.%m.%Y")
+ )
+
+ return description
diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 6e13c7689..5f6323430 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -15,47 +15,69 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+import itertools
+from typing import Dict, List, Optional
+from urllib.parse import quote, unquote
-from scholarly import scholarly
+try:
+ from fake_useragent.errors import FakeUserAgentError
+except (ImportError):
+ FakeUserAgentError = BaseException
+try:
+ from scholarly import scholarly
+except FakeUserAgentError:
+ raise ImportError("No module named 'scholarly'")
-from cps.services.Metadata import Metadata
+from cps import logger
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
+
+log = logger.create()
class scholar(Metadata):
__name__ = "Google Scholar"
__id__ = "googlescholar"
+ META_URL = "https://scholar.google.com/"
- def search(self, query, generic_cover=""):
+ def search(
+ self, query: str, generic_cover: str = "", locale: str = "en"
+ ) -> Optional[List[MetaRecord]]:
val = list()
if self.active:
- scholar_gen = scholarly.search_pubs(' '.join(query.split('+')))
- i = 0
- for publication in scholar_gen:
- v = dict()
- v['id'] = "1234" # publication['bib'].get('title')
- v['title'] = publication['bib'].get('title')
- v['authors'] = publication['bib'].get('author', [])
- v['description'] = publication['bib'].get('abstract', "")
- v['publisher'] = publication['bib'].get('venue', "")
- if publication['bib'].get('pub_year'):
- v['publishedDate'] = publication['bib'].get('pub_year')+"-01-01"
- else:
- v['publishedDate'] = ""
- v['tags'] = ""
- v['ratings'] = 0
- v['series'] = ""
- v['cover'] = generic_cover
- v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "",
- v['source'] = {
- "id": self.__id__,
- "description": "Google Scholar",
- "link": "https://scholar.google.com/"
- }
- val.append(v)
- i += 1
- if (i >= 10):
- break
+ title_tokens = list(self.get_title_tokens(query, strip_joiners=False))
+ if title_tokens:
+ tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+ query = " ".join(tokens)
+ try:
+ scholarly.set_timeout(20)
+ scholarly.set_retries(2)
+ scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
+ except Exception as e:
+ log.warning(e)
+ return list()
+ for result in scholar_gen:
+ match = self._parse_search_result(
+ result=result, generic_cover="", locale=locale
+ )
+ val.append(match)
return val
+ def _parse_search_result(
+ self, result: Dict, generic_cover: str, locale: str
+ ) -> MetaRecord:
+ match = MetaRecord(
+ id=result.get("pub_url", result.get("eprint_url", "")),
+ title=result["bib"].get("title"),
+ authors=result["bib"].get("author", []),
+ url=result.get("pub_url", result.get("eprint_url", "")),
+ source=MetaSourceInfo(
+ id=self.__id__, description=self.__name__, link=scholar.META_URL
+ ),
+ )
-
+ match.cover = result.get("image", {}).get("original_url", generic_cover)
+ match.description = unquote(result["bib"].get("abstract", ""))
+ match.publisher = result["bib"].get("venue", "")
+ match.publishedDate = result["bib"].get("pub_year") + "-01-01"
+ match.identifiers = {"scholar": match.id}
+ return match
diff --git a/cps/oauth.py b/cps/oauth.py
index f8e5c1fd3..0caa61ec5 100644
--- a/cps/oauth.py
+++ b/cps/oauth.py
@@ -19,18 +19,12 @@
from flask import session
try:
- from flask_dance.consumer.backend.sqla import SQLAlchemyBackend, first, _get_real_user
+ from flask_dance.consumer.storage.sqla import SQLAlchemyStorage as SQLAlchemyBackend
+ from flask_dance.consumer.storage.sqla import first, _get_real_user
from sqlalchemy.orm.exc import NoResultFound
- backend_resultcode = False # prevent storing values with this resultcode
+ backend_resultcode = True # prevent storing values with this resultcode
except ImportError:
- # fails on flask-dance >1.3, due to renaming
- try:
- from flask_dance.consumer.storage.sqla import SQLAlchemyStorage as SQLAlchemyBackend
- from flask_dance.consumer.storage.sqla import first, _get_real_user
- from sqlalchemy.orm.exc import NoResultFound
- backend_resultcode = True # prevent storing values with this resultcode
- except ImportError:
- pass
+ pass
class OAuthBackend(SQLAlchemyBackend):
diff --git a/cps/oauth_bb.py b/cps/oauth_bb.py
index d9efd41e4..ec400f716 100644
--- a/cps/oauth_bb.py
+++ b/cps/oauth_bb.py
@@ -74,7 +74,7 @@ def register_user_with_oauth(user=None):
if len(all_oauth.keys()) == 0:
return
if user is None:
- flash(_(u"Register with %(provider)s", provider=", ".join(list(all_oauth.values()))), category="success")
+ flash(_("Register with %(provider)s", provider=", ".join(list(all_oauth.values()))), category="success")
else:
for oauth_key in all_oauth.keys():
# Find this OAuth token in the database, or create it
@@ -134,8 +134,8 @@ def bind_oauth_or_register(provider_id, provider_user_id, redirect_url, provider
# already bind with user, just login
if oauth_entry.user:
login_user(oauth_entry.user)
- log.debug(u"You are now logged in as: '%s'", oauth_entry.user.name)
- flash(_(u"you are now logged in as: '%(nickname)s'", nickname= oauth_entry.user.name),
+ log.debug("You are now logged in as: '%s'", oauth_entry.user.name)
+ flash(_("Success! You are now logged in as: %(nickname)s", nickname= oauth_entry.user.name),
category="success")
return redirect(url_for('web.index'))
else:
@@ -145,21 +145,21 @@ def bind_oauth_or_register(provider_id, provider_user_id, redirect_url, provider
try:
ub.session.add(oauth_entry)
ub.session.commit()
- flash(_(u"Link to %(oauth)s Succeeded", oauth=provider_name), category="success")
+ flash(_("Link to %(oauth)s Succeeded", oauth=provider_name), category="success")
log.info("Link to {} Succeeded".format(provider_name))
return redirect(url_for('web.profile'))
except Exception as ex:
- log.debug_or_exception(ex)
+ log.error_or_exception(ex)
ub.session.rollback()
else:
- flash(_(u"Login failed, No User Linked With OAuth Account"), category="error")
+ flash(_("Login failed, No User Linked With OAuth Account"), category="error")
log.info('Login failed, No User Linked With OAuth Account')
return redirect(url_for('web.login'))
# return redirect(url_for('web.login'))
# if config.config_public_reg:
# return redirect(url_for('web.register'))
# else:
- # flash(_(u"Public registration is not enabled"), category="error")
+ # flash(_("Public registration is not enabled"), category="error")
# return redirect(url_for(redirect_url))
except (NoResultFound, AttributeError):
return redirect(url_for(redirect_url))
@@ -194,15 +194,15 @@ def unlink_oauth(provider):
ub.session.delete(oauth_entry)
ub.session.commit()
logout_oauth_user()
- flash(_(u"Unlink to %(oauth)s Succeeded", oauth=oauth_check[provider]), category="success")
+ flash(_("Unlink to %(oauth)s Succeeded", oauth=oauth_check[provider]), category="success")
log.info("Unlink to {} Succeeded".format(oauth_check[provider]))
except Exception as ex:
- log.debug_or_exception(ex)
+ log.error_or_exception(ex)
ub.session.rollback()
- flash(_(u"Unlink to %(oauth)s Failed", oauth=oauth_check[provider]), category="error")
+ flash(_("Unlink to %(oauth)s Failed", oauth=oauth_check[provider]), category="error")
except NoResultFound:
log.warning("oauth %s for user %d not found", provider, current_user.id)
- flash(_(u"Not Linked to %(oauth)s", oauth=provider), category="error")
+ flash(_("Not Linked to %(oauth)s", oauth=provider), category="error")
return redirect(url_for('web.profile'))
def generate_oauth_blueprints():
@@ -258,13 +258,13 @@ if ub.oauth_support:
@oauth_authorized.connect_via(oauthblueprints[0]['blueprint'])
def github_logged_in(blueprint, token):
if not token:
- flash(_(u"Failed to log in with GitHub."), category="error")
+ flash(_("Failed to log in with GitHub."), category="error")
log.error("Failed to log in with GitHub")
return False
resp = blueprint.session.get("/user")
if not resp.ok:
- flash(_(u"Failed to fetch user info from GitHub."), category="error")
+ flash(_("Failed to fetch user info from GitHub."), category="error")
log.error("Failed to fetch user info from GitHub")
return False
@@ -276,13 +276,13 @@ if ub.oauth_support:
@oauth_authorized.connect_via(oauthblueprints[1]['blueprint'])
def google_logged_in(blueprint, token):
if not token:
- flash(_(u"Failed to log in with Google."), category="error")
+ flash(_("Failed to log in with Google."), category="error")
log.error("Failed to log in with Google")
return False
resp = blueprint.session.get("/oauth2/v2/userinfo")
if not resp.ok:
- flash(_(u"Failed to fetch user info from Google."), category="error")
+ flash(_("Failed to fetch user info from Google."), category="error")
log.error("Failed to fetch user info from Google")
return False
@@ -295,8 +295,8 @@ if ub.oauth_support:
@oauth_error.connect_via(oauthblueprints[0]['blueprint'])
def github_error(blueprint, error, error_description=None, error_uri=None):
msg = (
- u"OAuth error from {name}! "
- u"error={error} description={description} uri={uri}"
+ "OAuth error from {name}! "
+ "error={error} description={description} uri={uri}"
).format(
name=blueprint.name,
error=error,
@@ -308,8 +308,8 @@ if ub.oauth_support:
@oauth_error.connect_via(oauthblueprints[1]['blueprint'])
def google_error(blueprint, error, error_description=None, error_uri=None):
msg = (
- u"OAuth error from {name}! "
- u"error={error} description={description} uri={uri}"
+ "OAuth error from {name}! "
+ "error={error} description={description} uri={uri}"
).format(
name=blueprint.name,
error=error,
@@ -329,10 +329,10 @@ def github_login():
if account_info.ok:
account_info_json = account_info.json()
return bind_oauth_or_register(oauthblueprints[0]['id'], account_info_json['id'], 'github.login', 'github')
- flash(_(u"GitHub Oauth error, please retry later."), category="error")
+ flash(_("GitHub Oauth error, please retry later."), category="error")
log.error("GitHub Oauth error, please retry later")
except (InvalidGrantError, TokenExpiredError) as e:
- flash(_(u"GitHub Oauth error: {}").format(e), category="error")
+ flash(_("GitHub Oauth error: {}").format(e), category="error")
log.error(e)
return redirect(url_for('web.login'))
@@ -353,10 +353,10 @@ def google_login():
if resp.ok:
account_info_json = resp.json()
return bind_oauth_or_register(oauthblueprints[1]['id'], account_info_json['id'], 'google.login', 'google')
- flash(_(u"Google Oauth error, please retry later."), category="error")
+ flash(_("Google Oauth error, please retry later."), category="error")
log.error("Google Oauth error, please retry later")
except (InvalidGrantError, TokenExpiredError) as e:
- flash(_(u"Google Oauth error: {}").format(e), category="error")
+ flash(_("Google Oauth error: {}").format(e), category="error")
log.error(e)
return redirect(url_for('web.login'))
diff --git a/cps/opds.py b/cps/opds.py
index 92c51d1ba..6b09a84d4 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -20,56 +20,28 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-import sys
import datetime
-from functools import wraps
+from urllib.parse import unquote_plus
-from flask import Blueprint, request, render_template, Response, g, make_response, abort
+from flask import Blueprint, request, render_template, make_response, abort
from flask_login import current_user
+from flask_babel import get_locale
+from flask_babel import gettext as _
from sqlalchemy.sql.expression import func, text, or_, and_, true
-from werkzeug.security import check_password_hash
+from sqlalchemy.exc import InvalidRequestError, OperationalError
-from . import constants, logger, config, db, calibre_db, ub, services, get_locale, isoLanguages
+from . import logger, config, db, calibre_db, ub, isoLanguages
+from .usermanagement import requires_basic_auth_if_no_ano
from .helper import get_download_link, get_book_cover
from .pagination import Pagination
from .web import render_read_books
-from .usermanagement import load_user_from_request
-from flask_babel import gettext as _
-from babel import Locale as LC
-from babel.core import UnknownLocaleError
+
opds = Blueprint('opds', __name__)
log = logger.create()
-def requires_basic_auth_if_no_ano(f):
- @wraps(f)
- def decorated(*args, **kwargs):
- auth = request.authorization
- if config.config_anonbrowse != 1:
- if not auth or auth.type != 'basic' or not check_auth(auth.username, auth.password):
- return authenticate()
- return f(*args, **kwargs)
- if config.config_login_type == constants.LOGIN_LDAP and services.ldap and config.config_anonbrowse != 1:
- return services.ldap.basic_auth_required(f)
- return decorated
-
-
-class FeedObject:
- def __init__(self, rating_id, rating_name):
- self.rating_id = rating_id
- self.rating_name = rating_name
-
- @property
- def id(self):
- return self.rating_id
-
- @property
- def name(self):
- return self.rating_name
-
-
@opds.route("/opds/")
@opds.route("/opds")
@requires_basic_auth_if_no_ano
@@ -84,10 +56,12 @@ def feed_osd():
@opds.route("/opds/search", defaults={'query': ""})
-@opds.route("/opds/search/")
+@opds.route("/opds/search/")
@requires_basic_auth_if_no_ano
def feed_cc_search(query):
- return feed_search(query.strip())
+ # Handle strange query from Libera Reader with + instead of spaces
+ plus_query = unquote_plus(request.environ['RAW_URI'].split('/opds/search/')[1]).strip()
+ return feed_search(plus_query)
@opds.route("/opds/search", methods=["GET"])
@@ -99,26 +73,7 @@ def feed_normal_search():
@opds.route("/opds/books")
@requires_basic_auth_if_no_ano
def feed_booksindex():
- shift = 0
- off = int(request.args.get("offset") or 0)
- entries = calibre_db.session.query(func.upper(func.substr(db.Books.sort, 1, 1)).label('id'))\
- .filter(calibre_db.common_filters()).group_by(func.upper(func.substr(db.Books.sort, 1, 1))).all()
-
- elements = []
- if off == 0:
- elements.append({'id': "00", 'name':_("All")})
- shift = 1
- for entry in entries[
- off + shift - 1:
- int(off + int(config.config_books_per_page) - shift)]:
- elements.append({'id': entry.id, 'name': entry.id})
-
- pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
- len(entries) + 1)
- return render_xml_template('feed.xml',
- letterelements=elements,
- folder='opds.feed_letter_books',
- pagination=pagination)
+ return render_element_index(db.Books.sort, None, 'opds.feed_letter_books')
@opds.route("/opds/books/letter/")
@@ -129,7 +84,8 @@ def feed_letter_books(book_id):
entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
db.Books,
letter,
- [db.Books.sort])
+ [db.Books.sort],
+ True, config.config_read_column)
return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@@ -139,15 +95,16 @@ def feed_letter_books(book_id):
def feed_new():
off = request.args.get("offset") or 0
entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
- db.Books, True, [db.Books.timestamp.desc()])
+ db.Books, True, [db.Books.timestamp.desc()],
+ True, config.config_read_column)
return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@opds.route("/opds/discover")
@requires_basic_auth_if_no_ano
def feed_discover():
- entries = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).order_by(func.random())\
- .limit(config.config_books_per_page)
+ query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+ entries = query.filter(calibre_db.common_filters()).order_by(func.random()).limit(config.config_books_per_page)
pagination = Pagination(1, config.config_books_per_page, int(config.config_books_per_page))
return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@@ -158,7 +115,8 @@ def feed_best_rated():
off = request.args.get("offset") or 0
entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
- [db.Books.timestamp.desc()])
+ [db.Books.timestamp.desc()],
+ True, config.config_read_column)
return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@@ -171,43 +129,23 @@ def feed_hot():
hot_books = all_books.offset(off).limit(config.config_books_per_page)
entries = list()
for book in hot_books:
- downloadBook = calibre_db.get_book(book.Downloads.book_id)
- if downloadBook:
- entries.append(
- calibre_db.get_filtered_book(book.Downloads.book_id)
- )
+ query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+ download_book = query.filter(calibre_db.common_filters()).filter(
+ book.Downloads.book_id == db.Books.id).first()
+ if download_book:
+ entries.append(download_book)
else:
ub.delete_download(book.Downloads.book_id)
- numBooks = entries.__len__()
+ num_books = entries.__len__()
pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1),
- config.config_books_per_page, numBooks)
+ config.config_books_per_page, num_books)
return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@opds.route("/opds/author")
@requires_basic_auth_if_no_ano
def feed_authorindex():
- shift = 0
- off = int(request.args.get("offset") or 0)
- entries = calibre_db.session.query(func.upper(func.substr(db.Authors.sort, 1, 1)).label('id'))\
- .join(db.books_authors_link).join(db.Books).filter(calibre_db.common_filters())\
- .group_by(func.upper(func.substr(db.Authors.sort, 1, 1))).all()
-
- elements = []
- if off == 0:
- elements.append({'id': "00", 'name':_("All")})
- shift = 1
- for entry in entries[
- off + shift - 1:
- int(off + int(config.config_books_per_page) - shift)]:
- elements.append({'id': entry.id, 'name': entry.id})
-
- pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
- len(entries) + 1)
- return render_xml_template('feed.xml',
- letterelements=elements,
- folder='opds.feed_letter_author',
- pagination=pagination)
+ return render_element_index(db.Authors.sort, db.books_authors_link, 'opds.feed_letter_author')
@opds.route("/opds/author/letter/")
@@ -228,12 +166,7 @@ def feed_letter_author(book_id):
@opds.route("/opds/author/")
@requires_basic_auth_if_no_ano
def feed_author(book_id):
- off = request.args.get("offset") or 0
- entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
- db.Books,
- db.Books.authors.any(db.Authors.id == book_id),
- [db.Books.timestamp.desc()])
- return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+ return render_xml_dataset(db.Authors, book_id)
@opds.route("/opds/publisher")
@@ -254,37 +187,14 @@ def feed_publisherindex():
@opds.route("/opds/publisher/")
@requires_basic_auth_if_no_ano
def feed_publisher(book_id):
- off = request.args.get("offset") or 0
- entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
- db.Books,
- db.Books.publishers.any(db.Publishers.id == book_id),
- [db.Books.timestamp.desc()])
- return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+ return render_xml_dataset(db.Publishers, book_id)
@opds.route("/opds/category")
@requires_basic_auth_if_no_ano
def feed_categoryindex():
- shift = 0
- off = int(request.args.get("offset") or 0)
- entries = calibre_db.session.query(func.upper(func.substr(db.Tags.name, 1, 1)).label('id'))\
- .join(db.books_tags_link).join(db.Books).filter(calibre_db.common_filters())\
- .group_by(func.upper(func.substr(db.Tags.name, 1, 1))).all()
- elements = []
- if off == 0:
- elements.append({'id': "00", 'name':_("All")})
- shift = 1
- for entry in entries[
- off + shift - 1:
- int(off + int(config.config_books_per_page) - shift)]:
- elements.append({'id': entry.id, 'name': entry.id})
+ return render_element_index(db.Tags.name, db.books_tags_link, 'opds.feed_letter_category')
- pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
- len(entries) + 1)
- return render_xml_template('feed.xml',
- letterelements=elements,
- folder='opds.feed_letter_category',
- pagination=pagination)
@opds.route("/opds/category/letter/")
@requires_basic_auth_if_no_ano
@@ -306,36 +216,14 @@ def feed_letter_category(book_id):
@opds.route("/opds/category/")
@requires_basic_auth_if_no_ano
def feed_category(book_id):
- off = request.args.get("offset") or 0
- entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
- db.Books,
- db.Books.tags.any(db.Tags.id == book_id),
- [db.Books.timestamp.desc()])
- return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+ return render_xml_dataset(db.Tags, book_id)
@opds.route("/opds/series")
@requires_basic_auth_if_no_ano
def feed_seriesindex():
- shift = 0
- off = int(request.args.get("offset") or 0)
- entries = calibre_db.session.query(func.upper(func.substr(db.Series.sort, 1, 1)).label('id'))\
- .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters())\
- .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
- elements = []
- if off == 0:
- elements.append({'id': "00", 'name':_("All")})
- shift = 1
- for entry in entries[
- off + shift - 1:
- int(off + int(config.config_books_per_page) - shift)]:
- elements.append({'id': entry.id, 'name': entry.id})
- pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
- len(entries) + 1)
- return render_xml_template('feed.xml',
- letterelements=elements,
- folder='opds.feed_letter_series',
- pagination=pagination)
+ return render_element_index(db.Series.sort, db.books_series_link, 'opds.feed_letter_series')
+
@opds.route("/opds/series/letter/")
@requires_basic_auth_if_no_ano
@@ -361,7 +249,8 @@ def feed_series(book_id):
entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
db.Books,
db.Books.series.any(db.Series.id == book_id),
- [db.Books.series_index])
+ [db.Books.series_index],
+ True, config.config_read_column)
return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@@ -370,7 +259,7 @@ def feed_series(book_id):
def feed_ratingindex():
off = request.args.get("offset") or 0
entries = calibre_db.session.query(db.Ratings, func.count('books_ratings_link.book').label('count'),
- (db.Ratings.rating / 2).label('name')) \
+ (db.Ratings.rating / 2).label('name')) \
.join(db.books_ratings_link)\
.join(db.Books)\
.filter(calibre_db.common_filters()) \
@@ -388,12 +277,7 @@ def feed_ratingindex():
@opds.route("/opds/ratings/")
@requires_basic_auth_if_no_ano
def feed_ratings(book_id):
- off = request.args.get("offset") or 0
- entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
- db.Books,
- db.Books.ratings.any(db.Ratings.id == book_id),
- [db.Books.timestamp.desc()])
- return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+ return render_xml_dataset(db.Ratings, book_id)
@opds.route("/opds/formats")
@@ -420,7 +304,8 @@ def feed_format(book_id):
entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
db.Books,
db.Books.data.any(db.Data.format == book_id.upper()),
- [db.Books.timestamp.desc()])
+ [db.Books.timestamp.desc()],
+ True, config.config_read_column)
return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@@ -429,20 +314,12 @@ def feed_format(book_id):
@requires_basic_auth_if_no_ano
def feed_languagesindex():
off = request.args.get("offset") or 0
- if current_user.filter_language() == u"all":
+ if current_user.filter_language() == "all":
languages = calibre_db.speaking_language()
else:
- #try:
- # cur_l = LC.parse(current_user.filter_language())
- #except UnknownLocaleError:
- # cur_l = None
languages = calibre_db.session.query(db.Languages).filter(
db.Languages.lang_code == current_user.filter_language()).all()
languages[0].name = isoLanguages.get_language_name(get_locale(), languages[0].lang_code)
- #if cur_l:
- # languages[0].name = cur_l.get_language_name(get_locale())
- #else:
- # languages[0].name = _(isoLanguages.get(part3=languages[0].lang_code).name)
pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
len(languages))
return render_xml_template('feed.xml', listelements=languages, folder='opds.feed_languages', pagination=pagination)
@@ -455,7 +332,8 @@ def feed_languages(book_id):
entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
db.Books,
db.Books.languages.any(db.Languages.id == book_id),
- [db.Books.timestamp.desc()])
+ [db.Books.timestamp.desc()],
+ True, config.config_read_column)
return render_xml_template('feed.xml', entries=entries, pagination=pagination)
@@ -463,7 +341,8 @@ def feed_languages(book_id):
@requires_basic_auth_if_no_ano
def feed_shelfindex():
off = request.args.get("offset") or 0
- shelf = g.shelves_access
+ shelf = ub.session.query(ub.Shelf).filter(
+ or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == current_user.id)).order_by(ub.Shelf.name).all()
number = len(shelf)
pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
number)
@@ -485,24 +364,32 @@ def feed_shelf(book_id):
result = list()
# user is allowed to access shelf
if shelf:
- books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == book_id).order_by(
- ub.BookShelf.order.asc()).all()
- for book in books_in_shelf:
- cur_book = calibre_db.get_book(book.book_id)
- result.append(cur_book)
- pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
- len(result))
+ result, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+ config.config_books_per_page,
+ db.Books,
+ ub.BookShelf.shelf == shelf.id,
+ [ub.BookShelf.order.asc()],
+ True, config.config_read_column,
+ ub.BookShelf, ub.BookShelf.book_id == db.Books.id)
+ # delete shelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web
+ wrong_entries = calibre_db.session.query(ub.BookShelf) \
+ .join(db.Books, ub.BookShelf.book_id == db.Books.id, isouter=True) \
+ .filter(db.Books.id == None).all()
+ for entry in wrong_entries:
+ log.info('Not existing book {} in {} deleted'.format(entry.book_id, shelf))
+ try:
+ ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == entry.book_id).delete()
+ ub.session.commit()
+ except (OperationalError, InvalidRequestError) as e:
+ ub.session.rollback()
+ log.error_or_exception("Settings Database error: {}".format(e))
return render_xml_template('feed.xml', entries=result, pagination=pagination)
@opds.route("/opds/download///")
@requires_basic_auth_if_no_ano
def opds_download_link(book_id, book_format):
- # I gave up with this: With enabled ldap login, the user doesn't get logged in, therefore it's always guest
- # workaround, loading the user from the request and checking it's download rights here
- # in case of anonymous browsing user is None
- user = load_user_from_request(request) or current_user
- if not user.role_download():
+ if not current_user.role_download():
return abort(403)
if "Kobo" in request.headers.get('User-Agent'):
client = "kobo"
@@ -525,47 +412,6 @@ def get_metadata_calibre_companion(uuid, library):
return ""
-def feed_search(term):
- if term:
- entries, __, ___ = calibre_db.get_search_results(term)
- entriescount = len(entries) if len(entries) > 0 else 1
- pagination = Pagination(1, entriescount, entriescount)
- return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
- else:
- return render_xml_template('feed.xml', searchterm="")
-
-
-def check_auth(username, password):
- try:
- username = username.encode('windows-1252')
- except UnicodeEncodeError:
- username = username.encode('utf-8')
- user = ub.session.query(ub.User).filter(func.lower(ub.User.name) ==
- username.decode('utf-8').lower()).first()
- if bool(user and check_password_hash(str(user.password), password)):
- return True
- else:
- ip_Address = request.headers.get('X-Forwarded-For', request.remote_addr)
- log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ip_Address)
- return False
-
-
-def authenticate():
- return Response(
- 'Could not verify your access level for that URL.\n'
- 'You have to login with proper credentials', 401,
- {'WWW-Authenticate': 'Basic realm="Login Required"'})
-
-
-def render_xml_template(*args, **kwargs):
- # ToDo: return time in current timezone similar to %z
- currtime = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S+00:00")
- xml = render_template(current_time=currtime, instance=config.config_calibre_web_title, *args, **kwargs)
- response = make_response(xml)
- response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
- return response
-
-
@opds.route("/opds/thumb_240_240/")
@opds.route("/opds/cover_240_240/")
@opds.route("/opds/cover_90_90/")
@@ -589,3 +435,71 @@ def feed_unread_books():
off = request.args.get("offset") or 0
result, pagination = render_read_books(int(off) / (int(config.config_books_per_page)) + 1, False, True)
return render_xml_template('feed.xml', entries=result, pagination=pagination)
+
+
+class FeedObject:
+ def __init__(self, rating_id, rating_name):
+ self.rating_id = rating_id
+ self.rating_name = rating_name
+
+ @property
+ def id(self):
+ return self.rating_id
+
+ @property
+ def name(self):
+ return self.rating_name
+
+
+def feed_search(term):
+ if term:
+ entries, __, ___ = calibre_db.get_search_results(term, config=config)
+ entries_count = len(entries) if len(entries) > 0 else 1
+ pagination = Pagination(1, entries_count, entries_count)
+ return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
+ else:
+ return render_xml_template('feed.xml', searchterm="")
+
+
+
+def render_xml_template(*args, **kwargs):
+ # ToDo: return time in current timezone similar to %z
+ currtime = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S+00:00")
+ xml = render_template(current_time=currtime, instance=config.config_calibre_web_title, *args, **kwargs)
+ response = make_response(xml)
+ response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
+ return response
+
+
+def render_xml_dataset(data_table, book_id):
+ off = request.args.get("offset") or 0
+ entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
+ db.Books,
+ getattr(db.Books, data_table.__tablename__).any(data_table.id == book_id),
+ [db.Books.timestamp.desc()],
+ True, config.config_read_column)
+ return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+
+
+def render_element_index(database_column, linked_table, folder):
+ shift = 0
+ off = int(request.args.get("offset") or 0)
+ entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'), None, None)
+ # query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+ if linked_table is not None:
+ entries = entries.join(linked_table).join(db.Books)
+ entries = entries.filter(calibre_db.common_filters()).group_by(func.upper(func.substr(database_column, 1, 1))).all()
+ elements = []
+ if off == 0:
+ elements.append({'id': "00", 'name': _("All")})
+ shift = 1
+ for entry in entries[
+ off + shift - 1:
+ int(off + int(config.config_books_per_page) - shift)]:
+ elements.append({'id': entry.id, 'name': entry.id})
+ pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
+ len(entries) + 1)
+ return render_xml_template('feed.xml',
+ letterelements=elements,
+ folder=folder,
+ pagination=pagination)
diff --git a/cps/pagination.py b/cps/pagination.py
index 7a9bfb702..bda9f4c8c 100644
--- a/cps/pagination.py
+++ b/cps/pagination.py
@@ -57,10 +57,10 @@ class Pagination(object):
def has_next(self):
return self.page < self.pages
- # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shwn
- # left_edge: first left_edges count of all pages are shown as number -> 1,2 shwn
- # left_current: left_current count below current page are shown as number, means if current page 5 -> 3,4 shwn
- # left_current: right_current count above current page are shown as number, means if current page 5 -> 6,7 shwn
+ # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shown
+ # left_edge: first left_edges count of all pages are shown as number -> 1,2 shown
+ # left_current: left_current count below current page are shown as number, means if current page 5 -> 3,4 shown
+ # left_current: right_current count above current page are shown as number, means if current page 5 -> 6,7 shown
def iter_pages(self, left_edge=2, left_current=2,
right_current=4, right_edge=2):
last = 0
diff --git a/cps/redirect.py b/cps/redirect.py
index d491b353f..09b3101f8 100644
--- a/cps/redirect.py
+++ b/cps/redirect.py
@@ -25,12 +25,9 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# http://flask.pocoo.org/snippets/62/
+# https://web.archive.org/web/20120517003641/http://flask.pocoo.org/snippets/62/
-try:
- from urllib.parse import urlparse, urljoin
-except ImportError:
- from urlparse import urlparse, urljoin
+from urllib.parse import urlparse, urljoin
from flask import request, url_for, redirect
diff --git a/cps/remotelogin.py b/cps/remotelogin.py
index a9994f09e..ee4346702 100644
--- a/cps/remotelogin.py
+++ b/cps/remotelogin.py
@@ -22,6 +22,7 @@
import json
from datetime import datetime
+from functools import wraps
from flask import Blueprint, request, make_response, abort, url_for, flash, redirect
from flask_login import login_required, current_user, login_user
@@ -31,10 +32,6 @@ from sqlalchemy.sql.expression import true
from . import config, logger, ub
from .render_template import render_title_template
-try:
- from functools import wraps
-except ImportError:
- pass # We're not using Python 3
remotelogin = Blueprint('remotelogin', __name__)
log = logger.create()
@@ -61,8 +58,8 @@ def remote_login():
ub.session.add(auth_token)
ub.session_commit()
verify_url = url_for('remotelogin.verify_token', token=auth_token.auth_token, _external=true)
- log.debug(u"Remot Login request with token: %s", auth_token.auth_token)
- return render_title_template('remote_login.html', title=_(u"Login"), token=auth_token.auth_token,
+ log.debug("Remot Login request with token: %s", auth_token.auth_token)
+ return render_title_template('remote_login.html', title=_("Login"), token=auth_token.auth_token,
verify_url=verify_url, page="remotelogin")
@@ -74,8 +71,8 @@ def verify_token(token):
# Token not found
if auth_token is None:
- flash(_(u"Token not found"), category="error")
- log.error(u"Remote Login token not found")
+ flash(_("Token not found"), category="error")
+ log.error("Remote Login token not found")
return redirect(url_for('web.index'))
# Token expired
@@ -83,8 +80,8 @@ def verify_token(token):
ub.session.delete(auth_token)
ub.session_commit()
- flash(_(u"Token has expired"), category="error")
- log.error(u"Remote Login token expired")
+ flash(_("Token has expired"), category="error")
+ log.error("Remote Login token expired")
return redirect(url_for('web.index'))
# Update token with user information
@@ -92,8 +89,8 @@ def verify_token(token):
auth_token.verified = True
ub.session_commit()
- flash(_(u"Success! Please return to your device"), category="success")
- log.debug(u"Remote Login token for userid %s verified", auth_token.user_id)
+ flash(_("Success! Please return to your device"), category="success")
+ log.debug("Remote Login token for userid %s verified", auth_token.user_id)
return redirect(url_for('web.index'))
@@ -108,7 +105,7 @@ def token_verified():
# Token not found
if auth_token is None:
data['status'] = 'error'
- data['message'] = _(u"Token not found")
+ data['message'] = _("Token not found")
# Token expired
elif datetime.now() > auth_token.expiration:
@@ -116,7 +113,7 @@ def token_verified():
ub.session_commit()
data['status'] = 'error'
- data['message'] = _(u"Token has expired")
+ data['message'] = _("Token has expired")
elif not auth_token.verified:
data['status'] = 'not_verified'
@@ -129,8 +126,8 @@ def token_verified():
ub.session_commit("User {} logged in via remotelogin, token deleted".format(user.name))
data['status'] = 'success'
- log.debug(u"Remote Login for userid %s succeded", user.id)
- flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.name), category="success")
+ log.debug("Remote Login for userid %s succeeded", user.id)
+ flash(_("Success! You are now logged in as: %(nickname)s", nickname=user.name), category="success")
response = make_response(json.dumps(data, ensure_ascii=False))
response.headers["Content-Type"] = "application/json; charset=utf-8"
diff --git a/cps/render_template.py b/cps/render_template.py
index 7cd341ea0..68b464593 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -16,20 +16,23 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-from flask import render_template
+from flask import render_template, g, abort, request
from flask_babel import gettext as _
-from flask import g
from werkzeug.local import LocalProxy
from flask_login import current_user
+from sqlalchemy.sql.expression import or_
-from . import config, constants, ub, logger, db, calibre_db
+from . import config, constants, logger, ub
from .ub import User
+
log = logger.create()
def get_sidebar_config(kwargs=None):
kwargs = kwargs or []
+ simple = bool([e for e in ['kindle', 'tolino', "kobo", "bookeen"]
+ if (e in request.headers.get('User-Agent', "").lower())])
if 'content' in kwargs:
content = kwargs['content']
content = isinstance(content, (User, LocalProxy)) and not content.role_anonymous()
@@ -44,12 +47,12 @@ def get_sidebar_config(kwargs=None):
"show_text": _('Show Hot Books'), "config_show": True})
if current_user.role_admin():
sidebar.append({"glyph": "glyphicon-download", "text": _('Downloaded Books'), "link": 'web.download_list',
- "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not g.user.is_anonymous),
+ "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not current_user.is_anonymous),
"page": "download", "show_text": _('Show Downloaded Books'),
"config_show": content})
else:
sidebar.append({"glyph": "glyphicon-download", "text": _('Downloaded Books'), "link": 'web.books_list',
- "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not g.user.is_anonymous),
+ "id": "download", "visibility": constants.SIDEBAR_DOWNLOAD, 'public': (not current_user.is_anonymous),
"page": "download", "show_text": _('Show Downloaded Books'),
"config_show": content})
sidebar.append(
@@ -57,66 +60,60 @@ def get_sidebar_config(kwargs=None):
"visibility": constants.SIDEBAR_BEST_RATED, 'public': True, "page": "rated",
"show_text": _('Show Top Rated Books'), "config_show": True})
sidebar.append({"glyph": "glyphicon-eye-open", "text": _('Read Books'), "link": 'web.books_list', "id": "read",
- "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous),
- "page": "read", "show_text": _('Show read and unread'), "config_show": content})
+ "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not current_user.is_anonymous),
+ "page": "read", "show_text": _('Show Read and Unread'), "config_show": content})
sidebar.append(
{"glyph": "glyphicon-eye-close", "text": _('Unread Books'), "link": 'web.books_list', "id": "unread",
- "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous), "page": "unread",
+ "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not current_user.is_anonymous), "page": "unread",
"show_text": _('Show unread'), "config_show": False})
sidebar.append({"glyph": "glyphicon-random", "text": _('Discover'), "link": 'web.books_list', "id": "rand",
"visibility": constants.SIDEBAR_RANDOM, 'public': True, "page": "discover",
"show_text": _('Show Random Books'), "config_show": True})
sidebar.append({"glyph": "glyphicon-inbox", "text": _('Categories'), "link": 'web.category_list', "id": "cat",
"visibility": constants.SIDEBAR_CATEGORY, 'public': True, "page": "category",
- "show_text": _('Show category selection'), "config_show": True})
+ "show_text": _('Show Category Section'), "config_show": True})
sidebar.append({"glyph": "glyphicon-bookmark", "text": _('Series'), "link": 'web.series_list', "id": "serie",
"visibility": constants.SIDEBAR_SERIES, 'public': True, "page": "series",
- "show_text": _('Show series selection'), "config_show": True})
+ "show_text": _('Show Series Section'), "config_show": True})
sidebar.append({"glyph": "glyphicon-user", "text": _('Authors'), "link": 'web.author_list', "id": "author",
"visibility": constants.SIDEBAR_AUTHOR, 'public': True, "page": "author",
- "show_text": _('Show author selection'), "config_show": True})
+ "show_text": _('Show Author Section'), "config_show": True})
sidebar.append(
{"glyph": "glyphicon-text-size", "text": _('Publishers'), "link": 'web.publisher_list', "id": "publisher",
"visibility": constants.SIDEBAR_PUBLISHER, 'public': True, "page": "publisher",
- "show_text": _('Show publisher selection'), "config_show":True})
+ "show_text": _('Show Publisher Section'), "config_show":True})
sidebar.append({"glyph": "glyphicon-flag", "text": _('Languages'), "link": 'web.language_overview', "id": "lang",
- "visibility": constants.SIDEBAR_LANGUAGE, 'public': (g.user.filter_language() == 'all'),
+ "visibility": constants.SIDEBAR_LANGUAGE, 'public': (current_user.filter_language() == 'all'),
"page": "language",
- "show_text": _('Show language selection'), "config_show": True})
+ "show_text": _('Show Language Section'), "config_show": True})
sidebar.append({"glyph": "glyphicon-star-empty", "text": _('Ratings'), "link": 'web.ratings_list', "id": "rate",
"visibility": constants.SIDEBAR_RATING, 'public': True,
- "page": "rating", "show_text": _('Show ratings selection'), "config_show": True})
+ "page": "rating", "show_text": _('Show Ratings Section'), "config_show": True})
sidebar.append({"glyph": "glyphicon-file", "text": _('File formats'), "link": 'web.formats_list', "id": "format",
"visibility": constants.SIDEBAR_FORMAT, 'public': True,
- "page": "format", "show_text": _('Show file formats selection'), "config_show": True})
+ "page": "format", "show_text": _('Show File Formats Section'), "config_show": True})
sidebar.append(
{"glyph": "glyphicon-trash", "text": _('Archived Books'), "link": 'web.books_list', "id": "archived",
- "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not g.user.is_anonymous), "page": "archived",
- "show_text": _('Show archived books'), "config_show": content})
- sidebar.append(
- {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
- "visibility": constants.SIDEBAR_LIST, 'public': (not g.user.is_anonymous), "page": "list",
- "show_text": _('Show Books List'), "config_show": content})
+ "visibility": constants.SIDEBAR_ARCHIVED, 'public': (not current_user.is_anonymous), "page": "archived",
+ "show_text": _('Show Archived Books'), "config_show": content})
+ if not simple:
+ sidebar.append(
+ {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
+ "visibility": constants.SIDEBAR_LIST, 'public': (not current_user.is_anonymous), "page": "list",
+ "show_text": _('Show Books List'), "config_show": content})
+ g.shelves_access = ub.session.query(ub.Shelf).filter(
+ or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == current_user.id)).order_by(ub.Shelf.name).all()
- return sidebar
+ return sidebar, simple
-def get_readbooks_ids():
- if not config.config_read_column:
- readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id))\
- .filter(ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED).all()
- return frozenset([x.book_id for x in readBooks])
- else:
- try:
- readBooks = calibre_db.session.query(db.cc_classes[config.config_read_column])\
- .filter(db.cc_classes[config.config_read_column].value == True).all()
- return frozenset([x.book for x in readBooks])
- except (KeyError, AttributeError):
- log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
- return []
# Returns the template for rendering and includes the instance name
def render_title_template(*args, **kwargs):
- sidebar = get_sidebar_config(kwargs)
- return render_template(instance=config.config_calibre_web_title, sidebar=sidebar,
- accept=constants.EXTENSIONS_UPLOAD, read_book_ids=get_readbooks_ids(),
- *args, **kwargs)
+ sidebar, simple = get_sidebar_config(kwargs)
+ try:
+ return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
+ accept=constants.EXTENSIONS_UPLOAD,
+ *args, **kwargs)
+ except PermissionError:
+ log.error("No permission to access {} file.".format(args[0]))
+ abort(403)
diff --git a/cps/schedule.py b/cps/schedule.py
new file mode 100644
index 000000000..707e9bb3c
--- /dev/null
+++ b/cps/schedule.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+
+# This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+# Copyright (C) 2020 mmonkey
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+import datetime
+
+from . import config, constants
+from .services.background_scheduler import BackgroundScheduler, CronTrigger, use_APScheduler
+from .tasks.database import TaskReconnectDatabase
+from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails, TaskClearCoverThumbnailCache
+from .services.worker import WorkerThread
+from .tasks.metadata_backup import TaskBackupMetadata
+
+def get_scheduled_tasks(reconnect=True):
+ tasks = list()
+ # config.schedule_reconnect or
+ # Reconnect Calibre database (metadata.db)
+ if reconnect:
+ tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
+
+ # ToDo make configurable. Generate metadata.opf file for each changed book
+ if False:
+ tasks.append([lambda: TaskBackupMetadata("en"), 'backup metadata', False])
+
+ # Generate all missing book cover thumbnails
+ if config.schedule_generate_book_covers:
+ tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers', True])
+ tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False])
+
+ # Generate all missing series thumbnails
+ if config.schedule_generate_series_covers:
+ tasks.append([lambda: TaskGenerateSeriesThumbnails(), 'generate book covers', False])
+
+ return tasks
+
+
+def end_scheduled_tasks():
+ worker = WorkerThread.get_instance()
+ for __, __, __, task, __ in worker.tasks:
+ if task.scheduled and task.is_cancellable:
+ worker.end_task(task.id)
+
+
+def register_scheduled_tasks(reconnect=True):
+ scheduler = BackgroundScheduler()
+
+ if scheduler:
+ # Remove all existing jobs
+ scheduler.remove_all_jobs()
+
+ start = config.schedule_start_time
+ duration = config.schedule_duration
+
+ # Register scheduled tasks
+ scheduler.schedule_tasks(tasks=get_scheduled_tasks(reconnect), trigger=CronTrigger(hour=start))
+ end_time = calclulate_end_time(start, duration)
+ scheduler.schedule(func=end_scheduled_tasks, trigger=CronTrigger(hour=end_time.hour, minute=end_time.minute),
+ name="end scheduled task")
+
+ # Kick-off tasks, if they should currently be running
+ if should_task_be_running(start, duration):
+ scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(reconnect))
+
+
+def register_startup_tasks():
+ scheduler = BackgroundScheduler()
+
+ if scheduler:
+ start = config.schedule_start_time
+ duration = config.schedule_duration
+
+ # Run scheduled tasks immediately for development and testing
+ # Ignore tasks that should currently be running, as these will be added when registering scheduled tasks
+ if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, duration):
+ scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
+
+
+def should_task_be_running(start, duration):
+ now = datetime.datetime.now()
+ start_time = datetime.datetime.now().replace(hour=start, minute=0, second=0, microsecond=0)
+ end_time = start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
+ return start_time < now < end_time
+
+
+def calclulate_end_time(start, duration):
+ start_time = datetime.datetime.now().replace(hour=start, minute=0)
+ return start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
+
diff --git a/cps/search.py b/cps/search.py
new file mode 100644
index 000000000..96f21d62c
--- /dev/null
+++ b/cps/search.py
@@ -0,0 +1,397 @@
+# This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+# Copyright (C) 2022 OzzieIsaacs
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+import json
+from datetime import datetime
+
+from flask import Blueprint, request, redirect, url_for, flash
+from flask import session as flask_session
+from flask_login import current_user
+from flask_babel import format_date
+from flask_babel import gettext as _
+from sqlalchemy.sql.expression import func, not_, and_, or_, text, true
+from sqlalchemy.sql.functions import coalesce
+
+from . import logger, db, calibre_db, config, ub
+from .usermanagement import login_required_if_no_ano
+from .render_template import render_title_template
+from .pagination import Pagination
+
+search = Blueprint('search', __name__)
+
+log = logger.create()
+
+
+@search.route("/search", methods=["POST"])
+@login_required_if_no_ano
+def simple_search():
+ term = dict(request.form).get("query")
+ if term:
+ flask_session['query'] = json.dumps(term.strip())
+ return redirect(url_for('web.books_list', data="search", sort_param='stored', query="")) # term.strip()
+ else:
+ return render_title_template('search.html',
+ searchterm="",
+ result_count=0,
+ title=_("Search"),
+ page="search")
+
+
+@search.route("/advsearch", methods=['POST'])
+@login_required_if_no_ano
+def advanced_search():
+ values = dict(request.form)
+ params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_shelf', 'exclude_shelf',
+ 'include_language', 'exclude_language', 'include_extension', 'exclude_extension']
+ for param in params:
+ values[param] = list(request.form.getlist(param))
+ flask_session['query'] = json.dumps(values)
+ return redirect(url_for('web.books_list', data="advsearch", sort_param='stored', query=""))
+
+
+@search.route("/advsearch", methods=['GET'])
+@login_required_if_no_ano
+def advanced_search_form():
+ # Build custom columns names
+ cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+ return render_prepare_search_form(cc)
+
+
+def adv_search_custom_columns(cc, term, q):
+ for c in cc:
+ if c.datatype == "datetime":
+ custom_start = term.get('custom_column_' + str(c.id) + '_start')
+ custom_end = term.get('custom_column_' + str(c.id) + '_end')
+ if custom_start:
+ q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+ func.datetime(db.cc_classes[c.id].value) >= func.datetime(custom_start)))
+ if custom_end:
+ q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+ func.datetime(db.cc_classes[c.id].value) <= func.datetime(custom_end)))
+ else:
+ custom_query = term.get('custom_column_' + str(c.id))
+ if custom_query != '' and custom_query is not None:
+ if c.datatype == 'bool':
+ q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+ db.cc_classes[c.id].value == (custom_query == "True")))
+ elif c.datatype == 'int' or c.datatype == 'float':
+ q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+ db.cc_classes[c.id].value == custom_query))
+ elif c.datatype == 'rating':
+ q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+ db.cc_classes[c.id].value == int(float(custom_query) * 2)))
+ else:
+ q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+ func.lower(db.cc_classes[c.id].value).ilike("%" + custom_query + "%")))
+ return q
+
+
+def adv_search_language(q, include_languages_inputs, exclude_languages_inputs):
+ if current_user.filter_language() != "all":
+ q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language()))
+ else:
+ for language in include_languages_inputs:
+ q = q.filter(db.Books.languages.any(db.Languages.id == language))
+ for language in exclude_languages_inputs:
+ q = q.filter(not_(db.Books.series.any(db.Languages.id == language)))
+ return q
+
+
+def adv_search_ratings(q, rating_high, rating_low):
+ if rating_high:
+ rating_high = int(rating_high) * 2
+ q = q.filter(db.Books.ratings.any(db.Ratings.rating <= rating_high))
+ if rating_low:
+ rating_low = int(rating_low) * 2
+ q = q.filter(db.Books.ratings.any(db.Ratings.rating >= rating_low))
+ return q
+
+
+def adv_search_read_status(read_status):
+ if not config.config_read_column:
+ if read_status == "True":
+ db_filter = and_(ub.ReadBook.user_id == int(current_user.id),
+ ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED)
+ else:
+ db_filter = coalesce(ub.ReadBook.read_status, 0) != ub.ReadBook.STATUS_FINISHED
+ else:
+ try:
+ if read_status == "True":
+ db_filter = db.cc_classes[config.config_read_column].value == True
+ else:
+ db_filter = coalesce(db.cc_classes[config.config_read_column].value, False) != True
+ except (KeyError, AttributeError, IndexError):
+ log.error("Custom Column No.{} does not exist in calibre database".format(config.config_read_column))
+ flash(_("Custom Column No.%(column)d does not exist in calibre database",
+ column=config.config_read_column),
+ category="error")
+ return true()
+ return db_filter
+
+
+def adv_search_extension(q, include_extension_inputs, exclude_extension_inputs):
+ for extension in include_extension_inputs:
+ q = q.filter(db.Books.data.any(db.Data.format == extension))
+ for extension in exclude_extension_inputs:
+ q = q.filter(not_(db.Books.data.any(db.Data.format == extension)))
+ return q
+
+
+def adv_search_tag(q, include_tag_inputs, exclude_tag_inputs):
+ for tag in include_tag_inputs:
+ q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+ for tag in exclude_tag_inputs:
+ q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag)))
+ return q
+
+
+def adv_search_serie(q, include_series_inputs, exclude_series_inputs):
+ for serie in include_series_inputs:
+ q = q.filter(db.Books.series.any(db.Series.id == serie))
+ for serie in exclude_series_inputs:
+ q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
+ return q
+
+def adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
+ q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)\
+ .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
+ if len(include_shelf_inputs) > 0:
+ q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
+ return q
+
+def extend_search_term(searchterm,
+ author_name,
+ book_title,
+ publisher,
+ pub_start,
+ pub_end,
+ tags,
+ rating_high,
+ rating_low,
+ read_status,
+ ):
+ searchterm.extend((author_name.replace('|', ','), book_title, publisher))
+ if pub_start:
+ try:
+ searchterm.extend([_("Published after ") +
+ format_date(datetime.strptime(pub_start, "%Y-%m-%d"),
+ format='medium')])
+ except ValueError:
+ pub_start = ""
+ if pub_end:
+ try:
+ searchterm.extend([_("Published before ") +
+ format_date(datetime.strptime(pub_end, "%Y-%m-%d"),
+ format='medium')])
+ except ValueError:
+ pub_end = ""
+ elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
+ for key, db_element in elements.items():
+ tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
+ searchterm.extend(tag.name for tag in tag_names)
+ tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['exclude_' + key])).all()
+ searchterm.extend(tag.name for tag in tag_names)
+ language_names = calibre_db.session.query(db.Languages). \
+ filter(db.Languages.id.in_(tags['include_language'])).all()
+ if language_names:
+ language_names = calibre_db.speaking_language(language_names)
+ searchterm.extend(language.name for language in language_names)
+ language_names = calibre_db.session.query(db.Languages). \
+ filter(db.Languages.id.in_(tags['exclude_language'])).all()
+ if language_names:
+ language_names = calibre_db.speaking_language(language_names)
+ searchterm.extend(language.name for language in language_names)
+ if rating_high:
+ searchterm.extend([_("Rating <= %(rating)s", rating=rating_high)])
+ if rating_low:
+ searchterm.extend([_("Rating >= %(rating)s", rating=rating_low)])
+ if read_status:
+ searchterm.extend([_("Read Status = %(status)s", status=read_status)])
+ searchterm.extend(ext for ext in tags['include_extension'])
+ searchterm.extend(ext for ext in tags['exclude_extension'])
+ # handle custom columns
+ searchterm = " + ".join(filter(None, searchterm))
+ return searchterm, pub_start, pub_end
+
+
+def render_adv_search_results(term, offset=None, order=None, limit=None):
+ sort = order[0] if order else [db.Books.sort]
+ pagination = None
+
+ cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+ calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
+ query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+ q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book)\
+ .outerjoin(db.Series)\
+ .filter(calibre_db.common_filters(True))
+
+ # parse multi selects to a complete dict
+ tags = dict()
+ elements = ['tag', 'serie', 'shelf', 'language', 'extension']
+ for element in elements:
+ tags['include_' + element] = term.get('include_' + element)
+ tags['exclude_' + element] = term.get('exclude_' + element)
+
+ author_name = term.get("author_name")
+ book_title = term.get("book_title")
+ publisher = term.get("publisher")
+ pub_start = term.get("publishstart")
+ pub_end = term.get("publishend")
+ rating_low = term.get("ratinghigh")
+ rating_high = term.get("ratinglow")
+ description = term.get("comment")
+ read_status = term.get("read_status")
+ if author_name:
+ author_name = author_name.strip().lower().replace(',', '|')
+ if book_title:
+ book_title = book_title.strip().lower()
+ if publisher:
+ publisher = publisher.strip().lower()
+
+ search_term = []
+ cc_present = False
+ for c in cc:
+ if c.datatype == "datetime":
+ column_start = term.get('custom_column_' + str(c.id) + '_start')
+ column_end = term.get('custom_column_' + str(c.id) + '_end')
+ if column_start:
+ search_term.extend(["{} >= {}".format(c.name,
+ format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
+ format='medium')
+ )])
+ cc_present = True
+ if column_end:
+ search_term.extend(["{} <= {}".format(c.name,
+ format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
+ format='medium')
+ )])
+ cc_present = True
+ elif term.get('custom_column_' + str(c.id)):
+ search_term.extend([("{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
+ cc_present = True
+
+ if any(tags.values()) or author_name or book_title or publisher or pub_start or pub_end or rating_low \
+ or rating_high or description or cc_present or read_status:
+ search_term, pub_start, pub_end = extend_search_term(search_term,
+ author_name,
+ book_title,
+ publisher,
+ pub_start,
+ pub_end,
+ tags,
+ rating_high,
+ rating_low,
+ read_status)
+ if author_name:
+ q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
+ if book_title:
+ q = q.filter(func.lower(db.Books.title).ilike("%" + book_title + "%"))
+ if pub_start:
+ q = q.filter(func.datetime(db.Books.pubdate) > func.datetime(pub_start))
+ if pub_end:
+ q = q.filter(func.datetime(db.Books.pubdate) < func.datetime(pub_end))
+ q = q.filter(adv_search_read_status(read_status))
+ if publisher:
+ q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
+ q = adv_search_tag(q, tags['include_tag'], tags['exclude_tag'])
+ q = adv_search_serie(q, tags['include_serie'], tags['exclude_serie'])
+ q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
+ q = adv_search_extension(q, tags['include_extension'], tags['exclude_extension'])
+ q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
+ q = adv_search_ratings(q, rating_high, rating_low)
+
+ if description:
+ q = q.filter(db.Books.comments.any(func.lower(db.Comments.text).ilike("%" + description + "%")))
+
+ # search custom columns
+ try:
+ q = adv_search_custom_columns(cc, term, q)
+ except AttributeError as ex:
+ log.debug_or_exception(ex)
+ flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
+
+ q = q.order_by(*sort).all()
+ flask_session['query'] = json.dumps(term)
+ ub.store_combo_ids(q)
+ result_count = len(q)
+ if offset is not None and limit is not None:
+ offset = int(offset)
+ limit_all = offset + int(limit)
+ pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
+ else:
+ offset = 0
+ limit_all = result_count
+ entries = calibre_db.order_authors(q[offset:limit_all], list_return=True, combined=True)
+ return render_title_template('search.html',
+ adv_searchterm=search_term,
+ pagination=pagination,
+ entries=entries,
+ result_count=result_count,
+ title=_("Advanced Search"), page="advsearch",
+ order=order[1])
+
+
+def render_prepare_search_form(cc):
+ # prepare data for search-form
+ tags = calibre_db.session.query(db.Tags)\
+ .join(db.books_tags_link)\
+ .join(db.Books)\
+ .filter(calibre_db.common_filters()) \
+ .group_by(text('books_tags_link.tag'))\
+ .order_by(db.Tags.name).all()
+ series = calibre_db.session.query(db.Series)\
+ .join(db.books_series_link)\
+ .join(db.Books)\
+ .filter(calibre_db.common_filters()) \
+ .group_by(text('books_series_link.series'))\
+ .order_by(db.Series.name)\
+ .filter(calibre_db.common_filters()).all()
+ shelves = ub.session.query(ub.Shelf)\
+ .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id)))\
+ .order_by(ub.Shelf.name).all()
+ extensions = calibre_db.session.query(db.Data)\
+ .join(db.Books)\
+ .filter(calibre_db.common_filters()) \
+ .group_by(db.Data.format)\
+ .order_by(db.Data.format).all()
+ if current_user.filter_language() == "all":
+ languages = calibre_db.speaking_language()
+ else:
+ languages = None
+ return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
+ series=series,shelves=shelves, title=_("Advanced Search"), cc=cc, page="advsearch")
+
+
+def render_search_results(term, offset=None, order=None, limit=None):
+ join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
+ entries, result_count, pagination = calibre_db.get_search_results(term,
+ config,
+ offset,
+ order,
+ limit,
+ *join)
+ return render_title_template('search.html',
+ searchterm=term,
+ pagination=pagination,
+ query=term,
+ adv_searchterm=term,
+ entries=entries,
+ result_count=result_count,
+ title=_("Search"),
+ page="search",
+ order=order[1])
+
+
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index e837fe21a..e018da326 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -16,69 +16,91 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-import os
-import json
-import importlib
-import sys
-import inspect
-import datetime
import concurrent.futures
+import importlib
+import inspect
+import json
+import os
+import sys
-from flask import Blueprint, request, Response, url_for
+from flask import Blueprint, Response, request, url_for
from flask_login import current_user
from flask_login import login_required
+from flask_babel import get_locale
+from sqlalchemy.exc import InvalidRequestError, OperationalError
from sqlalchemy.orm.attributes import flag_modified
-from sqlalchemy.exc import OperationalError, InvalidRequestError
-from . import constants, logger, ub
from cps.services.Metadata import Metadata
+from . import constants, logger, ub, web_server
+# current_milli_time = lambda: int(round(time() * 1000))
-meta = Blueprint('metadata', __name__)
+meta = Blueprint("metadata", __name__)
log = logger.create()
+try:
+ from dataclasses import asdict
+except ImportError:
+ log.info('*** "dataclasses" is needed for calibre-web to run. Please install it using pip: "pip install dataclasses" ***')
+ print('*** "dataclasses" is needed for calibre-web to run. Please install it using pip: "pip install dataclasses" ***')
+ web_server.stop(True)
+ sys.exit(6)
+
new_list = list()
meta_dir = os.path.join(constants.BASE_DIR, "cps", "metadata_provider")
modules = os.listdir(os.path.join(constants.BASE_DIR, "cps", "metadata_provider"))
for f in modules:
- if os.path.isfile(os.path.join(meta_dir, f)) and not f.endswith('__init__.py'):
+ if os.path.isfile(os.path.join(meta_dir, f)) and not f.endswith("__init__.py"):
a = os.path.basename(f)[:-3]
try:
importlib.import_module("cps.metadata_provider." + a)
new_list.append(a)
- except ImportError:
- log.error("Import error for metadata source: {}".format(a))
- pass
+ except (IndentationError, SyntaxError) as e:
+ log.error("Syntax error for metadata source: {} - {}".format(a, e))
+ except ImportError as e:
+ log.debug("Import error for metadata source: {} - {}".format(a, e))
+
def list_classes(provider_list):
classes = list()
for element in provider_list:
- for name, obj in inspect.getmembers(sys.modules["cps.metadata_provider." + element]):
- if inspect.isclass(obj) and name != "Metadata" and issubclass(obj, Metadata):
+ for name, obj in inspect.getmembers(
+ sys.modules["cps.metadata_provider." + element]
+ ):
+ if (
+ inspect.isclass(obj)
+ and name != "Metadata"
+ and issubclass(obj, Metadata)
+ ):
classes.append(obj())
return classes
+
cl = list_classes(new_list)
+
@meta.route("/metadata/provider")
@login_required
def metadata_provider():
- active = current_user.view_settings.get('metadata', {})
+ active = current_user.view_settings.get("metadata", {})
provider = list()
for c in cl:
ac = active.get(c.__id__, True)
- provider.append({"name": c.__name__, "active": ac, "initial": ac, "id": c.__id__})
- return Response(json.dumps(provider), mimetype='application/json')
+ provider.append(
+ {"name": c.__name__, "active": ac, "initial": ac, "id": c.__id__}
+ )
+ return Response(json.dumps(provider), mimetype="application/json")
-@meta.route("/metadata/provider", methods=['POST'])
-@meta.route("/metadata/provider/", methods=['POST'])
+
+@meta.route("/metadata/provider", methods=["POST"])
+@meta.route("/metadata/provider/", methods=["POST"])
@login_required
def metadata_change_active_provider(prov_name):
new_state = request.get_json()
- active = current_user.view_settings.get('metadata', {})
- active[new_state['id']] = new_state['value']
- current_user.view_settings['metadata'] = active
+ active = current_user.view_settings.get("metadata", {})
+ active[new_state["id"]] = new_state["value"]
+ current_user.view_settings["metadata"] = active
try:
try:
flag_modified(current_user, "view_settings")
@@ -89,29 +111,33 @@ def metadata_change_active_provider(prov_name):
log.error("Invalid request received: {}".format(request))
return "Invalid request", 400
if "initial" in new_state and prov_name:
- for c in cl:
- if c.__id__ == prov_name:
- data = c.search(new_state.get('query', ""))
- break
- return Response(json.dumps(data), mimetype='application/json')
+ data = []
+ provider = next((c for c in cl if c.__id__ == prov_name), None)
+ if provider is not None:
+ data = provider.search(new_state.get("query", ""))
+ return Response(
+ json.dumps([asdict(x) for x in data]), mimetype="application/json"
+ )
return ""
-@meta.route("/metadata/search", methods=['POST'])
+
+@meta.route("/metadata/search", methods=["POST"])
@login_required
def metadata_search():
- query = request.form.to_dict().get('query')
+ query = request.form.to_dict().get("query")
data = list()
- active = current_user.view_settings.get('metadata', {})
+ active = current_user.view_settings.get("metadata", {})
+ locale = get_locale()
if query:
- static_cover = url_for('static', filename='generic_cover.jpg')
+ static_cover = url_for("static", filename="generic_cover.jpg")
+ # start = current_milli_time()
with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
- meta = {executor.submit(c.search, query, static_cover): c for c in cl if active.get(c.__id__, True)}
+ meta = {
+ executor.submit(c.search, query, static_cover, locale): c
+ for c in cl
+ if active.get(c.__id__, True)
+ }
for future in concurrent.futures.as_completed(meta):
- data.extend(future.result())
- return Response(json.dumps(data), mimetype='application/json')
-
-
-
-
-
-
+ data.extend([asdict(x) for x in future.result() if x])
+ # log.info({'Time elapsed {}'.format(current_milli_time()-start)})
+ return Response(json.dumps(data), mimetype="application/json")
diff --git a/cps/server.py b/cps/server.py
index e261c50a2..6b5ac7610 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -22,9 +22,11 @@ import errno
import signal
import socket
import subprocess # nosec
+from .services.background_scheduler import BackgroundScheduler
try:
from gevent.pywsgi import WSGIServer
+ from .gevent_wsgi import MyWSGIHandler
from gevent.pool import Pool
from gevent import __version__ as _version
from greenlet import GreenletExit
@@ -32,7 +34,7 @@ try:
VERSION = 'Gevent ' + _version
_GEVENT = True
except ImportError:
- from tornado.wsgi import WSGIContainer
+ from .tornado_wsgi import MyWSGIContainer
from tornado.httpserver import HTTPServer
from tornado.ioloop import IOLoop
from tornado import version as _version
@@ -202,7 +204,9 @@ class WebServer(object):
if output is None:
output = _readable_listen_address(self.listen_address, self.listen_port)
log.info('Starting Gevent server on %s', output)
- self.wsgiserver = WSGIServer(sock, self.app, log=self.access_logger, spawn=Pool(), **ssl_args)
+ self.wsgiserver = WSGIServer(sock, self.app, log=self.access_logger, handler_class=MyWSGIHandler,
+ error_log=log,
+ spawn=Pool(), **ssl_args)
if ssl_args:
wrap_socket = self.wsgiserver.wrap_socket
def my_wrap_socket(*args, **kwargs):
@@ -225,8 +229,8 @@ class WebServer(object):
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
log.info('Starting Tornado server on %s', _readable_listen_address(self.listen_address, self.listen_port))
- # Max Buffersize set to 200MB )
- http_server = HTTPServer(WSGIContainer(self.app),
+ # Max Buffersize set to 200MB
+ http_server = HTTPServer(MyWSGIContainer(self.app),
max_buffer_size=209700000,
ssl_options=self.ssl_args)
http_server.listen(self.listen_port, self.listen_address)
@@ -262,6 +266,12 @@ class WebServer(object):
subprocess.call(args, close_fds=True) # nosec
return True
+ @staticmethod
+ def shutdown_scheduler():
+ scheduler = BackgroundScheduler()
+ if scheduler:
+ scheduler.scheduler.shutdown()
+
def _killServer(self, __, ___):
self.stop()
@@ -270,6 +280,7 @@ class WebServer(object):
updater_thread.stop()
log.info("webserver stop (restart=%s)", restart)
+ self.shutdown_scheduler()
self.restart = restart
if self.wsgiserver:
if _GEVENT:
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index d6e4e7d53..ab4fd4823 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -15,13 +15,97 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+import abc
+import dataclasses
+import os
+import re
+from typing import Dict, Generator, List, Optional, Union
+
+from cps import constants
-class Metadata():
+@dataclasses.dataclass
+class MetaSourceInfo:
+ id: str
+ description: str
+ link: str
+
+
+@dataclasses.dataclass
+class MetaRecord:
+ id: Union[str, int]
+ title: str
+ authors: List[str]
+ url: str
+ source: MetaSourceInfo
+ cover: str = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
+ description: Optional[str] = ""
+ series: Optional[str] = None
+ series_index: Optional[Union[int, float]] = 0
+ identifiers: Dict[str, Union[str, int]] = dataclasses.field(default_factory=dict)
+ publisher: Optional[str] = None
+ publishedDate: Optional[str] = None
+ rating: Optional[int] = 0
+ languages: Optional[List[str]] = dataclasses.field(default_factory=list)
+ tags: Optional[List[str]] = dataclasses.field(default_factory=list)
+
+
+class Metadata:
__name__ = "Generic"
+ __id__ = "generic"
def __init__(self):
self.active = True
def set_status(self, state):
self.active = state
+
+ @abc.abstractmethod
+ def search(
+ self, query: str, generic_cover: str = "", locale: str = "en"
+ ) -> Optional[List[MetaRecord]]:
+ pass
+
+ @staticmethod
+ def get_title_tokens(
+ title: str, strip_joiners: bool = True
+ ) -> Generator[str, None, None]:
+ """
+ Taken from calibre source code
+ It's a simplified (cut out what is unnecessary) version of
+ https://github.com/kovidgoyal/calibre/blob/99d85b97918625d172227c8ffb7e0c71794966c0/
+ src/calibre/ebooks/metadata/sources/base.py#L363-L367
+ (src/calibre/ebooks/metadata/sources/base.py - lines 363-398)
+ """
+ title_patterns = [
+ (re.compile(pat, re.IGNORECASE), repl)
+ for pat, repl in [
+ # Remove things like: (2010) (Omnibus) etc.
+ (
+ r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|"
+ r"audiobook|audio\scd|paperback|turtleback|"
+ r"mass\s*market|edition|ed\.)[\])}]",
+ "",
+ ),
+ # Remove any strings that contain the substring edition inside
+ # parentheses
+ (r"(?i)[({\[].*?(edition|ed.).*?[\]})]", ""),
+ # Remove commas used a separators in numbers
+ (r"(\d+),(\d+)", r"\1\2"),
+ # Remove hyphens only if they have whitespace before them
+ (r"(\s-)", " "),
+ # Replace other special chars with a space
+ (r"""[:,;!@$%^&*(){}.`~"\s\[\]/]《》「」“”""", " "),
+ ]
+ ]
+
+ for pat, repl in title_patterns:
+ title = pat.sub(repl, title)
+
+ tokens = title.split()
+ for token in tokens:
+ token = token.strip().strip('"').strip("'")
+ if token and (
+ not strip_joiners or token.lower() not in ("a", "and", "the", "&")
+ ):
+ yield token
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 692aaa240..a53d7a99b 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -21,11 +21,8 @@ import sys
from base64 import b64decode, b64encode
from jsonschema import validate, exceptions, __version__
from datetime import datetime
-try:
- # pylint: disable=unused-import
- from urllib import unquote
-except ImportError:
- from urllib.parse import unquote
+
+from urllib.parse import unquote
from flask import json
from .. import logger
@@ -138,12 +135,9 @@ class SyncToken:
archive_last_modified = get_datetime_from_json(data_json, "archive_last_modified")
reading_state_last_modified = get_datetime_from_json(data_json, "reading_state_last_modified")
tags_last_modified = get_datetime_from_json(data_json, "tags_last_modified")
- # books_last_id = data_json["books_last_id"]
except TypeError:
log.error("SyncToken timestamps don't parse to a datetime.")
return SyncToken(raw_kobo_store_token=raw_kobo_store_token)
- #except KeyError:
- # books_last_id = -1
return SyncToken(
raw_kobo_store_token=raw_kobo_store_token,
@@ -152,7 +146,6 @@ class SyncToken:
archive_last_modified=archive_last_modified,
reading_state_last_modified=reading_state_last_modified,
tags_last_modified=tags_last_modified,
- #books_last_id=books_last_id
)
def set_kobo_store_header(self, store_headers):
@@ -176,16 +169,14 @@ class SyncToken:
"archive_last_modified": to_epoch_timestamp(self.archive_last_modified),
"reading_state_last_modified": to_epoch_timestamp(self.reading_state_last_modified),
"tags_last_modified": to_epoch_timestamp(self.tags_last_modified),
- #"books_last_id":self.books_last_id
},
}
return b64encode_json(token)
def __str__(self):
- return "{},{},{},{},{},{}".format(self.raw_kobo_store_token,
- self.books_last_created,
+ return "{},{},{},{},{},{}".format(self.books_last_created,
self.books_last_modified,
self.archive_last_modified,
self.reading_state_last_modified,
- self.tags_last_modified)
- #self.books_last_id)
+ self.tags_last_modified,
+ self.raw_kobo_store_token)
diff --git a/cps/services/__init__.py b/cps/services/__init__.py
index 32a9d485d..f93eca340 100644
--- a/cps/services/__init__.py
+++ b/cps/services/__init__.py
@@ -18,11 +18,10 @@
from .. import logger
-
log = logger.create()
-
-try: from . import goodreads_support
+try:
+ from . import goodreads_support
except ImportError as err:
log.debug("Cannot import goodreads, showing authors-metadata will not work: %s", err)
goodreads_support = None
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
new file mode 100644
index 000000000..729915597
--- /dev/null
+++ b/cps/services/background_scheduler.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+
+# This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+# Copyright (C) 2020 mmonkey
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+import atexit
+
+from .. import logger
+from .worker import WorkerThread
+
+try:
+ from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+ from apscheduler.triggers.cron import CronTrigger
+ from apscheduler.triggers.date import DateTrigger
+ use_APScheduler = True
+except (ImportError, RuntimeError) as e:
+ use_APScheduler = False
+ log = logger.create()
+ log.info('APScheduler not found. Unable to schedule tasks.')
+
+
+class BackgroundScheduler:
+ _instance = None
+
+ def __new__(cls):
+ if not use_APScheduler:
+ return False
+
+ if cls._instance is None:
+ cls._instance = super(BackgroundScheduler, cls).__new__(cls)
+ cls.log = logger.create()
+ cls.scheduler = BScheduler()
+ cls.scheduler.start()
+
+ return cls._instance
+
+ def schedule(self, func, trigger, name=None):
+ if use_APScheduler:
+ return self.scheduler.add_job(func=func, trigger=trigger, name=name)
+
+ # Expects a lambda expression for the task
+ def schedule_task(self, task, user=None, name=None, hidden=False, trigger=None):
+ if use_APScheduler:
+ def scheduled_task():
+ worker_task = task()
+ worker_task.scheduled = True
+ WorkerThread.add(user, worker_task, hidden=hidden)
+ return self.schedule(func=scheduled_task, trigger=trigger, name=name)
+
+ # Expects a list of lambda expressions for the tasks
+ def schedule_tasks(self, tasks, user=None, trigger=None):
+ if use_APScheduler:
+ for task in tasks:
+ self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], hidden=task[2])
+
+ # Expects a lambda expression for the task
+ def schedule_task_immediately(self, task, user=None, name=None, hidden=False):
+ if use_APScheduler:
+ def immediate_task():
+ WorkerThread.add(user, task(), hidden)
+ return self.schedule(func=immediate_task, trigger=DateTrigger(), name=name)
+
+ # Expects a list of lambda expressions for the tasks
+ def schedule_tasks_immediately(self, tasks, user=None):
+ if use_APScheduler:
+ for task in tasks:
+ self.schedule_task_immediately(task[0], user, name="immediately " + task[1], hidden=task[2])
+
+ # Remove all jobs
+ def remove_all_jobs(self):
+ self.scheduler.remove_all_jobs()
diff --git a/cps/services/gmail.py b/cps/services/gmail.py
index ff36b3084..3a4eab7f9 100644
--- a/cps/services/gmail.py
+++ b/cps/services/gmail.py
@@ -25,7 +25,7 @@ from google.oauth2.credentials import Credentials
from datetime import datetime
import base64
from flask_babel import gettext as _
-from ..constants import BASE_DIR
+from ..constants import CONFIG_DIR
from .. import logger
@@ -53,11 +53,11 @@ def setup_gmail(token):
if creds and creds.expired and creds.refresh_token:
creds.refresh(Request())
else:
- cred_file = os.path.join(BASE_DIR, 'gmail.json')
+ cred_file = os.path.join(CONFIG_DIR, 'gmail.json')
if not os.path.exists(cred_file):
raise Exception(_("Found no valid gmail.json file with OAuth information"))
flow = InstalledAppFlow.from_client_secrets_file(
- os.path.join(BASE_DIR, 'gmail.json'), SCOPES)
+ os.path.join(CONFIG_DIR, 'gmail.json'), SCOPES)
creds = flow.run_local_server(port=0)
user_info = get_user_info(creds)
return {
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 5952c7057..63d83bfb3 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -37,11 +37,13 @@ STAT_WAITING = 0
STAT_FAIL = 1
STAT_STARTED = 2
STAT_FINISH_SUCCESS = 3
+STAT_ENDED = 4
+STAT_CANCELLED = 5
# Only retain this many tasks in dequeued list
TASK_CLEANUP_TRIGGER = 20
-QueuedTask = namedtuple('QueuedTask', 'num, user, added, task')
+QueuedTask = namedtuple('QueuedTask', 'num, user, added, task, hidden')
def _get_main_thread():
@@ -51,7 +53,6 @@ def _get_main_thread():
raise Exception("main thread not found?!")
-
class ImprovedQueue(queue.Queue):
def to_list(self):
"""
@@ -61,12 +62,13 @@ class ImprovedQueue(queue.Queue):
with self.mutex:
return list(self.queue)
+
# Class for all worker tasks in the background
class WorkerThread(threading.Thread):
_instance = None
@classmethod
- def getInstance(cls):
+ def get_instance(cls):
if cls._instance is None:
cls._instance = WorkerThread()
return cls._instance
@@ -82,15 +84,17 @@ class WorkerThread(threading.Thread):
self.start()
@classmethod
- def add(cls, user, task):
- ins = cls.getInstance()
+ def add(cls, user, task, hidden=False):
+ ins = cls.get_instance()
ins.num += 1
- log.debug("Add Task for user: {}: {}".format(user, task))
+ username = user if user is not None else 'System'
+ log.debug("Add Task for user: {} - {}".format(username, task))
ins.queue.put(QueuedTask(
num=ins.num,
- user=user,
+ user=username,
added=datetime.now(),
task=task,
+ hidden=hidden
))
@property
@@ -111,10 +115,10 @@ class WorkerThread(threading.Thread):
if delta > TASK_CLEANUP_TRIGGER:
ret = alive
else:
- # otherwise, lop off the oldest dead tasks until we hit the target trigger
- ret = sorted(dead, key=lambda x: x.task.end_time)[-TASK_CLEANUP_TRIGGER:] + alive
+ # otherwise, loop off the oldest dead tasks until we hit the target trigger
+ ret = sorted(dead, key=lambda y: y.task.end_time)[-TASK_CLEANUP_TRIGGER:] + alive
- self.dequeued = sorted(ret, key=lambda x: x.num)
+ self.dequeued = sorted(ret, key=lambda y: y.num)
# Main thread loop starting the different tasks
def run(self):
@@ -141,11 +145,21 @@ class WorkerThread(threading.Thread):
# sometimes tasks (like Upload) don't actually have work to do and are created as already finished
if item.task.stat is STAT_WAITING:
- # CalibreTask.start() should wrap all exceptions in it's own error handling
+ # CalibreTask.start() should wrap all exceptions in its own error handling
item.task.start(self)
+ # remove self_cleanup tasks and hidden "System Tasks" from list
+ if item.task.self_cleanup or item.hidden:
+ self.dequeued.remove(item)
+
self.queue.task_done()
+ def end_task(self, task_id):
+ ins = self.get_instance()
+ for __, __, __, task, __ in ins.tasks:
+ if str(task.id) == str(task_id) and task.is_cancellable:
+ task.stat = STAT_CANCELLED if task.stat == STAT_WAITING else STAT_ENDED
+
class CalibreTask:
__metaclass__ = abc.ABCMeta
@@ -158,10 +172,12 @@ class CalibreTask:
self.end_time = None
self.message = message
self.id = uuid.uuid4()
+ self.self_cleanup = False
+ self._scheduled = False
@abc.abstractmethod
def run(self, worker_thread):
- """Provides the caller some human-readable name for this class"""
+ """The main entry-point for this task"""
raise NotImplementedError
@abc.abstractmethod
@@ -169,6 +185,11 @@ class CalibreTask:
"""Provides the caller some human-readable name for this class"""
raise NotImplementedError
+ @abc.abstractmethod
+ def is_cancellable(self):
+ """Does this task gracefully handle being cancelled (STAT_ENDED, STAT_CANCELLED)?"""
+ raise NotImplementedError
+
def start(self, *args):
self.start_time = datetime.now()
self.stat = STAT_STARTED
@@ -178,7 +199,7 @@ class CalibreTask:
self.run(*args)
except Exception as ex:
self._handleError(str(ex))
- log.debug_or_exception(ex)
+ log.error_or_exception(ex)
self.end_time = datetime.now()
@@ -219,15 +240,23 @@ class CalibreTask:
We have a separate dictating this because there may be certain tasks that want to override this
"""
# By default, we're good to clean a task if it's "Done"
- return self.stat in (STAT_FINISH_SUCCESS, STAT_FAIL)
+ return self.stat in (STAT_FINISH_SUCCESS, STAT_FAIL, STAT_ENDED, STAT_CANCELLED)
- '''@progress.setter
- def progress(self, x):
- if x > 1:
- x = 1
- if x < 0:
- x = 0
- self._progress = x'''
+ @property
+ def self_cleanup(self):
+ return self._self_cleanup
+
+ @self_cleanup.setter
+ def self_cleanup(self, is_self_cleanup):
+ self._self_cleanup = is_self_cleanup
+
+ @property
+ def scheduled(self):
+ return self._scheduled
+
+ @scheduled.setter
+ def scheduled(self, is_scheduled):
+ self._scheduled = is_scheduled
def _handleError(self, error_message):
self.stat = STAT_FAIL
diff --git a/cps/shelf.py b/cps/shelf.py
index 97147a716..04f7a6a69 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -23,7 +23,7 @@
import sys
from datetime import datetime
-from flask import Blueprint, flash, redirect, request, url_for
+from flask import Blueprint, flash, redirect, request, url_for, abort
from flask_babel import gettext as _
from flask_login import current_user, login_required
from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -33,30 +33,12 @@ from . import calibre_db, config, db, logger, ub
from .render_template import render_title_template
from .usermanagement import login_required_if_no_ano
-shelf = Blueprint('shelf', __name__)
log = logger.create()
-
-def check_shelf_edit_permissions(cur_shelf):
- if not cur_shelf.is_public and not cur_shelf.user_id == int(current_user.id):
- log.error("User %s not allowed to edit shelf %s", current_user, cur_shelf)
- return False
- if cur_shelf.is_public and not current_user.role_edit_shelfs():
- log.info("User %s not allowed to edit public shelves", current_user)
- return False
- return True
+shelf = Blueprint('shelf', __name__)
-def check_shelf_view_permissions(cur_shelf):
- if cur_shelf.is_public:
- return True
- if current_user.is_anonymous or cur_shelf.user_id != current_user.id:
- log.error("User is unauthorized to view non-public shelf: %s", cur_shelf)
- return False
- return True
-
-
-@shelf.route("/shelf/add//")
+@shelf.route("/shelf/add//", methods=["POST"])
@login_required
def add_to_shelf(shelf_id, book_id):
xhr = request.headers.get('X-Requested-With') == 'XMLHttpRequest'
@@ -64,13 +46,13 @@ def add_to_shelf(shelf_id, book_id):
if shelf is None:
log.error("Invalid shelf specified: %s", shelf_id)
if not xhr:
- flash(_(u"Invalid shelf specified"), category="error")
+ flash(_("Invalid shelf specified"), category="error")
return redirect(url_for('web.index'))
return "Invalid shelf specified", 400
if not check_shelf_edit_permissions(shelf):
if not xhr:
- flash(_(u"Sorry you are not allowed to add a book to that shelf"), category="error")
+ flash(_("Sorry you are not allowed to add a book to that shelf"), category="error")
return redirect(url_for('web.index'))
return "Sorry you are not allowed to add a book to the that shelf", 403
@@ -79,7 +61,7 @@ def add_to_shelf(shelf_id, book_id):
if book_in_shelf:
log.error("Book %s is already part of %s", book_id, shelf)
if not xhr:
- flash(_(u"Book is already part of the shelf: %(shelfname)s", shelfname=shelf.name), category="error")
+ flash(_("Book is already part of the shelf: %(shelfname)s", shelfname=shelf.name), category="error")
return redirect(url_for('web.index'))
return "Book is already part of the shelf: %s" % shelf.name, 400
@@ -94,17 +76,17 @@ def add_to_shelf(shelf_id, book_id):
try:
ub.session.merge(shelf)
ub.session.commit()
- except (OperationalError, InvalidRequestError):
+ except (OperationalError, InvalidRequestError) as e:
ub.session.rollback()
- log.error("Settings DB is not Writeable")
- flash(_(u"Settings DB is not Writeable"), category="error")
+ log.error_or_exception("Settings Database error: {}".format(e))
+ flash(_("Oops! Database Error: %(error)s.", error=e.orig), category="error")
if "HTTP_REFERER" in request.environ:
return redirect(request.environ["HTTP_REFERER"])
else:
return redirect(url_for('web.index'))
if not xhr:
log.debug("Book has been added to shelf: {}".format(shelf.name))
- flash(_(u"Book has been added to shelf: %(sname)s", sname=shelf.name), category="success")
+ flash(_("Book has been added to shelf: %(sname)s", sname=shelf.name), category="success")
if "HTTP_REFERER" in request.environ:
return redirect(request.environ["HTTP_REFERER"])
else:
@@ -112,18 +94,18 @@ def add_to_shelf(shelf_id, book_id):
return "", 204
-@shelf.route("/shelf/massadd/")
+@shelf.route("/shelf/massadd/", methods=["POST"])
@login_required
def search_to_shelf(shelf_id):
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
if shelf is None:
- log.error("Invalid shelf specified: %s", shelf_id)
- flash(_(u"Invalid shelf specified"), category="error")
+ log.error("Invalid shelf specified: {}".format(shelf_id))
+ flash(_("Invalid shelf specified"), category="error")
return redirect(url_for('web.index'))
if not check_shelf_edit_permissions(shelf):
log.warning("You are not allowed to add a book to the shelf".format(shelf.name))
- flash(_(u"You are not allowed to add a book to the shelf"), category="error")
+ flash(_("You are not allowed to add a book to the shelf"), category="error")
return redirect(url_for('web.index'))
if current_user.id in ub.searched_ids and ub.searched_ids[current_user.id]:
@@ -141,7 +123,7 @@ def search_to_shelf(shelf_id):
if not books_for_shelf:
log.error("Books are already part of {}".format(shelf.name))
- flash(_(u"Books are already part of the shelf: %(name)s", name=shelf.name), category="error")
+ flash(_("Books are already part of the shelf: %(name)s", name=shelf.name), category="error")
return redirect(url_for('web.index'))
maxOrder = ub.session.query(func.max(ub.BookShelf.order)).filter(ub.BookShelf.shelf == shelf_id).first()[0] or 0
@@ -153,18 +135,18 @@ def search_to_shelf(shelf_id):
try:
ub.session.merge(shelf)
ub.session.commit()
- flash(_(u"Books have been added to shelf: %(sname)s", sname=shelf.name), category="success")
- except (OperationalError, InvalidRequestError):
+ flash(_("Books have been added to shelf: %(sname)s", sname=shelf.name), category="success")
+ except (OperationalError, InvalidRequestError) as e:
ub.session.rollback()
- log.error("Settings DB is not Writeable")
- flash(_("Settings DB is not Writeable"), category="error")
+ log.error_or_exception("Settings Database error: {}".format(e))
+ flash(_("Oops! Database Error: %(error)s.", error=e.orig), category="error")
else:
log.error("Could not add books to shelf: {}".format(shelf.name))
- flash(_(u"Could not add books to shelf: %(sname)s", sname=shelf.name), category="error")
+ flash(_("Could not add books to shelf: %(sname)s", sname=shelf.name), category="error")
return redirect(url_for('web.index'))
-@shelf.route("/shelf/remove//")
+@shelf.route("/shelf/remove//", methods=["POST"])
@login_required
def remove_from_shelf(shelf_id, book_id):
xhr = request.headers.get('X-Requested-With') == 'XMLHttpRequest'
@@ -197,16 +179,16 @@ def remove_from_shelf(shelf_id, book_id):
ub.session.delete(book_shelf)
shelf.last_modified = datetime.utcnow()
ub.session.commit()
- except (OperationalError, InvalidRequestError):
+ except (OperationalError, InvalidRequestError) as e:
ub.session.rollback()
- log.error("Settings DB is not Writeable")
- flash(_("Settings DB is not Writeable"), category="error")
+ log.error_or_exception("Settings Database error: {}".format(e))
+ flash(_("Oops! Database Error: %(error)s.", error=e.orig), category="error")
if "HTTP_REFERER" in request.environ:
return redirect(request.environ["HTTP_REFERER"])
else:
return redirect(url_for('web.index'))
if not xhr:
- flash(_(u"Book has been removed from shelf: %(sname)s", sname=shelf.name), category="success")
+ flash(_("Book has been removed from shelf: %(sname)s", sname=shelf.name), category="success")
if "HTTP_REFERER" in request.environ:
return redirect(request.environ["HTTP_REFERER"])
else:
@@ -215,7 +197,7 @@ def remove_from_shelf(shelf_id, book_id):
else:
if not xhr:
log.warning("You are not allowed to remove a book from shelf: {}".format(shelf.name))
- flash(_(u"Sorry you are not allowed to remove a book from this shelf"),
+ flash(_("Sorry you are not allowed to remove a book from this shelf"),
category="error")
return redirect(url_for('web.index'))
return "Sorry you are not allowed to remove a book from this shelf", 403
@@ -224,13 +206,8 @@ def remove_from_shelf(shelf_id, book_id):
@shelf.route("/shelf/create", methods=["GET", "POST"])
@login_required
def create_shelf():
- if not current_user.role_edit_shelfs() and request.method == 'POST':
- flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
- return redirect(url_for('web.index'))
- else:
- shelf = ub.Shelf()
- return create_edit_shelf(shelf, page_title=_(u"Create a Shelf"), page="shelfcreate")
-
+ shelf = ub.Shelf()
+ return create_edit_shelf(shelf, page_title=_("Create a Shelf"), page="shelfcreate")
@shelf.route("/shelf/edit/", methods=["GET", "POST"])
@@ -238,102 +215,24 @@ def create_shelf():
def edit_shelf(shelf_id):
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
if not check_shelf_edit_permissions(shelf):
- flash(_(u"Sorry you are not allowed to edit this shelf"), category="error")
+ flash(_("Sorry you are not allowed to edit this shelf"), category="error")
return redirect(url_for('web.index'))
- return create_edit_shelf(shelf, page_title=_(u"Edit a shelf"), page="shelfedit", shelf_id=shelf_id)
+ return create_edit_shelf(shelf, page_title=_("Edit a shelf"), page="shelfedit", shelf_id=shelf_id)
-# if shelf ID is set, we are editing a shelf
-def create_edit_shelf(shelf, page_title, page, shelf_id=False):
- sync_only_selected_shelves = current_user.kobo_only_shelves_sync
- # calibre_db.session.query(ub.Shelf).filter(ub.Shelf.user_id == current_user.id).filter(ub.Shelf.kobo_sync).count()
- if request.method == "POST":
- to_save = request.form.to_dict()
- shelf.is_public = 1 if to_save.get("is_public") else 0
- if config.config_kobo_sync:
- shelf.kobo_sync = True if to_save.get("kobo_sync") else False
- shelf_title = to_save.get("title", "")
- if check_shelf_is_unique(shelf, shelf_title, shelf_id):
- shelf.name = shelf_title
- if not shelf_id:
- shelf.user_id = int(current_user.id)
- ub.session.add(shelf)
- shelf_action = "created"
- flash_text = _(u"Shelf %(title)s created", title=shelf_title)
- else:
- shelf_action = "changed"
- flash_text = _(u"Shelf %(title)s changed", title=shelf_title)
- try:
- ub.session.commit()
- log.info(u"Shelf {} {}".format(shelf_title, shelf_action))
- flash(flash_text, category="success")
- return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
- except (OperationalError, InvalidRequestError) as ex:
- ub.session.rollback()
- log.debug_or_exception(ex)
- log.error("Settings DB is not Writeable")
- flash(_("Settings DB is not Writeable"), category="error")
- except Exception as ex:
- ub.session.rollback()
- log.debug_or_exception(ex)
- flash(_(u"There was an error"), category="error")
- return render_title_template('shelf_edit.html',
- shelf=shelf,
- title=page_title,
- page=page,
- kobo_sync_enabled=config.config_kobo_sync,
- sync_only_selected_shelves=sync_only_selected_shelves)
-
-
-def check_shelf_is_unique(shelf, title, shelf_id=False):
- if shelf_id:
- ident = ub.Shelf.id != shelf_id
- else:
- ident = true()
- if shelf.is_public == 1:
- is_shelf_name_unique = ub.session.query(ub.Shelf) \
- .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 1)) \
- .filter(ident) \
- .first() is None
-
- if not is_shelf_name_unique:
- log.error("A public shelf with the name '{}' already exists.".format(title))
- flash(_(u"A public shelf with the name '%(title)s' already exists.", title=title),
- category="error")
- else:
- is_shelf_name_unique = ub.session.query(ub.Shelf) \
- .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 0) &
- (ub.Shelf.user_id == int(current_user.id))) \
- .filter(ident) \
- .first() is None
-
- if not is_shelf_name_unique:
- log.error("A private shelf with the name '{}' already exists.".format(title))
- flash(_(u"A private shelf with the name '%(title)s' already exists.", title=title),
- category="error")
- return is_shelf_name_unique
-
-
-def delete_shelf_helper(cur_shelf):
- if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
- return
- shelf_id = cur_shelf.id
- ub.session.delete(cur_shelf)
- ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
- ub.session.add(ub.ShelfArchive(uuid=cur_shelf.uuid, user_id=cur_shelf.user_id))
- ub.session_commit("successfully deleted Shelf {}".format(cur_shelf.name))
-
-
-@shelf.route("/shelf/delete/")
+@shelf.route("/shelf/delete/", methods=["POST"])
@login_required
def delete_shelf(shelf_id):
cur_shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
try:
- delete_shelf_helper(cur_shelf)
- except InvalidRequestError:
+ if not delete_shelf_helper(cur_shelf):
+ flash(_("Error deleting Shelf"), category="error")
+ else:
+ flash(_("Shelf successfully deleted"), category="success")
+ except InvalidRequestError as e:
ub.session.rollback()
- log.error("Settings DB is not Writeable")
- flash(_("Settings DB is not Writeable"), category="error")
+ log.error_or_exception("Settings Database error: {}".format(e))
+ flash(_("Oops! Database Error: %(error)s.", error=e.orig), category="error")
return redirect(url_for('web.index'))
@@ -354,32 +253,144 @@ def show_shelf(shelf_id, sort_param, page):
@shelf.route("/shelf/order/", methods=["GET", "POST"])
@login_required
def order_shelf(shelf_id):
+ shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
+ if shelf and check_shelf_view_permissions(shelf):
+ if request.method == "POST":
+ to_save = request.form.to_dict()
+ books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).order_by(
+ ub.BookShelf.order.asc()).all()
+ counter = 0
+ for book in books_in_shelf:
+ setattr(book, 'order', to_save[str(book.book_id)])
+ counter += 1
+ # if order different from before -> shelf.last_modified = datetime.utcnow()
+ try:
+ ub.session.commit()
+ except (OperationalError, InvalidRequestError) as e:
+ ub.session.rollback()
+ log.error_or_exception("Settings Database error: {}".format(e))
+ flash(_("Oops! Database Error: %(error)s.", error=e.orig), category="error")
+
+ result = list()
+ if shelf:
+ result = calibre_db.session.query(db.Books) \
+ .join(ub.BookShelf, ub.BookShelf.book_id == db.Books.id, isouter=True) \
+ .add_columns(calibre_db.common_filters().label("visible")) \
+ .filter(ub.BookShelf.shelf == shelf_id).order_by(ub.BookShelf.order.asc()).all()
+ return render_title_template('shelf_order.html', entries=result,
+ title=_("Change order of Shelf: '%(name)s'", name=shelf.name),
+ shelf=shelf, page="shelforder")
+ else:
+ abort(404)
+
+
+def check_shelf_edit_permissions(cur_shelf):
+ if not cur_shelf.is_public and not cur_shelf.user_id == int(current_user.id):
+ log.error("User {} not allowed to edit shelf: {}".format(current_user.id, cur_shelf.name))
+ return False
+ if cur_shelf.is_public and not current_user.role_edit_shelfs():
+ log.info("User {} not allowed to edit public shelves".format(current_user.id))
+ return False
+ return True
+
+
+def check_shelf_view_permissions(cur_shelf):
+ if cur_shelf.is_public:
+ return True
+ if current_user.is_anonymous or cur_shelf.user_id != current_user.id:
+ log.error("User is unauthorized to view non-public shelf: {}".format(cur_shelf.name))
+ return False
+ return True
+
+
+# if shelf ID is set, we are editing a shelf
+def create_edit_shelf(shelf, page_title, page, shelf_id=False):
+ sync_only_selected_shelves = current_user.kobo_only_shelves_sync
+ # calibre_db.session.query(ub.Shelf).filter(ub.Shelf.user_id == current_user.id).filter(ub.Shelf.kobo_sync).count()
if request.method == "POST":
to_save = request.form.to_dict()
- books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).order_by(
- ub.BookShelf.order.asc()).all()
- counter = 0
- for book in books_in_shelf:
- setattr(book, 'order', to_save[str(book.book_id)])
- counter += 1
- # if order diffrent from before -> shelf.last_modified = datetime.utcnow()
- try:
- ub.session.commit()
- except (OperationalError, InvalidRequestError):
- ub.session.rollback()
- log.error("Settings DB is not Writeable")
- flash(_("Settings DB is not Writeable"), category="error")
+ if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
+ flash(_("Sorry you are not allowed to create a public shelf"), category="error")
+ return redirect(url_for('web.index'))
+ is_public = 1 if to_save.get("is_public") == "on" else 0
+ if config.config_kobo_sync:
+ shelf.kobo_sync = True if to_save.get("kobo_sync") else False
+ if shelf.kobo_sync:
+ ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id).filter(
+ ub.ShelfArchive.uuid == shelf.uuid).delete()
+ ub.session_commit()
+ shelf_title = to_save.get("title", "")
+ if check_shelf_is_unique(shelf_title, is_public, shelf_id):
+ shelf.name = shelf_title
+ shelf.is_public = is_public
+ if not shelf_id:
+ shelf.user_id = int(current_user.id)
+ ub.session.add(shelf)
+ shelf_action = "created"
+ flash_text = _("Shelf %(title)s created", title=shelf_title)
+ else:
+ shelf_action = "changed"
+ flash_text = _("Shelf %(title)s changed", title=shelf_title)
+ try:
+ ub.session.commit()
+ log.info("Shelf {} {}".format(shelf_title, shelf_action))
+ flash(flash_text, category="success")
+ return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
+ except (OperationalError, InvalidRequestError) as ex:
+ ub.session.rollback()
+ log.error_or_exception(ex)
+ log.error_or_exception("Settings Database error: {}".format(ex))
+ flash(_("Oops! Database Error: %(error)s.", error=ex.orig), category="error")
+ except Exception as ex:
+ ub.session.rollback()
+ log.error_or_exception(ex)
+ flash(_("There was an error"), category="error")
+ return render_title_template('shelf_edit.html',
+ shelf=shelf,
+ title=page_title,
+ page=page,
+ kobo_sync_enabled=config.config_kobo_sync,
+ sync_only_selected_shelves=sync_only_selected_shelves)
- shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
- result = list()
- if shelf and check_shelf_view_permissions(shelf):
- result = calibre_db.session.query(db.Books) \
- .join(ub.BookShelf, ub.BookShelf.book_id == db.Books.id, isouter=True) \
- .add_columns(calibre_db.common_filters().label("visible")) \
- .filter(ub.BookShelf.shelf == shelf_id).order_by(ub.BookShelf.order.asc()).all()
- return render_title_template('shelf_order.html', entries=result,
- title=_(u"Change order of Shelf: '%(name)s'", name=shelf.name),
- shelf=shelf, page="shelforder")
+
+def check_shelf_is_unique(title, is_public, shelf_id=False):
+ if shelf_id:
+ ident = ub.Shelf.id != shelf_id
+ else:
+ ident = true()
+ if is_public == 1:
+ is_shelf_name_unique = ub.session.query(ub.Shelf) \
+ .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 1)) \
+ .filter(ident) \
+ .first() is None
+
+ if not is_shelf_name_unique:
+ log.error("A public shelf with the name '{}' already exists.".format(title))
+ flash(_("A public shelf with the name '%(title)s' already exists.", title=title),
+ category="error")
+ else:
+ is_shelf_name_unique = ub.session.query(ub.Shelf) \
+ .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 0) &
+ (ub.Shelf.user_id == int(current_user.id))) \
+ .filter(ident) \
+ .first() is None
+
+ if not is_shelf_name_unique:
+ log.error("A private shelf with the name '{}' already exists.".format(title))
+ flash(_("A private shelf with the name '%(title)s' already exists.", title=title),
+ category="error")
+ return is_shelf_name_unique
+
+
+def delete_shelf_helper(cur_shelf):
+ if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
+ return False
+ shelf_id = cur_shelf.id
+ ub.session.delete(cur_shelf)
+ ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
+ ub.session.add(ub.ShelfArchive(uuid=cur_shelf.uuid, user_id=cur_shelf.user_id))
+ ub.session_commit("successfully deleted Shelf {}".format(cur_shelf.name))
+ return True
def change_shelf_order(shelf_id, order):
@@ -399,7 +410,6 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
# check user is allowed to access shelf
if shelf and check_shelf_view_permissions(shelf):
-
if shelf_type == 1:
# order = [ub.BookShelf.order.asc()]
if sort_param == 'pubnew':
@@ -430,6 +440,7 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
db.Books,
ub.BookShelf.shelf == shelf_id,
[ub.BookShelf.order.asc()],
+ True, config.config_read_column,
ub.BookShelf, ub.BookShelf.book_id == db.Books.id)
# delete chelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web
wrong_entries = calibre_db.session.query(ub.BookShelf) \
@@ -440,17 +451,17 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
try:
ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == entry.book_id).delete()
ub.session.commit()
- except (OperationalError, InvalidRequestError):
+ except (OperationalError, InvalidRequestError) as e:
ub.session.rollback()
- log.error("Settings DB is not Writeable")
- flash(_("Settings DB is not Writeable"), category="error")
+ log.error_or_exception("Settings Database error: {}".format(e))
+ flash(_("Oops! Database Error: %(error)s.", error=e.orig), category="error")
return render_title_template(page,
entries=result,
pagination=pagination,
- title=_(u"Shelf: '%(name)s'", name=shelf.name),
+ title=_("Shelf: '%(name)s'", name=shelf.name),
shelf=shelf,
page="shelf")
else:
- flash(_(u"Error opening shelf. Shelf does not exist or is not accessible"), category="error")
+ flash(_("Error opening shelf. Shelf does not exist or is not accessible"), category="error")
return redirect(url_for("web.index"))
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index 3a9801808..dbbea88ea 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -3290,9 +3290,11 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropd
-ms-transform-origin: center top;
transform-origin: center top;
border: 0;
- left: 0 !important;
overflow-y: auto;
}
+.dropdown-menu:not(.datepicker-dropdown):not(.profileDropli) {
+ left: 0 !important;
+}
#add-to-shelves {
max-height: calc(100% - 120px);
overflow-y: auto;
@@ -4423,38 +4425,6 @@ body.advanced_search > div.container-fluid > div.row-fluid > div.col-sm-10 > div
left: 49px;
margin-top: 5px
}
-
- body:not(.blur) > .navbar > .container-fluid > .navbar-header:after, body:not(.blur) > .navbar > .container-fluid > .navbar-header:before {
- color: hsla(0, 0%, 100%, .7);
- cursor: pointer;
- display: block;
- font-family: plex-icons-new, serif;
- font-size: 20px;
- font-stretch: 100%;
- font-style: normal;
- font-variant-caps: normal;
- font-variant-east-asian: normal;
- font-variant-numeric: normal;
- font-weight: 400;
- height: 60px;
- letter-spacing: normal;
- line-height: 60px;
- position: absolute
- }
-
- body:not(.blur) > .navbar > .container-fluid > .navbar-header:before {
- content: "\EA30";
- -webkit-font-variant-ligatures: normal;
- font-variant-ligatures: normal;
- left: 20px
- }
-
- body:not(.blur) > .navbar > .container-fluid > .navbar-header:after {
- content: "\EA2F";
- -webkit-font-variant-ligatures: normal;
- font-variant-ligatures: normal;
- left: 60px
- }
}
body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > div.row:first-of-type > div.col > h2:before, body.admin > div.container-fluid > div > div.col-sm-10 > div.discover > h2:first-of-type:before, body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > h1:before, body.newuser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > h1:before {
@@ -5150,7 +5120,7 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head
pointer-events: none
}
-#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
+#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #deleteButton, #deleteModal:hover:before, #cancelTaskModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
cursor: pointer
}
@@ -5237,7 +5207,11 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
margin-bottom: 20px
}
-body.admin:not(.modal-open) .btn-default {
+body.admin > div.container-fluid div.scheduled_tasks_details {
+ margin-bottom: 20px
+}
+
+body.admin .btn-default {
margin-bottom: 10px
}
@@ -5468,7 +5442,7 @@ body.admin.modal-open .navbar {
z-index: 0 !important
}
-#RestartDialog, #ShutdownDialog, #StatusDialog, #deleteModal {
+#RestartDialog, #ShutdownDialog, #StatusDialog, #deleteModal, #cancelTaskModal {
top: 0;
overflow: hidden;
padding-top: 70px;
@@ -5478,7 +5452,7 @@ body.admin.modal-open .navbar {
background: rgba(0, 0, 0, .5)
}
-#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #deleteModal:before {
+#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #deleteModal:before, #cancelTaskModal:before {
content: "\E208";
padding-right: 10px;
display: block;
@@ -5500,18 +5474,18 @@ body.admin.modal-open .navbar {
z-index: 99
}
-#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before, #cancelTaskModal.in:before {
-webkit-transform: translate(0, 0);
-ms-transform: translate(0, 0);
transform: translate(0, 0)
}
-#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog, #cancelTaskModal > .modal-dialog {
width: 450px;
margin: auto
}
-#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content, #cancelTaskModal > .modal-dialog > .modal-content {
max-height: calc(100% - 90px);
-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
@@ -5522,7 +5496,7 @@ body.admin.modal-open .navbar {
width: 450px
}
-#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header {
padding: 15px 20px;
border-radius: 3px 3px 0 0;
line-height: 1.71428571;
@@ -5535,7 +5509,7 @@ body.admin.modal-open .navbar {
text-align: left
}
-#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header:before {
padding-right: 10px;
font-size: 18px;
color: #999;
@@ -5564,6 +5538,11 @@ body.admin.modal-open .navbar {
font-family: plex-icons-new, serif
}
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-header:before {
+ content: "\EA6D";
+ font-family: plex-icons-new, serif
+}
+
#RestartDialog > .modal-dialog > .modal-content > .modal-header:after {
content: "Restart Calibre-Web";
display: inline-block;
@@ -5588,7 +5567,13 @@ body.admin.modal-open .navbar {
font-size: 20px
}
-#StatusDialog > .modal-dialog > .modal-content > .modal-header > span, #deleteModal > .modal-dialog > .modal-content > .modal-header > span, #loader > center > img, .rating-mobile {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-header:after {
+ content: "Delete Book";
+ display: inline-block;
+ font-size: 20px
+}
+
+#StatusDialog > .modal-dialog > .modal-content > .modal-header > span, #deleteModal > .modal-dialog > .modal-content > .modal-header > span, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header > span, #loader > center > img, .rating-mobile {
display: none
}
@@ -5602,7 +5587,7 @@ body.admin.modal-open .navbar {
text-align: left
}
-#ShutdownDialog > .modal-dialog > .modal-content > .modal-body, #StatusDialog > .modal-dialog > .modal-content > .modal-body, #deleteModal > .modal-dialog > .modal-content > .modal-body {
+#ShutdownDialog > .modal-dialog > .modal-content > .modal-body, #StatusDialog > .modal-dialog > .modal-content > .modal-body, #deleteModal > .modal-dialog > .modal-content > .modal-body, #cancelTaskModal > .modal-dialog > .modal-content > .modal-body {
padding: 20px 20px 40px;
font-size: 16px;
line-height: 1.6em;
@@ -5612,7 +5597,7 @@ body.admin.modal-open .navbar {
text-align: left
}
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p, #cancelTaskModal > .modal-dialog > .modal-content > .modal-body > p {
padding: 20px 20px 0 0;
font-size: 16px;
line-height: 1.6em;
@@ -5621,7 +5606,7 @@ body.admin.modal-open .navbar {
background: #282828
}
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default, #cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
float: right;
z-index: 9;
position: relative;
@@ -5669,6 +5654,18 @@ body.admin.modal-open .navbar {
border-radius: 3px
}
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
+ float: right;
+ z-index: 9;
+ position: relative;
+ margin: 0 0 0 10px;
+ min-width: 80px;
+ padding: 10px 18px;
+ font-size: 16px;
+ line-height: 1.33;
+ border-radius: 3px
+}
+
#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart) {
margin: 25px 0 0 10px
}
@@ -5681,7 +5678,11 @@ body.admin.modal-open .navbar {
margin: 0 0 0 10px
}
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+ margin: 0 0 0 10px
+}
+
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover, #cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
background-color: hsla(0, 0%, 100%, .3)
}
@@ -7303,11 +7304,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
background-color: transparent !important
}
- #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+ #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog, #cancelTaskModal > .modal-dialog {
max-width: calc(100vw - 40px)
}
- #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+ #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content, #cancelTaskModal > .modal-dialog > .modal-content {
max-width: calc(100vw - 40px);
left: 0
}
@@ -7457,7 +7458,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
padding: 30px 15px
}
- #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+ #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before, #cancelTaskModal.in:before {
left: auto;
right: 34px
}
diff --git a/cps/static/css/caliBlur_override.css b/cps/static/css/caliBlur_override.css
index 4c8b6cb07..29fd7e298 100644
--- a/cps/static/css/caliBlur_override.css
+++ b/cps/static/css/caliBlur_override.css
@@ -22,3 +22,7 @@ body.serieslist.grid-view div.container-fluid > div > div.col-sm-10::before {
padding: 0 0;
line-height: 15px;
}
+
+input.datepicker {color: transparent}
+input.datepicker:focus {color: transparent}
+input.datepicker:focus + input {color: #555}
diff --git a/cps/static/css/epub_themes.css b/cps/static/css/epub_themes.css
new file mode 100644
index 000000000..16c27805d
--- /dev/null
+++ b/cps/static/css/epub_themes.css
@@ -0,0 +1,19 @@
+.lightTheme {
+ background: #fff;
+ color: #000;
+}
+
+.darkTheme {
+ background: #202124;
+ color: #fff
+}
+
+.sepiaTheme {
+ background: #ece1ca;
+ color: #000;
+}
+
+.blackTheme {
+ background: #000;
+ color: #fff
+}
\ No newline at end of file
diff --git a/cps/static/css/libs/images/findbarButton-next-dark.svg b/cps/static/css/libs/images/findbarButton-next-dark.svg
deleted file mode 100644
index 80df70bc1..000000000
--- a/cps/static/css/libs/images/findbarButton-next-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/findbarButton-previous-dark.svg b/cps/static/css/libs/images/findbarButton-previous-dark.svg
deleted file mode 100644
index d304a9b8c..000000000
--- a/cps/static/css/libs/images/findbarButton-previous-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/grab.cur b/cps/static/css/libs/images/grab.cur
deleted file mode 100644
index db7ad5aed..000000000
Binary files a/cps/static/css/libs/images/grab.cur and /dev/null differ
diff --git a/cps/static/css/libs/images/grabbing.cur b/cps/static/css/libs/images/grabbing.cur
deleted file mode 100644
index e0dfd04e4..000000000
Binary files a/cps/static/css/libs/images/grabbing.cur and /dev/null differ
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-documentProperties-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-documentProperties-dark.svg
deleted file mode 100644
index 306e628d7..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-documentProperties-dark.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-firstPage-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-firstPage-dark.svg
deleted file mode 100644
index c13ff8671..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-firstPage-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-handTool-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-handTool-dark.svg
deleted file mode 100644
index 834d8b0da..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-handTool-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-lastPage-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-lastPage-dark.svg
deleted file mode 100644
index 8633e420a..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-lastPage-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-rotateCcw-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-rotateCcw-dark.svg
deleted file mode 100644
index 1a92f802c..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-rotateCcw-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-rotateCw-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-rotateCw-dark.svg
deleted file mode 100644
index 2a4ef7385..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-rotateCw-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-scrollHorizontal-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-scrollHorizontal-dark.svg
deleted file mode 100644
index 337f85ef4..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-scrollHorizontal-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-scrollPage.svg b/cps/static/css/libs/images/secondaryToolbarButton-scrollPage.svg
new file mode 100644
index 000000000..bea2f0d67
--- /dev/null
+++ b/cps/static/css/libs/images/secondaryToolbarButton-scrollPage.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-scrollVertical-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-scrollVertical-dark.svg
deleted file mode 100644
index 41bdd8f14..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-scrollVertical-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-scrollWrapped-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-scrollWrapped-dark.svg
deleted file mode 100644
index cd50526ff..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-scrollWrapped-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-selectTool-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-selectTool-dark.svg
deleted file mode 100644
index 7a95098af..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-selectTool-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-spreadEven-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-spreadEven-dark.svg
deleted file mode 100644
index 0c9586ed8..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-spreadEven-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-spreadNone-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-spreadNone-dark.svg
deleted file mode 100644
index 75e1b985d..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-spreadNone-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/secondaryToolbarButton-spreadOdd-dark.svg b/cps/static/css/libs/images/secondaryToolbarButton-spreadOdd-dark.svg
deleted file mode 100644
index 8dff9598e..000000000
--- a/cps/static/css/libs/images/secondaryToolbarButton-spreadOdd-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-bookmark-dark.svg b/cps/static/css/libs/images/toolbarButton-bookmark-dark.svg
deleted file mode 100644
index 7bf332972..000000000
--- a/cps/static/css/libs/images/toolbarButton-bookmark-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-currentOutlineItem.svg b/cps/static/css/libs/images/toolbarButton-currentOutlineItem.svg
new file mode 100644
index 000000000..c1c72b208
--- /dev/null
+++ b/cps/static/css/libs/images/toolbarButton-currentOutlineItem.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-download-dark.svg b/cps/static/css/libs/images/toolbarButton-download-dark.svg
deleted file mode 100644
index d2a92e5d4..000000000
--- a/cps/static/css/libs/images/toolbarButton-download-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-editorFreeText.svg b/cps/static/css/libs/images/toolbarButton-editorFreeText.svg
new file mode 100644
index 000000000..f0f11b47c
--- /dev/null
+++ b/cps/static/css/libs/images/toolbarButton-editorFreeText.svg
@@ -0,0 +1,24 @@
+
+
+
diff --git a/cps/static/css/libs/images/toolbarButton-editorInk.svg b/cps/static/css/libs/images/toolbarButton-editorInk.svg
new file mode 100644
index 000000000..2b37e85f3
--- /dev/null
+++ b/cps/static/css/libs/images/toolbarButton-editorInk.svg
@@ -0,0 +1,9 @@
+
+
+
diff --git a/cps/static/css/libs/images/toolbarButton-menuArrow-dark.svg b/cps/static/css/libs/images/toolbarButton-menuArrow-dark.svg
deleted file mode 100644
index eb7f50e6d..000000000
--- a/cps/static/css/libs/images/toolbarButton-menuArrow-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-openFile-dark.svg b/cps/static/css/libs/images/toolbarButton-openFile-dark.svg
deleted file mode 100644
index 0bd612f0e..000000000
--- a/cps/static/css/libs/images/toolbarButton-openFile-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-pageDown-dark.svg b/cps/static/css/libs/images/toolbarButton-pageDown-dark.svg
deleted file mode 100644
index c2ca60c8f..000000000
--- a/cps/static/css/libs/images/toolbarButton-pageDown-dark.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-pageUp-dark.svg b/cps/static/css/libs/images/toolbarButton-pageUp-dark.svg
deleted file mode 100644
index dddc4ab26..000000000
--- a/cps/static/css/libs/images/toolbarButton-pageUp-dark.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-presentationMode-dark.svg b/cps/static/css/libs/images/toolbarButton-presentationMode-dark.svg
deleted file mode 100644
index 13fa9dc7c..000000000
--- a/cps/static/css/libs/images/toolbarButton-presentationMode-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-print-dark.svg b/cps/static/css/libs/images/toolbarButton-print-dark.svg
deleted file mode 100644
index ad37022f0..000000000
--- a/cps/static/css/libs/images/toolbarButton-print-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-search-dark.svg b/cps/static/css/libs/images/toolbarButton-search-dark.svg
deleted file mode 100644
index cec8a4206..000000000
--- a/cps/static/css/libs/images/toolbarButton-search-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-secondaryToolbarToggle-dark.svg b/cps/static/css/libs/images/toolbarButton-secondaryToolbarToggle-dark.svg
deleted file mode 100644
index 0160c07cd..000000000
--- a/cps/static/css/libs/images/toolbarButton-secondaryToolbarToggle-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-sidebarToggle-dark.svg b/cps/static/css/libs/images/toolbarButton-sidebarToggle-dark.svg
deleted file mode 100644
index 0118e41a8..000000000
--- a/cps/static/css/libs/images/toolbarButton-sidebarToggle-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-viewAttachments-dark.svg b/cps/static/css/libs/images/toolbarButton-viewAttachments-dark.svg
deleted file mode 100644
index c9714fdea..000000000
--- a/cps/static/css/libs/images/toolbarButton-viewAttachments-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-viewLayers-dark.svg b/cps/static/css/libs/images/toolbarButton-viewLayers-dark.svg
deleted file mode 100644
index 76b042a95..000000000
--- a/cps/static/css/libs/images/toolbarButton-viewLayers-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-viewOutline-dark.svg b/cps/static/css/libs/images/toolbarButton-viewOutline-dark.svg
deleted file mode 100644
index 1704d961a..000000000
--- a/cps/static/css/libs/images/toolbarButton-viewOutline-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-viewThumbnail-dark.svg b/cps/static/css/libs/images/toolbarButton-viewThumbnail-dark.svg
deleted file mode 100644
index 17c55f7b8..000000000
--- a/cps/static/css/libs/images/toolbarButton-viewThumbnail-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-zoomIn-dark.svg b/cps/static/css/libs/images/toolbarButton-zoomIn-dark.svg
deleted file mode 100644
index 9b615541e..000000000
--- a/cps/static/css/libs/images/toolbarButton-zoomIn-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/toolbarButton-zoomOut-dark.svg b/cps/static/css/libs/images/toolbarButton-zoomOut-dark.svg
deleted file mode 100644
index 0fb3594d1..000000000
--- a/cps/static/css/libs/images/toolbarButton-zoomOut-dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/treeitem-collapsed-dark.svg b/cps/static/css/libs/images/treeitem-collapsed-dark.svg
deleted file mode 100644
index 1fb655162..000000000
--- a/cps/static/css/libs/images/treeitem-collapsed-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/images/treeitem-expanded-dark.svg b/cps/static/css/libs/images/treeitem-expanded-dark.svg
deleted file mode 100644
index 695b0aa61..000000000
--- a/cps/static/css/libs/images/treeitem-expanded-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/cps/static/css/libs/viewer.css b/cps/static/css/libs/viewer.css
index cd4781bf4..c357a9fde 100644
--- a/cps/static/css/libs/viewer.css
+++ b/cps/static/css/libs/viewer.css
@@ -15,6 +15,7 @@
.textLayer {
position: absolute;
+ text-align: initial;
left: 0;
top: 0;
right: 0;
@@ -22,9 +23,14 @@
overflow: hidden;
opacity: 0.2;
line-height: 1;
+ -webkit-text-size-adjust: none;
+ -moz-text-size-adjust: none;
+ text-size-adjust: none;
+ forced-color-adjust: none;
}
-.textLayer > span {
+.textLayer span,
+.textLayer br {
color: transparent;
position: absolute;
white-space: pre;
@@ -32,6 +38,13 @@
transform-origin: 0% 0%;
}
+/* Only necessary in Google Chrome, see issue 14205, and most unfortunately
+ * the problem doesn't show up in "text" reference tests. */
+.textLayer span.markedContent {
+ top: 0;
+ height: 0;
+}
+
.textLayer .highlight {
margin: -1px;
padding: 1px;
@@ -39,16 +52,20 @@
border-radius: 4px;
}
+.textLayer .highlight.appended {
+ position: initial;
+}
+
.textLayer .highlight.begin {
- border-radius: 4px 0px 0px 4px;
+ border-radius: 4px 0 0 4px;
}
.textLayer .highlight.end {
- border-radius: 0px 4px 4px 0px;
+ border-radius: 0 4px 4px 0;
}
.textLayer .highlight.middle {
- border-radius: 0px;
+ border-radius: 0;
}
.textLayer .highlight.selected {
@@ -63,28 +80,61 @@
background: rgba(0, 0, 255, 1);
}
+/* Avoids https://github.com/mozilla/pdf.js/issues/13840 in Chrome */
+.textLayer br::-moz-selection {
+ background: transparent;
+}
+.textLayer br::selection {
+ background: transparent;
+}
+
.textLayer .endOfContent {
display: block;
position: absolute;
- left: 0px;
+ left: 0;
top: 100%;
- right: 0px;
- bottom: 0px;
+ right: 0;
+ bottom: 0;
z-index: -1;
cursor: default;
-webkit-user-select: none;
-moz-user-select: none;
- -ms-user-select: none;
user-select: none;
}
.textLayer .endOfContent.active {
- top: 0px;
+ top: 0;
}
+:root {
+ --annotation-unfocused-field-background: url("data:image/svg+xml;charset=UTF-8,");
+}
+
+@media (forced-colors: active) {
+ .annotationLayer .textWidgetAnnotation input:required,
+ .annotationLayer .textWidgetAnnotation textarea:required,
+ .annotationLayer .choiceWidgetAnnotation select:required,
+ .annotationLayer .buttonWidgetAnnotation.checkBox input:required,
+ .annotationLayer .buttonWidgetAnnotation.radioButton input:required {
+ outline: 1.5px solid selectedItem;
+ }
+}
+
+.annotationLayer {
+ position: absolute;
+ top: 0;
+ left: 0;
+ pointer-events: none;
+ transform-origin: 0 0;
+}
+
.annotationLayer section {
position: absolute;
+ text-align: initial;
+ pointer-events: auto;
+ box-sizing: border-box;
+ transform-origin: 0 0;
}
.annotationLayer .linkAnnotation > a,
@@ -97,16 +147,23 @@
height: 100%;
}
+.annotationLayer .buttonWidgetAnnotation.pushButton > canvas {
+ width: 100%;
+ height: 100%;
+}
+
.annotationLayer .linkAnnotation > a:hover,
.annotationLayer .buttonWidgetAnnotation.pushButton > a:hover {
opacity: 0.2;
background: rgba(255, 255, 0, 1);
- box-shadow: 0px 2px 10px rgba(255, 255, 0, 1);
+ box-shadow: 0 2px 10px rgba(255, 255, 0, 1);
}
.annotationLayer .textAnnotation img {
position: absolute;
cursor: pointer;
+ width: 100%;
+ height: 100%;
}
.annotationLayer .textWidgetAnnotation input,
@@ -114,17 +171,24 @@
.annotationLayer .choiceWidgetAnnotation select,
.annotationLayer .buttonWidgetAnnotation.checkBox input,
.annotationLayer .buttonWidgetAnnotation.radioButton input {
- background-color: rgba(0, 54, 255, 0.13);
+ background-image: var(--annotation-unfocused-field-background);
border: 1px solid transparent;
box-sizing: border-box;
- font-size: 9px;
+ font: calc(9px * var(--scale-factor)) sans-serif;
height: 100%;
margin: 0;
- padding: 0 3px;
vertical-align: top;
width: 100%;
}
+.annotationLayer .textWidgetAnnotation input:required,
+.annotationLayer .textWidgetAnnotation textarea:required,
+.annotationLayer .choiceWidgetAnnotation select:required,
+.annotationLayer .buttonWidgetAnnotation.checkBox input:required,
+.annotationLayer .buttonWidgetAnnotation.radioButton input:required {
+ outline: 1.5px solid red;
+}
+
.annotationLayer .choiceWidgetAnnotation select option {
padding: 0;
}
@@ -134,8 +198,6 @@
}
.annotationLayer .textWidgetAnnotation textarea {
- font: message-box;
- font-size: 9px;
resize: none;
}
@@ -164,10 +226,20 @@
border: 1px solid transparent;
}
+.annotationLayer .textWidgetAnnotation input :focus,
+.annotationLayer .textWidgetAnnotation textarea :focus,
+.annotationLayer .choiceWidgetAnnotation select :focus,
+.annotationLayer .buttonWidgetAnnotation.checkBox :focus,
+.annotationLayer .buttonWidgetAnnotation.radioButton :focus {
+ background-image: none;
+ background-color: transparent;
+ outline: auto;
+}
+
.annotationLayer .buttonWidgetAnnotation.checkBox input:checked:before,
.annotationLayer .buttonWidgetAnnotation.checkBox input:checked:after,
.annotationLayer .buttonWidgetAnnotation.radioButton input:checked:before {
- background-color: rgba(0, 0, 0, 1);
+ background-color: CanvasText;
content: "";
display: block;
position: absolute;
@@ -209,7 +281,7 @@
* area, causing horizontal scrolling. We avoid this by extending the width
* when the element has focus and revert this when it loses focus.
*/
- width: 115%;
+ width: 103%;
}
.annotationLayer .buttonWidgetAnnotation.checkBox input,
@@ -217,46 +289,59 @@
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
- padding: 0;
+}
+
+.annotationLayer .popupTriggerArea {
+ height: 100%;
+ width: 100%;
}
.annotationLayer .popupWrapper {
position: absolute;
- width: 20em;
+ font-size: calc(9px * var(--scale-factor));
+ width: 100%;
+ min-width: calc(180px * var(--scale-factor));
+ pointer-events: none;
}
.annotationLayer .popup {
position: absolute;
- z-index: 200;
- max-width: 20em;
+ max-width: calc(180px * var(--scale-factor));
background-color: rgba(255, 255, 153, 1);
- box-shadow: 0px 2px 5px rgba(136, 136, 136, 1);
- border-radius: 2px;
- padding: 6px;
- margin-left: 5px;
+ box-shadow: 0 calc(2px * var(--scale-factor)) calc(5px * var(--scale-factor))
+ rgba(136, 136, 136, 1);
+ border-radius: calc(2px * var(--scale-factor));
+ padding: calc(6px * var(--scale-factor));
+ margin-left: calc(5px * var(--scale-factor));
cursor: pointer;
font: message-box;
- font-size: 9px;
+ white-space: normal;
word-wrap: break-word;
+ pointer-events: auto;
}
.annotationLayer .popup > * {
- font-size: 9px;
+ font-size: calc(9px * var(--scale-factor));
}
.annotationLayer .popup h1 {
display: inline-block;
}
-.annotationLayer .popup span {
+.annotationLayer .popupDate {
display: inline-block;
- margin-left: 5px;
+ margin-left: calc(5px * var(--scale-factor));
}
-.annotationLayer .popup p {
+.annotationLayer .popupContent {
border-top: 1px solid rgba(51, 51, 51, 1);
- margin-top: 2px;
- padding-top: 2px;
+ margin-top: calc(2px * var(--scale-factor));
+ padding-top: calc(2px * var(--scale-factor));
+}
+
+.annotationLayer .richText > * {
+ white-space: pre-wrap;
+ font-size: calc(9px * var(--scale-factor));
}
.annotationLayer .highlightAnnotation,
@@ -276,6 +361,527 @@
cursor: pointer;
}
+.annotationLayer section svg {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+}
+
+.annotationLayer .annotationTextContent {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ opacity: 0;
+ color: transparent;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ user-select: none;
+ pointer-events: none;
+}
+
+.annotationLayer .annotationTextContent span {
+ width: 100%;
+ display: inline-block;
+}
+
+
+:root {
+ --xfa-unfocused-field-background: url("data:image/svg+xml;charset=UTF-8,");
+}
+
+@media (forced-colors: active) {
+ .xfaLayer *:required {
+ outline: 1.5px solid selectedItem;
+ }
+}
+
+.xfaLayer .highlight {
+ margin: -1px;
+ padding: 1px;
+ background-color: rgba(239, 203, 237, 1);
+ border-radius: 4px;
+}
+
+.xfaLayer .highlight.appended {
+ position: initial;
+}
+
+.xfaLayer .highlight.begin {
+ border-radius: 4px 0 0 4px;
+}
+
+.xfaLayer .highlight.end {
+ border-radius: 0 4px 4px 0;
+}
+
+.xfaLayer .highlight.middle {
+ border-radius: 0;
+}
+
+.xfaLayer .highlight.selected {
+ background-color: rgba(203, 223, 203, 1);
+}
+
+.xfaLayer ::-moz-selection {
+ background: rgba(0, 0, 255, 1);
+}
+
+.xfaLayer ::selection {
+ background: rgba(0, 0, 255, 1);
+}
+
+.xfaPage {
+ overflow: hidden;
+ position: relative;
+}
+
+.xfaContentarea {
+ position: absolute;
+}
+
+.xfaPrintOnly {
+ display: none;
+}
+
+.xfaLayer {
+ position: absolute;
+ text-align: initial;
+ top: 0;
+ left: 0;
+ transform-origin: 0 0;
+ line-height: 1.2;
+}
+
+.xfaLayer * {
+ color: inherit;
+ font: inherit;
+ font-style: inherit;
+ font-weight: inherit;
+ font-kerning: inherit;
+ letter-spacing: -0.01px;
+ text-align: inherit;
+ text-decoration: inherit;
+ box-sizing: border-box;
+ background-color: transparent;
+ padding: 0;
+ margin: 0;
+ pointer-events: auto;
+ line-height: inherit;
+}
+
+.xfaLayer *:required {
+ outline: 1.5px solid red;
+}
+
+.xfaLayer div {
+ pointer-events: none;
+}
+
+.xfaLayer svg {
+ pointer-events: none;
+}
+
+.xfaLayer svg * {
+ pointer-events: none;
+}
+
+.xfaLayer a {
+ color: blue;
+}
+
+.xfaRich li {
+ margin-left: 3em;
+}
+
+.xfaFont {
+ color: black;
+ font-weight: normal;
+ font-kerning: none;
+ font-size: 10px;
+ font-style: normal;
+ letter-spacing: 0;
+ text-decoration: none;
+ vertical-align: 0;
+}
+
+.xfaCaption {
+ overflow: hidden;
+ flex: 0 0 auto;
+}
+
+.xfaCaptionForCheckButton {
+ overflow: hidden;
+ flex: 1 1 auto;
+}
+
+.xfaLabel {
+ height: 100%;
+ width: 100%;
+}
+
+.xfaLeft {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
+
+.xfaRight {
+ display: flex;
+ flex-direction: row-reverse;
+ align-items: center;
+}
+
+.xfaLeft > .xfaCaption,
+.xfaLeft > .xfaCaptionForCheckButton,
+.xfaRight > .xfaCaption,
+.xfaRight > .xfaCaptionForCheckButton {
+ max-height: 100%;
+}
+
+.xfaTop {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+}
+
+.xfaBottom {
+ display: flex;
+ flex-direction: column-reverse;
+ align-items: flex-start;
+}
+
+.xfaTop > .xfaCaption,
+.xfaTop > .xfaCaptionForCheckButton,
+.xfaBottom > .xfaCaption,
+.xfaBottom > .xfaCaptionForCheckButton {
+ width: 100%;
+}
+
+.xfaBorder {
+ background-color: transparent;
+ position: absolute;
+ pointer-events: none;
+}
+
+.xfaWrapped {
+ width: 100%;
+ height: 100%;
+}
+
+.xfaTextfield:focus,
+.xfaSelect:focus {
+ background-image: none;
+ background-color: transparent;
+ outline: auto;
+ outline-offset: -1px;
+}
+
+.xfaCheckbox:focus,
+.xfaRadio:focus {
+ outline: auto;
+}
+
+.xfaTextfield,
+.xfaSelect {
+ height: 100%;
+ width: 100%;
+ flex: 1 1 auto;
+ border: none;
+ resize: none;
+ background-image: var(--xfa-unfocused-field-background);
+}
+
+.xfaTop > .xfaTextfield,
+.xfaTop > .xfaSelect,
+.xfaBottom > .xfaTextfield,
+.xfaBottom > .xfaSelect {
+ flex: 0 1 auto;
+}
+
+.xfaButton {
+ cursor: pointer;
+ width: 100%;
+ height: 100%;
+ border: none;
+ text-align: center;
+}
+
+.xfaLink {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+
+.xfaCheckbox,
+.xfaRadio {
+ width: 100%;
+ height: 100%;
+ flex: 0 0 auto;
+ border: none;
+}
+
+.xfaRich {
+ white-space: pre-wrap;
+ width: 100%;
+ height: 100%;
+}
+
+.xfaImage {
+ -o-object-position: left top;
+ object-position: left top;
+ -o-object-fit: contain;
+ object-fit: contain;
+ width: 100%;
+ height: 100%;
+}
+
+.xfaLrTb,
+.xfaRlTb,
+.xfaTb {
+ display: flex;
+ flex-direction: column;
+ align-items: stretch;
+}
+
+.xfaLr {
+ display: flex;
+ flex-direction: row;
+ align-items: stretch;
+}
+
+.xfaRl {
+ display: flex;
+ flex-direction: row-reverse;
+ align-items: stretch;
+}
+
+.xfaTb > div {
+ justify-content: left;
+}
+
+.xfaPosition {
+ position: relative;
+}
+
+.xfaArea {
+ position: relative;
+}
+
+.xfaValignMiddle {
+ display: flex;
+ align-items: center;
+}
+
+.xfaTable {
+ display: flex;
+ flex-direction: column;
+ align-items: stretch;
+}
+
+.xfaTable .xfaRow {
+ display: flex;
+ flex-direction: row;
+ align-items: stretch;
+}
+
+.xfaTable .xfaRlRow {
+ display: flex;
+ flex-direction: row-reverse;
+ align-items: stretch;
+ flex: 1;
+}
+
+.xfaTable .xfaRlRow > div {
+ flex: 1;
+}
+
+.xfaNonInteractive input,
+.xfaNonInteractive textarea,
+.xfaDisabled input,
+.xfaDisabled textarea,
+.xfaReadOnly input,
+.xfaReadOnly textarea {
+ background: initial;
+}
+
+@media print {
+ .xfaTextfield,
+ .xfaSelect {
+ background: transparent;
+ }
+
+ .xfaSelect {
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+ text-indent: 1px;
+ text-overflow: "";
+ }
+}
+
+
+:root {
+ --focus-outline: solid 2px blue;
+ --hover-outline: dashed 2px blue;
+ --freetext-line-height: 1.35;
+ --freetext-padding: 2px;
+ --editorInk-editing-cursor: url(images/toolbarButton-editorInk.svg) 0 16;
+}
+
+@media (forced-colors: active) {
+ :root {
+ --focus-outline: solid 3px ButtonText;
+ --hover-outline: dashed 3px ButtonText;
+ }
+}
+
+[data-editor-rotation="90"] {
+ transform: rotate(90deg);
+}
+[data-editor-rotation="180"] {
+ transform: rotate(180deg);
+}
+[data-editor-rotation="270"] {
+ transform: rotate(270deg);
+}
+
+.annotationEditorLayer {
+ background: transparent;
+ position: absolute;
+ top: 0;
+ left: 0;
+ font-size: calc(100px * var(--scale-factor));
+ transform-origin: 0 0;
+}
+
+.annotationEditorLayer .selectedEditor {
+ outline: var(--focus-outline);
+ resize: none;
+}
+
+.annotationEditorLayer .freeTextEditor {
+ position: absolute;
+ background: transparent;
+ border-radius: 3px;
+ padding: calc(var(--freetext-padding) * var(--scale-factor));
+ resize: none;
+ width: auto;
+ height: auto;
+ z-index: 1;
+ transform-origin: 0 0;
+ touch-action: none;
+}
+
+.annotationEditorLayer .freeTextEditor .internal {
+ background: transparent;
+ border: none;
+ top: 0;
+ left: 0;
+ overflow: visible;
+ white-space: nowrap;
+ resize: none;
+ font: 10px sans-serif;
+ line-height: var(--freetext-line-height);
+}
+
+.annotationEditorLayer .freeTextEditor .overlay {
+ position: absolute;
+ display: none;
+ background: transparent;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+}
+
+.annotationEditorLayer .freeTextEditor .overlay.enabled {
+ display: block;
+}
+
+.annotationEditorLayer .freeTextEditor .internal:empty::before {
+ content: attr(default-content);
+ color: gray;
+}
+
+.annotationEditorLayer .freeTextEditor .internal:focus {
+ outline: none;
+}
+
+.annotationEditorLayer .inkEditor.disabled {
+ resize: none;
+}
+
+.annotationEditorLayer .inkEditor.disabled.selectedEditor {
+ resize: horizontal;
+}
+
+.annotationEditorLayer .freeTextEditor:hover:not(.selectedEditor),
+.annotationEditorLayer .inkEditor:hover:not(.selectedEditor) {
+ outline: var(--hover-outline);
+}
+
+.annotationEditorLayer .inkEditor {
+ position: absolute;
+ background: transparent;
+ border-radius: 3px;
+ overflow: auto;
+ width: 100%;
+ height: 100%;
+ z-index: 1;
+ transform-origin: 0 0;
+ cursor: auto;
+}
+
+.annotationEditorLayer .inkEditor.editing {
+ resize: none;
+ cursor: var(--editorInk-editing-cursor), pointer;
+}
+
+.annotationEditorLayer .inkEditor .inkEditorCanvas {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ touch-action: none;
+}
+
+:root {
+ --viewer-container-height: 0;
+ --pdfViewer-padding-bottom: 0;
+ --page-margin: 1px auto -8px;
+ --page-border: 9px solid transparent;
+ --page-border-image: url(images/shadow.png) 9 9 repeat;
+ --spreadHorizontalWrapped-margin-LR: -3.5px;
+ --scale-factor: 1;
+}
+
+@media screen and (forced-colors: active) {
+ :root {
+ --pdfViewer-padding-bottom: 9px;
+ --page-margin: 8px auto -1px;
+ --page-border: 1px solid CanvasText;
+ --page-border-image: none;
+ --spreadHorizontalWrapped-margin-LR: 3.5px;
+ }
+}
+
+[data-main-rotation="90"] {
+ transform: rotate(90deg) translateY(-100%);
+}
+[data-main-rotation="180"] {
+ transform: rotate(180deg) translate(-100%, -100%);
+}
+[data-main-rotation="270"] {
+ transform: rotate(270deg) translateX(-100%);
+}
+
+.pdfViewer {
+ padding-bottom: var(--pdfViewer-padding-bottom);
+}
+
.pdfViewer .canvasWrapper {
overflow: hidden;
}
@@ -284,18 +890,24 @@
direction: ltr;
width: 816px;
height: 1056px;
- margin: 1px auto -8px auto;
+ margin: var(--page-margin);
position: relative;
overflow: visible;
- border: 9px solid transparent;
+ border: var(--page-border);
+ -o-border-image: var(--page-border-image);
+ border-image: var(--page-border-image);
background-clip: content-box;
- -o-border-image: url(images/shadow.png) 9 9 repeat;
- border-image: url(images/shadow.png) 9 9 repeat;
background-color: rgba(255, 255, 255, 1);
}
+.pdfViewer .dummyPage {
+ position: relative;
+ width: 0;
+ height: var(--viewer-container-height);
+}
+
.pdfViewer.removePageBorders .page {
- margin: 0px auto 10px auto;
+ margin: 0 auto 10px;
border: none;
}
@@ -329,6 +941,7 @@
}
.spread .page,
+.spread .dummyPage,
.pdfViewer.scrollHorizontal .page,
.pdfViewer.scrollWrapped .page,
.pdfViewer.scrollHorizontal .spread,
@@ -340,8 +953,8 @@
.spread .page,
.pdfViewer.scrollHorizontal .page,
.pdfViewer.scrollWrapped .page {
- margin-left: -3.5px;
- margin-right: -3.5px;
+ margin-left: var(--spreadHorizontalWrapped-margin-LR);
+ margin-right: var(--spreadHorizontalWrapped-margin-LR);
}
.pdfViewer.removePageBorders .spread .page,
@@ -369,85 +982,86 @@
bottom: 0;
background: url("images/loading-icon.gif") center no-repeat;
}
+.pdfViewer .page .loadingIcon.notVisible {
+ background: none;
+}
+
+.pdfViewer.enablePermissions .textLayer span {
+ -webkit-user-select: none !important;
+ -moz-user-select: none !important;
+ user-select: none !important;
+ cursor: not-allowed;
+}
.pdfPresentationMode .pdfViewer {
- margin-left: 0;
- margin-right: 0;
+ padding-bottom: 0;
}
-.pdfPresentationMode .pdfViewer .page,
-.pdfPresentationMode .pdfViewer .spread {
- display: block;
+.pdfPresentationMode .spread {
+ margin: 0;
}
-.pdfPresentationMode .pdfViewer .page,
-.pdfPresentationMode .pdfViewer.removePageBorders .page {
- margin-left: auto;
- margin-right: auto;
-}
-
-.pdfPresentationMode:-ms-fullscreen .pdfViewer .page {
- margin-bottom: 100% !important;
-}
-
-.pdfPresentationMode:-webkit-full-screen .pdfViewer .page {
- margin-bottom: 100%;
- border: 0;
-}
-
-.pdfPresentationMode:-moz-full-screen .pdfViewer .page {
- margin-bottom: 100%;
- border: 0;
-}
-
-.pdfPresentationMode:fullscreen .pdfViewer .page {
- margin-bottom: 100%;
- border: 0;
+.pdfPresentationMode .pdfViewer .page {
+ margin: 0 auto;
+ border: 2px solid transparent;
}
:root {
+ --dir-factor: 1;
--sidebar-width: 200px;
--sidebar-transition-duration: 200ms;
--sidebar-transition-timing-function: ease;
+ --scale-select-container-width: 140px;
+ --scale-select-overflow: 22px;
--toolbar-icon-opacity: 0.7;
--doorhanger-icon-opacity: 0.9;
--main-color: rgba(12, 12, 13, 1);
--body-bg-color: rgba(237, 237, 240, 1);
- --errorWrapper-bg-color: rgba(255, 74, 74, 1);
+ --errorWrapper-bg-color: rgba(255, 110, 110, 1);
+ --progressBar-percent: 0%;
+ --progressBar-end-offset: 0;
--progressBar-color: rgba(10, 132, 255, 1);
--progressBar-indeterminate-bg-color: rgba(221, 221, 222, 1);
--progressBar-indeterminate-blend-color: rgba(116, 177, 239, 1);
--scrollbar-color: auto;
--scrollbar-bg-color: auto;
+ --toolbar-icon-bg-color: rgba(0, 0, 0, 1);
+ --toolbar-icon-hover-bg-color: rgba(0, 0, 0, 1);
- --sidebar-bg-color: rgba(245, 246, 247, 1);
+ --sidebar-narrow-bg-color: rgba(237, 237, 240, 0.9);
+ --sidebar-toolbar-bg-color: rgba(245, 246, 247, 1);
--toolbar-bg-color: rgba(249, 249, 250, 1);
--toolbar-border-color: rgba(204, 204, 204, 1);
--button-hover-color: rgba(221, 222, 223, 1);
+ --toggled-btn-color: rgba(0, 0, 0, 1);
--toggled-btn-bg-color: rgba(0, 0, 0, 0.3);
+ --toggled-hover-active-btn-color: rgba(0, 0, 0, 0.4);
--dropdown-btn-bg-color: rgba(215, 215, 219, 1);
--separator-color: rgba(0, 0, 0, 0.3);
--field-color: rgba(6, 6, 6, 1);
--field-bg-color: rgba(255, 255, 255, 1);
--field-border-color: rgba(187, 187, 188, 1);
- --findbar-nextprevious-btn-bg-color: rgba(227, 228, 230, 1);
- --outline-color: rgba(0, 0, 0, 0.8);
- --outline-hover-color: rgba(0, 0, 0, 0.9);
- --outline-active-color: rgba(0, 0, 0, 0.08);
- --outline-active-bg-color: rgba(0, 0, 0, 1);
+ --treeitem-color: rgba(0, 0, 0, 0.8);
+ --treeitem-hover-color: rgba(0, 0, 0, 0.9);
+ --treeitem-selected-color: rgba(0, 0, 0, 0.9);
+ --treeitem-selected-bg-color: rgba(0, 0, 0, 0.25);
--sidebaritem-bg-color: rgba(0, 0, 0, 0.15);
--doorhanger-bg-color: rgba(255, 255, 255, 1);
--doorhanger-border-color: rgba(12, 12, 13, 0.2);
- --doorhanger-hover-color: rgba(237, 237, 237, 1);
+ --doorhanger-hover-color: rgba(12, 12, 13, 1);
+ --doorhanger-hover-bg-color: rgba(237, 237, 237, 1);
--doorhanger-separator-color: rgba(222, 222, 222, 1);
- --overlay-button-bg-color: rgba(12, 12, 13, 0.1);
- --overlay-button-hover-color: rgba(12, 12, 13, 0.3);
+ --dialog-button-border: 0 none;
+ --dialog-button-bg-color: rgba(12, 12, 13, 0.1);
+ --dialog-button-hover-bg-color: rgba(12, 12, 13, 0.3);
- /*--loading-icon: url(images/loading.svg);
+ --loading-icon: url(images/loading.svg);
--treeitem-expanded-icon: url(images/treeitem-expanded.svg);
--treeitem-collapsed-icon: url(images/treeitem-collapsed.svg);
+ --toolbarButton-editorFreeText-icon: url(images/toolbarButton-editorFreeText.svg);
+ --toolbarButton-editorInk-icon: url(images/toolbarButton-editorInk.svg);
--toolbarButton-menuArrow-icon: url(images/toolbarButton-menuArrow.svg);
--toolbarButton-sidebarToggle-icon: url(images/toolbarButton-sidebarToggle.svg);
--toolbarButton-secondaryToolbarToggle-icon: url(images/toolbarButton-secondaryToolbarToggle.svg);
@@ -464,6 +1078,7 @@
--toolbarButton-viewOutline-icon: url(images/toolbarButton-viewOutline.svg);
--toolbarButton-viewAttachments-icon: url(images/toolbarButton-viewAttachments.svg);
--toolbarButton-viewLayers-icon: url(images/toolbarButton-viewLayers.svg);
+ --toolbarButton-currentOutlineItem-icon: url(images/toolbarButton-currentOutlineItem.svg);
--toolbarButton-search-icon: url(images/toolbarButton-search.svg);
--findbarButton-previous-icon: url(images/findbarButton-previous.svg);
--findbarButton-next-icon: url(images/findbarButton-next.svg);
@@ -473,48 +1088,82 @@
--secondaryToolbarButton-rotateCw-icon: url(images/secondaryToolbarButton-rotateCw.svg);
--secondaryToolbarButton-selectTool-icon: url(images/secondaryToolbarButton-selectTool.svg);
--secondaryToolbarButton-handTool-icon: url(images/secondaryToolbarButton-handTool.svg);
+ --secondaryToolbarButton-scrollPage-icon: url(images/secondaryToolbarButton-scrollPage.svg);
--secondaryToolbarButton-scrollVertical-icon: url(images/secondaryToolbarButton-scrollVertical.svg);
--secondaryToolbarButton-scrollHorizontal-icon: url(images/secondaryToolbarButton-scrollHorizontal.svg);
--secondaryToolbarButton-scrollWrapped-icon: url(images/secondaryToolbarButton-scrollWrapped.svg);
--secondaryToolbarButton-spreadNone-icon: url(images/secondaryToolbarButton-spreadNone.svg);
--secondaryToolbarButton-spreadOdd-icon: url(images/secondaryToolbarButton-spreadOdd.svg);
--secondaryToolbarButton-spreadEven-icon: url(images/secondaryToolbarButton-spreadEven.svg);
- --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties.svg);*/
+ --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties.svg);
+}
+
+[dir="rtl"]:root {
+ --dir-factor: -1;
}
@media (prefers-color-scheme: dark) {
:root {
--main-color: rgba(249, 249, 250, 1);
--body-bg-color: rgba(42, 42, 46, 1);
- --errorWrapper-bg-color: rgba(199, 17, 17, 1);
+ --errorWrapper-bg-color: rgba(169, 14, 14, 1);
--progressBar-color: rgba(0, 96, 223, 1);
--progressBar-indeterminate-bg-color: rgba(40, 40, 43, 1);
--progressBar-indeterminate-blend-color: rgba(20, 68, 133, 1);
--scrollbar-color: rgba(121, 121, 123, 1);
--scrollbar-bg-color: rgba(35, 35, 39, 1);
+ --toolbar-icon-bg-color: rgba(255, 255, 255, 1);
+ --toolbar-icon-hover-bg-color: rgba(255, 255, 255, 1);
- --sidebar-bg-color: rgba(50, 50, 52, 1);
+ --sidebar-narrow-bg-color: rgba(42, 42, 46, 0.9);
+ --sidebar-toolbar-bg-color: rgba(50, 50, 52, 1);
--toolbar-bg-color: rgba(56, 56, 61, 1);
--toolbar-border-color: rgba(12, 12, 13, 1);
--button-hover-color: rgba(102, 102, 103, 1);
+ --toggled-btn-color: rgba(255, 255, 255, 1);
--toggled-btn-bg-color: rgba(0, 0, 0, 0.3);
+ --toggled-hover-active-btn-color: rgba(0, 0, 0, 0.4);
--dropdown-btn-bg-color: rgba(74, 74, 79, 1);
--separator-color: rgba(0, 0, 0, 0.3);
--field-color: rgba(250, 250, 250, 1);
--field-bg-color: rgba(64, 64, 68, 1);
--field-border-color: rgba(115, 115, 115, 1);
- --findbar-nextprevious-btn-bg-color: rgba(89, 89, 89, 1);
- --outline-color: rgba(255, 255, 255, 0.8);
- --outline-hover-color: rgba(255, 255, 255, 0.9);
- --outline-active-color: rgba(255, 255, 255, 0.08);
- --outline-active-bg-color: rgba(255, 255, 255, 1);
+ --treeitem-color: rgba(255, 255, 255, 0.8);
+ --treeitem-hover-color: rgba(255, 255, 255, 0.9);
+ --treeitem-selected-color: rgba(255, 255, 255, 0.9);
+ --treeitem-selected-bg-color: rgba(255, 255, 255, 0.25);
--sidebaritem-bg-color: rgba(255, 255, 255, 0.15);
--doorhanger-bg-color: rgba(74, 74, 79, 1);
--doorhanger-border-color: rgba(39, 39, 43, 1);
- --doorhanger-hover-color: rgba(93, 94, 98, 1);
+ --doorhanger-hover-color: rgba(249, 249, 250, 1);
+ --doorhanger-hover-bg-color: rgba(93, 94, 98, 1);
--doorhanger-separator-color: rgba(92, 92, 97, 1);
- --overlay-button-bg-color: rgba(92, 92, 97, 1);
- --overlay-button-hover-color: rgba(115, 115, 115, 1);
+ --dialog-button-bg-color: rgba(92, 92, 97, 1);
+ --dialog-button-hover-bg-color: rgba(115, 115, 115, 1);
+
+ /* This image is used in elements, which unfortunately means that
+ * the `mask-image` approach used with all of the other images doesn't work
+ * here; hence why we still have two versions of this particular image. */
+ --loading-icon: url(images/loading-dark.svg);
+ }
+}
+
+@media screen and (forced-colors: active) {
+ :root {
+ --button-hover-color: Highlight;
+ --doorhanger-hover-bg-color: Highlight;
+ --toolbar-icon-opacity: 1;
+ --toolbar-icon-bg-color: ButtonText;
+ --toolbar-icon-hover-bg-color: ButtonFace;
+ --toggled-btn-color: HighlightText;
+ --toggled-btn-bg-color: LinkText;
+ --doorhanger-hover-color: ButtonFace;
+ --doorhanger-border-color-whcm: 1px solid ButtonText;
+ --doorhanger-triangle-opacity-whcm: 0;
+ --dialog-button-border: 1px solid Highlight;
+ --dialog-button-hover-bg-color: Highlight;
+ --dialog-button-hover-color: ButtonFace;
+ --field-border-color: ButtonText;
}
}
@@ -523,211 +1172,32 @@
margin: 0;
}
-html {
- height: 100%;
- width: 100%;
- /* Font size is needed to make the activity bar the correct size. */
- font-size: 10px;
-}
-
+html,
body {
height: 100%;
width: 100%;
- background-color: rgba(237, 237, 240, 1);
- background-color: var(--body-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- body {
- background-color: rgba(42, 42, 46, 1);
- background-color: var(--body-bg-color);
- }
}
body {
- font: message-box;
- outline: none;
- scrollbar-color: auto auto;
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- body {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- body {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- body {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- body {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-input {
- font: message-box;
- outline: none;
- scrollbar-color: auto auto;
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- input {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- input {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- input {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- input {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-button {
- font: message-box;
- outline: none;
- scrollbar-color: auto auto;
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- button {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- button {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- button {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- button {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
+ background-color: var(--body-bg-color);
}
+body,
+input,
+button,
select {
font: message-box;
outline: none;
- scrollbar-color: auto auto;
scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
}
-@media (prefers-color-scheme: dark) {
-
- select {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- select {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- select {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- select {
- scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
- scrollbar-color: var(--scrollbar-color) var(--scrollbar-bg-color);
- }
-}
-
-.hidden {
- display: none !important;
-}
+.hidden,
[hidden] {
display: none !important;
}
-.pdfViewer.enablePermissions .textLayer > span {
- -webkit-user-select: none !important;
- -moz-user-select: none !important;
- -ms-user-select: none !important;
- user-select: none !important;
- cursor: not-allowed;
-}
-
-#viewerContainer.pdfPresentationMode:-ms-fullscreen {
- top: 0px !important;
- overflow: hidden !important;
-}
-
-#viewerContainer.pdfPresentationMode:-ms-fullscreen::-ms-backdrop {
- background-color: rgba(0, 0, 0, 1);
-}
-
#viewerContainer.pdfPresentationMode:-webkit-full-screen {
- top: 0px;
- border-top: 2px solid rgba(0, 0, 0, 0);
+ top: 0;
background-color: rgba(0, 0, 0, 1);
width: 100%;
height: 100%;
@@ -737,33 +1207,8 @@ select {
user-select: none;
}
-#viewerContainer.pdfPresentationMode:-moz-full-screen {
- top: 0px;
- border-top: 2px solid rgba(0, 0, 0, 0);
- background-color: rgba(0, 0, 0, 1);
- width: 100%;
- height: 100%;
- overflow: hidden;
- cursor: none;
- -moz-user-select: none;
- user-select: none;
-}
-
-#viewerContainer.pdfPresentationMode:-ms-fullscreen {
- top: 0px;
- border-top: 2px solid rgba(0, 0, 0, 0);
- background-color: rgba(0, 0, 0, 1);
- width: 100%;
- height: 100%;
- overflow: hidden;
- cursor: none;
- -ms-user-select: none;
- user-select: none;
-}
-
#viewerContainer.pdfPresentationMode:fullscreen {
- top: 0px;
- border-top: 2px solid rgba(0, 0, 0, 0);
+ top: 0;
background-color: rgba(0, 0, 0, 1);
width: 100%;
height: 100%;
@@ -771,7 +1216,6 @@ select {
cursor: none;
-webkit-user-select: none;
-moz-user-select: none;
- -ms-user-select: none;
user-select: none;
}
@@ -779,36 +1223,20 @@ select {
display: none;
}
-.pdfPresentationMode:-moz-full-screen a:not(.internalLink) {
- display: none;
-}
-
-.pdfPresentationMode:-ms-fullscreen a:not(.internalLink) {
- display: none;
-}
-
.pdfPresentationMode:fullscreen a:not(.internalLink) {
display: none;
}
-.pdfPresentationMode:-webkit-full-screen .textLayer > span {
+.pdfPresentationMode:-webkit-full-screen .textLayer span {
cursor: none;
}
-.pdfPresentationMode:-moz-full-screen .textLayer > span {
- cursor: none;
-}
-
-.pdfPresentationMode:-ms-fullscreen .textLayer > span {
- cursor: none;
-}
-
-.pdfPresentationMode:fullscreen .textLayer > span {
+.pdfPresentationMode:fullscreen .textLayer span {
cursor: none;
}
.pdfPresentationMode.pdfPresentationModeControls > *,
-.pdfPresentationMode.pdfPresentationModeControls .textLayer > span {
+.pdfPresentationMode.pdfPresentationModeControls .textLayer span {
cursor: default;
}
@@ -818,54 +1246,58 @@ select {
position: relative;
}
+[dir="ltr"] #sidebarContainer {
+ left: calc(-1 * var(--sidebar-width));
+}
+
+[dir="rtl"] #sidebarContainer {
+ right: calc(-1 * var(--sidebar-width));
+}
+
+[dir="ltr"] #sidebarContainer {
+ border-right: var(--doorhanger-border-color-whcm);
+}
+
+[dir="rtl"] #sidebarContainer {
+ border-left: var(--doorhanger-border-color-whcm);
+}
+
+[dir="ltr"] #sidebarContainer {
+ transition-property: left;
+}
+
+[dir="rtl"] #sidebarContainer {
+ transition-property: right;
+}
+
#sidebarContainer {
position: absolute;
top: 32px;
bottom: 0;
- width: 200px;
+ inset-inline-start: calc(-1 * var(--sidebar-width));
width: var(--sidebar-width);
visibility: hidden;
z-index: 100;
border-top: 1px solid rgba(51, 51, 51, 1);
- transition-duration: 200ms;
+ -webkit-border-end: var(--doorhanger-border-color-whcm);
+ border-inline-end: var(--doorhanger-border-color-whcm);
+ transition-property: inset-inline-start;
transition-duration: var(--sidebar-transition-duration);
- transition-timing-function: ease;
transition-timing-function: var(--sidebar-transition-timing-function);
}
-html[dir="ltr"] #sidebarContainer {
- transition-property: left;
- left: -200px;
- left: calc(0px - var(--sidebar-width));
-}
-html[dir="rtl"] #sidebarContainer {
- transition-property: right;
- right: -200px;
- right: calc(0px - var(--sidebar-width));
-}
-
-.loadingInProgress #sidebarContainer {
- top: 36px;
-}
-
-#outerContainer.sidebarResizing #sidebarContainer {
- /* Improve responsiveness and avoid visual glitches when the sidebar is resized. */
- transition-duration: 0s;
- /* Prevent e.g. the thumbnails being selected when the sidebar is resized. */
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
#outerContainer.sidebarMoving #sidebarContainer,
#outerContainer.sidebarOpen #sidebarContainer {
visibility: visible;
}
-html[dir="ltr"] #outerContainer.sidebarOpen #sidebarContainer {
- left: 0px;
+[dir="ltr"] #outerContainer.sidebarOpen #sidebarContainer {
+ left: 0;
}
-html[dir="rtl"] #outerContainer.sidebarOpen #sidebarContainer {
- right: 0px;
+[dir="rtl"] #outerContainer.sidebarOpen #sidebarContainer {
+ right: 0;
+}
+#outerContainer.sidebarOpen #sidebarContainer {
+ inset-inline-start: 0;
}
#mainContainer {
@@ -874,30 +1306,30 @@ html[dir="rtl"] #outerContainer.sidebarOpen #sidebarContainer {
right: 0;
bottom: 0;
left: 0;
- min-width: 320px;
+ min-width: 350px;
+}
+
+[dir="ltr"] #sidebarContent {
+ left: 0;
+}
+
+[dir="rtl"] #sidebarContent {
+ right: 0;
}
#sidebarContent {
top: 32px;
bottom: 0;
+ inset-inline-start: 0;
overflow: auto;
- -webkit-overflow-scrolling: touch;
position: absolute;
width: 100%;
background-color: rgba(0, 0, 0, 0.1);
-}
-html[dir="ltr"] #sidebarContent {
- left: 0;
- box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25);
-}
-html[dir="rtl"] #sidebarContent {
- right: 0;
- box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.25);
+ box-shadow: inset calc(-1px * var(--dir-factor)) 0 0 rgba(0, 0, 0, 0.25);
}
#viewerContainer {
overflow: auto;
- -webkit-overflow-scrolling: touch;
position: absolute;
top: 32px;
right: 0;
@@ -906,32 +1338,31 @@ html[dir="rtl"] #sidebarContent {
outline: none;
}
#viewerContainer:not(.pdfPresentationMode) {
- transition-duration: 200ms;
transition-duration: var(--sidebar-transition-duration);
- transition-timing-function: ease;
transition-timing-function: var(--sidebar-transition-timing-function);
}
-#outerContainer.sidebarResizing #viewerContainer {
- /* Improve responsiveness and avoid visual glitches when the sidebar is resized. */
- transition-duration: 0s;
-}
-
-html[dir="ltr"]
- #outerContainer.sidebarOpen
- #viewerContainer:not(.pdfPresentationMode) {
- transition-property: left;
- left: 200px;
+[dir="ltr"] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
left: var(--sidebar-width);
}
-html[dir="rtl"]
- #outerContainer.sidebarOpen
- #viewerContainer:not(.pdfPresentationMode) {
- transition-property: right;
- right: 200px;
+
+[dir="rtl"] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
right: var(--sidebar-width);
}
+[dir="ltr"] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
+ transition-property: left;
+}
+
+[dir="rtl"] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
+ transition-property: right;
+}
+
+#outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentationMode) {
+ inset-inline-start: var(--sidebar-width);
+ transition-property: inset-inline-start;
+}
+
.toolbar {
position: relative;
left: 0;
@@ -947,256 +1378,127 @@ html[dir="rtl"]
#toolbarSidebar {
width: 100%;
height: 32px;
- background-color: rgba(245, 246, 247, 1);
- background-color: var(--sidebar-bg-color);
+ background-color: var(--sidebar-toolbar-bg-color);
+ box-shadow: inset calc(-1px * var(--dir-factor)) 0 0 rgba(0, 0, 0, 0.25),
+ 0 1px 0 rgba(0, 0, 0, 0.15), 0 0 1px rgba(0, 0, 0, 0.1);
}
-@media (prefers-color-scheme: dark) {
-
- #toolbarSidebar {
- background-color: rgba(50, 50, 52, 1);
- background-color: var(--sidebar-bg-color);
- }
-}
-html[dir="ltr"] #toolbarSidebar {
- box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(0, 0, 0, 0.15),
- 0 0 1px rgba(0, 0, 0, 0.1);
-}
-html[dir="rtl"] #toolbarSidebar {
- box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(0, 0, 0, 0.15),
- 0 0 1px rgba(0, 0, 0, 0.1);
+[dir="ltr"] #sidebarResizer {
+ right: -6px;
}
-html[dir="ltr"] #toolbarSidebar .toolbarButton {
- margin-right: 2px !important;
-}
-html[dir="rtl"] #toolbarSidebar .toolbarButton {
- margin-left: 2px !important;
+[dir="rtl"] #sidebarResizer {
+ left: -6px;
}
#sidebarResizer {
position: absolute;
top: 0;
bottom: 0;
+ inset-inline-end: -6px;
width: 6px;
z-index: 200;
cursor: ew-resize;
}
-html[dir="ltr"] #sidebarResizer {
- right: -6px;
-}
-html[dir="rtl"] #sidebarResizer {
- left: -6px;
-}
-#toolbarContainer {
+#toolbarContainer,
+.findbar,
+.secondaryToolbar,
+.editorParamsToolbar {
position: relative;
height: 32px;
- background-color: rgba(249, 249, 250, 1);
background-color: var(--toolbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- #toolbarContainer {
- background-color: rgba(56, 56, 61, 1);
- background-color: var(--toolbar-bg-color);
- }
-}
-
-.findbar {
- position: relative;
- height: 32px;
- background-color: rgba(249, 249, 250, 1);
- background-color: var(--toolbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .findbar {
- background-color: rgba(56, 56, 61, 1);
- background-color: var(--toolbar-bg-color);
- }
-}
-
-.secondaryToolbar {
- position: relative;
- height: 32px;
- background-color: rgba(249, 249, 250, 1);
- background-color: var(--toolbar-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbar {
- background-color: rgba(56, 56, 61, 1);
- background-color: var(--toolbar-bg-color);
- }
-}
-html[dir="ltr"] #toolbarContainer {
- box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
box-shadow: 0 1px 0 var(--toolbar-border-color);
}
-@media (prefers-color-scheme: dark) {
-
- html[dir="ltr"] #toolbarContainer {
- box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
- }
-}
-.findbar {
- box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .findbar {
- box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
- }
-}
-.secondaryToolbar {
- box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbar {
- box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
- }
-}
-html[dir="rtl"] #toolbarContainer {
- box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
- html[dir="rtl"] #toolbarContainer {
- box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
- }
-}
-.findbar {
- box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .findbar {
- box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
- }
-}
-.secondaryToolbar {
- box-shadow: 0 1px 0 rgba(204, 204, 204, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbar {
- box-shadow: 0 1px 0 rgba(12, 12, 13, 1);
- box-shadow: 0 1px 0 var(--toolbar-border-color);
- }
-}
#toolbarViewer {
height: 32px;
}
+[dir="ltr"] #loadingBar {
+ left: 0;
+ right: var(--progressBar-end-offset);
+}
+
+[dir="rtl"] #loadingBar {
+ right: 0;
+ left: var(--progressBar-end-offset);
+}
+
+[dir="ltr"] #loadingBar {
+ transition-property: left;
+}
+
+[dir="rtl"] #loadingBar {
+ transition-property: right;
+}
+
#loadingBar {
- position: relative;
- width: 100%;
+ position: absolute;
+ inset-inline: 0 var(--progressBar-end-offset);
height: 4px;
- background-color: rgba(237, 237, 240, 1);
background-color: var(--body-bg-color);
- border-bottom: 1px solid rgba(204, 204, 204, 1);
border-bottom: 1px solid var(--toolbar-border-color);
+ transition-property: inset-inline-start;
+ transition-duration: var(--sidebar-transition-duration);
+ transition-timing-function: var(--sidebar-transition-timing-function);
}
-@media (prefers-color-scheme: dark) {
-
- #loadingBar {
- border-bottom: 1px solid rgba(12, 12, 13, 1);
- border-bottom: 1px solid var(--toolbar-border-color);
- }
+[dir="ltr"] #outerContainer.sidebarOpen #loadingBar {
+ left: var(--sidebar-width);
}
-@media (prefers-color-scheme: dark) {
+[dir="rtl"] #outerContainer.sidebarOpen #loadingBar {
+ right: var(--sidebar-width);
+}
- #loadingBar {
- background-color: rgba(42, 42, 46, 1);
- background-color: var(--body-bg-color);
- }
+#outerContainer.sidebarOpen #loadingBar {
+ inset-inline-start: var(--sidebar-width);
}
#loadingBar .progress {
position: absolute;
top: 0;
left: 0;
- width: 0%;
+ width: 100%;
+ transform: scaleX(var(--progressBar-percent));
+ transform-origin: 0 0;
height: 100%;
- background-color: rgba(10, 132, 255, 1);
background-color: var(--progressBar-color);
overflow: hidden;
- transition: width 200ms;
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress {
- background-color: rgba(0, 96, 223, 1);
- background-color: var(--progressBar-color);
- }
+ transition: transform 200ms;
}
@-webkit-keyframes progressIndeterminate {
0% {
- left: -142px;
+ transform: translateX(-142px);
}
100% {
- left: 0;
+ transform: translateX(0);
}
}
@keyframes progressIndeterminate {
0% {
- left: -142px;
+ transform: translateX(-142px);
}
100% {
- left: 0;
+ transform: translateX(0);
}
}
-#loadingBar .progress.indeterminate {
- background-color: rgba(221, 221, 222, 1);
+#loadingBar.indeterminate .progress {
+ transform: none;
background-color: var(--progressBar-indeterminate-bg-color);
transition: none;
}
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate {
- background-color: rgba(40, 40, 43, 1);
- background-color: var(--progressBar-indeterminate-bg-color);
- }
-}
-
-#loadingBar .progress.indeterminate .glimmer {
+#loadingBar.indeterminate .progress .glimmer {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: calc(100% + 150px);
- background: repeating-linear-gradient(
- 135deg,
- rgba(116, 177, 239, 1) 0,
- rgba(221, 221, 222, 1) 5px,
- rgba(221, 221, 222, 1) 45px,
- rgba(10, 132, 255, 1) 55px,
- rgba(10, 132, 255, 1) 95px,
- rgba(116, 177, 239, 1) 100px
- );
background: repeating-linear-gradient(
135deg,
var(--progressBar-indeterminate-blend-color) 0,
@@ -1210,365 +1512,61 @@ html[dir="rtl"] #toolbarContainer {
animation: progressIndeterminate 1s linear infinite;
}
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #loadingBar .progress.indeterminate .glimmer {
- background: repeating-linear-gradient(
- 135deg,
- rgba(20, 68, 133, 1) 0,
- rgba(40, 40, 43, 1) 5px,
- rgba(40, 40, 43, 1) 45px,
- rgba(0, 96, 223, 1) 55px,
- rgba(0, 96, 223, 1) 95px,
- rgba(20, 68, 133, 1) 100px
- );
- background: repeating-linear-gradient(
- 135deg,
- var(--progressBar-indeterminate-blend-color) 0,
- var(--progressBar-indeterminate-bg-color) 5px,
- var(--progressBar-indeterminate-bg-color) 45px,
- var(--progressBar-color) 55px,
- var(--progressBar-color) 95px,
- var(--progressBar-indeterminate-blend-color) 100px
- );
- }
+#outerContainer.sidebarResizing #sidebarContainer,
+#outerContainer.sidebarResizing #viewerContainer,
+#outerContainer.sidebarResizing #loadingBar {
+ /* Improve responsiveness and avoid visual glitches when the sidebar is resized. */
+ transition-duration: 0s;
}
.findbar,
-.secondaryToolbar {
+.secondaryToolbar,
+.editorParamsToolbar {
top: 32px;
position: absolute;
z-index: 10000;
height: auto;
- min-width: 16px;
- padding: 0px 4px 0px 4px;
- margin: 4px 2px 4px 2px;
- color: rgba(217, 217, 217, 1);
+ padding: 0 4px;
+ margin: 4px 2px;
font-size: 12px;
line-height: 14px;
text-align: left;
cursor: default;
}
-.findbar {
- min-width: 300px;
- background-color: rgba(249, 249, 250, 1);
- background-color: var(--toolbar-bg-color);
+[dir="ltr"] .findbar {
+ left: 64px;
}
-@media (prefers-color-scheme: dark) {
+[dir="rtl"] .findbar {
+ right: 64px;
+}
- .findbar {
- background-color: rgba(56, 56, 61, 1);
+.findbar {
+ inset-inline-start: 64px;
+ min-width: 300px;
background-color: var(--toolbar-bg-color);
- }
}
.findbar > div {
height: 32px;
}
-.findbar.wrapContainers > div {
+[dir="ltr"] .findbar > div#findbarInputContainer {
+ margin-right: 4px;
+}
+[dir="rtl"] .findbar > div#findbarInputContainer {
+ margin-left: 4px;
+}
+.findbar > div#findbarInputContainer {
+ -webkit-margin-end: 4px;
+ margin-inline-end: 4px;
+}
+.findbar.wrapContainers > div,
+.findbar.wrapContainers > div#findbarMessageContainer > * {
clear: both;
}
.findbar.wrapContainers > div#findbarMessageContainer {
height: auto;
}
-html[dir="ltr"] .findbar {
- left: 64px;
-}
-html[dir="rtl"] .findbar {
- right: 64px;
-}
-
-html[dir="ltr"] .findbar .splitToolbarButton {
- margin-left: 0px;
- margin-top: 3px;
-}
-
-html[dir="rtl"] .findbar .splitToolbarButton {
- margin-right: 0px;
- margin-top: 3px;
-}
-
-.findbar .splitToolbarButton .findNext {
- width: 29px;
-}
-
-html[dir="ltr"] .findbar .splitToolbarButton .findNext {
- border-right: 1px solid rgba(187, 187, 188, 1);
- border-right: 1px solid var(--field-border-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- html[dir="ltr"] .findbar .splitToolbarButton .findNext {
- border-right: 1px solid rgba(115, 115, 115, 1);
- border-right: 1px solid var(--field-border-color);
- }
-}
-
-html[dir="rtl"] .findbar .splitToolbarButton .findNext {
- border-left: 1px solid rgba(187, 187, 188, 1);
- border-left: 1px solid var(--field-border-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- html[dir="rtl"] .findbar .splitToolbarButton .findNext {
- border-left: 1px solid rgba(115, 115, 115, 1);
- border-left: 1px solid var(--field-border-color);
- }
-}
-
-.findbar .splitToolbarButton .toolbarButton {
- background-color: rgba(227, 228, 230, 1);
- background-color: var(--findbar-nextprevious-btn-bg-color);
- border-radius: 0px;
- height: 26px;
- border-top: 1px solid rgba(187, 187, 188, 1);
- border-top: 1px solid var(--field-border-color);
- border-bottom: 1px solid rgba(187, 187, 188, 1);
- border-bottom: 1px solid var(--field-border-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .findbar .splitToolbarButton .toolbarButton {
- border-bottom: 1px solid rgba(115, 115, 115, 1);
- border-bottom: 1px solid var(--field-border-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .findbar .splitToolbarButton .toolbarButton {
- border-top: 1px solid rgba(115, 115, 115, 1);
- border-top: 1px solid var(--field-border-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .findbar .splitToolbarButton .toolbarButton {
- background-color: rgba(89, 89, 89, 1);
- background-color: var(--findbar-nextprevious-btn-bg-color);
- }
-}
-
-.findbar .splitToolbarButton .toolbarButton::before {
- top: 5px;
-}
-
-html[dir="ltr"] .findbar .splitToolbarButton > .findPrevious {
- border-radius: 0;
-}
-html[dir="ltr"] .findbar .splitToolbarButton > .findNext {
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 2px;
- border-top-left-radius: 0;
- border-top-right-radius: 2px;
-}
-
-html[dir="rtl"] .findbar .splitToolbarButton > .findPrevious {
- border-radius: 0;
-}
-html[dir="rtl"] .findbar .splitToolbarButton > .findNext {
- border-bottom-left-radius: 2px;
- border-bottom-right-radius: 0;
- border-top-left-radius: 2px;
- border-top-right-radius: 0;
-}
.findbar input[type="checkbox"] {
pointer-events: none;
@@ -1577,360 +1575,385 @@ html[dir="rtl"] .findbar .splitToolbarButton > .findNext {
.findbar label {
-webkit-user-select: none;
-moz-user-select: none;
- -ms-user-select: none;
user-select: none;
}
-.findbar label:hover {
- background-color: rgba(221, 222, 223, 1);
+.findbar label:hover,
+.findbar input:focus-visible + label {
+ color: var(--toggled-btn-color);
background-color: var(--button-hover-color);
}
-@media (prefers-color-scheme: dark) {
-
- .findbar label:hover {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-
-.findbar input:focus + label {
- background-color: rgba(221, 222, 223, 1);
- background-color: var(--button-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .findbar input:focus + label {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-
-html[dir="ltr"] #findInput {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-html[dir="rtl"] #findInput {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
.findbar .toolbarField[type="checkbox"]:checked + .toolbarLabel {
- background-color: rgba(0, 0, 0, 0.3) !important;
background-color: var(--toggled-btn-bg-color) !important;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .findbar .toolbarField[type="checkbox"]:checked + .toolbarLabel {
- background-color: rgba(0, 0, 0, 0.3) !important;
- background-color: var(--toggled-btn-bg-color) !important;
- }
+ color: var(--toggled-btn-color);
}
#findInput {
width: 200px;
}
-#findInput::-webkit-input-placeholder {
- color: rgba(191, 191, 191, 1);
-}
#findInput::-moz-placeholder {
font-style: normal;
}
-#findInput:-ms-input-placeholder {
- font-style: normal;
-}
-#findInput::-ms-input-placeholder {
- font-style: normal;
-}
#findInput::placeholder {
font-style: normal;
}
#findInput[data-status="pending"] {
- background-image: url(images/loading.svg);
- /*background-image: var(--loading-icon);*/
+ background-image: var(--loading-icon);
background-repeat: no-repeat;
- background-position: 98%;
+ background-position: calc(50% + 48% * var(--dir-factor));
}
-@media (prefers-color-scheme: dark) {
-
- #findInput[data-status="pending"] {
- background-image: url(images/loading-dark.svg);
- /*background-image: var(--loading-icon);*/
- }
-}
-html[dir="rtl"] #findInput[data-status="pending"] {
- background-position: 3px;
+#findInput[data-status="notFound"] {
+ background-color: rgba(255, 102, 102, 1);
}
-.secondaryToolbar {
- padding: 6px 0 10px 0;
- height: auto;
- z-index: 30000;
- background-color: rgba(255, 255, 255, 1);
- background-color: var(--doorhanger-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbar {
- background-color: rgba(74, 74, 79, 1);
- background-color: var(--doorhanger-bg-color);
- }
-}
-html[dir="ltr"] .secondaryToolbar {
+[dir="ltr"] .secondaryToolbar,[dir="ltr"]
+.editorParamsToolbar {
right: 4px;
}
-html[dir="rtl"] .secondaryToolbar {
+
+[dir="rtl"] .secondaryToolbar,[dir="rtl"]
+.editorParamsToolbar {
left: 4px;
}
+.secondaryToolbar,
+.editorParamsToolbar {
+ padding: 6px 0 10px;
+ inset-inline-end: 4px;
+ height: auto;
+ z-index: 30000;
+ background-color: var(--doorhanger-bg-color);
+}
+
+.editorParamsToolbarContainer {
+ width: 220px;
+ margin-bottom: -4px;
+}
+
+.editorParamsToolbarContainer > .editorParamsSetter {
+ min-height: 26px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-inline: 10px;
+}
+
+[dir="ltr"] .editorParamsToolbarContainer .editorParamsLabel {
+ padding-right: 10px;
+}
+
+[dir="rtl"] .editorParamsToolbarContainer .editorParamsLabel {
+ padding-left: 10px;
+}
+
+.editorParamsToolbarContainer .editorParamsLabel {
+ -webkit-padding-end: 10px;
+ padding-inline-end: 10px;
+ flex: none;
+ color: var(--main-color);
+}
+
+.editorParamsToolbarContainer .editorParamsColor {
+ width: 32px;
+ height: 32px;
+ flex: none;
+}
+
+.editorParamsToolbarContainer .editorParamsSlider {
+ background-color: transparent;
+ width: 90px;
+ flex: 0 1 0;
+}
+
+.editorParamsToolbarContainer .editorParamsSlider::-moz-range-progress {
+ background-color: black;
+}
+
+.editorParamsToolbarContainer .editorParamsSlider::-webkit-slider-runnable-track,
+.editorParamsToolbarContainer .editorParamsSlider::-moz-range-track {
+ background-color: black;
+}
+
+.editorParamsToolbarContainer .editorParamsSlider::-webkit-slider-thumb,
+.editorParamsToolbarContainer .editorParamsSlider::-moz-range-thumb {
+ background-color: white;
+}
+
#secondaryToolbarButtonContainer {
max-width: 220px;
- max-height: 400px;
+ min-height: 26px;
+ max-height: calc(var(--viewer-container-height) - 40px);
overflow-y: auto;
- -webkit-overflow-scrolling: touch;
margin-bottom: -4px;
}
-#secondaryToolbarButtonContainer.hiddenScrollModeButtons > .scrollModeButtons,
-#secondaryToolbarButtonContainer.hiddenSpreadModeButtons > .spreadModeButtons {
- display: none !important;
+[dir="ltr"] #editorInkParamsToolbar {
+ right: 40px;
}
-.doorHanger {
- border-radius: 2px;
- box-shadow: 0 1px 5px rgba(12, 12, 13, 0.2),
- 0 0 0 1px rgba(12, 12, 13, 0.2);
- box-shadow: 0 1px 5px var(--doorhanger-border-color),
- 0 0 0 1px var(--doorhanger-border-color);
+[dir="rtl"] #editorInkParamsToolbar {
+ left: 40px;
}
-@media (prefers-color-scheme: dark) {
-
- .doorHanger {
- box-shadow: 0 1px 5px rgba(39, 39, 43, 1),
- 0 0 0 1px rgba(39, 39, 43, 1);
- box-shadow: 0 1px 5px var(--doorhanger-border-color),
- 0 0 0 1px var(--doorhanger-border-color);
- }
+#editorInkParamsToolbar {
+ inset-inline-end: 40px;
+ background-color: var(--toolbar-bg-color);
}
+[dir="ltr"] #editorFreeTextParamsToolbar {
+ right: 68px;
+}
+
+[dir="rtl"] #editorFreeTextParamsToolbar {
+ left: 68px;
+}
+
+#editorFreeTextParamsToolbar {
+ inset-inline-end: 68px;
+ background-color: var(--toolbar-bg-color);
+}
+
+.doorHanger,
.doorHangerRight {
border-radius: 2px;
- box-shadow: 0 1px 5px rgba(12, 12, 13, 0.2),
- 0 0 0 1px rgba(12, 12, 13, 0.2);
box-shadow: 0 1px 5px var(--doorhanger-border-color),
0 0 0 1px var(--doorhanger-border-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .doorHangerRight {
- box-shadow: 0 1px 5px rgba(39, 39, 43, 1),
- 0 0 0 1px rgba(39, 39, 43, 1);
- box-shadow: 0 1px 5px var(--doorhanger-border-color),
- 0 0 0 1px var(--doorhanger-border-color);
- }
+ border: var(--doorhanger-border-color-whcm);
}
.doorHanger:after,
.doorHanger:before,
.doorHangerRight:after,
.doorHangerRight:before {
bottom: 100%;
- border: solid rgba(0, 0, 0, 0);
+ border: 8px solid rgba(0, 0, 0, 0);
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
+ opacity: var(--doorhanger-triangle-opacity-whcm);
}
-.doorHanger:after,
-.doorHangerRight:after {
- border-width: 8px;
-}
-.doorHanger:after {
- border-bottom-color: rgba(249, 249, 250, 1);
- border-bottom-color: var(--toolbar-bg-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .doorHanger:after {
- border-bottom-color: rgba(56, 56, 61, 1);
- border-bottom-color: var(--toolbar-bg-color);
- }
-}
-.doorHangerRight:after {
- border-bottom-color: rgba(255, 255, 255, 1);
- border-bottom-color: var(--doorhanger-bg-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .doorHangerRight:after {
- border-bottom-color: rgba(74, 74, 79, 1);
- border-bottom-color: var(--doorhanger-bg-color);
- }
-}
-.doorHanger:before {
- border-bottom-color: rgba(12, 12, 13, 0.2);
- border-bottom-color: var(--doorhanger-border-color);
- border-width: 9px;
-}
-@media (prefers-color-scheme: dark) {
-
- .doorHanger:before {
- border-bottom-color: rgba(39, 39, 43, 1);
- border-bottom-color: var(--doorhanger-border-color);
- }
-}
-.doorHangerRight:before {
- border-bottom-color: rgba(12, 12, 13, 0.2);
- border-bottom-color: var(--doorhanger-border-color);
- border-width: 9px;
-}
-@media (prefers-color-scheme: dark) {
-
- .doorHangerRight:before {
- border-bottom-color: rgba(39, 39, 43, 1);
- border-bottom-color: var(--doorhanger-border-color);
- }
-}
-
-html[dir="ltr"] .doorHanger:after,
-html[dir="rtl"] .doorHangerRight:after {
+[dir="ltr"] .doorHanger:after {
left: 10px;
+}
+[dir="rtl"] .doorHanger:after {
+ right: 10px;
+}
+[dir="ltr"] .doorHanger:after {
margin-left: -8px;
}
-
-html[dir="ltr"] .doorHanger:before,
-html[dir="rtl"] .doorHangerRight:before {
- left: 10px;
- margin-left: -9px;
-}
-
-html[dir="rtl"] .doorHanger:after,
-html[dir="ltr"] .doorHangerRight:after {
- right: 10px;
+[dir="rtl"] .doorHanger:after {
margin-right: -8px;
}
-
-html[dir="rtl"] .doorHanger:before,
-html[dir="ltr"] .doorHangerRight:before {
+.doorHanger:after {
+ inset-inline-start: 10px;
+ -webkit-margin-start: -8px;
+ margin-inline-start: -8px;
+ border-bottom-color: var(--toolbar-bg-color);
+}
+[dir="ltr"] .doorHangerRight:after {
right: 10px;
+}
+[dir="rtl"] .doorHangerRight:after {
+ left: 10px;
+}
+[dir="ltr"] .doorHangerRight:after {
+ margin-right: -8px;
+}
+[dir="rtl"] .doorHangerRight:after {
+ margin-left: -8px;
+}
+.doorHangerRight:after {
+ inset-inline-end: 10px;
+ -webkit-margin-end: -8px;
+ margin-inline-end: -8px;
+ border-bottom-color: var(--doorhanger-bg-color);
+}
+.doorHanger:before,
+.doorHangerRight:before {
+ border-bottom-color: var(--doorhanger-border-color);
+ border-width: 9px;
+}
+[dir="ltr"] .doorHanger:before {
+ left: 10px;
+}
+[dir="rtl"] .doorHanger:before {
+ right: 10px;
+}
+[dir="ltr"] .doorHanger:before {
+ margin-left: -9px;
+}
+[dir="rtl"] .doorHanger:before {
margin-right: -9px;
}
+.doorHanger:before {
+ inset-inline-start: 10px;
+ -webkit-margin-start: -9px;
+ margin-inline-start: -9px;
+}
+[dir="ltr"] .doorHangerRight:before {
+ right: 10px;
+}
+[dir="rtl"] .doorHangerRight:before {
+ left: 10px;
+}
+[dir="ltr"] .doorHangerRight:before {
+ margin-right: -9px;
+}
+[dir="rtl"] .doorHangerRight:before {
+ margin-left: -9px;
+}
+.doorHangerRight:before {
+ inset-inline-end: 10px;
+ -webkit-margin-end: -9px;
+ margin-inline-end: -9px;
+}
#findResultsCount {
background-color: rgba(217, 217, 217, 1);
color: rgba(82, 82, 82, 1);
text-align: center;
- padding: 3px 4px;
+ padding: 4px 5px;
margin: 5px;
}
#findMsg {
color: rgba(251, 0, 0, 1);
}
+
+#findResultsCount:empty,
#findMsg:empty {
display: none;
}
-#findInput.notFound {
- background-color: rgba(255, 102, 102, 1);
-}
-
#toolbarViewerMiddle {
position: absolute;
left: 50%;
transform: translateX(-50%);
}
-html[dir="ltr"] #toolbarViewerLeft,
-html[dir="rtl"] #toolbarViewerRight {
+[dir="ltr"] #toolbarViewerLeft,[dir="ltr"]
+#toolbarSidebarLeft {
float: left;
}
-html[dir="ltr"] #toolbarViewerRight,
-html[dir="rtl"] #toolbarViewerLeft {
- float: right;
-}
-html[dir="ltr"] #toolbarViewerLeft > *,
-html[dir="ltr"] #toolbarViewerMiddle > *,
-html[dir="ltr"] #toolbarViewerRight > *,
-html[dir="ltr"] .findbar * {
- position: relative;
- float: left;
-}
-html[dir="rtl"] #toolbarViewerLeft > *,
-html[dir="rtl"] #toolbarViewerMiddle > *,
-html[dir="rtl"] #toolbarViewerRight > *,
-html[dir="rtl"] .findbar * {
- position: relative;
+
+[dir="rtl"] #toolbarViewerLeft,[dir="rtl"]
+#toolbarSidebarLeft {
float: right;
}
-html[dir="ltr"] .splitToolbarButton {
- margin: 2px 2px 0;
- display: inline-block;
+#toolbarViewerLeft,
+#toolbarSidebarLeft {
+ float: inline-start;
}
-html[dir="rtl"] .splitToolbarButton {
- margin: 2px 2px 0;
- display: inline-block;
+[dir="ltr"] #toolbarViewerRight,[dir="ltr"]
+#toolbarSidebarRight {
+ float: right;
}
-html[dir="ltr"] .splitToolbarButton > .toolbarButton {
- border-radius: 2px;
+[dir="rtl"] #toolbarViewerRight,[dir="rtl"]
+#toolbarSidebarRight {
float: left;
}
-html[dir="rtl"] .splitToolbarButton > .toolbarButton {
- border-radius: 2px;
+#toolbarViewerRight,
+#toolbarSidebarRight {
+ float: inline-end;
+}
+
+[dir="ltr"] #toolbarViewerLeft > *,[dir="ltr"]
+#toolbarViewerMiddle > *,[dir="ltr"]
+#toolbarViewerRight > *,[dir="ltr"]
+#toolbarSidebarLeft *,[dir="ltr"]
+#toolbarSidebarRight *,[dir="ltr"]
+.findbar * {
+ float: left;
+}
+
+[dir="rtl"] #toolbarViewerLeft > *,[dir="rtl"]
+#toolbarViewerMiddle > *,[dir="rtl"]
+#toolbarViewerRight > *,[dir="rtl"]
+#toolbarSidebarLeft *,[dir="rtl"]
+#toolbarSidebarRight *,[dir="rtl"]
+.findbar * {
float: right;
}
+#toolbarViewerLeft > *,
+#toolbarViewerMiddle > *,
+#toolbarViewerRight > *,
+#toolbarSidebarLeft *,
+#toolbarSidebarRight *,
+.findbar * {
+ position: relative;
+ float: inline-start;
+}
+
+[dir="ltr"] #toolbarViewerLeft {
+ padding-left: 1px;
+}
+
+[dir="rtl"] #toolbarViewerLeft {
+ padding-right: 1px;
+}
+
+#toolbarViewerLeft {
+ -webkit-padding-start: 1px;
+ padding-inline-start: 1px;
+}
+[dir="ltr"] #toolbarViewerRight {
+ padding-right: 1px;
+}
+[dir="rtl"] #toolbarViewerRight {
+ padding-left: 1px;
+}
+#toolbarViewerRight {
+ -webkit-padding-end: 1px;
+ padding-inline-end: 1px;
+}
+[dir="ltr"] #toolbarSidebarRight {
+ padding-right: 2px;
+}
+[dir="rtl"] #toolbarSidebarRight {
+ padding-left: 2px;
+}
+#toolbarSidebarRight {
+ -webkit-padding-end: 2px;
+ padding-inline-end: 2px;
+}
+
+.splitToolbarButton {
+ margin: 2px;
+ display: inline-block;
+}
+[dir="ltr"] .splitToolbarButton > .toolbarButton {
+ float: left;
+}
+[dir="rtl"] .splitToolbarButton > .toolbarButton {
+ float: right;
+}
+.splitToolbarButton > .toolbarButton {
+ float: inline-start;
+}
+
.toolbarButton,
.secondaryToolbarButton,
-.overlayButton {
+.dialogButton {
border: 0 none;
background: none;
width: 28px;
height: 28px;
}
-.overlayButton {
- background-color: rgba(12, 12, 13, 0.1);
- background-color: var(--overlay-button-bg-color);
-}
-@media (prefers-color-scheme: dark) {
- .overlayButton {
- background-color: rgba(92, 92, 97, 1);
- background-color: var(--overlay-button-bg-color);
- }
+.dialogButton:hover,
+.dialogButton:focus-visible {
+ background-color: var(--dialog-button-hover-bg-color);
}
-.overlayButton:hover {
- background-color: rgba(12, 12, 13, 0.3);
- background-color: var(--overlay-button-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .overlayButton:hover {
- background-color: rgba(115, 115, 115, 1);
- background-color: var(--overlay-button-hover-color);
- }
-}
-
-.overlayButton:focus {
- background-color: rgba(12, 12, 13, 0.3);
- background-color: var(--overlay-button-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .overlayButton:focus {
- background-color: rgba(115, 115, 115, 1);
- background-color: var(--overlay-button-hover-color);
- }
+.dialogButton:hover > span,
+.dialogButton:focus-visible > span {
+ color: var(--dialog-button-hover-color);
}
.toolbarButton > span {
@@ -1942,466 +1965,143 @@ html[dir="rtl"] .splitToolbarButton > .toolbarButton {
.toolbarButton[disabled],
.secondaryToolbarButton[disabled],
-.overlayButton[disabled] {
+.dialogButton[disabled] {
opacity: 0.5;
}
-.splitToolbarButton.toggled .toolbarButton {
- margin: 0;
-}
-
-.splitToolbarButton > .toolbarButton:hover {
- background-color: rgba(221, 222, 223, 1);
- background-color: var(--button-hover-color);
- z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .splitToolbarButton > .toolbarButton:hover {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-
-.splitToolbarButton > .toolbarButton:focus {
- background-color: rgba(221, 222, 223, 1);
- background-color: var(--button-hover-color);
- z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .splitToolbarButton > .toolbarButton:focus {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-
+.splitToolbarButton > .toolbarButton:hover,
+.splitToolbarButton > .toolbarButton:focus-visible,
.dropdownToolbarButton:hover {
- background-color: rgba(221, 222, 223, 1);
background-color: var(--button-hover-color);
- z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton:hover {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-
-.toolbarButton.textButton:hover {
- background-color: rgba(221, 222, 223, 1);
- background-color: var(--button-hover-color);
- z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.textButton:hover {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-
-.toolbarButton.textButton:focus {
- background-color: rgba(221, 222, 223, 1);
- background-color: var(--button-hover-color);
- z-index: 199;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.textButton:focus {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
}
.splitToolbarButton > .toolbarButton {
position: relative;
-}
-html[dir="ltr"] .splitToolbarButton > .toolbarButton:first-child,
-html[dir="rtl"] .splitToolbarButton > .toolbarButton:last-child {
- position: relative;
margin: 0;
}
-html[dir="ltr"] .splitToolbarButton > .toolbarButton:last-child,
-html[dir="rtl"] .splitToolbarButton > .toolbarButton:first-child {
- position: relative;
- margin: 0;
+[dir="ltr"] #toolbarSidebar .splitToolbarButton > .toolbarButton {
+ margin-right: 2px;
}
-.splitToolbarButtonSeparator {
- padding: 10px 0;
- width: 1px;
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--separator-color);
- z-index: 99;
- display: inline-block;
- margin: 4px 0;
+[dir="rtl"] #toolbarSidebar .splitToolbarButton > .toolbarButton {
+ margin-left: 2px;
}
-@media (prefers-color-scheme: dark) {
-
- .splitToolbarButtonSeparator {
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--separator-color);
- }
+#toolbarSidebar .splitToolbarButton > .toolbarButton {
+ -webkit-margin-end: 2px;
+ margin-inline-end: 2px;
}
-.findbar .splitToolbarButtonSeparator {
- background-color: rgba(187, 187, 188, 1);
- background-color: var(--field-border-color);
- margin: 0;
- padding: 13px 0;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .findbar .splitToolbarButtonSeparator {
- background-color: rgba(115, 115, 115, 1);
- background-color: var(--field-border-color);
- }
-}
-
-html[dir="ltr"] .splitToolbarButtonSeparator {
+[dir="ltr"] .splitToolbarButtonSeparator {
float: left;
}
-html[dir="rtl"] .splitToolbarButtonSeparator {
+
+[dir="rtl"] .splitToolbarButtonSeparator {
float: right;
}
-.toolbarButton {
+.splitToolbarButtonSeparator {
+ float: inline-start;
+ margin: 4px 0;
+ width: 1px;
+ height: 20px;
+ background-color: var(--separator-color);
+}
+
+.toolbarButton,
+.dropdownToolbarButton,
+.secondaryToolbarButton,
+.dialogButton {
min-width: 16px;
- padding: 2px 6px 0;
- border: none;
- border-radius: 2px;
- color: rgba(12, 12, 13, 1);
- color: var(--main-color);
- font-size: 12px;
- line-height: 14px;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- /* Opera does not support user-select, use <... unselectable="on"> instead */
- cursor: default;
- box-sizing: border-box;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton {
- color: rgba(249, 249, 250, 1);
- color: var(--main-color);
- }
-}
-
-.dropdownToolbarButton {
- min-width: 16px;
- padding: 2px 6px 0;
- border: none;
- border-radius: 2px;
- color: rgba(12, 12, 13, 1);
- color: var(--main-color);
- font-size: 12px;
- line-height: 14px;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- /* Opera does not support user-select, use <... unselectable="on"> instead */
- cursor: default;
- box-sizing: border-box;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton {
- color: rgba(249, 249, 250, 1);
- color: var(--main-color);
- }
-}
-
-.secondaryToolbarButton {
- min-width: 16px;
- padding: 2px 6px 0;
- border: none;
- border-radius: 2px;
- color: rgba(12, 12, 13, 1);
- color: var(--main-color);
- font-size: 12px;
- line-height: 14px;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- /* Opera does not support user-select, use <... unselectable="on"> instead */
- cursor: default;
- box-sizing: border-box;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton {
- color: rgba(249, 249, 250, 1);
- color: var(--main-color);
- }
-}
-
-.overlayButton {
- min-width: 16px;
- padding: 2px 6px 0;
- border: none;
- border-radius: 2px;
- color: rgba(12, 12, 13, 1);
- color: var(--main-color);
- font-size: 12px;
- line-height: 14px;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- /* Opera does not support user-select, use <... unselectable="on"> instead */
- cursor: default;
- box-sizing: border-box;
-}
-
-@media (prefers-color-scheme: dark) {
-
- .overlayButton {
- color: rgba(249, 249, 250, 1);
- color: var(--main-color);
- }
-}
-
-html[dir="ltr"] .toolbarButton,
-html[dir="ltr"] .overlayButton,
-html[dir="ltr"] .dropdownToolbarButton {
- margin: 2px 1px;
-}
-html[dir="rtl"] .toolbarButton,
-html[dir="rtl"] .overlayButton,
-html[dir="rtl"] .dropdownToolbarButton {
margin: 2px 1px;
+ padding: 2px 6px 0;
+ border: none;
+ border-radius: 2px;
+ color: var(--main-color);
+ font-size: 12px;
+ line-height: 14px;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ user-select: none;
+ cursor: default;
+ box-sizing: border-box;
}
-html[dir="ltr"] #toolbarViewerLeft > .toolbarButton:first-child,
-html[dir="rtl"] #toolbarViewerRight > .toolbarButton:last-child {
- margin-left: 2px;
-}
-
-html[dir="ltr"] #toolbarViewerRight > .toolbarButton:last-child,
-html[dir="rtl"] #toolbarViewerLeft > .toolbarButton:first-child {
- margin-right: 2px;
-}
-.toolbarButton:hover {
- background-color: rgba(221, 222, 223, 1);
+.toolbarButton:hover,
+.toolbarButton:focus-visible {
background-color: var(--button-hover-color);
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton:hover {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-.toolbarButton:focus {
- background-color: rgba(221, 222, 223, 1);
- background-color: var(--button-hover-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton:focus {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-.secondaryToolbarButton:hover {
- background-color: rgba(237, 237, 237, 1);
- background-color: var(--doorhanger-hover-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton:hover {
- background-color: rgba(93, 94, 98, 1);
- background-color: var(--doorhanger-hover-color);
- }
-}
-.secondaryToolbarButton:focus {
- background-color: rgba(237, 237, 237, 1);
- background-color: var(--doorhanger-hover-color);
-}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton:focus {
- background-color: rgba(93, 94, 98, 1);
- background-color: var(--doorhanger-hover-color);
- }
-}
-
-.toolbarButton.toggled {
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--toggled-btn-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.toggled {
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--toggled-btn-bg-color);
- }
-}
-
-.splitToolbarButton.toggled > .toolbarButton.toggled {
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--toggled-btn-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .splitToolbarButton.toggled > .toolbarButton.toggled {
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--toggled-btn-bg-color);
- }
+.secondaryToolbarButton:hover,
+.secondaryToolbarButton:focus-visible {
+ background-color: var(--doorhanger-hover-bg-color);
+ color: var(--doorhanger-hover-color);
}
+.toolbarButton.toggled,
+.splitToolbarButton.toggled > .toolbarButton.toggled,
.secondaryToolbarButton.toggled {
- background-color: rgba(0, 0, 0, 0.3);
background-color: var(--toggled-btn-bg-color);
+ color: var(--toggled-btn-color);
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.toggled {
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--toggled-btn-bg-color);
- }
+.toolbarButton.toggled::before,
+.secondaryToolbarButton.toggled::before {
+ background-color: var(--toggled-btn-color);
}
.toolbarButton.toggled:hover:active,
.splitToolbarButton.toggled > .toolbarButton.toggled:hover:active,
.secondaryToolbarButton.toggled:hover:active {
- background-color: rgba(0, 0, 0, 0.4);
+ background-color: var(--toggled-hover-active-btn-color);
}
.dropdownToolbarButton {
- width: 140px;
+ width: var(--scale-select-container-width);
padding: 0;
overflow: hidden;
- background-color: rgba(215, 215, 219, 1);
background-color: var(--dropdown-btn-bg-color);
- margin-top: 2px !important;
}
-
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton {
- background-color: rgba(74, 74, 79, 1);
- background-color: var(--dropdown-btn-bg-color);
- }
-}
-.dropdownToolbarButton::after {
- position: absolute;
- display: inline-block;
- top: 6px;
- content: url(images/toolbarButton-menuArrow.svg);
- /*content: var(--toolbarButton-menuArrow-icon);*/
- pointer-events: none;
- max-width: 16px;
-}
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton::after {
- content: url(images/toolbarButton-menuArrow-dark.svg);
- /*content: var(--toolbarButton-menuArrow-icon);*/
- }
-}
-html[dir="ltr"] .dropdownToolbarButton::after {
+[dir="ltr"] .dropdownToolbarButton::after {
right: 7px;
}
-html[dir="rtl"] .dropdownToolbarButton::after {
+[dir="rtl"] .dropdownToolbarButton::after {
left: 7px;
}
+.dropdownToolbarButton::after {
+ top: 6px;
+ inset-inline-end: 7px;
+ pointer-events: none;
+ -webkit-mask-image: var(--toolbarButton-menuArrow-icon);
+ mask-image: var(--toolbarButton-menuArrow-icon);
+}
+
+[dir="ltr"] .dropdownToolbarButton > select {
+ padding-left: 4px;
+}
+
+[dir="rtl"] .dropdownToolbarButton > select {
+ padding-right: 4px;
+}
.dropdownToolbarButton > select {
- width: 162px;
+ width: calc(
+ var(--scale-select-container-width) + var(--scale-select-overflow)
+ );
height: 28px;
font-size: 12px;
- color: rgba(12, 12, 13, 1);
color: var(--main-color);
margin: 0;
padding: 1px 0 2px;
+ -webkit-padding-start: 4px;
+ padding-inline-start: 4px;
border: none;
- background-color: rgba(215, 215, 219, 1);
background-color: var(--dropdown-btn-bg-color);
}
-
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton > select {
- background-color: rgba(74, 74, 79, 1);
- background-color: var(--dropdown-btn-bg-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton > select {
- color: rgba(249, 249, 250, 1);
- color: var(--main-color);
- }
-}
-html[dir="ltr"] .dropdownToolbarButton > select {
- padding-left: 4px;
-}
-html[dir="rtl"] .dropdownToolbarButton > select {
- padding-right: 4px;
-}
-.dropdownToolbarButton > select:hover {
- background-color: rgba(221, 222, 223, 1);
+.dropdownToolbarButton > select:hover,
+.dropdownToolbarButton > select:focus-visible {
background-color: var(--button-hover-color);
+ color: var(--toggled-btn-color);
}
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton > select:hover {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-
-.dropdownToolbarButton > select:focus {
- background-color: rgba(221, 222, 223, 1);
- background-color: var(--button-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton > select:focus {
- background-color: rgba(102, 102, 103, 1);
- background-color: var(--button-hover-color);
- }
-}
-
.dropdownToolbarButton > select > option {
- background: rgba(255, 255, 255, 1);
background: var(--doorhanger-bg-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .dropdownToolbarButton > select > option {
- background: rgba(74, 74, 79, 1);
- background: var(--doorhanger-bg-color);
- }
-}
-
-#customScaleOption {
- display: none;
-}
-
-#pageWidthOption {
- border-bottom: 1px rgba(255, 255, 255, 0.5) solid;
+ color: var(--main-color);
}
.toolbarButtonSpacer {
@@ -2410,383 +2110,193 @@ html[dir="rtl"] .dropdownToolbarButton > select {
height: 1px;
}
-html[dir="ltr"] #findPrevious {
- margin-left: 0;
-}
-html[dir="ltr"] #findNext {
- margin-right: 3px;
-}
-
-html[dir="rtl"] #findPrevious {
- margin-right: 0;
-}
-html[dir="rtl"] #findNext {
- margin-left: 3px;
-}
-
-.toolbarButton::before {
- opacity: 0.7;
- opacity: var(--toolbar-icon-opacity);
- top: 6px;
-}
-
-.secondaryToolbarButton::before {
- opacity: 0.9;
- opacity: var(--doorhanger-icon-opacity);
- top: 5px;
-}
-
.toolbarButton::before,
-.secondaryToolbarButton::before {
+.secondaryToolbarButton::before,
+.dropdownToolbarButton::after,
+.treeItemToggler::before {
/* All matching images have a size of 16x16
* All relevant containers have a size of 28x28 */
position: absolute;
display: inline-block;
- left: 6px;
- max-width: 16px;
+ width: 16px;
+ height: 16px;
+
+ content: "";
+ background-color: var(--toolbar-icon-bg-color);
+ -webkit-mask-size: cover;
+ mask-size: cover;
}
-html[dir="ltr"] .secondaryToolbarButton::before {
+.dropdownToolbarButton:hover::after,
+.dropdownToolbarButton:focus-visible::after,
+.dropdownToolbarButton:active::after {
+ background-color: var(--toolbar-icon-hover-bg-color);
+}
+
+.toolbarButton::before {
+ opacity: var(--toolbar-icon-opacity);
+ top: 6px;
+ left: 6px;
+}
+
+.toolbarButton:hover::before,
+.toolbarButton:focus-visible::before,
+.secondaryToolbarButton:hover::before,
+.secondaryToolbarButton:focus-visible::before {
+ background-color: var(--toolbar-icon-hover-bg-color);
+}
+
+[dir="ltr"] .secondaryToolbarButton::before {
left: 12px;
}
-html[dir="rtl"] .secondaryToolbarButton::before {
+
+[dir="rtl"] .secondaryToolbarButton::before {
right: 12px;
}
-.toolbarButton#sidebarToggle::before {
- content: url(images/toolbarButton-sidebarToggle.svg);
- /*content: var(--toolbarButton-sidebarToggle-icon);*/
+.secondaryToolbarButton::before {
+ opacity: var(--doorhanger-icon-opacity);
+ top: 5px;
+ inset-inline-start: 12px;
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton#sidebarToggle::before {
- content: url(images/toolbarButton-sidebarToggle-dark.svg);
- /*content: var(--toolbarButton-sidebarToggle-icon);*/
- }
-}
-html[dir="rtl"] .toolbarButton#sidebarToggle::before {
- transform: scaleX(-1);
+#sidebarToggle::before {
+ -webkit-mask-image: var(--toolbarButton-sidebarToggle-icon);
+ mask-image: var(--toolbarButton-sidebarToggle-icon);
+ transform: scaleX(var(--dir-factor));
}
-.toolbarButton#secondaryToolbarToggle::before {
- content: url(images/toolbarButton-secondaryToolbarToggle.svg);
- /*content: var(--toolbarButton-secondaryToolbarToggle-icon);*/
+#secondaryToolbarToggle::before {
+ -webkit-mask-image: var(--toolbarButton-secondaryToolbarToggle-icon);
+ mask-image: var(--toolbarButton-secondaryToolbarToggle-icon);
+ transform: scaleX(var(--dir-factor));
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton#secondaryToolbarToggle::before {
- content: url(images/toolbarButton-secondaryToolbarToggle-dark.svg);
- /*content: var(--toolbarButton-secondaryToolbarToggle-icon);*/
- }
-}
-html[dir="rtl"] .toolbarButton#secondaryToolbarToggle::before {
- transform: scaleX(-1);
+#findPrevious::before {
+ -webkit-mask-image: var(--findbarButton-previous-icon);
+ mask-image: var(--findbarButton-previous-icon);
}
-.toolbarButton.findPrevious::before {
- content: url(images/findbarButton-previous.svg);
- /*content: var(--findbarButton-previous-icon);*/
+#findNext::before {
+ -webkit-mask-image: var(--findbarButton-next-icon);
+ mask-image: var(--findbarButton-next-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.findPrevious::before {
- content: url(images/findbarButton-previous-dark.svg);
- /*content: var(--findbarButton-previous-icon);*/
- }
-}
-html[dir="rtl"] .toolbarButton.findPrevious::before {
- transform: scaleX(-1);
+#previous::before {
+ -webkit-mask-image: var(--toolbarButton-pageUp-icon);
+ mask-image: var(--toolbarButton-pageUp-icon);
}
-.toolbarButton.findNext::before {
- content: url(images/findbarButton-next.svg);
- /*content: var(--findbarButton-next-icon);*/
+#next::before {
+ -webkit-mask-image: var(--toolbarButton-pageDown-icon);
+ mask-image: var(--toolbarButton-pageDown-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.findNext::before {
- content: url(images/findbarButton-next-dark.svg);
- /*content: var(--findbarButton-next-icon);*/
- }
-}
-html[dir="rtl"] .toolbarButton.findNext::before {
- transform: scaleX(-1);
+#zoomOut::before {
+ -webkit-mask-image: var(--toolbarButton-zoomOut-icon);
+ mask-image: var(--toolbarButton-zoomOut-icon);
}
-.toolbarButton.pageUp::before {
- content: url(images/toolbarButton-pageUp.svg);
- /*content: var(--toolbarButton-pageUp-icon);*/
+#zoomIn::before {
+ -webkit-mask-image: var(--toolbarButton-zoomIn-icon);
+ mask-image: var(--toolbarButton-zoomIn-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.pageUp::before {
- content: url(images/toolbarButton-pageUp-dark.svg);
- /*content: var(--toolbarButton-pageUp-icon);*/
- }
-}
-html[dir="rtl"] .toolbarButton.pageUp::before {
- transform: scaleX(-1);
+#presentationMode::before,
+#secondaryPresentationMode::before {
+ -webkit-mask-image: var(--toolbarButton-presentationMode-icon);
+ mask-image: var(--toolbarButton-presentationMode-icon);
}
-.toolbarButton.pageDown::before {
- content: url(images/toolbarButton-pageDown.svg);
- /*content: var(--toolbarButton-pageDown-icon);*/
+#editorFreeText::before {
+ -webkit-mask-image: var(--toolbarButton-editorFreeText-icon);
+ mask-image: var(--toolbarButton-editorFreeText-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.pageDown::before {
- content: url(images/toolbarButton-pageDown-dark.svg);
- /*content: var(--toolbarButton-pageDown-icon);*/
- }
-}
-html[dir="rtl"] .toolbarButton.pageDown::before {
- transform: scaleX(-1);
+#editorInk::before {
+ -webkit-mask-image: var(--toolbarButton-editorInk-icon);
+ mask-image: var(--toolbarButton-editorInk-icon);
}
-.toolbarButton.zoomOut::before {
- content: url(images/toolbarButton-zoomOut.svg);
- /*content: var(--toolbarButton-zoomOut-icon);*/
+#print::before,
+#secondaryPrint::before {
+ -webkit-mask-image: var(--toolbarButton-print-icon);
+ mask-image: var(--toolbarButton-print-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.zoomOut::before {
- content: url(images/toolbarButton-zoomOut-dark.svg);
- /*content: var(--toolbarButton-zoomOut-icon);*/
- }
+#openFile::before,
+#secondaryOpenFile::before {
+ -webkit-mask-image: var(--toolbarButton-openFile-icon);
+ mask-image: var(--toolbarButton-openFile-icon);
}
-.toolbarButton.zoomIn::before {
- content: url(images/toolbarButton-zoomIn.svg);
- /*content: var(--toolbarButton-zoomIn-icon);*/
+#download::before,
+#secondaryDownload::before {
+ -webkit-mask-image: var(--toolbarButton-download-icon);
+ mask-image: var(--toolbarButton-download-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.zoomIn::before {
- content: url(images/toolbarButton-zoomIn-dark.svg);
- /*content: var(--toolbarButton-zoomIn-icon);*/
- }
-}
-
-.toolbarButton.presentationMode::before {
- content: url(images/toolbarButton-presentationMode.svg);
- /*content: var(--toolbarButton-presentationMode-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.presentationMode::before {
- content: url(images/toolbarButton-presentationMode-dark.svg);
- /*content: var(--toolbarButton-presentationMode-icon);*/
- }
-}
-
-.secondaryToolbarButton.presentationMode::before {
- content: url(images/toolbarButton-presentationMode.svg);
- /*content: var(--toolbarButton-presentationMode-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.presentationMode::before {
- content: url(images/toolbarButton-presentationMode-dark.svg);
- /*content: var(--toolbarButton-presentationMode-icon);*/
- }
-}
-
-.toolbarButton.print::before {
- content: url(images/toolbarButton-print.svg);
- /*content: var(--toolbarButton-print-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.print::before {
- content: url(images/toolbarButton-print-dark.svg);
- /*content: var(--toolbarButton-print-icon);*/
- }
-}
-
-.secondaryToolbarButton.print::before {
- content: url(images/toolbarButton-print.svg);
- /*content: var(--toolbarButton-print-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.print::before {
- content: url(images/toolbarButton-print-dark.svg);
- /*content: var(--toolbarButton-print-icon);*/
- }
-}
-
-.toolbarButton.openFile::before {
- content: url(images/toolbarButton-openFile.svg);
- /*content: var(--toolbarButton-openFile-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.openFile::before {
- content: url(images/toolbarButton-openFile-dark.svg);
- /*content: var(--toolbarButton-openFile-icon);*/
- }
-}
-
-.secondaryToolbarButton.openFile::before {
- content: url(images/toolbarButton-openFile.svg);
- /*content: var(--toolbarButton-openFile-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.openFile::before {
- content: url(images/toolbarButton-openFile-dark.svg);
- /*content: var(--toolbarButton-openFile-icon);*/
- }
-}
-
-.toolbarButton.download::before {
- content: url(images/toolbarButton-download.svg);
- /*content: var(--toolbarButton-download-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.download::before {
- content: url(images/toolbarButton-download-dark.svg);
- /*content: var(--toolbarButton-download-icon);*/
- }
-}
-
-.secondaryToolbarButton.download::before {
- content: url(images/toolbarButton-download.svg);
- /*content: var(--toolbarButton-download-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.download::before {
- content: url(images/toolbarButton-download-dark.svg);
- /*content: var(--toolbarButton-download-icon);*/
- }
-}
-
-.secondaryToolbarButton.bookmark {
+a.secondaryToolbarButton {
padding-top: 6px;
text-decoration: none;
}
-
-.bookmark[href="#"] {
+a.toolbarButton[href="#"],
+a.secondaryToolbarButton[href="#"] {
opacity: 0.5;
pointer-events: none;
}
-.toolbarButton.bookmark::before {
- content: url(images/toolbarButton-bookmark.svg);
- /*content: var(--toolbarButton-bookmark-icon);*/
+#viewBookmark::before,
+#secondaryViewBookmark::before {
+ -webkit-mask-image: var(--toolbarButton-bookmark-icon);
+ mask-image: var(--toolbarButton-bookmark-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarButton.bookmark::before {
- content: url(images/toolbarButton-bookmark-dark.svg);
- /*content: var(--toolbarButton-bookmark-icon);*/
- }
+#viewThumbnail::before {
+ -webkit-mask-image: var(--toolbarButton-viewThumbnail-icon);
+ mask-image: var(--toolbarButton-viewThumbnail-icon);
}
-.secondaryToolbarButton.bookmark::before {
- content: url(images/toolbarButton-bookmark.svg);
- /*content: var(--toolbarButton-bookmark-icon);*/
+#viewOutline::before {
+ -webkit-mask-image: var(--toolbarButton-viewOutline-icon);
+ mask-image: var(--toolbarButton-viewOutline-icon);
+ transform: scaleX(var(--dir-factor));
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.bookmark::before {
- content: url(images/toolbarButton-bookmark-dark.svg);
- /*content: var(--toolbarButton-bookmark-icon);*/
- }
+#viewAttachments::before {
+ -webkit-mask-image: var(--toolbarButton-viewAttachments-icon);
+ mask-image: var(--toolbarButton-viewAttachments-icon);
}
-#viewThumbnail.toolbarButton::before {
- content: url(images/toolbarButton-viewThumbnail.svg);
- /*content: var(--toolbarButton-viewThumbnail-icon);*/
+#viewLayers::before {
+ -webkit-mask-image: var(--toolbarButton-viewLayers-icon);
+ mask-image: var(--toolbarButton-viewLayers-icon);
}
-@media (prefers-color-scheme: dark) {
-
- #viewThumbnail.toolbarButton::before {
- content: url(images/toolbarButton-viewThumbnail-dark.svg);
- /*content: var(--toolbarButton-viewThumbnail-icon);*/
- }
+#currentOutlineItem::before {
+ -webkit-mask-image: var(--toolbarButton-currentOutlineItem-icon);
+ mask-image: var(--toolbarButton-currentOutlineItem-icon);
+ transform: scaleX(var(--dir-factor));
}
-#viewOutline.toolbarButton::before {
- content: url(images/toolbarButton-viewOutline.svg);
- /*content: var(--toolbarButton-viewOutline-icon);*/
+#viewFind::before {
+ -webkit-mask-image: var(--toolbarButton-search-icon);
+ mask-image: var(--toolbarButton-search-icon);
}
-@media (prefers-color-scheme: dark) {
-
- #viewOutline.toolbarButton::before {
- content: url(images/toolbarButton-viewOutline-dark.svg);
- /*content: var(--toolbarButton-viewOutline-icon);*/
- }
-}
-html[dir="rtl"] #viewOutline.toolbarButton::before {
- transform: scaleX(-1);
+[dir="ltr"] .pdfSidebarNotification::after {
+ left: 17px;
}
-#viewAttachments.toolbarButton::before {
- content: url(images/toolbarButton-viewAttachments.svg);
- /*content: var(--toolbarButton-viewAttachments-icon);*/
+[dir="rtl"] .pdfSidebarNotification::after {
+ right: 17px;
}
-@media (prefers-color-scheme: dark) {
-
- #viewAttachments.toolbarButton::before {
- content: url(images/toolbarButton-viewAttachments-dark.svg);
- /*content: var(--toolbarButton-viewAttachments-icon);*/
- }
-}
-
-#viewLayers.toolbarButton::before {
- content: url(images/toolbarButton-viewLayers.svg);
- /*content: var(--toolbarButton-viewLayers-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- #viewLayers.toolbarButton::before {
- content: url(images/toolbarButton-viewLayers-dark.svg);
- /*content: var(--toolbarButton-viewLayers-icon);*/
- }
-}
-
-#viewFind.toolbarButton::before {
- content: url(images/toolbarButton-search.svg);
- /*content: var(--toolbarButton-search-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- #viewFind.toolbarButton::before {
- content: url(images/toolbarButton-search-dark.svg);
- /*content: var(--toolbarButton-search-icon);*/
- }
-}
-
-.toolbarButton.pdfSidebarNotification::after {
+.pdfSidebarNotification::after {
position: absolute;
display: inline-block;
top: 1px;
+ inset-inline-start: 17px;
/* Create a filled circle, with a diameter of 9 pixels, using only CSS: */
content: "";
background-color: rgba(112, 219, 85, 1);
@@ -2794,333 +2304,177 @@ html[dir="rtl"] #viewOutline.toolbarButton::before {
width: 9px;
border-radius: 50%;
}
-html[dir="ltr"] .toolbarButton.pdfSidebarNotification::after {
- left: 17px;
+
+[dir="ltr"] .secondaryToolbarButton {
+ padding-left: 36px;
}
-html[dir="rtl"] .toolbarButton.pdfSidebarNotification::after {
- right: 17px;
+
+[dir="rtl"] .secondaryToolbarButton {
+ padding-right: 36px;
+}
+
+[dir="ltr"] .secondaryToolbarButton {
+ text-align: left;
+}
+
+[dir="rtl"] .secondaryToolbarButton {
+ text-align: right;
}
.secondaryToolbarButton {
position: relative;
margin: 0;
- padding: 0 0 1px 0;
+ padding: 0 0 1px;
+ -webkit-padding-start: 36px;
+ padding-inline-start: 36px;
height: auto;
min-height: 26px;
width: auto;
min-width: 100%;
+ text-align: start;
white-space: normal;
border-radius: 0;
box-sizing: border-box;
}
-html[dir="ltr"] .secondaryToolbarButton {
- padding-left: 36px;
- text-align: left;
-}
-html[dir="rtl"] .secondaryToolbarButton {
- padding-right: 36px;
- text-align: right;
-}
-
-html[dir="ltr"] .secondaryToolbarButton > span {
+[dir="ltr"] .secondaryToolbarButton > span {
padding-right: 4px;
}
-html[dir="rtl"] .secondaryToolbarButton > span {
+[dir="rtl"] .secondaryToolbarButton > span {
padding-left: 4px;
}
-
-.secondaryToolbarButton.firstPage::before {
- content: url(images/secondaryToolbarButton-firstPage.svg);
- /*content: var(--secondaryToolbarButton-firstPage-icon);*/
+.secondaryToolbarButton > span {
+ -webkit-padding-end: 4px;
+ padding-inline-end: 4px;
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.firstPage::before {
- content: url(images/secondaryToolbarButton-firstPage-dark.svg);
- /*content: var(--secondaryToolbarButton-firstPage-icon);*/
- }
+#firstPage::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-firstPage-icon);
+ mask-image: var(--secondaryToolbarButton-firstPage-icon);
}
-.secondaryToolbarButton.lastPage::before {
- content: url(images/secondaryToolbarButton-lastPage.svg);
- /*content: var(--secondaryToolbarButton-lastPage-icon);*/
+#lastPage::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-lastPage-icon);
+ mask-image: var(--secondaryToolbarButton-lastPage-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.lastPage::before {
- content: url(images/secondaryToolbarButton-lastPage-dark.svg);
- /*content: var(--secondaryToolbarButton-lastPage-icon);*/
- }
+#pageRotateCcw::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-rotateCcw-icon);
+ mask-image: var(--secondaryToolbarButton-rotateCcw-icon);
}
-.secondaryToolbarButton.rotateCcw::before {
- content: url(images/secondaryToolbarButton-rotateCcw.svg);
- /*content: var(--secondaryToolbarButton-rotateCcw-icon);*/
+#pageRotateCw::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-rotateCw-icon);
+ mask-image: var(--secondaryToolbarButton-rotateCw-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.rotateCcw::before {
- content: url(images/secondaryToolbarButton-rotateCcw-dark.svg);
- /*content: var(--secondaryToolbarButton-rotateCcw-icon);*/
- }
+#cursorSelectTool::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-selectTool-icon);
+ mask-image: var(--secondaryToolbarButton-selectTool-icon);
}
-.secondaryToolbarButton.rotateCw::before {
- content: url(images/secondaryToolbarButton-rotateCw.svg);
- /*content: var(--secondaryToolbarButton-rotateCw-icon);*/
+#cursorHandTool::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-handTool-icon);
+ mask-image: var(--secondaryToolbarButton-handTool-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.rotateCw::before {
- content: url(images/secondaryToolbarButton-rotateCw-dark.svg);
- /*content: var(--secondaryToolbarButton-rotateCw-icon);*/
- }
+#scrollPage::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-scrollPage-icon);
+ mask-image: var(--secondaryToolbarButton-scrollPage-icon);
}
-.secondaryToolbarButton.selectTool::before {
- content: url(images/secondaryToolbarButton-selectTool.svg);
- /*content: var(--secondaryToolbarButton-selectTool-icon);*/
+#scrollVertical::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-scrollVertical-icon);
+ mask-image: var(--secondaryToolbarButton-scrollVertical-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.selectTool::before {
- content: url(images/secondaryToolbarButton-selectTool-dark.svg);
- /*content: var(--secondaryToolbarButton-selectTool-icon);*/
- }
+#scrollHorizontal::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-scrollHorizontal-icon);
+ mask-image: var(--secondaryToolbarButton-scrollHorizontal-icon);
}
-.secondaryToolbarButton.handTool::before {
- content: url(images/secondaryToolbarButton-handTool.svg);
- /*content: var(--secondaryToolbarButton-handTool-icon);*/
+#scrollWrapped::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-scrollWrapped-icon);
+ mask-image: var(--secondaryToolbarButton-scrollWrapped-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.handTool::before {
- content: url(images/secondaryToolbarButton-handTool-dark.svg);
- /*content: var(--secondaryToolbarButton-handTool-icon);*/
- }
+#spreadNone::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-spreadNone-icon);
+ mask-image: var(--secondaryToolbarButton-spreadNone-icon);
}
-.secondaryToolbarButton.scrollVertical::before {
- content: url(images/secondaryToolbarButton-scrollVertical.svg);
- /*content: var(--secondaryToolbarButton-scrollVertical-icon);*/
+#spreadOdd::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-spreadOdd-icon);
+ mask-image: var(--secondaryToolbarButton-spreadOdd-icon);
}
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.scrollVertical::before {
- content: url(images/secondaryToolbarButton-scrollVertical-dark.svg);
- /*content: var(--secondaryToolbarButton-scrollVertical-icon);*/
- }
+#spreadEven::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-spreadEven-icon);
+ mask-image: var(--secondaryToolbarButton-spreadEven-icon);
}
-.secondaryToolbarButton.scrollHorizontal::before {
- content: url(images/secondaryToolbarButton-scrollHorizontal.svg);
- /*content: var(--secondaryToolbarButton-scrollHorizontal-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.scrollHorizontal::before {
- content: url(images/secondaryToolbarButton-scrollHorizontal-dark.svg);
- /*content: var(--secondaryToolbarButton-scrollHorizontal-icon);*/
- }
-}
-
-.secondaryToolbarButton.scrollWrapped::before {
- content: url(images/secondaryToolbarButton-scrollWrapped.svg);
- /*content: var(--secondaryToolbarButton-scrollWrapped-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.scrollWrapped::before {
- content: url(images/secondaryToolbarButton-scrollWrapped-dark.svg);
- /*content: var(--secondaryToolbarButton-scrollWrapped-icon);*/
- }
-}
-
-.secondaryToolbarButton.spreadNone::before {
- content: url(images/secondaryToolbarButton-spreadNone.svg);
- /*content: var(--secondaryToolbarButton-spreadNone-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.spreadNone::before {
- content: url(images/secondaryToolbarButton-spreadNone-dark.svg);
- /*content: var(--secondaryToolbarButton-spreadNone-icon);*/
- }
-}
-
-.secondaryToolbarButton.spreadOdd::before {
- content: url(images/secondaryToolbarButton-spreadOdd.svg);
- /*content: var(--secondaryToolbarButton-spreadOdd-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.spreadOdd::before {
- content: url(images/secondaryToolbarButton-spreadOdd-dark.svg);
- /*content: var(--secondaryToolbarButton-spreadOdd-icon);*/
- }
-}
-
-.secondaryToolbarButton.spreadEven::before {
- content: url(images/secondaryToolbarButton-spreadEven.svg);
- /*content: var(--secondaryToolbarButton-spreadEven-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.spreadEven::before {
- content: url(images/secondaryToolbarButton-spreadEven-dark.svg);
- /*content: var(--secondaryToolbarButton-spreadEven-icon);*/
- }
-}
-
-.secondaryToolbarButton.documentProperties::before {
- content: url(images/secondaryToolbarButton-documentProperties.svg);
- /*content: var(--secondaryToolbarButton-documentProperties-icon);*/
-}
-
-@media (prefers-color-scheme: dark) {
-
- .secondaryToolbarButton.documentProperties::before {
- content: url(images/secondaryToolbarButton-documentProperties-dark.svg);
- /*content: var(--secondaryToolbarButton-documentProperties-icon);*/
- }
+#documentProperties::before {
+ -webkit-mask-image: var(--secondaryToolbarButton-documentProperties-icon);
+ mask-image: var(--secondaryToolbarButton-documentProperties-icon);
}
.verticalToolbarSeparator {
display: block;
- padding: 11px 0;
margin: 5px 2px;
width: 1px;
- background-color: rgba(0, 0, 0, 0.3);
+ height: 22px;
background-color: var(--separator-color);
}
-
-@media (prefers-color-scheme: dark) {
-
- .verticalToolbarSeparator {
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--separator-color);
- }
-}
-html[dir="ltr"] .verticalToolbarSeparator {
- margin-left: 2px;
-}
-html[dir="rtl"] .verticalToolbarSeparator {
- margin-right: 2px;
-}
-
.horizontalToolbarSeparator {
display: block;
- margin: 6px 0 5px 0;
+ margin: 6px 0;
height: 1px;
width: 100%;
- border-top: 1px solid rgba(222, 222, 222, 1);
- border-top: 1px solid var(--doorhanger-separator-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .horizontalToolbarSeparator {
- border-top: 1px solid rgba(92, 92, 97, 1);
- border-top: 1px solid var(--doorhanger-separator-color);
- }
+ background-color: var(--doorhanger-separator-color);
}
.toolbarField {
padding: 4px 7px;
- margin: 3px 0 3px 0;
+ margin: 3px 0;
border-radius: 2px;
- background-color: rgba(255, 255, 255, 1);
background-color: var(--field-bg-color);
background-clip: padding-box;
- border-width: 1px;
- border-style: solid;
- border-color: rgba(187, 187, 188, 1);
- border-color: var(--field-border-color);
+ border: 1px solid var(--field-border-color);
box-shadow: none;
- color: rgba(6, 6, 6, 1);
color: var(--field-color);
font-size: 12px;
line-height: 16px;
outline-style: none;
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarField {
- color: rgba(250, 250, 250, 1);
- color: var(--field-color);
- }
+[dir="ltr"] .toolbarField[type="checkbox"] {
+ margin-left: 7px;
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarField {
- border-color: rgba(115, 115, 115, 1);
- border-color: var(--field-border-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarField {
- background-color: rgba(64, 64, 68, 1);
- background-color: var(--field-bg-color);
- }
+[dir="rtl"] .toolbarField[type="checkbox"] {
+ margin-right: 7px;
}
.toolbarField[type="checkbox"] {
opacity: 0;
position: absolute !important;
left: 0;
+ margin: 10px 0 3px;
+ -webkit-margin-start: 7px;
+ margin-inline-start: 7px;
}
-html[dir="ltr"] .toolbarField[type="checkbox"] {
- margin: 10px 0 3px 7px;
-}
-
-html[dir="rtl"] .toolbarField[type="checkbox"] {
- margin: 10px 7px 3px 0;
-}
-
-.toolbarField.pageNumber {
+#pageNumber {
-moz-appearance: textfield; /* hides the spinner in moz */
- min-width: 16px;
text-align: right;
width: 40px;
}
-
-.toolbarField.pageNumber.visiblePageIsLoading {
- background-image: url(images/loading.svg);
- /*background-image: var(--loading-icon);*/
+#pageNumber.visiblePageIsLoading {
+ background-image: var(--loading-icon);
background-repeat: no-repeat;
background-position: 3px;
}
-
-@media (prefers-color-scheme: dark) {
-
- .toolbarField.pageNumber.visiblePageIsLoading {
- background-image: url(images/loading-dark.svg);
- /*background-image: var(--loading-icon);*/
- }
-}
-
-.toolbarField.pageNumber::-webkit-inner-spin-button,
-.toolbarField.pageNumber::-webkit-outer-spin-button {
+#pageNumber::-webkit-inner-spin-button {
-webkit-appearance: none;
- margin: 0;
}
.toolbarField:focus {
@@ -3129,45 +2483,49 @@ html[dir="rtl"] .toolbarField[type="checkbox"] {
.toolbarLabel {
min-width: 16px;
- padding: 6px;
+ padding: 7px;
margin: 2px;
- border: 1px solid rgba(0, 0, 0, 0);
border-radius: 2px;
- color: rgba(12, 12, 13, 1);
color: var(--main-color);
font-size: 12px;
line-height: 14px;
text-align: left;
-webkit-user-select: none;
-moz-user-select: none;
- -ms-user-select: none;
user-select: none;
cursor: default;
}
-@media (prefers-color-scheme: dark) {
-
- .toolbarLabel {
- color: rgba(249, 249, 250, 1);
- color: var(--main-color);
- }
+[dir="ltr"] #numPages.toolbarLabel {
+ padding-left: 3px;
}
-html[dir="ltr"] #numPages.toolbarLabel {
- padding-left: 2px;
-}
-html[dir="rtl"] #numPages.toolbarLabel {
- padding-right: 2px;
+[dir="rtl"] #numPages.toolbarLabel {
+ padding-right: 3px;
}
-#thumbnailView {
+#numPages.toolbarLabel {
+ -webkit-padding-start: 3px;
+ padding-inline-start: 3px;
+}
+
+#thumbnailView,
+#outlineView,
+#attachmentsView,
+#layersView {
position: absolute;
- width: calc(100% - 60px);
+ width: calc(100% - 8px);
top: 0;
bottom: 0;
- padding: 10px 30px 0;
+ padding: 4px 4px 0;
overflow: auto;
- -webkit-overflow-scrolling: touch;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ user-select: none;
+}
+#thumbnailView {
+ width: calc(100% - 60px);
+ padding: 10px 30px 0;
}
#thumbnailView > a:active,
@@ -3175,27 +2533,29 @@ html[dir="rtl"] #numPages.toolbarLabel {
outline: 0;
}
-.thumbnail {
- margin: 0 10px 5px 10px;
-}
-html[dir="ltr"] .thumbnail {
+[dir="ltr"] .thumbnail {
float: left;
}
-html[dir="rtl"] .thumbnail {
+
+[dir="rtl"] .thumbnail {
float: right;
}
+.thumbnail {
+ float: inline-start;
+ margin: 0 10px 5px;
+}
+
#thumbnailView > a:last-of-type > .thumbnail {
margin-bottom: 10px;
}
-
#thumbnailView > a:last-of-type > .thumbnail:not([data-loaded]) {
margin-bottom: 9px;
}
.thumbnail:not([data-loaded]) {
border: 1px dashed rgba(132, 132, 132, 1);
- margin: -1px 9px 4px 9px;
+ margin: -1px 9px 4px;
}
.thumbnailImage {
@@ -3217,306 +2577,140 @@ a:focus > .thumbnail > .thumbnailSelectionRing > .thumbnailImage,
opacity: 0.9;
}
-a:focus > .thumbnail > .thumbnailSelectionRing {
- background-color: rgba(0, 0, 0, 0.15);
- background-color: var(--sidebaritem-bg-color);
- background-clip: padding-box;
- color: rgba(255, 255, 255, 0.9);
-}
-
-@media (prefers-color-scheme: dark) {
-
- a:focus > .thumbnail > .thumbnailSelectionRing {
- background-color: rgba(255, 255, 255, 0.15);
- background-color: var(--sidebaritem-bg-color);
- }
-}
-
+a:focus > .thumbnail > .thumbnailSelectionRing,
.thumbnail:hover > .thumbnailSelectionRing {
- background-color: rgba(0, 0, 0, 0.15);
background-color: var(--sidebaritem-bg-color);
background-clip: padding-box;
color: rgba(255, 255, 255, 0.9);
}
-@media (prefers-color-scheme: dark) {
-
- .thumbnail:hover > .thumbnailSelectionRing {
- background-color: rgba(255, 255, 255, 0.15);
- background-color: var(--sidebaritem-bg-color);
- }
-}
-
.thumbnail.selected > .thumbnailSelectionRing > .thumbnailImage {
opacity: 1;
}
.thumbnail.selected > .thumbnailSelectionRing {
- background-color: rgba(0, 0, 0, 0.15);
background-color: var(--sidebaritem-bg-color);
background-clip: padding-box;
color: rgba(255, 255, 255, 1);
}
-@media (prefers-color-scheme: dark) {
-
- .thumbnail.selected > .thumbnailSelectionRing {
- background-color: rgba(255, 255, 255, 0.15);
- background-color: var(--sidebaritem-bg-color);
- }
-}
-
-#outlineView,
-#attachmentsView,
-#layersView {
- position: absolute;
- width: calc(100% - 8px);
- top: 0;
- bottom: 0;
- padding: 4px 4px 0;
- overflow: auto;
- -webkit-overflow-scrolling: touch;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-
-html[dir="ltr"] .treeWithDeepNesting > .treeItem,
-html[dir="ltr"] .treeItem > .treeItems {
+[dir="ltr"] .treeWithDeepNesting > .treeItem,[dir="ltr"]
+.treeItem > .treeItems {
margin-left: 20px;
}
-html[dir="rtl"] .treeWithDeepNesting > .treeItem,
-html[dir="rtl"] .treeItem > .treeItems {
+[dir="rtl"] .treeWithDeepNesting > .treeItem,[dir="rtl"]
+.treeItem > .treeItems {
margin-right: 20px;
}
+.treeWithDeepNesting > .treeItem,
+.treeItem > .treeItems {
+ -webkit-margin-start: 20px;
+ margin-inline-start: 20px;
+}
+
+[dir="ltr"] .treeItem > a {
+ padding-left: 4px;
+}
+
+[dir="rtl"] .treeItem > a {
+ padding-right: 4px;
+}
+
.treeItem > a {
text-decoration: none;
display: inline-block;
- min-width: 95%;
/* Subtract the right padding (left, in RTL mode) of the container: */
min-width: calc(100% - 4px);
height: auto;
margin-bottom: 1px;
+ padding: 2px 0 5px;
+ -webkit-padding-start: 4px;
+ padding-inline-start: 4px;
border-radius: 2px;
- color: rgba(0, 0, 0, 0.8);
- color: var(--outline-color);
+ color: var(--treeitem-color);
font-size: 13px;
line-height: 15px;
-webkit-user-select: none;
-moz-user-select: none;
- -ms-user-select: none;
user-select: none;
white-space: normal;
cursor: pointer;
}
-@media (prefers-color-scheme: dark) {
-
- .treeItem > a {
- color: rgba(255, 255, 255, 0.8);
- color: var(--outline-color);
- }
-}
-html[dir="ltr"] .treeItem > a {
- padding: 2px 0 5px 4px;
-}
-html[dir="rtl"] .treeItem > a {
- padding: 2px 4px 5px 0;
-}
-
-#layersView .treeItem > a > * {
+#layersView .treeItem > a * {
cursor: pointer;
}
-html[dir="ltr"] #layersView .treeItem > a > label {
+[dir="ltr"] #layersView .treeItem > a > label {
padding-left: 4px;
}
-html[dir="rtl"] #layersView .treesItem > a > label {
+[dir="rtl"] #layersView .treeItem > a > label {
padding-right: 4px;
}
+#layersView .treeItem > a > label {
+ -webkit-padding-start: 4px;
+ padding-inline-start: 4px;
+}
+[dir="ltr"] #layersView .treeItem > a > label > input {
+ float: left;
+}
+[dir="rtl"] #layersView .treeItem > a > label > input {
+ float: right;
+}
+#layersView .treeItem > a > label > input {
+ float: inline-start;
+ margin-top: 1px;
+}
+
+[dir="ltr"] .treeItemToggler {
+ float: left;
+}
+
+[dir="rtl"] .treeItemToggler {
+ float: right;
+}
.treeItemToggler {
position: relative;
+ float: inline-start;
height: 0;
width: 0;
color: rgba(255, 255, 255, 0.5);
}
-.treeItemToggler::before {
- content: url(images/treeitem-expanded.svg);
- /*content: var(--treeitem-expanded-icon);*/
- display: inline-block;
- position: absolute;
- max-width: 16px;
+[dir="ltr"] .treeItemToggler::before {
+ right: 4px;
}
-@media (prefers-color-scheme: dark) {
-
- .treeItemToggler::before {
- content: url(images/treeitem-expanded-dark.svg);
- /*content: var(--treeitem-expanded-icon);*/
- }
+[dir="rtl"] .treeItemToggler::before {
+ left: 4px;
+}
+.treeItemToggler::before {
+ inset-inline-end: 4px;
+ -webkit-mask-image: var(--treeitem-expanded-icon);
+ mask-image: var(--treeitem-expanded-icon);
}
.treeItemToggler.treeItemsHidden::before {
- content: url(images/treeitem-collapsed.svg);
- /*content: var(--treeitem-collapsed-icon);*/
- max-width: 16px;
-}
-@media (prefers-color-scheme: dark) {
-
- .treeItemToggler.treeItemsHidden::before {
- content: url(images/treeitem-collapsed-dark.svg);
- /*content: var(--treeitem-collapsed-icon);*/
- }
-}
-html[dir="rtl"] .treeItemToggler.treeItemsHidden::before {
- transform: scaleX(-1);
+ -webkit-mask-image: var(--treeitem-collapsed-icon);
+ mask-image: var(--treeitem-collapsed-icon);
+ transform: scaleX(var(--dir-factor));
}
.treeItemToggler.treeItemsHidden ~ .treeItems {
display: none;
}
-html[dir="ltr"] .treeItemToggler {
- float: left;
-}
-html[dir="rtl"] .treeItemToggler {
- float: right;
-}
-html[dir="ltr"] .treeItemToggler::before {
- right: 4px;
-}
-html[dir="rtl"] .treeItemToggler::before {
- left: 4px;
-}
-
-.treeItemToggler:hover {
- background-color: rgba(0, 0, 0, 0.15);
- background-color: var(--sidebaritem-bg-color);
- background-clip: padding-box;
- border-radius: 2px;
- color: rgba(0, 0, 0, 0.9);
- color: var(--outline-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItemToggler:hover {
- color: rgba(255, 255, 255, 0.9);
- color: var(--outline-hover-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItemToggler:hover {
- background-color: rgba(255, 255, 255, 0.15);
- background-color: var(--sidebaritem-bg-color);
- }
-}
-
-.treeItemToggler:hover + a {
- background-color: rgba(0, 0, 0, 0.15);
- background-color: var(--sidebaritem-bg-color);
- background-clip: padding-box;
- border-radius: 2px;
- color: rgba(0, 0, 0, 0.9);
- color: var(--outline-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItemToggler:hover + a {
- color: rgba(255, 255, 255, 0.9);
- color: var(--outline-hover-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItemToggler:hover + a {
- background-color: rgba(255, 255, 255, 0.15);
- background-color: var(--sidebaritem-bg-color);
- }
-}
-
-.treeItemToggler:hover ~ .treeItems {
- background-color: rgba(0, 0, 0, 0.15);
- background-color: var(--sidebaritem-bg-color);
- background-clip: padding-box;
- border-radius: 2px;
- color: rgba(0, 0, 0, 0.9);
- color: var(--outline-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItemToggler:hover ~ .treeItems {
- color: rgba(255, 255, 255, 0.9);
- color: var(--outline-hover-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItemToggler:hover ~ .treeItems {
- background-color: rgba(255, 255, 255, 0.15);
- background-color: var(--sidebaritem-bg-color);
- }
+
+.treeItem.selected > a {
+ background-color: var(--treeitem-selected-bg-color);
+ color: var(--treeitem-selected-color);
}
+.treeItemToggler:hover,
+.treeItemToggler:hover + a,
+.treeItemToggler:hover ~ .treeItems,
.treeItem > a:hover {
- background-color: rgba(0, 0, 0, 0.15);
background-color: var(--sidebaritem-bg-color);
background-clip: padding-box;
border-radius: 2px;
- color: rgba(0, 0, 0, 0.9);
- color: var(--outline-hover-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItem > a:hover {
- color: rgba(255, 255, 255, 0.9);
- color: var(--outline-hover-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItem > a:hover {
- background-color: rgba(255, 255, 255, 0.15);
- background-color: var(--sidebaritem-bg-color);
- }
-}
-
-.treeItem.selected {
- background-color: rgba(0, 0, 0, 1);
- background-color: var(--outline-active-bg-color);
- background-clip: padding-box;
- color: rgba(0, 0, 0, 0.08);
- color: var(--outline-active-color);
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItem.selected {
- color: rgba(255, 255, 255, 0.08);
- color: var(--outline-active-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- .treeItem.selected {
- background-color: rgba(255, 255, 255, 1);
- background-color: var(--outline-active-bg-color);
- }
-}
-
-.noResults {
- font-size: 12px;
- color: rgba(255, 255, 255, 0.8);
- font-style: italic;
- cursor: default;
+ color: var(--treeitem-hover-color);
}
/* TODO: file FF bug to support ::-moz-selection:window-inactive
@@ -3530,9 +2724,7 @@ html[dir="rtl"] .treeItemToggler::before {
}
#errorWrapper {
- background: none repeat scroll 0 0 rgba(255, 74, 74, 1);
- background: none repeat scroll 0 0 var(--errorWrapper-bg-color);
- color: rgba(12, 12, 13, 1);
+ background-color: var(--errorWrapper-bg-color);
color: var(--main-color);
left: 0;
position: absolute;
@@ -3541,289 +2733,115 @@ html[dir="rtl"] .treeItemToggler::before {
padding: 3px 6px;
}
-@media (prefers-color-scheme: dark) {
-
- #errorWrapper {
- color: rgba(249, 249, 250, 1);
- color: var(--main-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #errorWrapper {
- background: none repeat scroll 0 0 rgba(199, 17, 17, 1);
- background: none repeat scroll 0 0 var(--errorWrapper-bg-color);
- }
-}
-.loadingInProgress #errorWrapper {
- top: 37px;
-}
-
#errorMessageLeft {
float: left;
}
-
#errorMessageRight {
float: right;
}
+#errorSpacer {
+ clear: both;
+}
#errorMoreInfo {
- background-color: rgba(255, 255, 255, 1);
background-color: var(--field-bg-color);
- color: rgba(6, 6, 6, 1);
color: var(--field-color);
- border: 1px solid rgba(187, 187, 188, 1);
border: 1px solid var(--field-border-color);
padding: 3px;
margin: 3px;
width: 98%;
}
-@media (prefers-color-scheme: dark) {
-
- #errorMoreInfo {
- border: 1px solid rgba(115, 115, 115, 1);
- border: 1px solid var(--field-border-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #errorMoreInfo {
- color: rgba(250, 250, 250, 1);
- color: var(--field-color);
- }
-}
-
-@media (prefers-color-scheme: dark) {
-
- #errorMoreInfo {
- background-color: rgba(64, 64, 68, 1);
- background-color: var(--field-bg-color);
- }
-}
-
-.overlayButton {
+.dialogButton {
width: auto;
- margin: 3px 4px 2px 4px !important;
- padding: 2px 11px 2px 11px;
+ margin: 3px 4px 2px !important;
+ padding: 2px 11px;
+ color: var(--main-color);
+ background-color: var(--dialog-button-bg-color);
+ border: var(--dialog-button-border) !important;
}
-#overlayContainer {
- display: table;
- position: absolute;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.2);
- z-index: 40000;
-}
-#overlayContainer > * {
- overflow: auto;
- -webkit-overflow-scrolling: touch;
-}
-
-#overlayContainer > .container {
- display: table-cell;
- vertical-align: middle;
- text-align: center;
-}
-
-#overlayContainer > .container > .dialog {
- display: inline-block;
+dialog {
+ margin: auto;
padding: 15px;
border-spacing: 4px;
- color: rgba(12, 12, 13, 1);
color: var(--main-color);
font-size: 12px;
line-height: 14px;
- background-color: rgba(255, 255, 255, 1);
background-color: var(--doorhanger-bg-color);
border: 1px solid rgba(0, 0, 0, 0.5);
border-radius: 4px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
}
-
-@media (prefers-color-scheme: dark) {
-
- #overlayContainer > .container > .dialog {
- background-color: rgba(74, 74, 79, 1);
- background-color: var(--doorhanger-bg-color);
- }
+dialog::-webkit-backdrop {
+ background-color: rgba(0, 0, 0, 0.2);
+}
+dialog::backdrop {
+ background-color: rgba(0, 0, 0, 0.2);
}
-@media (prefers-color-scheme: dark) {
-
- #overlayContainer > .container > .dialog {
- color: rgba(249, 249, 250, 1);
- color: var(--main-color);
- }
-}
-
-.dialog > .row {
+dialog > .row {
display: table-row;
}
-.dialog > .row > * {
+dialog > .row > * {
display: table-cell;
}
-.dialog .toolbarField {
+dialog .toolbarField {
margin: 5px 0;
}
-.dialog .separator {
+dialog .separator {
display: block;
- margin: 4px 0 4px 0;
+ margin: 4px 0;
height: 1px;
width: 100%;
- background-color: rgba(0, 0, 0, 0.3);
background-color: var(--separator-color);
}
-@media (prefers-color-scheme: dark) {
-
- .dialog .separator {
- background-color: rgba(0, 0, 0, 0.3);
- background-color: var(--separator-color);
- }
-}
-
-.dialog .buttonRow {
+dialog .buttonRow {
text-align: center;
vertical-align: middle;
}
-.dialog :link {
+dialog :link {
color: rgba(255, 255, 255, 1);
}
-#passwordOverlay > .dialog {
+#passwordDialog {
text-align: center;
}
-#passwordOverlay .toolbarField {
+#passwordDialog .toolbarField {
width: 200px;
}
-#documentPropertiesOverlay > .dialog {
+#documentPropertiesDialog {
text-align: left;
}
-#documentPropertiesOverlay .row > * {
- min-width: 100px;
-}
-html[dir="ltr"] #documentPropertiesOverlay .row > * {
+[dir="ltr"] #documentPropertiesDialog .row > * {
text-align: left;
}
-html[dir="rtl"] #documentPropertiesOverlay .row > * {
+[dir="rtl"] #documentPropertiesDialog .row > * {
text-align: right;
}
-#documentPropertiesOverlay .row > span {
+#documentPropertiesDialog .row > * {
+ min-width: 100px;
+ text-align: start;
+}
+#documentPropertiesDialog .row > span {
width: 125px;
word-wrap: break-word;
}
-#documentPropertiesOverlay .row > p {
+#documentPropertiesDialog .row > p {
max-width: 225px;
word-wrap: break-word;
}
-#documentPropertiesOverlay .buttonRow {
+#documentPropertiesDialog .buttonRow {
margin-top: 10px;
}
-.clearBoth {
- clear: both;
-}
-
-.fileInput {
- background: rgba(255, 255, 255, 1);
- color: rgba(0, 0, 0, 1);
- margin-top: 5px;
- visibility: hidden;
- position: fixed;
- right: 0;
- top: 0;
-}
-
-#PDFBug {
- background: none repeat scroll 0 0 rgba(255, 255, 255, 1);
- border: 1px solid rgba(102, 102, 102, 1);
- position: fixed;
- top: 32px;
- right: 0;
- bottom: 0;
- font-size: 10px;
- padding: 0;
- width: 300px;
-}
-#PDFBug .controls {
- background: rgba(238, 238, 238, 1);
- border-bottom: 1px solid rgba(102, 102, 102, 1);
- padding: 3px;
-}
-#PDFBug .panels {
- bottom: 0;
- left: 0;
- overflow: auto;
- -webkit-overflow-scrolling: touch;
- position: absolute;
- right: 0;
- top: 27px;
-}
-#PDFBug .panels > div {
- padding: 5px;
-}
-#PDFBug button.active {
- font-weight: bold;
-}
-.debuggerShowText {
- background: none repeat scroll 0 0 rgba(255, 255, 0, 1);
- color: rgba(0, 0, 255, 1);
-}
-.debuggerHideText:hover {
- background: none repeat scroll 0 0 rgba(255, 255, 0, 1);
-}
-#PDFBug .stats {
- font-family: courier;
- font-size: 10px;
- white-space: pre;
-}
-#PDFBug .stats .title {
- font-weight: bold;
-}
-#PDFBug table {
- font-size: 10px;
-}
-
-#viewer.textLayer-visible .textLayer {
- opacity: 1;
-}
-
-#viewer.textLayer-visible .canvasWrapper {
- background-color: rgba(128, 255, 128, 1);
-}
-
-#viewer.textLayer-visible .canvasWrapper canvas {
- mix-blend-mode: screen;
-}
-
-#viewer.textLayer-visible .textLayer > span {
- background-color: rgba(255, 255, 0, 0.1);
- color: rgba(0, 0, 0, 1);
- border: solid 1px rgba(255, 0, 0, 0.5);
- box-sizing: border-box;
-}
-
-#viewer.textLayer-hover .textLayer > span:hover {
- background-color: rgba(255, 255, 255, 1);
- color: rgba(0, 0, 0, 1);
-}
-
-#viewer.textLayer-shadow .textLayer > span {
- background-color: rgba(255, 255, 255, 0.6);
- color: rgba(0, 0, 0, 1);
-}
-
.grab-to-pan-grab {
- cursor: url("images/grab.cur"), move !important;
cursor: -webkit-grab !important;
cursor: grab !important;
}
@@ -3833,7 +2851,6 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
}
.grab-to-pan-grab:active,
.grab-to-pan-grabbing {
- cursor: url("images/grabbing.cur"), move !important;
cursor: -webkit-grabbing !important;
cursor: grabbing !important;
position: fixed;
@@ -3856,51 +2873,9 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
}
@media print {
- /* General rules for printing. */
body {
background: rgba(0, 0, 0, 0) none;
}
-
- /* Rules for browsers that don't support mozPrintCallback. */
- #sidebarContainer,
- #secondaryToolbar,
- .toolbar,
- #loadingBox,
- #errorWrapper,
- .textLayer {
- display: none;
- }
- #viewerContainer {
- overflow: visible;
- }
-
- #mainContainer,
- #viewerContainer,
- .page,
- .page canvas {
- position: static;
- padding: 0;
- margin: 0;
- }
-
- .page {
- float: left;
- display: none;
- border: none;
- box-shadow: none;
- background-clip: content-box;
- background-color: rgba(255, 255, 255, 1);
- }
-
- .page[data-loaded] {
- display: block;
- }
-
- .fileInput {
- display: none;
- }
-
- /* Rules for browsers that support PDF.js printing */
body[data-pdfjsprinting] #outerContainer {
display: none;
}
@@ -3911,18 +2886,38 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
height: 100%;
}
/* wrapper around (scaled) print canvas elements */
- #printContainer > div {
- position: relative;
- top: 0;
- left: 0;
- width: 1px;
- height: 1px;
- overflow: visible;
+ #printContainer > .printedPage {
page-break-after: always;
page-break-inside: avoid;
+
+ /* The wrapper always cover the whole page. */
+ height: 100%;
+ width: 100%;
+
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
}
- #printContainer canvas,
- #printContainer img {
+
+ #printContainer > .xfaPrintedPage .xfaPage {
+ position: absolute;
+ }
+
+ #printContainer > .xfaPrintedPage {
+ page-break-after: always;
+ page-break-inside: avoid;
+ width: 100%;
+ height: 100%;
+ position: relative;
+ }
+
+ #printContainer > .printedPage canvas,
+ #printContainer > .printedPage img {
+ /* The intrinsic canvas / image size will make sure that we fit the page. */
+ max-width: 100%;
+ max-height: 100%;
+
direction: ltr;
display: block;
}
@@ -3945,28 +2940,21 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
}
@media all and (max-width: 840px) {
- #sidebarContent {
- background-color: rgba(0, 0, 0, 0.7);
+ #sidebarContainer {
+ background-color: var(--sidebar-narrow-bg-color);
}
-
- html[dir="ltr"] #outerContainer.sidebarOpen #viewerContainer {
- left: 0px !important;
+ [dir="ltr"] #outerContainer.sidebarOpen #viewerContainer {
+ left: 0 !important;
}
- html[dir="rtl"] #outerContainer.sidebarOpen #viewerContainer {
- right: 0px !important;
+ [dir="rtl"] #outerContainer.sidebarOpen #viewerContainer {
+ right: 0 !important;
}
-
- #outerContainer .hiddenLargeView,
- #outerContainer .hiddenMediumView {
- display: inherit;
- }
- #outerContainer .visibleLargeView,
- #outerContainer .visibleMediumView {
- display: none;
+ #outerContainer.sidebarOpen #viewerContainer {
+ inset-inline-start: 0 !important;
}
}
-@media all and (max-width: 770px) {
+@media all and (max-width: 820px) {
#outerContainer .hiddenLargeView {
display: none;
}
@@ -3975,7 +2963,7 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
}
}
-@media all and (max-width: 700px) {
+@media all and (max-width: 750px) {
#outerContainer .hiddenMediumView {
display: none;
}
@@ -3984,7 +2972,7 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
}
}
-@media all and (max-width: 640px) {
+@media all and (max-width: 690px) {
.hiddenSmallView,
.hiddenSmallView * {
display: none;
@@ -3995,15 +2983,18 @@ html[dir="rtl"] #documentPropertiesOverlay .row > * {
.toolbarButtonSpacer {
width: 0;
}
- html[dir="ltr"] .findbar {
+ [dir="ltr"] .findbar {
left: 34px;
}
- html[dir="rtl"] .findbar {
+ [dir="rtl"] .findbar {
right: 34px;
}
+ .findbar {
+ inset-inline-start: 34px;
+ }
}
-@media all and (max-width: 535px) {
+@media all and (max-width: 560px) {
#scaleSelectContainer {
display: none;
}
diff --git a/cps/static/css/main.css b/cps/static/css/main.css
index adbfbfdfb..03cb0a011 100644
--- a/cps/static/css/main.css
+++ b/cps/static/css/main.css
@@ -567,6 +567,36 @@ input:-moz-placeholder { color: #454545; }
font-size: 0.8em;
}
+.md-content .themes button {
+ display: inline-block;
+ border: none;
+ text-align: center;
+ text-decoration: none;
+ margin-top: 5%;
+ margin-right: 1%;
+ font-size: 16px;
+}
+
+.md-content .themes button.darkTheme {
+ background-color: #202124;
+ color: white;
+}
+
+.md-content .themes button.whiteTheme {
+ background-color: white;
+ color: black;
+}
+
+.md-content .themes button.sepiaTheme {
+ background-color: #ece1ca;
+ color: black;
+}
+
+.md-content .themes button.blackTheme {
+ background-color: black;
+ color: white;
+}
+
/* Effect 1: Fade in and scale up */
.md-effect-1 .md-content {
-webkit-transform: scale(0.7);
diff --git a/cps/static/css/reader.css b/cps/static/css/reader.css
new file mode 100644
index 000000000..ec8054ca0
--- /dev/null
+++ b/cps/static/css/reader.css
@@ -0,0 +1,29 @@
+.fontSizeWrapper {
+ position: relative;
+}
+.slider {
+ position: absolute;
+ top: 50%;
+ transform: translate(0,-50%);
+ width: 90%;
+ height: 60px;
+ background: transparent;
+ border-radius: 20px;
+ display: flex;
+ align-items: center;
+ box-shadow: 0px 15px 40px #7E6D5766;
+}
+.slider label {
+ font-size: 20px;
+ font-weight: 400;
+ font-family: Open Sans;
+ padding-right: 10px;
+ color: white;
+}
+.slider input[type="range"] {
+ width: 80%;
+ height: 5px;
+ background: black;
+ border: none;
+ outline: none;
+}
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index bf2257e65..59bcd2c03 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -140,6 +140,7 @@ table .bg-dark-danger a { color: #fff; }
.container-fluid .book {
margin-top: 20px;
+ max-width: 180px;
display: flex;
flex-direction: column;
}
@@ -429,7 +430,7 @@ div.log {
}
#detailcover { cursor:zoom-in; }
-#detailcover:-webkit-full-screen { cursor:zoom-out; }
-#detailcover:-moz-full-screen { cursor:zoom-out; }
-#detailcover:-ms-fullscreen { cursor:zoom-out; }
-#detailcover:fullscreen { cursor:zoom-out; }
+#detailcover:-webkit-full-screen { cursor:zoom-out; border: 0; }
+#detailcover:-moz-full-screen { cursor:zoom-out; border: 0; }
+#detailcover:-ms-fullscreen { cursor:zoom-out; border: 0; }
+#detailcover:fullscreen { cursor:zoom-out; border: 0; }
diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
old mode 100644
new mode 100755
index 3203c255d..ec394d0b1
--- a/cps/static/js/caliBlur.js
+++ b/cps/static/js/caliBlur.js
@@ -16,7 +16,6 @@
*/
// Move advanced search to side-menu
$("a[href*='advanced']").parent().insertAfter("#nav_new");
-$("body").addClass("blur");
$("body.stat").addClass("stats");
$("body.config").addClass("admin");
$("body.uiconfig").addClass("admin");
@@ -29,8 +28,8 @@ $("body > div.container-fluid > div > div.col-sm-10 > div.filterheader").attr("s
// Back button
curHref = window.location.href.split("/");
prevHref = document.referrer.split("/");
-$(".navbar-form.navbar-left")
- .before('');
+$(".plexBack a").attr('href', encodeURI(document.referrer));
+
if (history.length === 1 ||
curHref[0] +
curHref[1] +
@@ -44,14 +43,9 @@ if (history.length === 1 ||
//Weird missing a after pressing back from edit.
setTimeout(function () {
- if ($(".plexBack a").length < 1) {
- $(".plexBack").append('');
- }
+ $(".plexBack a").attr('href', encodeURI(document.referrer));
}, 10);
-// Home button
-$(".plexBack").before('');
-$("a.navbar-brand").clone().appendTo(".home-btn").empty().removeClass("navbar-brand");
/////////////////////////////////
// Start of Book Details Work //
///////////////////////////////
@@ -201,7 +195,7 @@ if ($("body.book").length > 0) {
// Move dropdown lists higher in dom, replace bootstrap toggle with own toggle.
$('ul[aria-labelledby="read-in-browser"]').insertBefore(".blur-wrapper").addClass("readinbrowser-drop");
- $('ul[aria-labelledby="send-to-kindle"]').insertBefore(".blur-wrapper").addClass("sendtokindle-drop");
+ $('ul[aria-labelledby="send-to-kereader"]').insertBefore(".blur-wrapper").addClass("sendtoereader-drop");
$(".leramslist").insertBefore(".blur-wrapper");
$('ul[aria-labelledby="btnGroupDrop1"]').insertBefore(".blur-wrapper").addClass("leramslist");
$("#add-to-shelves").insertBefore(".blur-wrapper");
@@ -215,7 +209,7 @@ if ($("body.book").length > 0) {
});
$("#sendbtn2").click(function () {
- $(".sendtokindle-drop").toggle();
+ $(".sendtoereader-drop").toggle();
});
@@ -242,12 +236,12 @@ if ($("body.book").length > 0) {
if ($("#sendbtn2").length > 0) {
position = $("#sendbtn2").offset().left
- if (position + $(".sendtokindle-drop").width() > $(window).width()) {
- positionOff = position + $(".sendtokindle-drop").width() - $(window).width();
+ if (position + $(".sendtoereader-drop").width() > $(window).width()) {
+ positionOff = position + $(".sendtoereader-drop").width() - $(window).width();
ribPosition = position - positionOff - 5
- $(".sendtokindle-drop").attr("style", "left: " + ribPosition + "px !important; right: auto; top: " + topPos + "px");
+ $(".sendtoereader-drop").attr("style", "left: " + ribPosition + "px !important; right: auto; top: " + topPos + "px");
} else {
- $(".sendtokindle-drop").attr("style", "left: " + position + "px !important; right: auto; top: " + topPos + "px");
+ $(".sendtoereader-drop").attr("style", "left: " + position + "px !important; right: auto; top: " + topPos + "px");
}
}
@@ -270,7 +264,7 @@ if ($("body.book").length > 0) {
if (position + $("#add-to-shelves").width() > $(window).width()) {
positionOff = position + $("#add-to-shelves").width() - $(window).width();
- adsPosition = position - positionOff - 5
+ adsPosition = position - positionOff - 5;
$("#add-to-shelves").attr("style", "left: " + adsPosition + "px !important; right: auto; top: " + topPos + "px");
} else {
$("#add-to-shelves").attr("style", "left: " + position + "px !important; right: auto; top: " + topPos + "px");
@@ -300,7 +294,7 @@ if ($("body.book").length > 0) {
$(document).mouseup(function (e) {
var container = new Array();
container.push($('ul[aria-labelledby="read-in-browser"]'));
- container.push($(".sendtokindle-drop"));
+ container.push($(".sendtoereader-drop"));
container.push($(".leramslist"));
container.push($("#add-to-shelves"));
container.push($(".navbar-collapse.collapse.in"));
@@ -326,13 +320,8 @@ url = window.location.pathname
// Move create shelf
$("#nav_createshelf").prependTo(".your-shelves");
-// Create drop-down for profile and move elements to it
-$("#main-nav")
- .prepend('');
-$("#top_user").parent().addClass("dropdown").appendTo(".profileDropli");
-$("#nav_about").addClass("dropdown").appendTo(".profileDropli");
-$("#register").parent().addClass("dropdown").appendTo(".profileDropli");
-$("#logout").parent().addClass("dropdown").appendTo(".profileDropli");
+// Move About link it the profile dropdown
+$(".profileDropli #top_user").parent().after($("#nav_about").addClass("dropdown"))
// Remove the modals except from some areas where they are needed
bodyClass = $("body").attr("class").split(" ");
@@ -429,7 +418,7 @@ if($("body.advsearch").length > 0) {
if (position + $("#add-to-shelves").width() > $(window).width()) {
positionOff = position + $("#add-to-shelves").width() - $(window).width();
- adsPosition = position - positionOff - 5
+ adsPosition = position - positionOff - 5;
$("#add-to-shelves").attr("style", "left: " + adsPosition + "px !important; right: auto; top: " + topPos + "px");
} else {
$("#add-to-shelves").attr("style", "left: " + position + "px !important; right: auto; top: " + topPos + "px");
@@ -479,12 +468,12 @@ if ($.trim($("#add-to-shelves").html()).length === 0) {
$("#add-to-shelf").addClass("empty-ul");
}
-shelfLength = $("#add-to-shelves li").length
-emptyLength = 0
+shelfLength = $("#add-to-shelves li").length;
+emptyLength = 0;
$("#add-to-shelves").on("click", "li a", function () {
console.log("#remove-from-shelves change registered");
- emptyLength++
+ emptyLength++;
setTimeout(function () {
if (emptyLength >= shelfLength) {
@@ -666,7 +655,7 @@ $("#sendbtn").attr({
$("#sendbtn2").attr({
"data-toggle-two": "tooltip",
- "title": $("#sendbtn2").text(), // "Send to Kindle",
+ "title": $("#sendbtn2").text(), // "Send to eReader",
"data-placement": "bottom",
"data-viewport": ".btn-toolbar"
})
diff --git a/cps/static/js/compress/jszip.js b/cps/static/js/compress/jszip.js
deleted file mode 100644
index 1546d7fcb..000000000
--- a/cps/static/js/compress/jszip.js
+++ /dev/null
@@ -1,9155 +0,0 @@
-/*!
-
-JSZip - A Javascript class for generating and reading zip files
-
-
-(c) 2009-2014 Stuart Knightley
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
-
-JSZip uses the library pako released under the MIT license :
-https://github.com/nodeca/pako/blob/master/LICENSE
-*/
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.JSZip=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o> 2;
- enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
- enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
- enc4 = chr3 & 63;
-
- if (isNaN(chr2)) {
- enc3 = enc4 = 64;
- }
- else if (isNaN(chr3)) {
- enc4 = 64;
- }
-
- output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
-
- }
-
- return output;
-};
-
-// public method for decoding
-exports.decode = function(input, utf8) {
- var output = "";
- var chr1, chr2, chr3;
- var enc1, enc2, enc3, enc4;
- var i = 0;
-
- input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-
- while (i < input.length) {
-
- enc1 = _keyStr.indexOf(input.charAt(i++));
- enc2 = _keyStr.indexOf(input.charAt(i++));
- enc3 = _keyStr.indexOf(input.charAt(i++));
- enc4 = _keyStr.indexOf(input.charAt(i++));
-
- chr1 = (enc1 << 2) | (enc2 >> 4);
- chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
- chr3 = ((enc3 & 3) << 6) | enc4;
-
- output = output + String.fromCharCode(chr1);
-
- if (enc3 != 64) {
- output = output + String.fromCharCode(chr2);
- }
- if (enc4 != 64) {
- output = output + String.fromCharCode(chr3);
- }
-
- }
-
- return output;
-
-};
-
-},{}],2:[function(_dereq_,module,exports){
-'use strict';
-function CompressedObject() {
- this.compressedSize = 0;
- this.uncompressedSize = 0;
- this.crc32 = 0;
- this.compressionMethod = null;
- this.compressedContent = null;
-}
-
-CompressedObject.prototype = {
- /**
- * Return the decompressed content in an unspecified format.
- * The format will depend on the decompressor.
- * @return {Object} the decompressed content.
- */
- getContent: function() {
- return null; // see implementation
- },
- /**
- * Return the compressed content in an unspecified format.
- * The format will depend on the compressed conten source.
- * @return {Object} the compressed content.
- */
- getCompressedContent: function() {
- return null; // see implementation
- }
-};
-module.exports = CompressedObject;
-
-},{}],3:[function(_dereq_,module,exports){
-'use strict';
-exports.STORE = {
- magic: "\x00\x00",
- compress: function(content, compressionOptions) {
- return content; // no compression
- },
- uncompress: function(content) {
- return content; // no compression
- },
- compressInputType: null,
- uncompressInputType: null
-};
-exports.DEFLATE = _dereq_('./flate');
-
-},{"./flate":8}],4:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-var table = [
- 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
- 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
- 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
- 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
- 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
- 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
- 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
- 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
- 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
- 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
- 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
- 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
- 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
- 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
- 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
- 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
- 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
- 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
- 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
- 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
- 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
- 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
- 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
- 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
- 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
- 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
- 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
- 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
- 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
- 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
- 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
- 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
- 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
- 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
- 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
- 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
- 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
- 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
- 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
- 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
- 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
- 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
- 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
- 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
- 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
- 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
- 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
- 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
- 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
- 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
- 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
- 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
- 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
- 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
- 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
- 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
- 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
- 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
- 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
- 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
- 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
- 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
- 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
- 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-];
-
-/**
- *
- * Javascript crc32
- * http://www.webtoolkit.info/
- *
- */
-module.exports = function crc32(input, crc) {
- if (typeof input === "undefined" || !input.length) {
- return 0;
- }
-
- var isArray = utils.getTypeOf(input) !== "string";
-
- if (typeof(crc) == "undefined") {
- crc = 0;
- }
- var x = 0;
- var y = 0;
- var b = 0;
-
- crc = crc ^ (-1);
- for (var i = 0, iTop = input.length; i < iTop; i++) {
- b = isArray ? input[i] : input.charCodeAt(i);
- y = (crc ^ b) & 0xFF;
- x = table[y];
- crc = (crc >>> 8) ^ x;
- }
-
- return crc ^ (-1);
-};
-// vim: set shiftwidth=4 softtabstop=4:
-
-},{"./utils":21}],5:[function(_dereq_,module,exports){
-'use strict';
-var utils = _dereq_('./utils');
-
-function DataReader(data) {
- this.data = null; // type : see implementation
- this.length = 0;
- this.index = 0;
-}
-DataReader.prototype = {
- /**
- * Check that the offset will not go too far.
- * @param {string} offset the additional offset to check.
- * @throws {Error} an Error if the offset is out of bounds.
- */
- checkOffset: function(offset) {
- this.checkIndex(this.index + offset);
- },
- /**
- * Check that the specifed index will not be too far.
- * @param {string} newIndex the index to check.
- * @throws {Error} an Error if the index is out of bounds.
- */
- checkIndex: function(newIndex) {
- if (this.length < newIndex || newIndex < 0) {
- throw new Error("End of data reached (data length = " + this.length + ", asked index = " + (newIndex) + "). Corrupted zip ?");
- }
- },
- /**
- * Change the index.
- * @param {number} newIndex The new index.
- * @throws {Error} if the new index is out of the data.
- */
- setIndex: function(newIndex) {
- this.checkIndex(newIndex);
- this.index = newIndex;
- },
- /**
- * Skip the next n bytes.
- * @param {number} n the number of bytes to skip.
- * @throws {Error} if the new index is out of the data.
- */
- skip: function(n) {
- this.setIndex(this.index + n);
- },
- /**
- * Get the byte at the specified index.
- * @param {number} i the index to use.
- * @return {number} a byte.
- */
- byteAt: function(i) {
- // see implementations
- },
- /**
- * Get the next number with a given byte size.
- * @param {number} size the number of bytes to read.
- * @return {number} the corresponding number.
- */
- readInt: function(size) {
- var result = 0,
- i;
- this.checkOffset(size);
- for (i = this.index + size - 1; i >= this.index; i--) {
- result = (result << 8) + this.byteAt(i);
- }
- this.index += size;
- return result;
- },
- /**
- * Get the next string with a given byte size.
- * @param {number} size the number of bytes to read.
- * @return {string} the corresponding string.
- */
- readString: function(size) {
- return utils.transformTo("string", this.readData(size));
- },
- /**
- * Get raw data without conversion, bytes.
- * @param {number} size the number of bytes to read.
- * @return {Object} the raw data, implementation specific.
- */
- readData: function(size) {
- // see implementations
- },
- /**
- * Find the last occurence of a zip signature (4 bytes).
- * @param {string} sig the signature to find.
- * @return {number} the index of the last occurence, -1 if not found.
- */
- lastIndexOfSignature: function(sig) {
- // see implementations
- },
- /**
- * Get the next date.
- * @return {Date} the date.
- */
- readDate: function() {
- var dostime = this.readInt(4);
- return new Date(
- ((dostime >> 25) & 0x7f) + 1980, // year
- ((dostime >> 21) & 0x0f) - 1, // month
- (dostime >> 16) & 0x1f, // day
- (dostime >> 11) & 0x1f, // hour
- (dostime >> 5) & 0x3f, // minute
- (dostime & 0x1f) << 1); // second
- }
-};
-module.exports = DataReader;
-
-},{"./utils":21}],6:[function(_dereq_,module,exports){
-'use strict';
-exports.base64 = false;
-exports.binary = false;
-exports.dir = false;
-exports.createFolders = false;
-exports.date = null;
-exports.compression = null;
-exports.compressionOptions = null;
-exports.comment = null;
-exports.unixPermissions = null;
-exports.dosPermissions = null;
-
-},{}],7:[function(_dereq_,module,exports){
-'use strict';
-var utils = _dereq_('./utils');
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2binary = function(str) {
- return utils.string2binary(str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2Uint8Array = function(str) {
- return utils.transformTo("uint8array", str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.uint8Array2String = function(array) {
- return utils.transformTo("string", array);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2Blob = function(str) {
- var buffer = utils.transformTo("arraybuffer", str);
- return utils.arrayBuffer2Blob(buffer);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.arrayBuffer2Blob = function(buffer) {
- return utils.arrayBuffer2Blob(buffer);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.transformTo = function(outputType, input) {
- return utils.transformTo(outputType, input);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.getTypeOf = function(input) {
- return utils.getTypeOf(input);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.checkSupport = function(type) {
- return utils.checkSupport(type);
-};
-
-/**
- * @deprecated
- * This value will be removed in a future version without replacement.
- */
-exports.MAX_VALUE_16BITS = utils.MAX_VALUE_16BITS;
-
-/**
- * @deprecated
- * This value will be removed in a future version without replacement.
- */
-exports.MAX_VALUE_32BITS = utils.MAX_VALUE_32BITS;
-
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.pretty = function(str) {
- return utils.pretty(str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.findCompression = function(compressionMethod) {
- return utils.findCompression(compressionMethod);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.isRegExp = function (object) {
- return utils.isRegExp(object);
-};
-
-
-},{"./utils":21}],8:[function(_dereq_,module,exports){
-'use strict';
-var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
-
-var pako = _dereq_("pako");
-exports.uncompressInputType = USE_TYPEDARRAY ? "uint8array" : "array";
-exports.compressInputType = USE_TYPEDARRAY ? "uint8array" : "array";
-
-exports.magic = "\x08\x00";
-exports.compress = function(input, compressionOptions) {
- return pako.deflateRaw(input, {
- level : compressionOptions.level || -1 // default compression
- });
-};
-exports.uncompress = function(input) {
- return pako.inflateRaw(input);
-};
-
-},{"pako":24}],9:[function(_dereq_,module,exports){
-'use strict';
-
-var base64 = _dereq_('./base64');
-
-/**
-Usage:
- zip = new JSZip();
- zip.file("hello.txt", "Hello, World!").file("tempfile", "nothing");
- zip.folder("images").file("smile.gif", base64Data, {base64: true});
- zip.file("Xmas.txt", "Ho ho ho !", {date : new Date("December 25, 2007 00:00:01")});
- zip.remove("tempfile");
-
- base64zip = zip.generate();
-
-**/
-
-/**
- * Representation a of zip file in js
- * @constructor
- * @param {String=|ArrayBuffer=|Uint8Array=} data the data to load, if any (optional).
- * @param {Object=} options the options for creating this objects (optional).
- */
-function JSZip(data, options) {
- // if this constructor is used without `new`, it adds `new` before itself:
- if(!(this instanceof JSZip)) return new JSZip(data, options);
-
- // object containing the files :
- // {
- // "folder/" : {...},
- // "folder/data.txt" : {...}
- // }
- this.files = {};
-
- this.comment = null;
-
- // Where we are in the hierarchy
- this.root = "";
- if (data) {
- this.load(data, options);
- }
- this.clone = function() {
- var newObj = new JSZip();
- for (var i in this) {
- if (typeof this[i] !== "function") {
- newObj[i] = this[i];
- }
- }
- return newObj;
- };
-}
-JSZip.prototype = _dereq_('./object');
-JSZip.prototype.load = _dereq_('./load');
-JSZip.support = _dereq_('./support');
-JSZip.defaults = _dereq_('./defaults');
-
-/**
- * @deprecated
- * This namespace will be removed in a future version without replacement.
- */
-JSZip.utils = _dereq_('./deprecatedPublicUtils');
-
-JSZip.base64 = {
- /**
- * @deprecated
- * This method will be removed in a future version without replacement.
- */
- encode : function(input) {
- return base64.encode(input);
- },
- /**
- * @deprecated
- * This method will be removed in a future version without replacement.
- */
- decode : function(input) {
- return base64.decode(input);
- }
-};
-JSZip.compressions = _dereq_('./compressions');
-module.exports = JSZip;
-
-},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(_dereq_,module,exports){
-'use strict';
-var base64 = _dereq_('./base64');
-var ZipEntries = _dereq_('./zipEntries');
-module.exports = function(data, options) {
- var files, zipEntries, i, input;
- options = options || {};
- if (options.base64) {
- data = base64.decode(data);
- }
-
- zipEntries = new ZipEntries(data, options);
- files = zipEntries.files;
- for (i = 0; i < files.length; i++) {
- input = files[i];
- this.file(input.fileName, input.decompressed, {
- binary: true,
- optimizedBinaryString: true,
- date: input.date,
- dir: input.dir,
- comment : input.fileComment.length ? input.fileComment : null,
- unixPermissions : input.unixPermissions,
- dosPermissions : input.dosPermissions,
- createFolders: options.createFolders
- });
- }
- if (zipEntries.zipComment.length) {
- this.comment = zipEntries.zipComment;
- }
-
- return this;
-};
-
-},{"./base64":1,"./zipEntries":22}],11:[function(_dereq_,module,exports){
-(function (Buffer){
-'use strict';
-module.exports = function(data, encoding){
- return new Buffer(data, encoding);
-};
-module.exports.test = function(b){
- return Buffer.isBuffer(b);
-};
-
-}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
-},{}],12:[function(_dereq_,module,exports){
-'use strict';
-var Uint8ArrayReader = _dereq_('./uint8ArrayReader');
-
-function NodeBufferReader(data) {
- this.data = data;
- this.length = this.data.length;
- this.index = 0;
-}
-NodeBufferReader.prototype = new Uint8ArrayReader();
-
-/**
- * @see DataReader.readData
- */
-NodeBufferReader.prototype.readData = function(size) {
- this.checkOffset(size);
- var result = this.data.slice(this.index, this.index + size);
- this.index += size;
- return result;
-};
-module.exports = NodeBufferReader;
-
-},{"./uint8ArrayReader":18}],13:[function(_dereq_,module,exports){
-'use strict';
-var support = _dereq_('./support');
-var utils = _dereq_('./utils');
-var crc32 = _dereq_('./crc32');
-var signature = _dereq_('./signature');
-var defaults = _dereq_('./defaults');
-var base64 = _dereq_('./base64');
-var compressions = _dereq_('./compressions');
-var CompressedObject = _dereq_('./compressedObject');
-var nodeBuffer = _dereq_('./nodeBuffer');
-var utf8 = _dereq_('./utf8');
-var StringWriter = _dereq_('./stringWriter');
-var Uint8ArrayWriter = _dereq_('./uint8ArrayWriter');
-
-/**
- * Returns the raw data of a ZipObject, decompress the content if necessary.
- * @param {ZipObject} file the file to use.
- * @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
- */
-var getRawData = function(file) {
- if (file._data instanceof CompressedObject) {
- file._data = file._data.getContent();
- file.options.binary = true;
- file.options.base64 = false;
-
- if (utils.getTypeOf(file._data) === "uint8array") {
- var copy = file._data;
- // when reading an arraybuffer, the CompressedObject mechanism will keep it and subarray() a Uint8Array.
- // if we request a file in the same format, we might get the same Uint8Array or its ArrayBuffer (the original zip file).
- file._data = new Uint8Array(copy.length);
- // with an empty Uint8Array, Opera fails with a "Offset larger than array size"
- if (copy.length !== 0) {
- file._data.set(copy, 0);
- }
- }
- }
- return file._data;
-};
-
-/**
- * Returns the data of a ZipObject in a binary form. If the content is an unicode string, encode it.
- * @param {ZipObject} file the file to use.
- * @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
- */
-var getBinaryData = function(file) {
- var result = getRawData(file),
- type = utils.getTypeOf(result);
- if (type === "string") {
- if (!file.options.binary) {
- // unicode text !
- // unicode string => binary string is a painful process, check if we can avoid it.
- if (support.nodebuffer) {
- return nodeBuffer(result, "utf-8");
- }
- }
- return file.asBinary();
- }
- return result;
-};
-
-/**
- * Transform this._data into a string.
- * @param {function} filter a function String -> String, applied if not null on the result.
- * @return {String} the string representing this._data.
- */
-var dataToString = function(asUTF8) {
- var result = getRawData(this);
- if (result === null || typeof result === "undefined") {
- return "";
- }
- // if the data is a base64 string, we decode it before checking the encoding !
- if (this.options.base64) {
- result = base64.decode(result);
- }
- if (asUTF8 && this.options.binary) {
- // JSZip.prototype.utf8decode supports arrays as input
- // skip to array => string step, utf8decode will do it.
- result = out.utf8decode(result);
- }
- else {
- // no utf8 transformation, do the array => string step.
- result = utils.transformTo("string", result);
- }
-
- if (!asUTF8 && !this.options.binary) {
- result = utils.transformTo("string", out.utf8encode(result));
- }
- return result;
-};
-/**
- * A simple object representing a file in the zip file.
- * @constructor
- * @param {string} name the name of the file
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data
- * @param {Object} options the options of the file
- */
-var ZipObject = function(name, data, options) {
- this.name = name;
- this.dir = options.dir;
- this.date = options.date;
- this.comment = options.comment;
- this.unixPermissions = options.unixPermissions;
- this.dosPermissions = options.dosPermissions;
-
- this._data = data;
- this.options = options;
-
- /*
- * This object contains initial values for dir and date.
- * With them, we can check if the user changed the deprecated metadata in
- * `ZipObject#options` or not.
- */
- this._initialMetadata = {
- dir : options.dir,
- date : options.date
- };
-};
-
-ZipObject.prototype = {
- /**
- * Return the content as UTF8 string.
- * @return {string} the UTF8 string.
- */
- asText: function() {
- return dataToString.call(this, true);
- },
- /**
- * Returns the binary content.
- * @return {string} the content as binary.
- */
- asBinary: function() {
- return dataToString.call(this, false);
- },
- /**
- * Returns the content as a nodejs Buffer.
- * @return {Buffer} the content as a Buffer.
- */
- asNodeBuffer: function() {
- var result = getBinaryData(this);
- return utils.transformTo("nodebuffer", result);
- },
- /**
- * Returns the content as an Uint8Array.
- * @return {Uint8Array} the content as an Uint8Array.
- */
- asUint8Array: function() {
- var result = getBinaryData(this);
- return utils.transformTo("uint8array", result);
- },
- /**
- * Returns the content as an ArrayBuffer.
- * @return {ArrayBuffer} the content as an ArrayBufer.
- */
- asArrayBuffer: function() {
- return this.asUint8Array().buffer;
- }
-};
-
-/**
- * Transform an integer into a string in hexadecimal.
- * @private
- * @param {number} dec the number to convert.
- * @param {number} bytes the number of bytes to generate.
- * @returns {string} the result.
- */
-var decToHex = function(dec, bytes) {
- var hex = "",
- i;
- for (i = 0; i < bytes; i++) {
- hex += String.fromCharCode(dec & 0xff);
- dec = dec >>> 8;
- }
- return hex;
-};
-
-/**
- * Merge the objects passed as parameters into a new one.
- * @private
- * @param {...Object} var_args All objects to merge.
- * @return {Object} a new object with the data of the others.
- */
-var extend = function() {
- var result = {}, i, attr;
- for (i = 0; i < arguments.length; i++) { // arguments is not enumerable in some browsers
- for (attr in arguments[i]) {
- if (arguments[i].hasOwnProperty(attr) && typeof result[attr] === "undefined") {
- result[attr] = arguments[i][attr];
- }
- }
- }
- return result;
-};
-
-/**
- * Transforms the (incomplete) options from the user into the complete
- * set of options to create a file.
- * @private
- * @param {Object} o the options from the user.
- * @return {Object} the complete set of options.
- */
-var prepareFileAttrs = function(o) {
- o = o || {};
- if (o.base64 === true && (o.binary === null || o.binary === undefined)) {
- o.binary = true;
- }
- o = extend(o, defaults);
- o.date = o.date || new Date();
- if (o.compression !== null) o.compression = o.compression.toUpperCase();
-
- return o;
-};
-
-/**
- * Add a file in the current folder.
- * @private
- * @param {string} name the name of the file
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data of the file
- * @param {Object} o the options of the file
- * @return {Object} the new file.
- */
-var fileAdd = function(name, data, o) {
- // be sure sub folders exist
- var dataType = utils.getTypeOf(data),
- parent;
-
- o = prepareFileAttrs(o);
-
- if (typeof o.unixPermissions === "string") {
- o.unixPermissions = parseInt(o.unixPermissions, 8);
- }
-
- // UNX_IFDIR 0040000 see zipinfo.c
- if (o.unixPermissions && (o.unixPermissions & 0x4000)) {
- o.dir = true;
- }
- // Bit 4 Directory
- if (o.dosPermissions && (o.dosPermissions & 0x0010)) {
- o.dir = true;
- }
-
- if (o.dir) {
- name = forceTrailingSlash(name);
- }
-
- if (o.createFolders && (parent = parentFolder(name))) {
- folderAdd.call(this, parent, true);
- }
-
- if (o.dir || data === null || typeof data === "undefined") {
- o.base64 = false;
- o.binary = false;
- data = null;
- dataType = null;
- }
- else if (dataType === "string") {
- if (o.binary && !o.base64) {
- // optimizedBinaryString == true means that the file has already been filtered with a 0xFF mask
- if (o.optimizedBinaryString !== true) {
- // this is a string, not in a base64 format.
- // Be sure that this is a correct "binary string"
- data = utils.string2binary(data);
- }
- }
- }
- else { // arraybuffer, uint8array, ...
- o.base64 = false;
- o.binary = true;
-
- if (!dataType && !(data instanceof CompressedObject)) {
- throw new Error("The data of '" + name + "' is in an unsupported format !");
- }
-
- // special case : it's way easier to work with Uint8Array than with ArrayBuffer
- if (dataType === "arraybuffer") {
- data = utils.transformTo("uint8array", data);
- }
- }
-
- var object = new ZipObject(name, data, o);
- this.files[name] = object;
- return object;
-};
-
-/**
- * Find the parent folder of the path.
- * @private
- * @param {string} path the path to use
- * @return {string} the parent folder, or ""
- */
-var parentFolder = function (path) {
- if (path.slice(-1) == '/') {
- path = path.substring(0, path.length - 1);
- }
- var lastSlash = path.lastIndexOf('/');
- return (lastSlash > 0) ? path.substring(0, lastSlash) : "";
-};
-
-
-/**
- * Returns the path with a slash at the end.
- * @private
- * @param {String} path the path to check.
- * @return {String} the path with a trailing slash.
- */
-var forceTrailingSlash = function(path) {
- // Check the name ends with a /
- if (path.slice(-1) != "/") {
- path += "/"; // IE doesn't like substr(-1)
- }
- return path;
-};
-/**
- * Add a (sub) folder in the current folder.
- * @private
- * @param {string} name the folder's name
- * @param {boolean=} [createFolders] If true, automatically create sub
- * folders. Defaults to false.
- * @return {Object} the new folder.
- */
-var folderAdd = function(name, createFolders) {
- createFolders = (typeof createFolders !== 'undefined') ? createFolders : false;
-
- name = forceTrailingSlash(name);
-
- // Does this folder already exist?
- if (!this.files[name]) {
- fileAdd.call(this, name, null, {
- dir: true,
- createFolders: createFolders
- });
- }
- return this.files[name];
-};
-
-/**
- * Generate a JSZip.CompressedObject for a given zipOject.
- * @param {ZipObject} file the object to read.
- * @param {JSZip.compression} compression the compression to use.
- * @param {Object} compressionOptions the options to use when compressing.
- * @return {JSZip.CompressedObject} the compressed result.
- */
-var generateCompressedObjectFrom = function(file, compression, compressionOptions) {
- var result = new CompressedObject(),
- content;
-
- // the data has not been decompressed, we might reuse things !
- if (file._data instanceof CompressedObject) {
- result.uncompressedSize = file._data.uncompressedSize;
- result.crc32 = file._data.crc32;
-
- if (result.uncompressedSize === 0 || file.dir) {
- compression = compressions['STORE'];
- result.compressedContent = "";
- result.crc32 = 0;
- }
- else if (file._data.compressionMethod === compression.magic) {
- result.compressedContent = file._data.getCompressedContent();
- }
- else {
- content = file._data.getContent();
- // need to decompress / recompress
- result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
- }
- }
- else {
- // have uncompressed data
- content = getBinaryData(file);
- if (!content || content.length === 0 || file.dir) {
- compression = compressions['STORE'];
- content = "";
- }
- result.uncompressedSize = content.length;
- result.crc32 = crc32(content);
- result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
- }
-
- result.compressedSize = result.compressedContent.length;
- result.compressionMethod = compression.magic;
-
- return result;
-};
-
-
-
-
-/**
- * Generate the UNIX part of the external file attributes.
- * @param {Object} unixPermissions the unix permissions or null.
- * @param {Boolean} isDir true if the entry is a directory, false otherwise.
- * @return {Number} a 32 bit integer.
- *
- * adapted from http://unix.stackexchange.com/questions/14705/the-zip-formats-external-file-attribute :
- *
- * TTTTsstrwxrwxrwx0000000000ADVSHR
- * ^^^^____________________________ file type, see zipinfo.c (UNX_*)
- * ^^^_________________________ setuid, setgid, sticky
- * ^^^^^^^^^________________ permissions
- * ^^^^^^^^^^______ not used ?
- * ^^^^^^ DOS attribute bits : Archive, Directory, Volume label, System file, Hidden, Read only
- */
-var generateUnixExternalFileAttr = function (unixPermissions, isDir) {
-
- var result = unixPermissions;
- if (!unixPermissions) {
- // I can't use octal values in strict mode, hence the hexa.
- // 040775 => 0x41fd
- // 0100664 => 0x81b4
- result = isDir ? 0x41fd : 0x81b4;
- }
-
- return (result & 0xFFFF) << 16;
-};
-
-/**
- * Generate the DOS part of the external file attributes.
- * @param {Object} dosPermissions the dos permissions or null.
- * @param {Boolean} isDir true if the entry is a directory, false otherwise.
- * @return {Number} a 32 bit integer.
- *
- * Bit 0 Read-Only
- * Bit 1 Hidden
- * Bit 2 System
- * Bit 3 Volume Label
- * Bit 4 Directory
- * Bit 5 Archive
- */
-var generateDosExternalFileAttr = function (dosPermissions, isDir) {
-
- // the dir flag is already set for compatibility
-
- return (dosPermissions || 0) & 0x3F;
-};
-
-/**
- * Generate the various parts used in the construction of the final zip file.
- * @param {string} name the file name.
- * @param {ZipObject} file the file content.
- * @param {JSZip.CompressedObject} compressedObject the compressed object.
- * @param {number} offset the current offset from the start of the zip file.
- * @param {String} platform let's pretend we are this platform (change platform dependents fields)
- * @return {object} the zip parts.
- */
-var generateZipParts = function(name, file, compressedObject, offset, platform) {
- var data = compressedObject.compressedContent,
- utfEncodedFileName = utils.transformTo("string", utf8.utf8encode(file.name)),
- comment = file.comment || "",
- utfEncodedComment = utils.transformTo("string", utf8.utf8encode(comment)),
- useUTF8ForFileName = utfEncodedFileName.length !== file.name.length,
- useUTF8ForComment = utfEncodedComment.length !== comment.length,
- o = file.options,
- dosTime,
- dosDate,
- extraFields = "",
- unicodePathExtraField = "",
- unicodeCommentExtraField = "",
- dir, date;
-
-
- // handle the deprecated options.dir
- if (file._initialMetadata.dir !== file.dir) {
- dir = file.dir;
- } else {
- dir = o.dir;
- }
-
- // handle the deprecated options.date
- if(file._initialMetadata.date !== file.date) {
- date = file.date;
- } else {
- date = o.date;
- }
-
- var extFileAttr = 0;
- var versionMadeBy = 0;
- if (dir) {
- // dos or unix, we set the dos dir flag
- extFileAttr |= 0x00010;
- }
- if(platform === "UNIX") {
- versionMadeBy = 0x031E; // UNIX, version 3.0
- extFileAttr |= generateUnixExternalFileAttr(file.unixPermissions, dir);
- } else { // DOS or other, fallback to DOS
- versionMadeBy = 0x0014; // DOS, version 2.0
- extFileAttr |= generateDosExternalFileAttr(file.dosPermissions, dir);
- }
-
- // date
- // @see http://www.delorie.com/djgpp/doc/rbinter/it/52/13.html
- // @see http://www.delorie.com/djgpp/doc/rbinter/it/65/16.html
- // @see http://www.delorie.com/djgpp/doc/rbinter/it/66/16.html
-
- dosTime = date.getHours();
- dosTime = dosTime << 6;
- dosTime = dosTime | date.getMinutes();
- dosTime = dosTime << 5;
- dosTime = dosTime | date.getSeconds() / 2;
-
- dosDate = date.getFullYear() - 1980;
- dosDate = dosDate << 4;
- dosDate = dosDate | (date.getMonth() + 1);
- dosDate = dosDate << 5;
- dosDate = dosDate | date.getDate();
-
- if (useUTF8ForFileName) {
- // set the unicode path extra field. unzip needs at least one extra
- // field to correctly handle unicode path, so using the path is as good
- // as any other information. This could improve the situation with
- // other archive managers too.
- // This field is usually used without the utf8 flag, with a non
- // unicode path in the header (winrar, winzip). This helps (a bit)
- // with the messy Windows' default compressed folders feature but
- // breaks on p7zip which doesn't seek the unicode path extra field.
- // So for now, UTF-8 everywhere !
- unicodePathExtraField =
- // Version
- decToHex(1, 1) +
- // NameCRC32
- decToHex(crc32(utfEncodedFileName), 4) +
- // UnicodeName
- utfEncodedFileName;
-
- extraFields +=
- // Info-ZIP Unicode Path Extra Field
- "\x75\x70" +
- // size
- decToHex(unicodePathExtraField.length, 2) +
- // content
- unicodePathExtraField;
- }
-
- if(useUTF8ForComment) {
-
- unicodeCommentExtraField =
- // Version
- decToHex(1, 1) +
- // CommentCRC32
- decToHex(this.crc32(utfEncodedComment), 4) +
- // UnicodeName
- utfEncodedComment;
-
- extraFields +=
- // Info-ZIP Unicode Path Extra Field
- "\x75\x63" +
- // size
- decToHex(unicodeCommentExtraField.length, 2) +
- // content
- unicodeCommentExtraField;
- }
-
- var header = "";
-
- // version needed to extract
- header += "\x0A\x00";
- // general purpose bit flag
- // set bit 11 if utf8
- header += (useUTF8ForFileName || useUTF8ForComment) ? "\x00\x08" : "\x00\x00";
- // compression method
- header += compressedObject.compressionMethod;
- // last mod file time
- header += decToHex(dosTime, 2);
- // last mod file date
- header += decToHex(dosDate, 2);
- // crc-32
- header += decToHex(compressedObject.crc32, 4);
- // compressed size
- header += decToHex(compressedObject.compressedSize, 4);
- // uncompressed size
- header += decToHex(compressedObject.uncompressedSize, 4);
- // file name length
- header += decToHex(utfEncodedFileName.length, 2);
- // extra field length
- header += decToHex(extraFields.length, 2);
-
-
- var fileRecord = signature.LOCAL_FILE_HEADER + header + utfEncodedFileName + extraFields;
-
- var dirRecord = signature.CENTRAL_FILE_HEADER +
- // version made by (00: DOS)
- decToHex(versionMadeBy, 2) +
- // file header (common to file and central directory)
- header +
- // file comment length
- decToHex(utfEncodedComment.length, 2) +
- // disk number start
- "\x00\x00" +
- // internal file attributes TODO
- "\x00\x00" +
- // external file attributes
- decToHex(extFileAttr, 4) +
- // relative offset of local header
- decToHex(offset, 4) +
- // file name
- utfEncodedFileName +
- // extra field
- extraFields +
- // file comment
- utfEncodedComment;
-
- return {
- fileRecord: fileRecord,
- dirRecord: dirRecord,
- compressedObject: compressedObject
- };
-};
-
-
-// return the actual prototype of JSZip
-var out = {
- /**
- * Read an existing zip and merge the data in the current JSZip object.
- * The implementation is in jszip-load.js, don't forget to include it.
- * @param {String|ArrayBuffer|Uint8Array|Buffer} stream The stream to load
- * @param {Object} options Options for loading the stream.
- * options.base64 : is the stream in base64 ? default : false
- * @return {JSZip} the current JSZip object
- */
- load: function(stream, options) {
- throw new Error("Load method is not defined. Is the file jszip-load.js included ?");
- },
-
- /**
- * Filter nested files/folders with the specified function.
- * @param {Function} search the predicate to use :
- * function (relativePath, file) {...}
- * It takes 2 arguments : the relative path and the file.
- * @return {Array} An array of matching elements.
- */
- filter: function(search) {
- var result = [],
- filename, relativePath, file, fileClone;
- for (filename in this.files) {
- if (!this.files.hasOwnProperty(filename)) {
- continue;
- }
- file = this.files[filename];
- // return a new object, don't let the user mess with our internal objects :)
- fileClone = new ZipObject(file.name, file._data, extend(file.options));
- relativePath = filename.slice(this.root.length, filename.length);
- if (filename.slice(0, this.root.length) === this.root && // the file is in the current root
- search(relativePath, fileClone)) { // and the file matches the function
- result.push(fileClone);
- }
- }
- return result;
- },
-
- /**
- * Add a file to the zip file, or search a file.
- * @param {string|RegExp} name The name of the file to add (if data is defined),
- * the name of the file to find (if no data) or a regex to match files.
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data The file data, either raw or base64 encoded
- * @param {Object} o File options
- * @return {JSZip|Object|Array} this JSZip object (when adding a file),
- * a file (when searching by string) or an array of files (when searching by regex).
- */
- file: function(name, data, o) {
- if (arguments.length === 1) {
- if (utils.isRegExp(name)) {
- var regexp = name;
- return this.filter(function(relativePath, file) {
- return !file.dir && regexp.test(relativePath);
- });
- }
- else { // text
- return this.filter(function(relativePath, file) {
- return !file.dir && relativePath === name;
- })[0] || null;
- }
- }
- else { // more than one argument : we have data !
- name = this.root + name;
- fileAdd.call(this, name, data, o);
- }
- return this;
- },
-
- /**
- * Add a directory to the zip file, or search.
- * @param {String|RegExp} arg The name of the directory to add, or a regex to search folders.
- * @return {JSZip} an object with the new directory as the root, or an array containing matching folders.
- */
- folder: function(arg) {
- if (!arg) {
- return this;
- }
-
- if (utils.isRegExp(arg)) {
- return this.filter(function(relativePath, file) {
- return file.dir && arg.test(relativePath);
- });
- }
-
- // else, name is a new folder
- var name = this.root + arg;
- var newFolder = folderAdd.call(this, name);
-
- // Allow chaining by returning a new object with this folder as the root
- var ret = this.clone();
- ret.root = newFolder.name;
- return ret;
- },
-
- /**
- * Delete a file, or a directory and all sub-files, from the zip
- * @param {string} name the name of the file to delete
- * @return {JSZip} this JSZip object
- */
- remove: function(name) {
- name = this.root + name;
- var file = this.files[name];
- if (!file) {
- // Look for any folders
- if (name.slice(-1) != "/") {
- name += "/";
- }
- file = this.files[name];
- }
-
- if (file && !file.dir) {
- // file
- delete this.files[name];
- } else {
- // maybe a folder, delete recursively
- var kids = this.filter(function(relativePath, file) {
- return file.name.slice(0, name.length) === name;
- });
- for (var i = 0; i < kids.length; i++) {
- delete this.files[kids[i].name];
- }
- }
-
- return this;
- },
-
- /**
- * Generate the complete zip file
- * @param {Object} options the options to generate the zip file :
- * - base64, (deprecated, use type instead) true to generate base64.
- * - compression, "STORE" by default.
- * - type, "base64" by default. Values are : string, base64, uint8array, arraybuffer, blob.
- * @return {String|Uint8Array|ArrayBuffer|Buffer|Blob} the zip file
- */
- generate: function(options) {
- options = extend(options || {}, {
- base64: true,
- compression: "STORE",
- compressionOptions : null,
- type: "base64",
- platform: "DOS",
- comment: null,
- mimeType: 'application/zip'
- });
-
- utils.checkSupport(options.type);
-
- // accept nodejs `process.platform`
- if(
- options.platform === 'darwin' ||
- options.platform === 'freebsd' ||
- options.platform === 'linux' ||
- options.platform === 'sunos'
- ) {
- options.platform = "UNIX";
- }
- if (options.platform === 'win32') {
- options.platform = "DOS";
- }
-
- var zipData = [],
- localDirLength = 0,
- centralDirLength = 0,
- writer, i,
- utfEncodedComment = utils.transformTo("string", this.utf8encode(options.comment || this.comment || ""));
-
- // first, generate all the zip parts.
- for (var name in this.files) {
- if (!this.files.hasOwnProperty(name)) {
- continue;
- }
- var file = this.files[name];
-
- var compressionName = file.options.compression || options.compression.toUpperCase();
- var compression = compressions[compressionName];
- if (!compression) {
- throw new Error(compressionName + " is not a valid compression method !");
- }
- var compressionOptions = file.options.compressionOptions || options.compressionOptions || {};
-
- var compressedObject = generateCompressedObjectFrom.call(this, file, compression, compressionOptions);
-
- var zipPart = generateZipParts.call(this, name, file, compressedObject, localDirLength, options.platform);
- localDirLength += zipPart.fileRecord.length + compressedObject.compressedSize;
- centralDirLength += zipPart.dirRecord.length;
- zipData.push(zipPart);
- }
-
- var dirEnd = "";
-
- // end of central dir signature
- dirEnd = signature.CENTRAL_DIRECTORY_END +
- // number of this disk
- "\x00\x00" +
- // number of the disk with the start of the central directory
- "\x00\x00" +
- // total number of entries in the central directory on this disk
- decToHex(zipData.length, 2) +
- // total number of entries in the central directory
- decToHex(zipData.length, 2) +
- // size of the central directory 4 bytes
- decToHex(centralDirLength, 4) +
- // offset of start of central directory with respect to the starting disk number
- decToHex(localDirLength, 4) +
- // .ZIP file comment length
- decToHex(utfEncodedComment.length, 2) +
- // .ZIP file comment
- utfEncodedComment;
-
-
- // we have all the parts (and the total length)
- // time to create a writer !
- var typeName = options.type.toLowerCase();
- if(typeName==="uint8array"||typeName==="arraybuffer"||typeName==="blob"||typeName==="nodebuffer") {
- writer = new Uint8ArrayWriter(localDirLength + centralDirLength + dirEnd.length);
- }else{
- writer = new StringWriter(localDirLength + centralDirLength + dirEnd.length);
- }
-
- for (i = 0; i < zipData.length; i++) {
- writer.append(zipData[i].fileRecord);
- writer.append(zipData[i].compressedObject.compressedContent);
- }
- for (i = 0; i < zipData.length; i++) {
- writer.append(zipData[i].dirRecord);
- }
-
- writer.append(dirEnd);
-
- var zip = writer.finalize();
-
-
-
- switch(options.type.toLowerCase()) {
- // case "zip is an Uint8Array"
- case "uint8array" :
- case "arraybuffer" :
- case "nodebuffer" :
- return utils.transformTo(options.type.toLowerCase(), zip);
- case "blob" :
- return utils.arrayBuffer2Blob(utils.transformTo("arraybuffer", zip), options.mimeType);
- // case "zip is a string"
- case "base64" :
- return (options.base64) ? base64.encode(zip) : zip;
- default : // case "string" :
- return zip;
- }
-
- },
-
- /**
- * @deprecated
- * This method will be removed in a future version without replacement.
- */
- crc32: function (input, crc) {
- return crc32(input, crc);
- },
-
- /**
- * @deprecated
- * This method will be removed in a future version without replacement.
- */
- utf8encode: function (string) {
- return utils.transformTo("string", utf8.utf8encode(string));
- },
-
- /**
- * @deprecated
- * This method will be removed in a future version without replacement.
- */
- utf8decode: function (input) {
- return utf8.utf8decode(input);
- }
-};
-module.exports = out;
-
-},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(_dereq_,module,exports){
-'use strict';
-exports.LOCAL_FILE_HEADER = "PK\x03\x04";
-exports.CENTRAL_FILE_HEADER = "PK\x01\x02";
-exports.CENTRAL_DIRECTORY_END = "PK\x05\x06";
-exports.ZIP64_CENTRAL_DIRECTORY_LOCATOR = "PK\x06\x07";
-exports.ZIP64_CENTRAL_DIRECTORY_END = "PK\x06\x06";
-exports.DATA_DESCRIPTOR = "PK\x07\x08";
-
-},{}],15:[function(_dereq_,module,exports){
-'use strict';
-var DataReader = _dereq_('./dataReader');
-var utils = _dereq_('./utils');
-
-function StringReader(data, optimizedBinaryString) {
- this.data = data;
- if (!optimizedBinaryString) {
- this.data = utils.string2binary(this.data);
- }
- this.length = this.data.length;
- this.index = 0;
-}
-StringReader.prototype = new DataReader();
-/**
- * @see DataReader.byteAt
- */
-StringReader.prototype.byteAt = function(i) {
- return this.data.charCodeAt(i);
-};
-/**
- * @see DataReader.lastIndexOfSignature
- */
-StringReader.prototype.lastIndexOfSignature = function(sig) {
- return this.data.lastIndexOf(sig);
-};
-/**
- * @see DataReader.readData
- */
-StringReader.prototype.readData = function(size) {
- this.checkOffset(size);
- // this will work because the constructor applied the "& 0xff" mask.
- var result = this.data.slice(this.index, this.index + size);
- this.index += size;
- return result;
-};
-module.exports = StringReader;
-
-},{"./dataReader":5,"./utils":21}],16:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-/**
- * An object to write any content to a string.
- * @constructor
- */
-var StringWriter = function() {
- this.data = [];
-};
-StringWriter.prototype = {
- /**
- * Append any content to the current string.
- * @param {Object} input the content to add.
- */
- append: function(input) {
- input = utils.transformTo("string", input);
- this.data.push(input);
- },
- /**
- * Finalize the construction an return the result.
- * @return {string} the generated string.
- */
- finalize: function() {
- return this.data.join("");
- }
-};
-
-module.exports = StringWriter;
-
-},{"./utils":21}],17:[function(_dereq_,module,exports){
-(function (Buffer){
-'use strict';
-exports.base64 = true;
-exports.array = true;
-exports.string = true;
-exports.arraybuffer = typeof ArrayBuffer !== "undefined" && typeof Uint8Array !== "undefined";
-// contains true if JSZip can read/generate nodejs Buffer, false otherwise.
-// Browserify will provide a Buffer implementation for browsers, which is
-// an augmented Uint8Array (i.e., can be used as either Buffer or U8).
-exports.nodebuffer = typeof Buffer !== "undefined";
-// contains true if JSZip can read/generate Uint8Array, false otherwise.
-exports.uint8array = typeof Uint8Array !== "undefined";
-
-if (typeof ArrayBuffer === "undefined") {
- exports.blob = false;
-}
-else {
- var buffer = new ArrayBuffer(0);
- try {
- exports.blob = new Blob([buffer], {
- type: "application/zip"
- }).size === 0;
- }
- catch (e) {
- try {
- var Builder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
- var builder = new Builder();
- builder.append(buffer);
- exports.blob = builder.getBlob('application/zip').size === 0;
- }
- catch (e) {
- exports.blob = false;
- }
- }
-}
-
-}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
-},{}],18:[function(_dereq_,module,exports){
-'use strict';
-var DataReader = _dereq_('./dataReader');
-
-function Uint8ArrayReader(data) {
- if (data) {
- this.data = data;
- this.length = this.data.length;
- this.index = 0;
- }
-}
-Uint8ArrayReader.prototype = new DataReader();
-/**
- * @see DataReader.byteAt
- */
-Uint8ArrayReader.prototype.byteAt = function(i) {
- return this.data[i];
-};
-/**
- * @see DataReader.lastIndexOfSignature
- */
-Uint8ArrayReader.prototype.lastIndexOfSignature = function(sig) {
- var sig0 = sig.charCodeAt(0),
- sig1 = sig.charCodeAt(1),
- sig2 = sig.charCodeAt(2),
- sig3 = sig.charCodeAt(3);
- for (var i = this.length - 4; i >= 0; --i) {
- if (this.data[i] === sig0 && this.data[i + 1] === sig1 && this.data[i + 2] === sig2 && this.data[i + 3] === sig3) {
- return i;
- }
- }
-
- return -1;
-};
-/**
- * @see DataReader.readData
- */
-Uint8ArrayReader.prototype.readData = function(size) {
- this.checkOffset(size);
- if(size === 0) {
- // in IE10, when using subarray(idx, idx), we get the array [0x00] instead of [].
- return new Uint8Array(0);
- }
- var result = this.data.subarray(this.index, this.index + size);
- this.index += size;
- return result;
-};
-module.exports = Uint8ArrayReader;
-
-},{"./dataReader":5}],19:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-/**
- * An object to write any content to an Uint8Array.
- * @constructor
- * @param {number} length The length of the array.
- */
-var Uint8ArrayWriter = function(length) {
- this.data = new Uint8Array(length);
- this.index = 0;
-};
-Uint8ArrayWriter.prototype = {
- /**
- * Append any content to the current array.
- * @param {Object} input the content to add.
- */
- append: function(input) {
- if (input.length !== 0) {
- // with an empty Uint8Array, Opera fails with a "Offset larger than array size"
- input = utils.transformTo("uint8array", input);
- this.data.set(input, this.index);
- this.index += input.length;
- }
- },
- /**
- * Finalize the construction an return the result.
- * @return {Uint8Array} the generated array.
- */
- finalize: function() {
- return this.data;
- }
-};
-
-module.exports = Uint8ArrayWriter;
-
-},{"./utils":21}],20:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-var support = _dereq_('./support');
-var nodeBuffer = _dereq_('./nodeBuffer');
-
-/**
- * The following functions come from pako, from pako/lib/utils/strings
- * released under the MIT license, see pako https://github.com/nodeca/pako/
- */
-
-// Table with utf8 lengths (calculated by first byte of sequence)
-// Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
-// because max possible codepoint is 0x10ffff
-var _utf8len = new Array(256);
-for (var i=0; i<256; i++) {
- _utf8len[i] = (i >= 252 ? 6 : i >= 248 ? 5 : i >= 240 ? 4 : i >= 224 ? 3 : i >= 192 ? 2 : 1);
-}
-_utf8len[254]=_utf8len[254]=1; // Invalid sequence start
-
-// convert string to array (typed, when possible)
-var string2buf = function (str) {
- var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
-
- // count binary size
- for (m_pos = 0; m_pos < str_len; m_pos++) {
- c = str.charCodeAt(m_pos);
- if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
- c2 = str.charCodeAt(m_pos+1);
- if ((c2 & 0xfc00) === 0xdc00) {
- c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
- m_pos++;
- }
- }
- buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
- }
-
- // allocate buffer
- if (support.uint8array) {
- buf = new Uint8Array(buf_len);
- } else {
- buf = new Array(buf_len);
- }
-
- // convert
- for (i=0, m_pos = 0; i < buf_len; m_pos++) {
- c = str.charCodeAt(m_pos);
- if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
- c2 = str.charCodeAt(m_pos+1);
- if ((c2 & 0xfc00) === 0xdc00) {
- c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
- m_pos++;
- }
- }
- if (c < 0x80) {
- /* one byte */
- buf[i++] = c;
- } else if (c < 0x800) {
- /* two bytes */
- buf[i++] = 0xC0 | (c >>> 6);
- buf[i++] = 0x80 | (c & 0x3f);
- } else if (c < 0x10000) {
- /* three bytes */
- buf[i++] = 0xE0 | (c >>> 12);
- buf[i++] = 0x80 | (c >>> 6 & 0x3f);
- buf[i++] = 0x80 | (c & 0x3f);
- } else {
- /* four bytes */
- buf[i++] = 0xf0 | (c >>> 18);
- buf[i++] = 0x80 | (c >>> 12 & 0x3f);
- buf[i++] = 0x80 | (c >>> 6 & 0x3f);
- buf[i++] = 0x80 | (c & 0x3f);
- }
- }
-
- return buf;
-};
-
-// Calculate max possible position in utf8 buffer,
-// that will not break sequence. If that's not possible
-// - (very small limits) return max size as is.
-//
-// buf[] - utf8 bytes array
-// max - length limit (mandatory);
-var utf8border = function(buf, max) {
- var pos;
-
- max = max || buf.length;
- if (max > buf.length) { max = buf.length; }
-
- // go back from last position, until start of sequence found
- pos = max-1;
- while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
-
- // Fuckup - very small and broken sequence,
- // return max, because we should return something anyway.
- if (pos < 0) { return max; }
-
- // If we came to start of buffer - that means vuffer is too small,
- // return max too.
- if (pos === 0) { return max; }
-
- return (pos + _utf8len[buf[pos]] > max) ? pos : max;
-};
-
-// convert array to string
-var buf2string = function (buf) {
- var str, i, out, c, c_len;
- var len = buf.length;
-
- // Reserve max possible length (2 words per char)
- // NB: by unknown reasons, Array is significantly faster for
- // String.fromCharCode.apply than Uint16Array.
- var utf16buf = new Array(len*2);
-
- for (out=0, i=0; i 4) { utf16buf[out++] = 0xfffd; i += c_len-1; continue; }
-
- // apply mask on first byte
- c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
- // join the rest
- while (c_len > 1 && i < len) {
- c = (c << 6) | (buf[i++] & 0x3f);
- c_len--;
- }
-
- // terminated by end of string?
- if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
-
- if (c < 0x10000) {
- utf16buf[out++] = c;
- } else {
- c -= 0x10000;
- utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
- utf16buf[out++] = 0xdc00 | (c & 0x3ff);
- }
- }
-
- // shrinkBuf(utf16buf, out)
- if (utf16buf.length !== out) {
- if(utf16buf.subarray) {
- utf16buf = utf16buf.subarray(0, out);
- } else {
- utf16buf.length = out;
- }
- }
-
- // return String.fromCharCode.apply(null, utf16buf);
- return utils.applyFromCharCode(utf16buf);
-};
-
-
-// That's all for the pako functions.
-
-
-/**
- * Transform a javascript string into an array (typed if possible) of bytes,
- * UTF-8 encoded.
- * @param {String} str the string to encode
- * @return {Array|Uint8Array|Buffer} the UTF-8 encoded string.
- */
-exports.utf8encode = function utf8encode(str) {
- if (support.nodebuffer) {
- return nodeBuffer(str, "utf-8");
- }
-
- return string2buf(str);
-};
-
-
-/**
- * Transform a bytes array (or a representation) representing an UTF-8 encoded
- * string into a javascript string.
- * @param {Array|Uint8Array|Buffer} buf the data de decode
- * @return {String} the decoded string.
- */
-exports.utf8decode = function utf8decode(buf) {
- if (support.nodebuffer) {
- return utils.transformTo("nodebuffer", buf).toString("utf-8");
- }
-
- buf = utils.transformTo(support.uint8array ? "uint8array" : "array", buf);
-
- // return buf2string(buf);
- // Chrome prefers to work with "small" chunks of data
- // for the method buf2string.
- // Firefox and Chrome has their own shortcut, IE doesn't seem to really care.
- var result = [], k = 0, len = buf.length, chunk = 65536;
- while (k < len) {
- var nextBoundary = utf8border(buf, Math.min(k + chunk, len));
- if (support.uint8array) {
- result.push(buf2string(buf.subarray(k, nextBoundary)));
- } else {
- result.push(buf2string(buf.slice(k, nextBoundary)));
- }
- k = nextBoundary;
- }
- return result.join("");
-
-};
-// vim: set shiftwidth=4 softtabstop=4:
-
-},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(_dereq_,module,exports){
-'use strict';
-var support = _dereq_('./support');
-var compressions = _dereq_('./compressions');
-var nodeBuffer = _dereq_('./nodeBuffer');
-/**
- * Convert a string to a "binary string" : a string containing only char codes between 0 and 255.
- * @param {string} str the string to transform.
- * @return {String} the binary string.
- */
-exports.string2binary = function(str) {
- var result = "";
- for (var i = 0; i < str.length; i++) {
- result += String.fromCharCode(str.charCodeAt(i) & 0xff);
- }
- return result;
-};
-exports.arrayBuffer2Blob = function(buffer, mimeType) {
- exports.checkSupport("blob");
- mimeType = mimeType || 'application/zip';
-
- try {
- // Blob constructor
- return new Blob([buffer], {
- type: mimeType
- });
- }
- catch (e) {
-
- try {
- // deprecated, browser only, old way
- var Builder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
- var builder = new Builder();
- builder.append(buffer);
- return builder.getBlob(mimeType);
- }
- catch (e) {
-
- // well, fuck ?!
- throw new Error("Bug : can't construct the Blob.");
- }
- }
-
-
-};
-/**
- * The identity function.
- * @param {Object} input the input.
- * @return {Object} the same input.
- */
-function identity(input) {
- return input;
-}
-
-/**
- * Fill in an array with a string.
- * @param {String} str the string to use.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to fill in (will be mutated).
- * @return {Array|ArrayBuffer|Uint8Array|Buffer} the updated array.
- */
-function stringToArrayLike(str, array) {
- for (var i = 0; i < str.length; ++i) {
- array[i] = str.charCodeAt(i) & 0xFF;
- }
- return array;
-}
-
-/**
- * Transform an array-like object to a string.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
- * @return {String} the result.
- */
-function arrayLikeToString(array) {
- // Performances notes :
- // --------------------
- // String.fromCharCode.apply(null, array) is the fastest, see
- // see http://jsperf.com/converting-a-uint8array-to-a-string/2
- // but the stack is limited (and we can get huge arrays !).
- //
- // result += String.fromCharCode(array[i]); generate too many strings !
- //
- // This code is inspired by http://jsperf.com/arraybuffer-to-string-apply-performance/2
- var chunk = 65536;
- var result = [],
- len = array.length,
- type = exports.getTypeOf(array),
- k = 0,
- canUseApply = true;
- try {
- switch(type) {
- case "uint8array":
- String.fromCharCode.apply(null, new Uint8Array(0));
- break;
- case "nodebuffer":
- String.fromCharCode.apply(null, nodeBuffer(0));
- break;
- }
- } catch(e) {
- canUseApply = false;
- }
-
- // no apply : slow and painful algorithm
- // default browser on android 4.*
- if (!canUseApply) {
- var resultStr = "";
- for(var i = 0; i < array.length;i++) {
- resultStr += String.fromCharCode(array[i]);
- }
- return resultStr;
- }
- while (k < len && chunk > 1) {
- try {
- if (type === "array" || type === "nodebuffer") {
- result.push(String.fromCharCode.apply(null, array.slice(k, Math.min(k + chunk, len))));
- }
- else {
- result.push(String.fromCharCode.apply(null, array.subarray(k, Math.min(k + chunk, len))));
- }
- k += chunk;
- }
- catch (e) {
- chunk = Math.floor(chunk / 2);
- }
- }
- return result.join("");
-}
-
-exports.applyFromCharCode = arrayLikeToString;
-
-
-/**
- * Copy the data from an array-like to an other array-like.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} arrayFrom the origin array.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} arrayTo the destination array which will be mutated.
- * @return {Array|ArrayBuffer|Uint8Array|Buffer} the updated destination array.
- */
-function arrayLikeToArrayLike(arrayFrom, arrayTo) {
- for (var i = 0; i < arrayFrom.length; i++) {
- arrayTo[i] = arrayFrom[i];
- }
- return arrayTo;
-}
-
-// a matrix containing functions to transform everything into everything.
-var transform = {};
-
-// string to ?
-transform["string"] = {
- "string": identity,
- "array": function(input) {
- return stringToArrayLike(input, new Array(input.length));
- },
- "arraybuffer": function(input) {
- return transform["string"]["uint8array"](input).buffer;
- },
- "uint8array": function(input) {
- return stringToArrayLike(input, new Uint8Array(input.length));
- },
- "nodebuffer": function(input) {
- return stringToArrayLike(input, nodeBuffer(input.length));
- }
-};
-
-// array to ?
-transform["array"] = {
- "string": arrayLikeToString,
- "array": identity,
- "arraybuffer": function(input) {
- return (new Uint8Array(input)).buffer;
- },
- "uint8array": function(input) {
- return new Uint8Array(input);
- },
- "nodebuffer": function(input) {
- return nodeBuffer(input);
- }
-};
-
-// arraybuffer to ?
-transform["arraybuffer"] = {
- "string": function(input) {
- return arrayLikeToString(new Uint8Array(input));
- },
- "array": function(input) {
- return arrayLikeToArrayLike(new Uint8Array(input), new Array(input.byteLength));
- },
- "arraybuffer": identity,
- "uint8array": function(input) {
- return new Uint8Array(input);
- },
- "nodebuffer": function(input) {
- return nodeBuffer(new Uint8Array(input));
- }
-};
-
-// uint8array to ?
-transform["uint8array"] = {
- "string": arrayLikeToString,
- "array": function(input) {
- return arrayLikeToArrayLike(input, new Array(input.length));
- },
- "arraybuffer": function(input) {
- return input.buffer;
- },
- "uint8array": identity,
- "nodebuffer": function(input) {
- return nodeBuffer(input);
- }
-};
-
-// nodebuffer to ?
-transform["nodebuffer"] = {
- "string": arrayLikeToString,
- "array": function(input) {
- return arrayLikeToArrayLike(input, new Array(input.length));
- },
- "arraybuffer": function(input) {
- return transform["nodebuffer"]["uint8array"](input).buffer;
- },
- "uint8array": function(input) {
- return arrayLikeToArrayLike(input, new Uint8Array(input.length));
- },
- "nodebuffer": identity
-};
-
-/**
- * Transform an input into any type.
- * The supported output type are : string, array, uint8array, arraybuffer, nodebuffer.
- * If no output type is specified, the unmodified input will be returned.
- * @param {String} outputType the output type.
- * @param {String|Array|ArrayBuffer|Uint8Array|Buffer} input the input to convert.
- * @throws {Error} an Error if the browser doesn't support the requested output type.
- */
-exports.transformTo = function(outputType, input) {
- if (!input) {
- // undefined, null, etc
- // an empty string won't harm.
- input = "";
- }
- if (!outputType) {
- return input;
- }
- exports.checkSupport(outputType);
- var inputType = exports.getTypeOf(input);
- var result = transform[inputType][outputType](input);
- return result;
-};
-
-/**
- * Return the type of the input.
- * The type will be in a format valid for JSZip.utils.transformTo : string, array, uint8array, arraybuffer.
- * @param {Object} input the input to identify.
- * @return {String} the (lowercase) type of the input.
- */
-exports.getTypeOf = function(input) {
- if (typeof input === "string") {
- return "string";
- }
- if (Object.prototype.toString.call(input) === "[object Array]") {
- return "array";
- }
- if (support.nodebuffer && nodeBuffer.test(input)) {
- return "nodebuffer";
- }
- if (support.uint8array && input instanceof Uint8Array) {
- return "uint8array";
- }
- if (support.arraybuffer && input instanceof ArrayBuffer) {
- return "arraybuffer";
- }
-};
-
-/**
- * Throw an exception if the type is not supported.
- * @param {String} type the type to check.
- * @throws {Error} an Error if the browser doesn't support the requested type.
- */
-exports.checkSupport = function(type) {
- var supported = support[type.toLowerCase()];
- if (!supported) {
- throw new Error(type + " is not supported by this browser");
- }
-};
-exports.MAX_VALUE_16BITS = 65535;
-exports.MAX_VALUE_32BITS = -1; // well, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" is parsed as -1
-
-/**
- * Prettify a string read as binary.
- * @param {string} str the string to prettify.
- * @return {string} a pretty string.
- */
-exports.pretty = function(str) {
- var res = '',
- code, i;
- for (i = 0; i < (str || "").length; i++) {
- code = str.charCodeAt(i);
- res += '\\x' + (code < 16 ? "0" : "") + code.toString(16).toUpperCase();
- }
- return res;
-};
-
-/**
- * Find a compression registered in JSZip.
- * @param {string} compressionMethod the method magic to find.
- * @return {Object|null} the JSZip compression object, null if none found.
- */
-exports.findCompression = function(compressionMethod) {
- for (var method in compressions) {
- if (!compressions.hasOwnProperty(method)) {
- continue;
- }
- if (compressions[method].magic === compressionMethod) {
- return compressions[method];
- }
- }
- return null;
-};
-/**
-* Cross-window, cross-Node-context regular expression detection
-* @param {Object} object Anything
-* @return {Boolean} true if the object is a regular expression,
-* false otherwise
-*/
-exports.isRegExp = function (object) {
- return Object.prototype.toString.call(object) === "[object RegExp]";
-};
-
-
-},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(_dereq_,module,exports){
-'use strict';
-var StringReader = _dereq_('./stringReader');
-var NodeBufferReader = _dereq_('./nodeBufferReader');
-var Uint8ArrayReader = _dereq_('./uint8ArrayReader');
-var utils = _dereq_('./utils');
-var sig = _dereq_('./signature');
-var ZipEntry = _dereq_('./zipEntry');
-var support = _dereq_('./support');
-var jszipProto = _dereq_('./object');
-// class ZipEntries {{{
-/**
- * All the entries in the zip file.
- * @constructor
- * @param {String|ArrayBuffer|Uint8Array} data the binary stream to load.
- * @param {Object} loadOptions Options for loading the stream.
- */
-function ZipEntries(data, loadOptions) {
- this.files = [];
- this.loadOptions = loadOptions;
- if (data) {
- this.load(data);
- }
-}
-ZipEntries.prototype = {
- /**
- * Check that the reader is on the speficied signature.
- * @param {string} expectedSignature the expected signature.
- * @throws {Error} if it is an other signature.
- */
- checkSignature: function(expectedSignature) {
- var signature = this.reader.readString(4);
- if (signature !== expectedSignature) {
- throw new Error("Corrupted zip or bug : unexpected signature " + "(" + utils.pretty(signature) + ", expected " + utils.pretty(expectedSignature) + ")");
- }
- },
- /**
- * Read the end of the central directory.
- */
- readBlockEndOfCentral: function() {
- this.diskNumber = this.reader.readInt(2);
- this.diskWithCentralDirStart = this.reader.readInt(2);
- this.centralDirRecordsOnThisDisk = this.reader.readInt(2);
- this.centralDirRecords = this.reader.readInt(2);
- this.centralDirSize = this.reader.readInt(4);
- this.centralDirOffset = this.reader.readInt(4);
-
- this.zipCommentLength = this.reader.readInt(2);
- // warning : the encoding depends of the system locale
- // On a linux machine with LANG=en_US.utf8, this field is utf8 encoded.
- // On a windows machine, this field is encoded with the localized windows code page.
- this.zipComment = this.reader.readString(this.zipCommentLength);
- // To get consistent behavior with the generation part, we will assume that
- // this is utf8 encoded.
- this.zipComment = jszipProto.utf8decode(this.zipComment);
- },
- /**
- * Read the end of the Zip 64 central directory.
- * Not merged with the method readEndOfCentral :
- * The end of central can coexist with its Zip64 brother,
- * I don't want to read the wrong number of bytes !
- */
- readBlockZip64EndOfCentral: function() {
- this.zip64EndOfCentralSize = this.reader.readInt(8);
- this.versionMadeBy = this.reader.readString(2);
- this.versionNeeded = this.reader.readInt(2);
- this.diskNumber = this.reader.readInt(4);
- this.diskWithCentralDirStart = this.reader.readInt(4);
- this.centralDirRecordsOnThisDisk = this.reader.readInt(8);
- this.centralDirRecords = this.reader.readInt(8);
- this.centralDirSize = this.reader.readInt(8);
- this.centralDirOffset = this.reader.readInt(8);
-
- this.zip64ExtensibleData = {};
- var extraDataSize = this.zip64EndOfCentralSize - 44,
- index = 0,
- extraFieldId,
- extraFieldLength,
- extraFieldValue;
- while (index < extraDataSize) {
- extraFieldId = this.reader.readInt(2);
- extraFieldLength = this.reader.readInt(4);
- extraFieldValue = this.reader.readString(extraFieldLength);
- this.zip64ExtensibleData[extraFieldId] = {
- id: extraFieldId,
- length: extraFieldLength,
- value: extraFieldValue
- };
- }
- },
- /**
- * Read the end of the Zip 64 central directory locator.
- */
- readBlockZip64EndOfCentralLocator: function() {
- this.diskWithZip64CentralDirStart = this.reader.readInt(4);
- this.relativeOffsetEndOfZip64CentralDir = this.reader.readInt(8);
- this.disksCount = this.reader.readInt(4);
- if (this.disksCount > 1) {
- throw new Error("Multi-volumes zip are not supported");
- }
- },
- /**
- * Read the local files, based on the offset read in the central part.
- */
- readLocalFiles: function() {
- var i, file;
- for (i = 0; i < this.files.length; i++) {
- file = this.files[i];
- this.reader.setIndex(file.localHeaderOffset);
- this.checkSignature(sig.LOCAL_FILE_HEADER);
- file.readLocalPart(this.reader);
- file.handleUTF8();
- file.processAttributes();
- }
- },
- /**
- * Read the central directory.
- */
- readCentralDir: function() {
- var file;
-
- this.reader.setIndex(this.centralDirOffset);
- while (this.reader.readString(4) === sig.CENTRAL_FILE_HEADER) {
- file = new ZipEntry({
- zip64: this.zip64
- }, this.loadOptions);
- file.readCentralPart(this.reader);
- this.files.push(file);
- }
- },
- /**
- * Read the end of central directory.
- */
- readEndOfCentral: function() {
- var offset = this.reader.lastIndexOfSignature(sig.CENTRAL_DIRECTORY_END);
- if (offset === -1) {
- // Check if the content is a truncated zip or complete garbage.
- // A "LOCAL_FILE_HEADER" is not required at the beginning (auto
- // extractible zip for example) but it can give a good hint.
- // If an ajax request was used without responseType, we will also
- // get unreadable data.
- var isGarbage = true;
- try {
- this.reader.setIndex(0);
- this.checkSignature(sig.LOCAL_FILE_HEADER);
- isGarbage = false;
- } catch (e) {}
-
- if (isGarbage) {
- throw new Error("Can't find end of central directory : is this a zip file ? " +
- "If it is, see http://stuk.github.io/jszip/documentation/howto/read_zip.html");
- } else {
- throw new Error("Corrupted zip : can't find end of central directory");
- }
- }
- this.reader.setIndex(offset);
- this.checkSignature(sig.CENTRAL_DIRECTORY_END);
- this.readBlockEndOfCentral();
-
-
- /* extract from the zip spec :
- 4) If one of the fields in the end of central directory
- record is too small to hold required data, the field
- should be set to -1 (0xFFFF or 0xFFFFFFFF) and the
- ZIP64 format record should be created.
- 5) The end of central directory record and the
- Zip64 end of central directory locator record must
- reside on the same disk when splitting or spanning
- an archive.
- */
- if (this.diskNumber === utils.MAX_VALUE_16BITS || this.diskWithCentralDirStart === utils.MAX_VALUE_16BITS || this.centralDirRecordsOnThisDisk === utils.MAX_VALUE_16BITS || this.centralDirRecords === utils.MAX_VALUE_16BITS || this.centralDirSize === utils.MAX_VALUE_32BITS || this.centralDirOffset === utils.MAX_VALUE_32BITS) {
- this.zip64 = true;
-
- /*
- Warning : the zip64 extension is supported, but ONLY if the 64bits integer read from
- the zip file can fit into a 32bits integer. This cannot be solved : Javascript represents
- all numbers as 64-bit double precision IEEE 754 floating point numbers.
- So, we have 53bits for integers and bitwise operations treat everything as 32bits.
- see https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Operators/Bitwise_Operators
- and http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf section 8.5
- */
-
- // should look for a zip64 EOCD locator
- offset = this.reader.lastIndexOfSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
- if (offset === -1) {
- throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");
- }
- this.reader.setIndex(offset);
- this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
- this.readBlockZip64EndOfCentralLocator();
-
- // now the zip64 EOCD record
- this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir);
- this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_END);
- this.readBlockZip64EndOfCentral();
- }
- },
- prepareReader: function(data) {
- var type = utils.getTypeOf(data);
- if (type === "string" && !support.uint8array) {
- this.reader = new StringReader(data, this.loadOptions.optimizedBinaryString);
- }
- else if (type === "nodebuffer") {
- this.reader = new NodeBufferReader(data);
- }
- else {
- this.reader = new Uint8ArrayReader(utils.transformTo("uint8array", data));
- }
- },
- /**
- * Read a zip file and create ZipEntries.
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the binary string representing a zip file.
- */
- load: function(data) {
- this.prepareReader(data);
- this.readEndOfCentral();
- this.readCentralDir();
- this.readLocalFiles();
- }
-};
-// }}} end of ZipEntries
-module.exports = ZipEntries;
-
-},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(_dereq_,module,exports){
-'use strict';
-var StringReader = _dereq_('./stringReader');
-var utils = _dereq_('./utils');
-var CompressedObject = _dereq_('./compressedObject');
-var jszipProto = _dereq_('./object');
-
-var MADE_BY_DOS = 0x00;
-var MADE_BY_UNIX = 0x03;
-
-// class ZipEntry {{{
-/**
- * An entry in the zip file.
- * @constructor
- * @param {Object} options Options of the current file.
- * @param {Object} loadOptions Options for loading the stream.
- */
-function ZipEntry(options, loadOptions) {
- this.options = options;
- this.loadOptions = loadOptions;
-}
-ZipEntry.prototype = {
- /**
- * say if the file is encrypted.
- * @return {boolean} true if the file is encrypted, false otherwise.
- */
- isEncrypted: function() {
- // bit 1 is set
- return (this.bitFlag & 0x0001) === 0x0001;
- },
- /**
- * say if the file has utf-8 filename/comment.
- * @return {boolean} true if the filename/comment is in utf-8, false otherwise.
- */
- useUTF8: function() {
- // bit 11 is set
- return (this.bitFlag & 0x0800) === 0x0800;
- },
- /**
- * Prepare the function used to generate the compressed content from this ZipFile.
- * @param {DataReader} reader the reader to use.
- * @param {number} from the offset from where we should read the data.
- * @param {number} length the length of the data to read.
- * @return {Function} the callback to get the compressed content (the type depends of the DataReader class).
- */
- prepareCompressedContent: function(reader, from, length) {
- return function() {
- var previousIndex = reader.index;
- reader.setIndex(from);
- var compressedFileData = reader.readData(length);
- reader.setIndex(previousIndex);
-
- return compressedFileData;
- };
- },
- /**
- * Prepare the function used to generate the uncompressed content from this ZipFile.
- * @param {DataReader} reader the reader to use.
- * @param {number} from the offset from where we should read the data.
- * @param {number} length the length of the data to read.
- * @param {JSZip.compression} compression the compression used on this file.
- * @param {number} uncompressedSize the uncompressed size to expect.
- * @return {Function} the callback to get the uncompressed content (the type depends of the DataReader class).
- */
- prepareContent: function(reader, from, length, compression, uncompressedSize) {
- return function() {
-
- var compressedFileData = utils.transformTo(compression.uncompressInputType, this.getCompressedContent());
- var uncompressedFileData = compression.uncompress(compressedFileData);
-
- if (uncompressedFileData.length !== uncompressedSize) {
- throw new Error("Bug : uncompressed data size mismatch");
- }
-
- return uncompressedFileData;
- };
- },
- /**
- * Read the local part of a zip file and add the info in this object.
- * @param {DataReader} reader the reader to use.
- */
- readLocalPart: function(reader) {
- var compression, localExtraFieldsLength;
-
- // we already know everything from the central dir !
- // If the central dir data are false, we are doomed.
- // On the bright side, the local part is scary : zip64, data descriptors, both, etc.
- // The less data we get here, the more reliable this should be.
- // Let's skip the whole header and dash to the data !
- reader.skip(22);
- // in some zip created on windows, the filename stored in the central dir contains \ instead of /.
- // Strangely, the filename here is OK.
- // I would love to treat these zip files as corrupted (see http://www.info-zip.org/FAQ.html#backslashes
- // or APPNOTE#4.4.17.1, "All slashes MUST be forward slashes '/'") but there are a lot of bad zip generators...
- // Search "unzip mismatching "local" filename continuing with "central" filename version" on
- // the internet.
- //
- // I think I see the logic here : the central directory is used to display
- // content and the local directory is used to extract the files. Mixing / and \
- // may be used to display \ to windows users and use / when extracting the files.
- // Unfortunately, this lead also to some issues : http://seclists.org/fulldisclosure/2009/Sep/394
- this.fileNameLength = reader.readInt(2);
- localExtraFieldsLength = reader.readInt(2); // can't be sure this will be the same as the central dir
- this.fileName = reader.readString(this.fileNameLength);
- reader.skip(localExtraFieldsLength);
-
- if (this.compressedSize == -1 || this.uncompressedSize == -1) {
- throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory " + "(compressedSize == -1 || uncompressedSize == -1)");
- }
-
- compression = utils.findCompression(this.compressionMethod);
- if (compression === null) { // no compression found
- throw new Error("Corrupted zip : compression " + utils.pretty(this.compressionMethod) + " unknown (inner file : " + this.fileName + ")");
- }
- this.decompressed = new CompressedObject();
- this.decompressed.compressedSize = this.compressedSize;
- this.decompressed.uncompressedSize = this.uncompressedSize;
- this.decompressed.crc32 = this.crc32;
- this.decompressed.compressionMethod = this.compressionMethod;
- this.decompressed.getCompressedContent = this.prepareCompressedContent(reader, reader.index, this.compressedSize, compression);
- this.decompressed.getContent = this.prepareContent(reader, reader.index, this.compressedSize, compression, this.uncompressedSize);
-
- // we need to compute the crc32...
- if (this.loadOptions.checkCRC32) {
- this.decompressed = utils.transformTo("string", this.decompressed.getContent());
- if (jszipProto.crc32(this.decompressed) !== this.crc32) {
- throw new Error("Corrupted zip : CRC32 mismatch");
- }
- }
- },
-
- /**
- * Read the central part of a zip file and add the info in this object.
- * @param {DataReader} reader the reader to use.
- */
- readCentralPart: function(reader) {
- this.versionMadeBy = reader.readInt(2);
- this.versionNeeded = reader.readInt(2);
- this.bitFlag = reader.readInt(2);
- this.compressionMethod = reader.readString(2);
- this.date = reader.readDate();
- this.crc32 = reader.readInt(4);
- this.compressedSize = reader.readInt(4);
- this.uncompressedSize = reader.readInt(4);
- this.fileNameLength = reader.readInt(2);
- this.extraFieldsLength = reader.readInt(2);
- this.fileCommentLength = reader.readInt(2);
- this.diskNumberStart = reader.readInt(2);
- this.internalFileAttributes = reader.readInt(2);
- this.externalFileAttributes = reader.readInt(4);
- this.localHeaderOffset = reader.readInt(4);
-
- if (this.isEncrypted()) {
- throw new Error("Encrypted zip are not supported");
- }
-
- this.fileName = reader.readString(this.fileNameLength);
- this.readExtraFields(reader);
- this.parseZIP64ExtraField(reader);
- this.fileComment = reader.readString(this.fileCommentLength);
- },
-
- /**
- * Parse the external file attributes and get the unix/dos permissions.
- */
- processAttributes: function () {
- this.unixPermissions = null;
- this.dosPermissions = null;
- var madeBy = this.versionMadeBy >> 8;
-
- // Check if we have the DOS directory flag set.
- // We look for it in the DOS and UNIX permissions
- // but some unknown platform could set it as a compatibility flag.
- this.dir = this.externalFileAttributes & 0x0010 ? true : false;
-
- if(madeBy === MADE_BY_DOS) {
- // first 6 bits (0 to 5)
- this.dosPermissions = this.externalFileAttributes & 0x3F;
- }
-
- if(madeBy === MADE_BY_UNIX) {
- this.unixPermissions = (this.externalFileAttributes >> 16) & 0xFFFF;
- // the octal permissions are in (this.unixPermissions & 0x01FF).toString(8);
- }
-
- // fail safe : if the name ends with a / it probably means a folder
- if (!this.dir && this.fileName.slice(-1) === '/') {
- this.dir = true;
- }
- },
-
- /**
- * Parse the ZIP64 extra field and merge the info in the current ZipEntry.
- * @param {DataReader} reader the reader to use.
- */
- parseZIP64ExtraField: function(reader) {
-
- if (!this.extraFields[0x0001]) {
- return;
- }
-
- // should be something, preparing the extra reader
- var extraReader = new StringReader(this.extraFields[0x0001].value);
-
- // I really hope that these 64bits integer can fit in 32 bits integer, because js
- // won't let us have more.
- if (this.uncompressedSize === utils.MAX_VALUE_32BITS) {
- this.uncompressedSize = extraReader.readInt(8);
- }
- if (this.compressedSize === utils.MAX_VALUE_32BITS) {
- this.compressedSize = extraReader.readInt(8);
- }
- if (this.localHeaderOffset === utils.MAX_VALUE_32BITS) {
- this.localHeaderOffset = extraReader.readInt(8);
- }
- if (this.diskNumberStart === utils.MAX_VALUE_32BITS) {
- this.diskNumberStart = extraReader.readInt(4);
- }
- },
- /**
- * Read the central part of a zip file and add the info in this object.
- * @param {DataReader} reader the reader to use.
- */
- readExtraFields: function(reader) {
- var start = reader.index,
- extraFieldId,
- extraFieldLength,
- extraFieldValue;
-
- this.extraFields = this.extraFields || {};
-
- while (reader.index < start + this.extraFieldsLength) {
- extraFieldId = reader.readInt(2);
- extraFieldLength = reader.readInt(2);
- extraFieldValue = reader.readString(extraFieldLength);
-
- this.extraFields[extraFieldId] = {
- id: extraFieldId,
- length: extraFieldLength,
- value: extraFieldValue
- };
- }
- },
- /**
- * Apply an UTF8 transformation if needed.
- */
- handleUTF8: function() {
- if (this.useUTF8()) {
- this.fileName = jszipProto.utf8decode(this.fileName);
- this.fileComment = jszipProto.utf8decode(this.fileComment);
- } else {
- var upath = this.findExtraFieldUnicodePath();
- if (upath !== null) {
- this.fileName = upath;
- }
- var ucomment = this.findExtraFieldUnicodeComment();
- if (ucomment !== null) {
- this.fileComment = ucomment;
- }
- }
- },
-
- /**
- * Find the unicode path declared in the extra field, if any.
- * @return {String} the unicode path, null otherwise.
- */
- findExtraFieldUnicodePath: function() {
- var upathField = this.extraFields[0x7075];
- if (upathField) {
- var extraReader = new StringReader(upathField.value);
-
- // wrong version
- if (extraReader.readInt(1) !== 1) {
- return null;
- }
-
- // the crc of the filename changed, this field is out of date.
- if (jszipProto.crc32(this.fileName) !== extraReader.readInt(4)) {
- return null;
- }
-
- return jszipProto.utf8decode(extraReader.readString(upathField.length - 5));
- }
- return null;
- },
-
- /**
- * Find the unicode comment declared in the extra field, if any.
- * @return {String} the unicode comment, null otherwise.
- */
- findExtraFieldUnicodeComment: function() {
- var ucommentField = this.extraFields[0x6375];
- if (ucommentField) {
- var extraReader = new StringReader(ucommentField.value);
-
- // wrong version
- if (extraReader.readInt(1) !== 1) {
- return null;
- }
-
- // the crc of the comment changed, this field is out of date.
- if (jszipProto.crc32(this.fileComment) !== extraReader.readInt(4)) {
- return null;
- }
-
- return jszipProto.utf8decode(extraReader.readString(ucommentField.length - 5));
- }
- return null;
- }
-};
-module.exports = ZipEntry;
-
-},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(_dereq_,module,exports){
-// Top level file is just a mixin of submodules & constants
-'use strict';
-
-var assign = _dereq_('./lib/utils/common').assign;
-
-var deflate = _dereq_('./lib/deflate');
-var inflate = _dereq_('./lib/inflate');
-var constants = _dereq_('./lib/zlib/constants');
-
-var pako = {};
-
-assign(pako, deflate, inflate, constants);
-
-module.exports = pako;
-},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(_dereq_,module,exports){
-'use strict';
-
-
-var zlib_deflate = _dereq_('./zlib/deflate.js');
-var utils = _dereq_('./utils/common');
-var strings = _dereq_('./utils/strings');
-var msg = _dereq_('./zlib/messages');
-var zstream = _dereq_('./zlib/zstream');
-
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-var Z_NO_FLUSH = 0;
-var Z_FINISH = 4;
-
-var Z_OK = 0;
-var Z_STREAM_END = 1;
-
-var Z_DEFAULT_COMPRESSION = -1;
-
-var Z_DEFAULT_STRATEGY = 0;
-
-var Z_DEFLATED = 8;
-
-/* ===========================================================================*/
-
-
-/**
- * class Deflate
- *
- * Generic JS-style wrapper for zlib calls. If you don't need
- * streaming behaviour - use more simple functions: [[deflate]],
- * [[deflateRaw]] and [[gzip]].
- **/
-
-/* internal
- * Deflate.chunks -> Array
- *
- * Chunks of output data, if [[Deflate#onData]] not overriden.
- **/
-
-/**
- * Deflate.result -> Uint8Array|Array
- *
- * Compressed result, generated by default [[Deflate#onData]]
- * and [[Deflate#onEnd]] handlers. Filled after you push last chunk
- * (call [[Deflate#push]] with `Z_FINISH` / `true` param).
- **/
-
-/**
- * Deflate.err -> Number
- *
- * Error code after deflate finished. 0 (Z_OK) on success.
- * You will not need it in real life, because deflate errors
- * are possible only on wrong options or bad `onData` / `onEnd`
- * custom handlers.
- **/
-
-/**
- * Deflate.msg -> String
- *
- * Error message, if [[Deflate.err]] != 0
- **/
-
-
-/**
- * new Deflate(options)
- * - options (Object): zlib deflate options.
- *
- * Creates new deflator instance with specified params. Throws exception
- * on bad params. Supported options:
- *
- * - `level`
- * - `windowBits`
- * - `memLevel`
- * - `strategy`
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Additional options, for internal needs:
- *
- * - `chunkSize` - size of generated data chunks (16K by default)
- * - `raw` (Boolean) - do raw deflate
- * - `gzip` (Boolean) - create gzip wrapper
- * - `to` (String) - if equal to 'string', then result will be "binary string"
- * (each char code [0..255])
- * - `header` (Object) - custom header for gzip
- * - `text` (Boolean) - true if compressed data believed to be text
- * - `time` (Number) - modification time, unix timestamp
- * - `os` (Number) - operation system code
- * - `extra` (Array) - array of bytes with extra data (max 65536)
- * - `name` (String) - file name (binary string)
- * - `comment` (String) - comment (binary string)
- * - `hcrc` (Boolean) - true if header crc should be added
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- * , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
- * , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
- *
- * var deflate = new pako.Deflate({ level: 3});
- *
- * deflate.push(chunk1, false);
- * deflate.push(chunk2, true); // true -> last chunk
- *
- * if (deflate.err) { throw new Error(deflate.err); }
- *
- * console.log(deflate.result);
- * ```
- **/
-var Deflate = function(options) {
-
- this.options = utils.assign({
- level: Z_DEFAULT_COMPRESSION,
- method: Z_DEFLATED,
- chunkSize: 16384,
- windowBits: 15,
- memLevel: 8,
- strategy: Z_DEFAULT_STRATEGY,
- to: ''
- }, options || {});
-
- var opt = this.options;
-
- if (opt.raw && (opt.windowBits > 0)) {
- opt.windowBits = -opt.windowBits;
- }
-
- else if (opt.gzip && (opt.windowBits > 0) && (opt.windowBits < 16)) {
- opt.windowBits += 16;
- }
-
- this.err = 0; // error code, if happens (0 = Z_OK)
- this.msg = ''; // error message
- this.ended = false; // used to avoid multiple onEnd() calls
- this.chunks = []; // chunks of compressed data
-
- this.strm = new zstream();
- this.strm.avail_out = 0;
-
- var status = zlib_deflate.deflateInit2(
- this.strm,
- opt.level,
- opt.method,
- opt.windowBits,
- opt.memLevel,
- opt.strategy
- );
-
- if (status !== Z_OK) {
- throw new Error(msg[status]);
- }
-
- if (opt.header) {
- zlib_deflate.deflateSetHeader(this.strm, opt.header);
- }
-};
-
-/**
- * Deflate#push(data[, mode]) -> Boolean
- * - data (Uint8Array|Array|String): input data. Strings will be converted to
- * utf8 byte sequence.
- * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
- * See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
- *
- * Sends input data to deflate pipe, generating [[Deflate#onData]] calls with
- * new compressed chunks. Returns `true` on success. The last data block must have
- * mode Z_FINISH (or `true`). That flush internal pending buffers and call
- * [[Deflate#onEnd]].
- *
- * On fail call [[Deflate#onEnd]] with error code and return false.
- *
- * We strongly recommend to use `Uint8Array` on input for best speed (output
- * array format is detected automatically). Also, don't skip last param and always
- * use the same type in your code (boolean or number). That will improve JS speed.
- *
- * For regular `Array`-s make sure all elements are [0..255].
- *
- * ##### Example
- *
- * ```javascript
- * push(chunk, false); // push one of data chunks
- * ...
- * push(chunk, true); // push last chunk
- * ```
- **/
-Deflate.prototype.push = function(data, mode) {
- var strm = this.strm;
- var chunkSize = this.options.chunkSize;
- var status, _mode;
-
- if (this.ended) { return false; }
-
- _mode = (mode === ~~mode) ? mode : ((mode === true) ? Z_FINISH : Z_NO_FLUSH);
-
- // Convert data if needed
- if (typeof data === 'string') {
- // If we need to compress text, change encoding to utf8.
- strm.input = strings.string2buf(data);
- } else {
- strm.input = data;
- }
-
- strm.next_in = 0;
- strm.avail_in = strm.input.length;
-
- do {
- if (strm.avail_out === 0) {
- strm.output = new utils.Buf8(chunkSize);
- strm.next_out = 0;
- strm.avail_out = chunkSize;
- }
- status = zlib_deflate.deflate(strm, _mode); /* no bad return value */
-
- if (status !== Z_STREAM_END && status !== Z_OK) {
- this.onEnd(status);
- this.ended = true;
- return false;
- }
- if (strm.avail_out === 0 || (strm.avail_in === 0 && _mode === Z_FINISH)) {
- if (this.options.to === 'string') {
- this.onData(strings.buf2binstring(utils.shrinkBuf(strm.output, strm.next_out)));
- } else {
- this.onData(utils.shrinkBuf(strm.output, strm.next_out));
- }
- }
- } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== Z_STREAM_END);
-
- // Finalize on the last chunk.
- if (_mode === Z_FINISH) {
- status = zlib_deflate.deflateEnd(this.strm);
- this.onEnd(status);
- this.ended = true;
- return status === Z_OK;
- }
-
- return true;
-};
-
-
-/**
- * Deflate#onData(chunk) -> Void
- * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
- * on js engine support. When string output requested, each chunk
- * will be string.
- *
- * By default, stores data blocks in `chunks[]` property and glue
- * those in `onEnd`. Override this handler, if you need another behaviour.
- **/
-Deflate.prototype.onData = function(chunk) {
- this.chunks.push(chunk);
-};
-
-
-/**
- * Deflate#onEnd(status) -> Void
- * - status (Number): deflate status. 0 (Z_OK) on success,
- * other if not.
- *
- * Called once after you tell deflate that input stream complete
- * or error happenned. By default - join collected chunks,
- * free memory and fill `results` / `err` properties.
- **/
-Deflate.prototype.onEnd = function(status) {
- // On success - join
- if (status === Z_OK) {
- if (this.options.to === 'string') {
- this.result = this.chunks.join('');
- } else {
- this.result = utils.flattenChunks(this.chunks);
- }
- }
- this.chunks = [];
- this.err = status;
- this.msg = this.strm.msg;
-};
-
-
-/**
- * deflate(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * Compress `data` with deflate alrorythm and `options`.
- *
- * Supported options are:
- *
- * - level
- * - windowBits
- * - memLevel
- * - strategy
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Sugar (options):
- *
- * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
- * negative windowBits implicitly.
- * - `to` (String) - if equal to 'string', then result will be "binary string"
- * (each char code [0..255])
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- * , data = Uint8Array([1,2,3,4,5,6,7,8,9]);
- *
- * console.log(pako.deflate(data));
- * ```
- **/
-function deflate(input, options) {
- var deflator = new Deflate(options);
-
- deflator.push(input, true);
-
- // That will never happens, if you don't cheat with options :)
- if (deflator.err) { throw deflator.msg; }
-
- return deflator.result;
-}
-
-
-/**
- * deflateRaw(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * The same as [[deflate]], but creates raw data, without wrapper
- * (header and adler32 crc).
- **/
-function deflateRaw(input, options) {
- options = options || {};
- options.raw = true;
- return deflate(input, options);
-}
-
-
-/**
- * gzip(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * The same as [[deflate]], but create gzip wrapper instead of
- * deflate one.
- **/
-function gzip(input, options) {
- options = options || {};
- options.gzip = true;
- return deflate(input, options);
-}
-
-
-exports.Deflate = Deflate;
-exports.deflate = deflate;
-exports.deflateRaw = deflateRaw;
-exports.gzip = gzip;
-},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(_dereq_,module,exports){
-'use strict';
-
-
-var zlib_inflate = _dereq_('./zlib/inflate.js');
-var utils = _dereq_('./utils/common');
-var strings = _dereq_('./utils/strings');
-var c = _dereq_('./zlib/constants');
-var msg = _dereq_('./zlib/messages');
-var zstream = _dereq_('./zlib/zstream');
-var gzheader = _dereq_('./zlib/gzheader');
-
-
-/**
- * class Inflate
- *
- * Generic JS-style wrapper for zlib calls. If you don't need
- * streaming behaviour - use more simple functions: [[inflate]]
- * and [[inflateRaw]].
- **/
-
-/* internal
- * inflate.chunks -> Array
- *
- * Chunks of output data, if [[Inflate#onData]] not overriden.
- **/
-
-/**
- * Inflate.result -> Uint8Array|Array|String
- *
- * Uncompressed result, generated by default [[Inflate#onData]]
- * and [[Inflate#onEnd]] handlers. Filled after you push last chunk
- * (call [[Inflate#push]] with `Z_FINISH` / `true` param).
- **/
-
-/**
- * Inflate.err -> Number
- *
- * Error code after inflate finished. 0 (Z_OK) on success.
- * Should be checked if broken data possible.
- **/
-
-/**
- * Inflate.msg -> String
- *
- * Error message, if [[Inflate.err]] != 0
- **/
-
-
-/**
- * new Inflate(options)
- * - options (Object): zlib inflate options.
- *
- * Creates new inflator instance with specified params. Throws exception
- * on bad params. Supported options:
- *
- * - `windowBits`
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Additional options, for internal needs:
- *
- * - `chunkSize` - size of generated data chunks (16K by default)
- * - `raw` (Boolean) - do raw inflate
- * - `to` (String) - if equal to 'string', then result will be converted
- * from utf8 to utf16 (javascript) string. When string output requested,
- * chunk length can differ from `chunkSize`, depending on content.
- *
- * By default, when no options set, autodetect deflate/gzip data format via
- * wrapper header.
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- * , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
- * , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
- *
- * var inflate = new pako.Inflate({ level: 3});
- *
- * inflate.push(chunk1, false);
- * inflate.push(chunk2, true); // true -> last chunk
- *
- * if (inflate.err) { throw new Error(inflate.err); }
- *
- * console.log(inflate.result);
- * ```
- **/
-var Inflate = function(options) {
-
- this.options = utils.assign({
- chunkSize: 16384,
- windowBits: 0,
- to: ''
- }, options || {});
-
- var opt = this.options;
-
- // Force window size for `raw` data, if not set directly,
- // because we have no header for autodetect.
- if (opt.raw && (opt.windowBits >= 0) && (opt.windowBits < 16)) {
- opt.windowBits = -opt.windowBits;
- if (opt.windowBits === 0) { opt.windowBits = -15; }
- }
-
- // If `windowBits` not defined (and mode not raw) - set autodetect flag for gzip/deflate
- if ((opt.windowBits >= 0) && (opt.windowBits < 16) &&
- !(options && options.windowBits)) {
- opt.windowBits += 32;
- }
-
- // Gzip header has no info about windows size, we can do autodetect only
- // for deflate. So, if window size not set, force it to max when gzip possible
- if ((opt.windowBits > 15) && (opt.windowBits < 48)) {
- // bit 3 (16) -> gzipped data
- // bit 4 (32) -> autodetect gzip/deflate
- if ((opt.windowBits & 15) === 0) {
- opt.windowBits |= 15;
- }
- }
-
- this.err = 0; // error code, if happens (0 = Z_OK)
- this.msg = ''; // error message
- this.ended = false; // used to avoid multiple onEnd() calls
- this.chunks = []; // chunks of compressed data
-
- this.strm = new zstream();
- this.strm.avail_out = 0;
-
- var status = zlib_inflate.inflateInit2(
- this.strm,
- opt.windowBits
- );
-
- if (status !== c.Z_OK) {
- throw new Error(msg[status]);
- }
-
- this.header = new gzheader();
-
- zlib_inflate.inflateGetHeader(this.strm, this.header);
-};
-
-/**
- * Inflate#push(data[, mode]) -> Boolean
- * - data (Uint8Array|Array|String): input data
- * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
- * See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
- *
- * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with
- * new output chunks. Returns `true` on success. The last data block must have
- * mode Z_FINISH (or `true`). That flush internal pending buffers and call
- * [[Inflate#onEnd]].
- *
- * On fail call [[Inflate#onEnd]] with error code and return false.
- *
- * We strongly recommend to use `Uint8Array` on input for best speed (output
- * format is detected automatically). Also, don't skip last param and always
- * use the same type in your code (boolean or number). That will improve JS speed.
- *
- * For regular `Array`-s make sure all elements are [0..255].
- *
- * ##### Example
- *
- * ```javascript
- * push(chunk, false); // push one of data chunks
- * ...
- * push(chunk, true); // push last chunk
- * ```
- **/
-Inflate.prototype.push = function(data, mode) {
- var strm = this.strm;
- var chunkSize = this.options.chunkSize;
- var status, _mode;
- var next_out_utf8, tail, utf8str;
-
- if (this.ended) { return false; }
- _mode = (mode === ~~mode) ? mode : ((mode === true) ? c.Z_FINISH : c.Z_NO_FLUSH);
-
- // Convert data if needed
- if (typeof data === 'string') {
- // Only binary strings can be decompressed on practice
- strm.input = strings.binstring2buf(data);
- } else {
- strm.input = data;
- }
-
- strm.next_in = 0;
- strm.avail_in = strm.input.length;
-
- do {
- if (strm.avail_out === 0) {
- strm.output = new utils.Buf8(chunkSize);
- strm.next_out = 0;
- strm.avail_out = chunkSize;
- }
-
- status = zlib_inflate.inflate(strm, c.Z_NO_FLUSH); /* no bad return value */
-
- if (status !== c.Z_STREAM_END && status !== c.Z_OK) {
- this.onEnd(status);
- this.ended = true;
- return false;
- }
-
- if (strm.next_out) {
- if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && _mode === c.Z_FINISH)) {
-
- if (this.options.to === 'string') {
-
- next_out_utf8 = strings.utf8border(strm.output, strm.next_out);
-
- tail = strm.next_out - next_out_utf8;
- utf8str = strings.buf2string(strm.output, next_out_utf8);
-
- // move tail
- strm.next_out = tail;
- strm.avail_out = chunkSize - tail;
- if (tail) { utils.arraySet(strm.output, strm.output, next_out_utf8, tail, 0); }
-
- this.onData(utf8str);
-
- } else {
- this.onData(utils.shrinkBuf(strm.output, strm.next_out));
- }
- }
- }
- } while ((strm.avail_in > 0) && status !== c.Z_STREAM_END);
-
- if (status === c.Z_STREAM_END) {
- _mode = c.Z_FINISH;
- }
- // Finalize on the last chunk.
- if (_mode === c.Z_FINISH) {
- status = zlib_inflate.inflateEnd(this.strm);
- this.onEnd(status);
- this.ended = true;
- return status === c.Z_OK;
- }
-
- return true;
-};
-
-
-/**
- * Inflate#onData(chunk) -> Void
- * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
- * on js engine support. When string output requested, each chunk
- * will be string.
- *
- * By default, stores data blocks in `chunks[]` property and glue
- * those in `onEnd`. Override this handler, if you need another behaviour.
- **/
-Inflate.prototype.onData = function(chunk) {
- this.chunks.push(chunk);
-};
-
-
-/**
- * Inflate#onEnd(status) -> Void
- * - status (Number): inflate status. 0 (Z_OK) on success,
- * other if not.
- *
- * Called once after you tell inflate that input stream complete
- * or error happenned. By default - join collected chunks,
- * free memory and fill `results` / `err` properties.
- **/
-Inflate.prototype.onEnd = function(status) {
- // On success - join
- if (status === c.Z_OK) {
- if (this.options.to === 'string') {
- // Glue & convert here, until we teach pako to send
- // utf8 alligned strings to onData
- this.result = this.chunks.join('');
- } else {
- this.result = utils.flattenChunks(this.chunks);
- }
- }
- this.chunks = [];
- this.err = status;
- this.msg = this.strm.msg;
-};
-
-
-/**
- * inflate(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * Decompress `data` with inflate/ungzip and `options`. Autodetect
- * format via wrapper header by default. That's why we don't provide
- * separate `ungzip` method.
- *
- * Supported options are:
- *
- * - windowBits
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information.
- *
- * Sugar (options):
- *
- * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
- * negative windowBits implicitly.
- * - `to` (String) - if equal to 'string', then result will be converted
- * from utf8 to utf16 (javascript) string. When string output requested,
- * chunk length can differ from `chunkSize`, depending on content.
- *
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- * , input = pako.deflate([1,2,3,4,5,6,7,8,9])
- * , output;
- *
- * try {
- * output = pako.inflate(input);
- * } catch (err)
- * console.log(err);
- * }
- * ```
- **/
-function inflate(input, options) {
- var inflator = new Inflate(options);
-
- inflator.push(input, true);
-
- // That will never happens, if you don't cheat with options :)
- if (inflator.err) { throw inflator.msg; }
-
- return inflator.result;
-}
-
-
-/**
- * inflateRaw(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * The same as [[inflate]], but creates raw data, without wrapper
- * (header and adler32 crc).
- **/
-function inflateRaw(input, options) {
- options = options || {};
- options.raw = true;
- return inflate(input, options);
-}
-
-
-/**
- * ungzip(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * Just shortcut to [[inflate]], because it autodetects format
- * by header.content. Done for convenience.
- **/
-
-
-exports.Inflate = Inflate;
-exports.inflate = inflate;
-exports.inflateRaw = inflateRaw;
-exports.ungzip = inflate;
-
-},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(_dereq_,module,exports){
-'use strict';
-
-
-var TYPED_OK = (typeof Uint8Array !== 'undefined') &&
- (typeof Uint16Array !== 'undefined') &&
- (typeof Int32Array !== 'undefined');
-
-
-exports.assign = function (obj /*from1, from2, from3, ...*/) {
- var sources = Array.prototype.slice.call(arguments, 1);
- while (sources.length) {
- var source = sources.shift();
- if (!source) { continue; }
-
- if (typeof(source) !== 'object') {
- throw new TypeError(source + 'must be non-object');
- }
-
- for (var p in source) {
- if (source.hasOwnProperty(p)) {
- obj[p] = source[p];
- }
- }
- }
-
- return obj;
-};
-
-
-// reduce buffer size, avoiding mem copy
-exports.shrinkBuf = function (buf, size) {
- if (buf.length === size) { return buf; }
- if (buf.subarray) { return buf.subarray(0, size); }
- buf.length = size;
- return buf;
-};
-
-
-var fnTyped = {
- arraySet: function (dest, src, src_offs, len, dest_offs) {
- if (src.subarray && dest.subarray) {
- dest.set(src.subarray(src_offs, src_offs+len), dest_offs);
- return;
- }
- // Fallback to ordinary array
- for(var i=0; i= 252 ? 6 : i >= 248 ? 5 : i >= 240 ? 4 : i >= 224 ? 3 : i >= 192 ? 2 : 1);
-}
-_utf8len[254]=_utf8len[254]=1; // Invalid sequence start
-
-
-// convert string to array (typed, when possible)
-exports.string2buf = function (str) {
- var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
-
- // count binary size
- for (m_pos = 0; m_pos < str_len; m_pos++) {
- c = str.charCodeAt(m_pos);
- if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
- c2 = str.charCodeAt(m_pos+1);
- if ((c2 & 0xfc00) === 0xdc00) {
- c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
- m_pos++;
- }
- }
- buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
- }
-
- // allocate buffer
- buf = new utils.Buf8(buf_len);
-
- // convert
- for (i=0, m_pos = 0; i < buf_len; m_pos++) {
- c = str.charCodeAt(m_pos);
- if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
- c2 = str.charCodeAt(m_pos+1);
- if ((c2 & 0xfc00) === 0xdc00) {
- c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
- m_pos++;
- }
- }
- if (c < 0x80) {
- /* one byte */
- buf[i++] = c;
- } else if (c < 0x800) {
- /* two bytes */
- buf[i++] = 0xC0 | (c >>> 6);
- buf[i++] = 0x80 | (c & 0x3f);
- } else if (c < 0x10000) {
- /* three bytes */
- buf[i++] = 0xE0 | (c >>> 12);
- buf[i++] = 0x80 | (c >>> 6 & 0x3f);
- buf[i++] = 0x80 | (c & 0x3f);
- } else {
- /* four bytes */
- buf[i++] = 0xf0 | (c >>> 18);
- buf[i++] = 0x80 | (c >>> 12 & 0x3f);
- buf[i++] = 0x80 | (c >>> 6 & 0x3f);
- buf[i++] = 0x80 | (c & 0x3f);
- }
- }
-
- return buf;
-};
-
-// Helper (used in 2 places)
-function buf2binstring(buf, len) {
- // use fallback for big arrays to avoid stack overflow
- if (len < 65537) {
- if ((buf.subarray && STR_APPLY_UIA_OK) || (!buf.subarray && STR_APPLY_OK)) {
- return String.fromCharCode.apply(null, utils.shrinkBuf(buf, len));
- }
- }
-
- var result = '';
- for(var i=0; i < len; i++) {
- result += String.fromCharCode(buf[i]);
- }
- return result;
-}
-
-
-// Convert byte array to binary string
-exports.buf2binstring = function(buf) {
- return buf2binstring(buf, buf.length);
-};
-
-
-// Convert binary string (typed, when possible)
-exports.binstring2buf = function(str) {
- var buf = new utils.Buf8(str.length);
- for(var i=0, len=buf.length; i < len; i++) {
- buf[i] = str.charCodeAt(i);
- }
- return buf;
-};
-
-
-// convert array to string
-exports.buf2string = function (buf, max) {
- var i, out, c, c_len;
- var len = max || buf.length;
-
- // Reserve max possible length (2 words per char)
- // NB: by unknown reasons, Array is significantly faster for
- // String.fromCharCode.apply than Uint16Array.
- var utf16buf = new Array(len*2);
-
- for (out=0, i=0; i 4) { utf16buf[out++] = 0xfffd; i += c_len-1; continue; }
-
- // apply mask on first byte
- c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
- // join the rest
- while (c_len > 1 && i < len) {
- c = (c << 6) | (buf[i++] & 0x3f);
- c_len--;
- }
-
- // terminated by end of string?
- if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
-
- if (c < 0x10000) {
- utf16buf[out++] = c;
- } else {
- c -= 0x10000;
- utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
- utf16buf[out++] = 0xdc00 | (c & 0x3ff);
- }
- }
-
- return buf2binstring(utf16buf, out);
-};
-
-
-// Calculate max possible position in utf8 buffer,
-// that will not break sequence. If that's not possible
-// - (very small limits) return max size as is.
-//
-// buf[] - utf8 bytes array
-// max - length limit (mandatory);
-exports.utf8border = function(buf, max) {
- var pos;
-
- max = max || buf.length;
- if (max > buf.length) { max = buf.length; }
-
- // go back from last position, until start of sequence found
- pos = max-1;
- while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
-
- // Fuckup - very small and broken sequence,
- // return max, because we should return something anyway.
- if (pos < 0) { return max; }
-
- // If we came to start of buffer - that means vuffer is too small,
- // return max too.
- if (pos === 0) { return max; }
-
- return (pos + _utf8len[buf[pos]] > max) ? pos : max;
-};
-
-},{"./common":27}],29:[function(_dereq_,module,exports){
-'use strict';
-
-// Note: adler32 takes 12% for level 0 and 2% for level 6.
-// It doesn't worth to make additional optimizationa as in original.
-// Small size is preferable.
-
-function adler32(adler, buf, len, pos) {
- var s1 = (adler & 0xffff) |0
- , s2 = ((adler >>> 16) & 0xffff) |0
- , n = 0;
-
- while (len !== 0) {
- // Set limit ~ twice less than 5552, to keep
- // s2 in 31-bits, because we force signed ints.
- // in other case %= will fail.
- n = len > 2000 ? 2000 : len;
- len -= n;
-
- do {
- s1 = (s1 + buf[pos++]) |0;
- s2 = (s2 + s1) |0;
- } while (--n);
-
- s1 %= 65521;
- s2 %= 65521;
- }
-
- return (s1 | (s2 << 16)) |0;
-}
-
-
-module.exports = adler32;
-},{}],30:[function(_dereq_,module,exports){
-module.exports = {
-
- /* Allowed flush values; see deflate() and inflate() below for details */
- Z_NO_FLUSH: 0,
- Z_PARTIAL_FLUSH: 1,
- Z_SYNC_FLUSH: 2,
- Z_FULL_FLUSH: 3,
- Z_FINISH: 4,
- Z_BLOCK: 5,
- Z_TREES: 6,
-
- /* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
- Z_OK: 0,
- Z_STREAM_END: 1,
- Z_NEED_DICT: 2,
- Z_ERRNO: -1,
- Z_STREAM_ERROR: -2,
- Z_DATA_ERROR: -3,
- //Z_MEM_ERROR: -4,
- Z_BUF_ERROR: -5,
- //Z_VERSION_ERROR: -6,
-
- /* compression levels */
- Z_NO_COMPRESSION: 0,
- Z_BEST_SPEED: 1,
- Z_BEST_COMPRESSION: 9,
- Z_DEFAULT_COMPRESSION: -1,
-
-
- Z_FILTERED: 1,
- Z_HUFFMAN_ONLY: 2,
- Z_RLE: 3,
- Z_FIXED: 4,
- Z_DEFAULT_STRATEGY: 0,
-
- /* Possible values of the data_type field (though see inflate()) */
- Z_BINARY: 0,
- Z_TEXT: 1,
- //Z_ASCII: 1, // = Z_TEXT (deprecated)
- Z_UNKNOWN: 2,
-
- /* The deflate compression method */
- Z_DEFLATED: 8
- //Z_NULL: null // Use -1 or null inline, depending on var type
-};
-},{}],31:[function(_dereq_,module,exports){
-'use strict';
-
-// Note: we can't get significant speed boost here.
-// So write code to minimize size - no pregenerated tables
-// and array tools dependencies.
-
-
-// Use ordinary array, since untyped makes no boost here
-function makeTable() {
- var c, table = [];
-
- for(var n =0; n < 256; n++){
- c = n;
- for(var k =0; k < 8; k++){
- c = ((c&1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
- }
- table[n] = c;
- }
-
- return table;
-}
-
-// Create table on load. Just 255 signed longs. Not a problem.
-var crcTable = makeTable();
-
-
-function crc32(crc, buf, len, pos) {
- var t = crcTable
- , end = pos + len;
-
- crc = crc ^ (-1);
-
- for (var i = pos; i < end; i++ ) {
- crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF];
- }
-
- return (crc ^ (-1)); // >>> 0;
-}
-
-
-module.exports = crc32;
-},{}],32:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('../utils/common');
-var trees = _dereq_('./trees');
-var adler32 = _dereq_('./adler32');
-var crc32 = _dereq_('./crc32');
-var msg = _dereq_('./messages');
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-/* Allowed flush values; see deflate() and inflate() below for details */
-var Z_NO_FLUSH = 0;
-var Z_PARTIAL_FLUSH = 1;
-//var Z_SYNC_FLUSH = 2;
-var Z_FULL_FLUSH = 3;
-var Z_FINISH = 4;
-var Z_BLOCK = 5;
-//var Z_TREES = 6;
-
-
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-var Z_OK = 0;
-var Z_STREAM_END = 1;
-//var Z_NEED_DICT = 2;
-//var Z_ERRNO = -1;
-var Z_STREAM_ERROR = -2;
-var Z_DATA_ERROR = -3;
-//var Z_MEM_ERROR = -4;
-var Z_BUF_ERROR = -5;
-//var Z_VERSION_ERROR = -6;
-
-
-/* compression levels */
-//var Z_NO_COMPRESSION = 0;
-//var Z_BEST_SPEED = 1;
-//var Z_BEST_COMPRESSION = 9;
-var Z_DEFAULT_COMPRESSION = -1;
-
-
-var Z_FILTERED = 1;
-var Z_HUFFMAN_ONLY = 2;
-var Z_RLE = 3;
-var Z_FIXED = 4;
-var Z_DEFAULT_STRATEGY = 0;
-
-/* Possible values of the data_type field (though see inflate()) */
-//var Z_BINARY = 0;
-//var Z_TEXT = 1;
-//var Z_ASCII = 1; // = Z_TEXT
-var Z_UNKNOWN = 2;
-
-
-/* The deflate compression method */
-var Z_DEFLATED = 8;
-
-/*============================================================================*/
-
-
-var MAX_MEM_LEVEL = 9;
-/* Maximum value for memLevel in deflateInit2 */
-var MAX_WBITS = 15;
-/* 32K LZ77 window */
-var DEF_MEM_LEVEL = 8;
-
-
-var LENGTH_CODES = 29;
-/* number of length codes, not counting the special END_BLOCK code */
-var LITERALS = 256;
-/* number of literal bytes 0..255 */
-var L_CODES = LITERALS + 1 + LENGTH_CODES;
-/* number of Literal or Length codes, including the END_BLOCK code */
-var D_CODES = 30;
-/* number of distance codes */
-var BL_CODES = 19;
-/* number of codes used to transfer the bit lengths */
-var HEAP_SIZE = 2*L_CODES + 1;
-/* maximum heap size */
-var MAX_BITS = 15;
-/* All codes must not exceed MAX_BITS bits */
-
-var MIN_MATCH = 3;
-var MAX_MATCH = 258;
-var MIN_LOOKAHEAD = (MAX_MATCH + MIN_MATCH + 1);
-
-var PRESET_DICT = 0x20;
-
-var INIT_STATE = 42;
-var EXTRA_STATE = 69;
-var NAME_STATE = 73;
-var COMMENT_STATE = 91;
-var HCRC_STATE = 103;
-var BUSY_STATE = 113;
-var FINISH_STATE = 666;
-
-var BS_NEED_MORE = 1; /* block not completed, need more input or more output */
-var BS_BLOCK_DONE = 2; /* block flush performed */
-var BS_FINISH_STARTED = 3; /* finish started, need only more output at next deflate */
-var BS_FINISH_DONE = 4; /* finish done, accept no more input or output */
-
-var OS_CODE = 0x03; // Unix :) . Don't detect, use this default.
-
-function err(strm, errorCode) {
- strm.msg = msg[errorCode];
- return errorCode;
-}
-
-function rank(f) {
- return ((f) << 1) - ((f) > 4 ? 9 : 0);
-}
-
-function zero(buf) { var len = buf.length; while (--len >= 0) { buf[len] = 0; } }
-
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->output buffer and copying into it.
- * (See also read_buf()).
- */
-function flush_pending(strm) {
- var s = strm.state;
-
- //_tr_flush_bits(s);
- var len = s.pending;
- if (len > strm.avail_out) {
- len = strm.avail_out;
- }
- if (len === 0) { return; }
-
- utils.arraySet(strm.output, s.pending_buf, s.pending_out, len, strm.next_out);
- strm.next_out += len;
- s.pending_out += len;
- strm.total_out += len;
- strm.avail_out -= len;
- s.pending -= len;
- if (s.pending === 0) {
- s.pending_out = 0;
- }
-}
-
-
-function flush_block_only (s, last) {
- trees._tr_flush_block(s, (s.block_start >= 0 ? s.block_start : -1), s.strstart - s.block_start, last);
- s.block_start = s.strstart;
- flush_pending(s.strm);
-}
-
-
-function put_byte(s, b) {
- s.pending_buf[s.pending++] = b;
-}
-
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-function putShortMSB(s, b) {
-// put_byte(s, (Byte)(b >> 8));
-// put_byte(s, (Byte)(b & 0xff));
- s.pending_buf[s.pending++] = (b >>> 8) & 0xff;
- s.pending_buf[s.pending++] = b & 0xff;
-}
-
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read. All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->input buffer and copying from it.
- * (See also flush_pending()).
- */
-function read_buf(strm, buf, start, size) {
- var len = strm.avail_in;
-
- if (len > size) { len = size; }
- if (len === 0) { return 0; }
-
- strm.avail_in -= len;
-
- utils.arraySet(buf, strm.input, strm.next_in, len, start);
- if (strm.state.wrap === 1) {
- strm.adler = adler32(strm.adler, buf, len, start);
- }
-
- else if (strm.state.wrap === 2) {
- strm.adler = crc32(strm.adler, buf, len, start);
- }
-
- strm.next_in += len;
- strm.total_in += len;
-
- return len;
-}
-
-
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-function longest_match(s, cur_match) {
- var chain_length = s.max_chain_length; /* max hash chain length */
- var scan = s.strstart; /* current string */
- var match; /* matched string */
- var len; /* length of current match */
- var best_len = s.prev_length; /* best match length so far */
- var nice_match = s.nice_match; /* stop if match long enough */
- var limit = (s.strstart > (s.w_size - MIN_LOOKAHEAD)) ?
- s.strstart - (s.w_size - MIN_LOOKAHEAD) : 0/*NIL*/;
-
- var _win = s.window; // shortcut
-
- var wmask = s.w_mask;
- var prev = s.prev;
-
- /* Stop when cur_match becomes <= limit. To simplify the code,
- * we prevent matches with the string of window index 0.
- */
-
- var strend = s.strstart + MAX_MATCH;
- var scan_end1 = _win[scan + best_len - 1];
- var scan_end = _win[scan + best_len];
-
- /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
- * It is easy to get rid of this optimization if necessary.
- */
- // Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
- /* Do not waste too much time if we already have a good match: */
- if (s.prev_length >= s.good_match) {
- chain_length >>= 2;
- }
- /* Do not look for matches beyond the end of the input. This is necessary
- * to make deflate deterministic.
- */
- if (nice_match > s.lookahead) { nice_match = s.lookahead; }
-
- // Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
- do {
- // Assert(cur_match < s->strstart, "no future");
- match = cur_match;
-
- /* Skip to next match if the match length cannot increase
- * or if the match length is less than 2. Note that the checks below
- * for insufficient lookahead only occur occasionally for performance
- * reasons. Therefore uninitialized memory will be accessed, and
- * conditional jumps will be made that depend on those values.
- * However the length of the match is limited to the lookahead, so
- * the output of deflate is not affected by the uninitialized values.
- */
-
- if (_win[match + best_len] !== scan_end ||
- _win[match + best_len - 1] !== scan_end1 ||
- _win[match] !== _win[scan] ||
- _win[++match] !== _win[scan + 1]) {
- continue;
- }
-
- /* The check at best_len-1 can be removed because it will be made
- * again later. (This heuristic is not always a win.)
- * It is not necessary to compare scan[2] and match[2] since they
- * are always equal when the other bytes match, given that
- * the hash keys are equal and that HASH_BITS >= 8.
- */
- scan += 2;
- match++;
- // Assert(*scan == *match, "match[2]?");
-
- /* We check for insufficient lookahead only every 8th comparison;
- * the 256th check will be made at strstart+258.
- */
- do {
- /*jshint noempty:false*/
- } while (_win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
- _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
- _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
- _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
- scan < strend);
-
- // Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
- len = MAX_MATCH - (strend - scan);
- scan = strend - MAX_MATCH;
-
- if (len > best_len) {
- s.match_start = cur_match;
- best_len = len;
- if (len >= nice_match) {
- break;
- }
- scan_end1 = _win[scan + best_len - 1];
- scan_end = _win[scan + best_len];
- }
- } while ((cur_match = prev[cur_match & wmask]) > limit && --chain_length !== 0);
-
- if (best_len <= s.lookahead) {
- return best_len;
- }
- return s.lookahead;
-}
-
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- * At least one byte has been read, or avail_in == 0; reads are
- * performed for at least two bytes (required for the zip translate_eol
- * option -- not supported here).
- */
-function fill_window(s) {
- var _w_size = s.w_size;
- var p, n, m, more, str;
-
- //Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
- do {
- more = s.window_size - s.lookahead - s.strstart;
-
- // JS ints have 32 bit, block below not needed
- /* Deal with !@#$% 64K limit: */
- //if (sizeof(int) <= 2) {
- // if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
- // more = wsize;
- //
- // } else if (more == (unsigned)(-1)) {
- // /* Very unlikely, but possible on 16 bit machine if
- // * strstart == 0 && lookahead == 1 (input done a byte at time)
- // */
- // more--;
- // }
- //}
-
-
- /* If the window is almost full and there is insufficient lookahead,
- * move the upper half to the lower one to make room in the upper half.
- */
- if (s.strstart >= _w_size + (_w_size - MIN_LOOKAHEAD)) {
-
- utils.arraySet(s.window, s.window, _w_size, _w_size, 0);
- s.match_start -= _w_size;
- s.strstart -= _w_size;
- /* we now have strstart >= MAX_DIST */
- s.block_start -= _w_size;
-
- /* Slide the hash table (could be avoided with 32 bit values
- at the expense of memory usage). We slide even when level == 0
- to keep the hash table consistent if we switch back to level > 0
- later. (Using level 0 permanently is not an optimal usage of
- zlib, so we don't care about this pathological case.)
- */
-
- n = s.hash_size;
- p = n;
- do {
- m = s.head[--p];
- s.head[p] = (m >= _w_size ? m - _w_size : 0);
- } while (--n);
-
- n = _w_size;
- p = n;
- do {
- m = s.prev[--p];
- s.prev[p] = (m >= _w_size ? m - _w_size : 0);
- /* If n is not on any hash chain, prev[n] is garbage but
- * its value will never be used.
- */
- } while (--n);
-
- more += _w_size;
- }
- if (s.strm.avail_in === 0) {
- break;
- }
-
- /* If there was no sliding:
- * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
- * more == window_size - lookahead - strstart
- * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
- * => more >= window_size - 2*WSIZE + 2
- * In the BIG_MEM or MMAP case (not yet supported),
- * window_size == input_size + MIN_LOOKAHEAD &&
- * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
- * Otherwise, window_size == 2*WSIZE so more >= 2.
- * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
- */
- //Assert(more >= 2, "more < 2");
- n = read_buf(s.strm, s.window, s.strstart + s.lookahead, more);
- s.lookahead += n;
-
- /* Initialize the hash value now that we have some input: */
- if (s.lookahead + s.insert >= MIN_MATCH) {
- str = s.strstart - s.insert;
- s.ins_h = s.window[str];
-
- /* UPDATE_HASH(s, s->ins_h, s->window[str + 1]); */
- s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + 1]) & s.hash_mask;
-//#if MIN_MATCH != 3
-// Call update_hash() MIN_MATCH-3 more times
-//#endif
- while (s.insert) {
- /* UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); */
- s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + MIN_MATCH-1]) & s.hash_mask;
-
- s.prev[str & s.w_mask] = s.head[s.ins_h];
- s.head[s.ins_h] = str;
- str++;
- s.insert--;
- if (s.lookahead + s.insert < MIN_MATCH) {
- break;
- }
- }
- }
- /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
- * but this is not important since only literal bytes will be emitted.
- */
-
- } while (s.lookahead < MIN_LOOKAHEAD && s.strm.avail_in !== 0);
-
- /* If the WIN_INIT bytes after the end of the current data have never been
- * written, then zero those bytes in order to avoid memory check reports of
- * the use of uninitialized (or uninitialised as Julian writes) bytes by
- * the longest match routines. Update the high water mark for the next
- * time through here. WIN_INIT is set to MAX_MATCH since the longest match
- * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
- */
-// if (s.high_water < s.window_size) {
-// var curr = s.strstart + s.lookahead;
-// var init = 0;
-//
-// if (s.high_water < curr) {
-// /* Previous high water mark below current data -- zero WIN_INIT
-// * bytes or up to end of window, whichever is less.
-// */
-// init = s.window_size - curr;
-// if (init > WIN_INIT)
-// init = WIN_INIT;
-// zmemzero(s->window + curr, (unsigned)init);
-// s->high_water = curr + init;
-// }
-// else if (s->high_water < (ulg)curr + WIN_INIT) {
-// /* High water mark at or above current data, but below current data
-// * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-// * to end of window, whichever is less.
-// */
-// init = (ulg)curr + WIN_INIT - s->high_water;
-// if (init > s->window_size - s->high_water)
-// init = s->window_size - s->high_water;
-// zmemzero(s->window + s->high_water, (unsigned)init);
-// s->high_water += init;
-// }
-// }
-//
-// Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-// "not enough room for search");
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-function deflate_stored(s, flush) {
- /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
- * to pending_buf_size, and each stored block has a 5 byte header:
- */
- var max_block_size = 0xffff;
-
- if (max_block_size > s.pending_buf_size - 5) {
- max_block_size = s.pending_buf_size - 5;
- }
-
- /* Copy as much as possible from input to output: */
- for (;;) {
- /* Fill the window as much as possible: */
- if (s.lookahead <= 1) {
-
- //Assert(s->strstart < s->w_size+MAX_DIST(s) ||
- // s->block_start >= (long)s->w_size, "slide too late");
-// if (!(s.strstart < s.w_size + (s.w_size - MIN_LOOKAHEAD) ||
-// s.block_start >= s.w_size)) {
-// throw new Error("slide too late");
-// }
-
- fill_window(s);
- if (s.lookahead === 0 && flush === Z_NO_FLUSH) {
- return BS_NEED_MORE;
- }
-
- if (s.lookahead === 0) {
- break;
- }
- /* flush the current block */
- }
- //Assert(s->block_start >= 0L, "block gone");
-// if (s.block_start < 0) throw new Error("block gone");
-
- s.strstart += s.lookahead;
- s.lookahead = 0;
-
- /* Emit a stored block if pending_buf will be full: */
- var max_start = s.block_start + max_block_size;
-
- if (s.strstart === 0 || s.strstart >= max_start) {
- /* strstart == 0 is possible when wraparound on 16-bit machine */
- s.lookahead = s.strstart - max_start;
- s.strstart = max_start;
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
-
-
- }
- /* Flush if we may have to slide, otherwise block_start may become
- * negative and the data will be gone:
- */
- if (s.strstart - s.block_start >= (s.w_size - MIN_LOOKAHEAD)) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
- }
-
- s.insert = 0;
-
- if (flush === Z_FINISH) {
- /*** FLUSH_BLOCK(s, 1); ***/
- flush_block_only(s, true);
- if (s.strm.avail_out === 0) {
- return BS_FINISH_STARTED;
- }
- /***/
- return BS_FINISH_DONE;
- }
-
- if (s.strstart > s.block_start) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
-
- return BS_NEED_MORE;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-function deflate_fast(s, flush) {
- var hash_head; /* head of the hash chain */
- var bflush; /* set if current block must be flushed */
-
- for (;;) {
- /* Make sure that we always have enough lookahead, except
- * at the end of the input file. We need MAX_MATCH bytes
- * for the next match, plus MIN_MATCH bytes to insert the
- * string following the next match.
- */
- if (s.lookahead < MIN_LOOKAHEAD) {
- fill_window(s);
- if (s.lookahead < MIN_LOOKAHEAD && flush === Z_NO_FLUSH) {
- return BS_NEED_MORE;
- }
- if (s.lookahead === 0) {
- break; /* flush the current block */
- }
- }
-
- /* Insert the string window[strstart .. strstart+2] in the
- * dictionary, and set hash_head to the head of the hash chain:
- */
- hash_head = 0/*NIL*/;
- if (s.lookahead >= MIN_MATCH) {
- /*** INSERT_STRING(s, s.strstart, hash_head); ***/
- s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
- hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
- s.head[s.ins_h] = s.strstart;
- /***/
- }
-
- /* Find the longest match, discarding those <= prev_length.
- * At this point we have always match_length < MIN_MATCH
- */
- if (hash_head !== 0/*NIL*/ && ((s.strstart - hash_head) <= (s.w_size - MIN_LOOKAHEAD))) {
- /* To simplify the code, we prevent matches with the string
- * of window index 0 (in particular we have to avoid a match
- * of the string with itself at the start of the input file).
- */
- s.match_length = longest_match(s, hash_head);
- /* longest_match() sets match_start */
- }
- if (s.match_length >= MIN_MATCH) {
- // check_match(s, s.strstart, s.match_start, s.match_length); // for debug only
-
- /*** _tr_tally_dist(s, s.strstart - s.match_start,
- s.match_length - MIN_MATCH, bflush); ***/
- bflush = trees._tr_tally(s, s.strstart - s.match_start, s.match_length - MIN_MATCH);
-
- s.lookahead -= s.match_length;
-
- /* Insert new strings in the hash table only if the match length
- * is not too large. This saves time but degrades compression.
- */
- if (s.match_length <= s.max_lazy_match/*max_insert_length*/ && s.lookahead >= MIN_MATCH) {
- s.match_length--; /* string at strstart already in table */
- do {
- s.strstart++;
- /*** INSERT_STRING(s, s.strstart, hash_head); ***/
- s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
- hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
- s.head[s.ins_h] = s.strstart;
- /***/
- /* strstart never exceeds WSIZE-MAX_MATCH, so there are
- * always MIN_MATCH bytes ahead.
- */
- } while (--s.match_length !== 0);
- s.strstart++;
- } else
- {
- s.strstart += s.match_length;
- s.match_length = 0;
- s.ins_h = s.window[s.strstart];
- /* UPDATE_HASH(s, s.ins_h, s.window[s.strstart+1]); */
- s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + 1]) & s.hash_mask;
-
-//#if MIN_MATCH != 3
-// Call UPDATE_HASH() MIN_MATCH-3 more times
-//#endif
- /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
- * matter since it will be recomputed at next deflate call.
- */
- }
- } else {
- /* No match, output a literal byte */
- //Tracevv((stderr,"%c", s.window[s.strstart]));
- /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
- bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
-
- s.lookahead--;
- s.strstart++;
- }
- if (bflush) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
- }
- s.insert = ((s.strstart < (MIN_MATCH-1)) ? s.strstart : MIN_MATCH-1);
- if (flush === Z_FINISH) {
- /*** FLUSH_BLOCK(s, 1); ***/
- flush_block_only(s, true);
- if (s.strm.avail_out === 0) {
- return BS_FINISH_STARTED;
- }
- /***/
- return BS_FINISH_DONE;
- }
- if (s.last_lit) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
- return BS_BLOCK_DONE;
-}
-
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-function deflate_slow(s, flush) {
- var hash_head; /* head of hash chain */
- var bflush; /* set if current block must be flushed */
-
- var max_insert;
-
- /* Process the input block. */
- for (;;) {
- /* Make sure that we always have enough lookahead, except
- * at the end of the input file. We need MAX_MATCH bytes
- * for the next match, plus MIN_MATCH bytes to insert the
- * string following the next match.
- */
- if (s.lookahead < MIN_LOOKAHEAD) {
- fill_window(s);
- if (s.lookahead < MIN_LOOKAHEAD && flush === Z_NO_FLUSH) {
- return BS_NEED_MORE;
- }
- if (s.lookahead === 0) { break; } /* flush the current block */
- }
-
- /* Insert the string window[strstart .. strstart+2] in the
- * dictionary, and set hash_head to the head of the hash chain:
- */
- hash_head = 0/*NIL*/;
- if (s.lookahead >= MIN_MATCH) {
- /*** INSERT_STRING(s, s.strstart, hash_head); ***/
- s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
- hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
- s.head[s.ins_h] = s.strstart;
- /***/
- }
-
- /* Find the longest match, discarding those <= prev_length.
- */
- s.prev_length = s.match_length;
- s.prev_match = s.match_start;
- s.match_length = MIN_MATCH-1;
-
- if (hash_head !== 0/*NIL*/ && s.prev_length < s.max_lazy_match &&
- s.strstart - hash_head <= (s.w_size-MIN_LOOKAHEAD)/*MAX_DIST(s)*/) {
- /* To simplify the code, we prevent matches with the string
- * of window index 0 (in particular we have to avoid a match
- * of the string with itself at the start of the input file).
- */
- s.match_length = longest_match(s, hash_head);
- /* longest_match() sets match_start */
-
- if (s.match_length <= 5 &&
- (s.strategy === Z_FILTERED || (s.match_length === MIN_MATCH && s.strstart - s.match_start > 4096/*TOO_FAR*/))) {
-
- /* If prev_match is also MIN_MATCH, match_start is garbage
- * but we will ignore the current match anyway.
- */
- s.match_length = MIN_MATCH-1;
- }
- }
- /* If there was a match at the previous step and the current
- * match is not better, output the previous match:
- */
- if (s.prev_length >= MIN_MATCH && s.match_length <= s.prev_length) {
- max_insert = s.strstart + s.lookahead - MIN_MATCH;
- /* Do not insert strings in hash table beyond this. */
-
- //check_match(s, s.strstart-1, s.prev_match, s.prev_length);
-
- /***_tr_tally_dist(s, s.strstart - 1 - s.prev_match,
- s.prev_length - MIN_MATCH, bflush);***/
- bflush = trees._tr_tally(s, s.strstart - 1- s.prev_match, s.prev_length - MIN_MATCH);
- /* Insert in hash table all strings up to the end of the match.
- * strstart-1 and strstart are already inserted. If there is not
- * enough lookahead, the last two strings are not inserted in
- * the hash table.
- */
- s.lookahead -= s.prev_length-1;
- s.prev_length -= 2;
- do {
- if (++s.strstart <= max_insert) {
- /*** INSERT_STRING(s, s.strstart, hash_head); ***/
- s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
- hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
- s.head[s.ins_h] = s.strstart;
- /***/
- }
- } while (--s.prev_length !== 0);
- s.match_available = 0;
- s.match_length = MIN_MATCH-1;
- s.strstart++;
-
- if (bflush) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
-
- } else if (s.match_available) {
- /* If there was no match at the previous position, output a
- * single literal. If there was a match but the current match
- * is longer, truncate the previous match to a single literal.
- */
- //Tracevv((stderr,"%c", s->window[s->strstart-1]));
- /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
- bflush = trees._tr_tally(s, 0, s.window[s.strstart-1]);
-
- if (bflush) {
- /*** FLUSH_BLOCK_ONLY(s, 0) ***/
- flush_block_only(s, false);
- /***/
- }
- s.strstart++;
- s.lookahead--;
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- } else {
- /* There is no previous match to compare with, wait for
- * the next step to decide.
- */
- s.match_available = 1;
- s.strstart++;
- s.lookahead--;
- }
- }
- //Assert (flush != Z_NO_FLUSH, "no flush?");
- if (s.match_available) {
- //Tracevv((stderr,"%c", s->window[s->strstart-1]));
- /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
- bflush = trees._tr_tally(s, 0, s.window[s.strstart-1]);
-
- s.match_available = 0;
- }
- s.insert = s.strstart < MIN_MATCH-1 ? s.strstart : MIN_MATCH-1;
- if (flush === Z_FINISH) {
- /*** FLUSH_BLOCK(s, 1); ***/
- flush_block_only(s, true);
- if (s.strm.avail_out === 0) {
- return BS_FINISH_STARTED;
- }
- /***/
- return BS_FINISH_DONE;
- }
- if (s.last_lit) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
-
- return BS_BLOCK_DONE;
-}
-
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one. Do not maintain a hash table. (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-function deflate_rle(s, flush) {
- var bflush; /* set if current block must be flushed */
- var prev; /* byte at distance one to match */
- var scan, strend; /* scan goes up to strend for length of run */
-
- var _win = s.window;
-
- for (;;) {
- /* Make sure that we always have enough lookahead, except
- * at the end of the input file. We need MAX_MATCH bytes
- * for the longest run, plus one for the unrolled loop.
- */
- if (s.lookahead <= MAX_MATCH) {
- fill_window(s);
- if (s.lookahead <= MAX_MATCH && flush === Z_NO_FLUSH) {
- return BS_NEED_MORE;
- }
- if (s.lookahead === 0) { break; } /* flush the current block */
- }
-
- /* See how many times the previous byte repeats */
- s.match_length = 0;
- if (s.lookahead >= MIN_MATCH && s.strstart > 0) {
- scan = s.strstart - 1;
- prev = _win[scan];
- if (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan]) {
- strend = s.strstart + MAX_MATCH;
- do {
- /*jshint noempty:false*/
- } while (prev === _win[++scan] && prev === _win[++scan] &&
- prev === _win[++scan] && prev === _win[++scan] &&
- prev === _win[++scan] && prev === _win[++scan] &&
- prev === _win[++scan] && prev === _win[++scan] &&
- scan < strend);
- s.match_length = MAX_MATCH - (strend - scan);
- if (s.match_length > s.lookahead) {
- s.match_length = s.lookahead;
- }
- }
- //Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
- }
-
- /* Emit match if have run of MIN_MATCH or longer, else emit literal */
- if (s.match_length >= MIN_MATCH) {
- //check_match(s, s.strstart, s.strstart - 1, s.match_length);
-
- /*** _tr_tally_dist(s, 1, s.match_length - MIN_MATCH, bflush); ***/
- bflush = trees._tr_tally(s, 1, s.match_length - MIN_MATCH);
-
- s.lookahead -= s.match_length;
- s.strstart += s.match_length;
- s.match_length = 0;
- } else {
- /* No match, output a literal byte */
- //Tracevv((stderr,"%c", s->window[s->strstart]));
- /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
- bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
-
- s.lookahead--;
- s.strstart++;
- }
- if (bflush) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
- }
- s.insert = 0;
- if (flush === Z_FINISH) {
- /*** FLUSH_BLOCK(s, 1); ***/
- flush_block_only(s, true);
- if (s.strm.avail_out === 0) {
- return BS_FINISH_STARTED;
- }
- /***/
- return BS_FINISH_DONE;
- }
- if (s.last_lit) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
- return BS_BLOCK_DONE;
-}
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-function deflate_huff(s, flush) {
- var bflush; /* set if current block must be flushed */
-
- for (;;) {
- /* Make sure that we have a literal to write. */
- if (s.lookahead === 0) {
- fill_window(s);
- if (s.lookahead === 0) {
- if (flush === Z_NO_FLUSH) {
- return BS_NEED_MORE;
- }
- break; /* flush the current block */
- }
- }
-
- /* Output a literal byte */
- s.match_length = 0;
- //Tracevv((stderr,"%c", s->window[s->strstart]));
- /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
- bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
- s.lookahead--;
- s.strstart++;
- if (bflush) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
- }
- s.insert = 0;
- if (flush === Z_FINISH) {
- /*** FLUSH_BLOCK(s, 1); ***/
- flush_block_only(s, true);
- if (s.strm.avail_out === 0) {
- return BS_FINISH_STARTED;
- }
- /***/
- return BS_FINISH_DONE;
- }
- if (s.last_lit) {
- /*** FLUSH_BLOCK(s, 0); ***/
- flush_block_only(s, false);
- if (s.strm.avail_out === 0) {
- return BS_NEED_MORE;
- }
- /***/
- }
- return BS_BLOCK_DONE;
-}
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-var Config = function (good_length, max_lazy, nice_length, max_chain, func) {
- this.good_length = good_length;
- this.max_lazy = max_lazy;
- this.nice_length = nice_length;
- this.max_chain = max_chain;
- this.func = func;
-};
-
-var configuration_table;
-
-configuration_table = [
- /* good lazy nice chain */
- new Config(0, 0, 0, 0, deflate_stored), /* 0 store only */
- new Config(4, 4, 8, 4, deflate_fast), /* 1 max speed, no lazy matches */
- new Config(4, 5, 16, 8, deflate_fast), /* 2 */
- new Config(4, 6, 32, 32, deflate_fast), /* 3 */
-
- new Config(4, 4, 16, 16, deflate_slow), /* 4 lazy matches */
- new Config(8, 16, 32, 32, deflate_slow), /* 5 */
- new Config(8, 16, 128, 128, deflate_slow), /* 6 */
- new Config(8, 32, 128, 256, deflate_slow), /* 7 */
- new Config(32, 128, 258, 1024, deflate_slow), /* 8 */
- new Config(32, 258, 258, 4096, deflate_slow) /* 9 max compression */
-];
-
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-function lm_init(s) {
- s.window_size = 2 * s.w_size;
-
- /*** CLEAR_HASH(s); ***/
- zero(s.head); // Fill with NIL (= 0);
-
- /* Set the default configuration parameters:
- */
- s.max_lazy_match = configuration_table[s.level].max_lazy;
- s.good_match = configuration_table[s.level].good_length;
- s.nice_match = configuration_table[s.level].nice_length;
- s.max_chain_length = configuration_table[s.level].max_chain;
-
- s.strstart = 0;
- s.block_start = 0;
- s.lookahead = 0;
- s.insert = 0;
- s.match_length = s.prev_length = MIN_MATCH - 1;
- s.match_available = 0;
- s.ins_h = 0;
-}
-
-
-function DeflateState() {
- this.strm = null; /* pointer back to this zlib stream */
- this.status = 0; /* as the name implies */
- this.pending_buf = null; /* output still pending */
- this.pending_buf_size = 0; /* size of pending_buf */
- this.pending_out = 0; /* next pending byte to output to the stream */
- this.pending = 0; /* nb of bytes in the pending buffer */
- this.wrap = 0; /* bit 0 true for zlib, bit 1 true for gzip */
- this.gzhead = null; /* gzip header information to write */
- this.gzindex = 0; /* where in extra, name, or comment */
- this.method = Z_DEFLATED; /* can only be DEFLATED */
- this.last_flush = -1; /* value of flush param for previous deflate call */
-
- this.w_size = 0; /* LZ77 window size (32K by default) */
- this.w_bits = 0; /* log2(w_size) (8..16) */
- this.w_mask = 0; /* w_size - 1 */
-
- this.window = null;
- /* Sliding window. Input bytes are read into the second half of the window,
- * and move to the first half later to keep a dictionary of at least wSize
- * bytes. With this organization, matches are limited to a distance of
- * wSize-MAX_MATCH bytes, but this ensures that IO is always
- * performed with a length multiple of the block size.
- */
-
- this.window_size = 0;
- /* Actual size of window: 2*wSize, except when the user input buffer
- * is directly used as sliding window.
- */
-
- this.prev = null;
- /* Link to older string with same hash index. To limit the size of this
- * array to 64K, this link is maintained only for the last 32K strings.
- * An index in this array is thus a window index modulo 32K.
- */
-
- this.head = null; /* Heads of the hash chains or NIL. */
-
- this.ins_h = 0; /* hash index of string to be inserted */
- this.hash_size = 0; /* number of elements in hash table */
- this.hash_bits = 0; /* log2(hash_size) */
- this.hash_mask = 0; /* hash_size-1 */
-
- this.hash_shift = 0;
- /* Number of bits by which ins_h must be shifted at each input
- * step. It must be such that after MIN_MATCH steps, the oldest
- * byte no longer takes part in the hash key, that is:
- * hash_shift * MIN_MATCH >= hash_bits
- */
-
- this.block_start = 0;
- /* Window position at the beginning of the current output block. Gets
- * negative when the window is moved backwards.
- */
-
- this.match_length = 0; /* length of best match */
- this.prev_match = 0; /* previous match */
- this.match_available = 0; /* set if previous match exists */
- this.strstart = 0; /* start of string to insert */
- this.match_start = 0; /* start of matching string */
- this.lookahead = 0; /* number of valid bytes ahead in window */
-
- this.prev_length = 0;
- /* Length of the best match at previous step. Matches not greater than this
- * are discarded. This is used in the lazy match evaluation.
- */
-
- this.max_chain_length = 0;
- /* To speed up deflation, hash chains are never searched beyond this
- * length. A higher limit improves compression ratio but degrades the
- * speed.
- */
-
- this.max_lazy_match = 0;
- /* Attempt to find a better match only when the current match is strictly
- * smaller than this value. This mechanism is used only for compression
- * levels >= 4.
- */
- // That's alias to max_lazy_match, don't use directly
- //this.max_insert_length = 0;
- /* Insert new strings in the hash table only if the match length is not
- * greater than this length. This saves time but degrades compression.
- * max_insert_length is used only for compression levels <= 3.
- */
-
- this.level = 0; /* compression level (1..9) */
- this.strategy = 0; /* favor or force Huffman coding*/
-
- this.good_match = 0;
- /* Use a faster search when the previous match is longer than this */
-
- this.nice_match = 0; /* Stop searching when current match exceeds this */
-
- /* used by trees.c: */
-
- /* Didn't use ct_data typedef below to suppress compiler warning */
-
- // struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
- // struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
- // struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
-
- // Use flat array of DOUBLE size, with interleaved fata,
- // because JS does not support effective
- this.dyn_ltree = new utils.Buf16(HEAP_SIZE * 2);
- this.dyn_dtree = new utils.Buf16((2*D_CODES+1) * 2);
- this.bl_tree = new utils.Buf16((2*BL_CODES+1) * 2);
- zero(this.dyn_ltree);
- zero(this.dyn_dtree);
- zero(this.bl_tree);
-
- this.l_desc = null; /* desc. for literal tree */
- this.d_desc = null; /* desc. for distance tree */
- this.bl_desc = null; /* desc. for bit length tree */
-
- //ush bl_count[MAX_BITS+1];
- this.bl_count = new utils.Buf16(MAX_BITS+1);
- /* number of codes at each bit length for an optimal tree */
-
- //int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */
- this.heap = new utils.Buf16(2*L_CODES+1); /* heap used to build the Huffman trees */
- zero(this.heap);
-
- this.heap_len = 0; /* number of elements in the heap */
- this.heap_max = 0; /* element of largest frequency */
- /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
- * The same heap array is used to build all trees.
- */
-
- this.depth = new utils.Buf16(2*L_CODES+1); //uch depth[2*L_CODES+1];
- zero(this.depth);
- /* Depth of each subtree used as tie breaker for trees of equal frequency
- */
-
- this.l_buf = 0; /* buffer index for literals or lengths */
-
- this.lit_bufsize = 0;
- /* Size of match buffer for literals/lengths. There are 4 reasons for
- * limiting lit_bufsize to 64K:
- * - frequencies can be kept in 16 bit counters
- * - if compression is not successful for the first block, all input
- * data is still in the window so we can still emit a stored block even
- * when input comes from standard input. (This can also be done for
- * all blocks if lit_bufsize is not greater than 32K.)
- * - if compression is not successful for a file smaller than 64K, we can
- * even emit a stored file instead of a stored block (saving 5 bytes).
- * This is applicable only for zip (not gzip or zlib).
- * - creating new Huffman trees less frequently may not provide fast
- * adaptation to changes in the input data statistics. (Take for
- * example a binary file with poorly compressible code followed by
- * a highly compressible string table.) Smaller buffer sizes give
- * fast adaptation but have of course the overhead of transmitting
- * trees more frequently.
- * - I can't count above 4
- */
-
- this.last_lit = 0; /* running index in l_buf */
-
- this.d_buf = 0;
- /* Buffer index for distances. To simplify the code, d_buf and l_buf have
- * the same number of elements. To use different lengths, an extra flag
- * array would be necessary.
- */
-
- this.opt_len = 0; /* bit length of current block with optimal trees */
- this.static_len = 0; /* bit length of current block with static trees */
- this.matches = 0; /* number of string matches in current block */
- this.insert = 0; /* bytes at end of window left to insert */
-
-
- this.bi_buf = 0;
- /* Output buffer. bits are inserted starting at the bottom (least
- * significant bits).
- */
- this.bi_valid = 0;
- /* Number of valid bits in bi_buf. All bits above the last valid bit
- * are always zero.
- */
-
- // Used for window memory init. We safely ignore it for JS. That makes
- // sense only for pointers and memory check tools.
- //this.high_water = 0;
- /* High water mark offset in window for initialized bytes -- bytes above
- * this are set to zero in order to avoid memory check warnings when
- * longest match routines access bytes past the input. This is then
- * updated to the new high water mark.
- */
-}
-
-
-function deflateResetKeep(strm) {
- var s;
-
- if (!strm || !strm.state) {
- return err(strm, Z_STREAM_ERROR);
- }
-
- strm.total_in = strm.total_out = 0;
- strm.data_type = Z_UNKNOWN;
-
- s = strm.state;
- s.pending = 0;
- s.pending_out = 0;
-
- if (s.wrap < 0) {
- s.wrap = -s.wrap;
- /* was made negative by deflate(..., Z_FINISH); */
- }
- s.status = (s.wrap ? INIT_STATE : BUSY_STATE);
- strm.adler = (s.wrap === 2) ?
- 0 // crc32(0, Z_NULL, 0)
- :
- 1; // adler32(0, Z_NULL, 0)
- s.last_flush = Z_NO_FLUSH;
- trees._tr_init(s);
- return Z_OK;
-}
-
-
-function deflateReset(strm) {
- var ret = deflateResetKeep(strm);
- if (ret === Z_OK) {
- lm_init(strm.state);
- }
- return ret;
-}
-
-
-function deflateSetHeader(strm, head) {
- if (!strm || !strm.state) { return Z_STREAM_ERROR; }
- if (strm.state.wrap !== 2) { return Z_STREAM_ERROR; }
- strm.state.gzhead = head;
- return Z_OK;
-}
-
-
-function deflateInit2(strm, level, method, windowBits, memLevel, strategy) {
- if (!strm) { // === Z_NULL
- return Z_STREAM_ERROR;
- }
- var wrap = 1;
-
- if (level === Z_DEFAULT_COMPRESSION) {
- level = 6;
- }
-
- if (windowBits < 0) { /* suppress zlib wrapper */
- wrap = 0;
- windowBits = -windowBits;
- }
-
- else if (windowBits > 15) {
- wrap = 2; /* write gzip wrapper instead */
- windowBits -= 16;
- }
-
-
- if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method !== Z_DEFLATED ||
- windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
- strategy < 0 || strategy > Z_FIXED) {
- return err(strm, Z_STREAM_ERROR);
- }
-
-
- if (windowBits === 8) {
- windowBits = 9;
- }
- /* until 256-byte window bug fixed */
-
- var s = new DeflateState();
-
- strm.state = s;
- s.strm = strm;
-
- s.wrap = wrap;
- s.gzhead = null;
- s.w_bits = windowBits;
- s.w_size = 1 << s.w_bits;
- s.w_mask = s.w_size - 1;
-
- s.hash_bits = memLevel + 7;
- s.hash_size = 1 << s.hash_bits;
- s.hash_mask = s.hash_size - 1;
- s.hash_shift = ~~((s.hash_bits + MIN_MATCH - 1) / MIN_MATCH);
-
- s.window = new utils.Buf8(s.w_size * 2);
- s.head = new utils.Buf16(s.hash_size);
- s.prev = new utils.Buf16(s.w_size);
-
- // Don't need mem init magic for JS.
- //s.high_water = 0; /* nothing written to s->window yet */
-
- s.lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
- s.pending_buf_size = s.lit_bufsize * 4;
- s.pending_buf = new utils.Buf8(s.pending_buf_size);
-
- s.d_buf = s.lit_bufsize >> 1;
- s.l_buf = (1 + 2) * s.lit_bufsize;
-
- s.level = level;
- s.strategy = strategy;
- s.method = method;
-
- return deflateReset(strm);
-}
-
-function deflateInit(strm, level) {
- return deflateInit2(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
-}
-
-
-function deflate(strm, flush) {
- var old_flush, s;
- var beg, val; // for gzip header write only
-
- if (!strm || !strm.state ||
- flush > Z_BLOCK || flush < 0) {
- return strm ? err(strm, Z_STREAM_ERROR) : Z_STREAM_ERROR;
- }
-
- s = strm.state;
-
- if (!strm.output ||
- (!strm.input && strm.avail_in !== 0) ||
- (s.status === FINISH_STATE && flush !== Z_FINISH)) {
- return err(strm, (strm.avail_out === 0) ? Z_BUF_ERROR : Z_STREAM_ERROR);
- }
-
- s.strm = strm; /* just in case */
- old_flush = s.last_flush;
- s.last_flush = flush;
-
- /* Write the header */
- if (s.status === INIT_STATE) {
-
- if (s.wrap === 2) { // GZIP header
- strm.adler = 0; //crc32(0L, Z_NULL, 0);
- put_byte(s, 31);
- put_byte(s, 139);
- put_byte(s, 8);
- if (!s.gzhead) { // s->gzhead == Z_NULL
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, s.level === 9 ? 2 :
- (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2 ?
- 4 : 0));
- put_byte(s, OS_CODE);
- s.status = BUSY_STATE;
- }
- else {
- put_byte(s, (s.gzhead.text ? 1 : 0) +
- (s.gzhead.hcrc ? 2 : 0) +
- (!s.gzhead.extra ? 0 : 4) +
- (!s.gzhead.name ? 0 : 8) +
- (!s.gzhead.comment ? 0 : 16)
- );
- put_byte(s, s.gzhead.time & 0xff);
- put_byte(s, (s.gzhead.time >> 8) & 0xff);
- put_byte(s, (s.gzhead.time >> 16) & 0xff);
- put_byte(s, (s.gzhead.time >> 24) & 0xff);
- put_byte(s, s.level === 9 ? 2 :
- (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2 ?
- 4 : 0));
- put_byte(s, s.gzhead.os & 0xff);
- if (s.gzhead.extra && s.gzhead.extra.length) {
- put_byte(s, s.gzhead.extra.length & 0xff);
- put_byte(s, (s.gzhead.extra.length >> 8) & 0xff);
- }
- if (s.gzhead.hcrc) {
- strm.adler = crc32(strm.adler, s.pending_buf, s.pending, 0);
- }
- s.gzindex = 0;
- s.status = EXTRA_STATE;
- }
- }
- else // DEFLATE header
- {
- var header = (Z_DEFLATED + ((s.w_bits - 8) << 4)) << 8;
- var level_flags = -1;
-
- if (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2) {
- level_flags = 0;
- } else if (s.level < 6) {
- level_flags = 1;
- } else if (s.level === 6) {
- level_flags = 2;
- } else {
- level_flags = 3;
- }
- header |= (level_flags << 6);
- if (s.strstart !== 0) { header |= PRESET_DICT; }
- header += 31 - (header % 31);
-
- s.status = BUSY_STATE;
- putShortMSB(s, header);
-
- /* Save the adler32 of the preset dictionary: */
- if (s.strstart !== 0) {
- putShortMSB(s, strm.adler >>> 16);
- putShortMSB(s, strm.adler & 0xffff);
- }
- strm.adler = 1; // adler32(0L, Z_NULL, 0);
- }
- }
-
-//#ifdef GZIP
- if (s.status === EXTRA_STATE) {
- if (s.gzhead.extra/* != Z_NULL*/) {
- beg = s.pending; /* start of bytes to update crc */
-
- while (s.gzindex < (s.gzhead.extra.length & 0xffff)) {
- if (s.pending === s.pending_buf_size) {
- if (s.gzhead.hcrc && s.pending > beg) {
- strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
- }
- flush_pending(strm);
- beg = s.pending;
- if (s.pending === s.pending_buf_size) {
- break;
- }
- }
- put_byte(s, s.gzhead.extra[s.gzindex] & 0xff);
- s.gzindex++;
- }
- if (s.gzhead.hcrc && s.pending > beg) {
- strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
- }
- if (s.gzindex === s.gzhead.extra.length) {
- s.gzindex = 0;
- s.status = NAME_STATE;
- }
- }
- else {
- s.status = NAME_STATE;
- }
- }
- if (s.status === NAME_STATE) {
- if (s.gzhead.name/* != Z_NULL*/) {
- beg = s.pending; /* start of bytes to update crc */
- //int val;
-
- do {
- if (s.pending === s.pending_buf_size) {
- if (s.gzhead.hcrc && s.pending > beg) {
- strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
- }
- flush_pending(strm);
- beg = s.pending;
- if (s.pending === s.pending_buf_size) {
- val = 1;
- break;
- }
- }
- // JS specific: little magic to add zero terminator to end of string
- if (s.gzindex < s.gzhead.name.length) {
- val = s.gzhead.name.charCodeAt(s.gzindex++) & 0xff;
- } else {
- val = 0;
- }
- put_byte(s, val);
- } while (val !== 0);
-
- if (s.gzhead.hcrc && s.pending > beg){
- strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
- }
- if (val === 0) {
- s.gzindex = 0;
- s.status = COMMENT_STATE;
- }
- }
- else {
- s.status = COMMENT_STATE;
- }
- }
- if (s.status === COMMENT_STATE) {
- if (s.gzhead.comment/* != Z_NULL*/) {
- beg = s.pending; /* start of bytes to update crc */
- //int val;
-
- do {
- if (s.pending === s.pending_buf_size) {
- if (s.gzhead.hcrc && s.pending > beg) {
- strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
- }
- flush_pending(strm);
- beg = s.pending;
- if (s.pending === s.pending_buf_size) {
- val = 1;
- break;
- }
- }
- // JS specific: little magic to add zero terminator to end of string
- if (s.gzindex < s.gzhead.comment.length) {
- val = s.gzhead.comment.charCodeAt(s.gzindex++) & 0xff;
- } else {
- val = 0;
- }
- put_byte(s, val);
- } while (val !== 0);
-
- if (s.gzhead.hcrc && s.pending > beg) {
- strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
- }
- if (val === 0) {
- s.status = HCRC_STATE;
- }
- }
- else {
- s.status = HCRC_STATE;
- }
- }
- if (s.status === HCRC_STATE) {
- if (s.gzhead.hcrc) {
- if (s.pending + 2 > s.pending_buf_size) {
- flush_pending(strm);
- }
- if (s.pending + 2 <= s.pending_buf_size) {
- put_byte(s, strm.adler & 0xff);
- put_byte(s, (strm.adler >> 8) & 0xff);
- strm.adler = 0; //crc32(0L, Z_NULL, 0);
- s.status = BUSY_STATE;
- }
- }
- else {
- s.status = BUSY_STATE;
- }
- }
-//#endif
-
- /* Flush as much pending output as possible */
- if (s.pending !== 0) {
- flush_pending(strm);
- if (strm.avail_out === 0) {
- /* Since avail_out is 0, deflate will be called again with
- * more output space, but possibly with both pending and
- * avail_in equal to zero. There won't be anything to do,
- * but this is not an error situation so make sure we
- * return OK instead of BUF_ERROR at next call of deflate:
- */
- s.last_flush = -1;
- return Z_OK;
- }
-
- /* Make sure there is something to do and avoid duplicate consecutive
- * flushes. For repeated and useless calls with Z_FINISH, we keep
- * returning Z_STREAM_END instead of Z_BUF_ERROR.
- */
- } else if (strm.avail_in === 0 && rank(flush) <= rank(old_flush) &&
- flush !== Z_FINISH) {
- return err(strm, Z_BUF_ERROR);
- }
-
- /* User must not provide more input after the first FINISH: */
- if (s.status === FINISH_STATE && strm.avail_in !== 0) {
- return err(strm, Z_BUF_ERROR);
- }
-
- /* Start a new block or continue the current one.
- */
- if (strm.avail_in !== 0 || s.lookahead !== 0 ||
- (flush !== Z_NO_FLUSH && s.status !== FINISH_STATE)) {
- var bstate = (s.strategy === Z_HUFFMAN_ONLY) ? deflate_huff(s, flush) :
- (s.strategy === Z_RLE ? deflate_rle(s, flush) :
- configuration_table[s.level].func(s, flush));
-
- if (bstate === BS_FINISH_STARTED || bstate === BS_FINISH_DONE) {
- s.status = FINISH_STATE;
- }
- if (bstate === BS_NEED_MORE || bstate === BS_FINISH_STARTED) {
- if (strm.avail_out === 0) {
- s.last_flush = -1;
- /* avoid BUF_ERROR next call, see above */
- }
- return Z_OK;
- /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
- * of deflate should use the same flush parameter to make sure
- * that the flush is complete. So we don't have to output an
- * empty block here, this will be done at next call. This also
- * ensures that for a very small output buffer, we emit at most
- * one empty block.
- */
- }
- if (bstate === BS_BLOCK_DONE) {
- if (flush === Z_PARTIAL_FLUSH) {
- trees._tr_align(s);
- }
- else if (flush !== Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-
- trees._tr_stored_block(s, 0, 0, false);
- /* For a full flush, this empty block will be recognized
- * as a special marker by inflate_sync().
- */
- if (flush === Z_FULL_FLUSH) {
- /*** CLEAR_HASH(s); ***/ /* forget history */
- zero(s.head); // Fill with NIL (= 0);
-
- if (s.lookahead === 0) {
- s.strstart = 0;
- s.block_start = 0;
- s.insert = 0;
- }
- }
- }
- flush_pending(strm);
- if (strm.avail_out === 0) {
- s.last_flush = -1; /* avoid BUF_ERROR at next call, see above */
- return Z_OK;
- }
- }
- }
- //Assert(strm->avail_out > 0, "bug2");
- //if (strm.avail_out <= 0) { throw new Error("bug2");}
-
- if (flush !== Z_FINISH) { return Z_OK; }
- if (s.wrap <= 0) { return Z_STREAM_END; }
-
- /* Write the trailer */
- if (s.wrap === 2) {
- put_byte(s, strm.adler & 0xff);
- put_byte(s, (strm.adler >> 8) & 0xff);
- put_byte(s, (strm.adler >> 16) & 0xff);
- put_byte(s, (strm.adler >> 24) & 0xff);
- put_byte(s, strm.total_in & 0xff);
- put_byte(s, (strm.total_in >> 8) & 0xff);
- put_byte(s, (strm.total_in >> 16) & 0xff);
- put_byte(s, (strm.total_in >> 24) & 0xff);
- }
- else
- {
- putShortMSB(s, strm.adler >>> 16);
- putShortMSB(s, strm.adler & 0xffff);
- }
-
- flush_pending(strm);
- /* If avail_out is zero, the application will call deflate again
- * to flush the rest.
- */
- if (s.wrap > 0) { s.wrap = -s.wrap; }
- /* write the trailer only once! */
- return s.pending !== 0 ? Z_OK : Z_STREAM_END;
-}
-
-function deflateEnd(strm) {
- var status;
-
- if (!strm/*== Z_NULL*/ || !strm.state/*== Z_NULL*/) {
- return Z_STREAM_ERROR;
- }
-
- status = strm.state.status;
- if (status !== INIT_STATE &&
- status !== EXTRA_STATE &&
- status !== NAME_STATE &&
- status !== COMMENT_STATE &&
- status !== HCRC_STATE &&
- status !== BUSY_STATE &&
- status !== FINISH_STATE
- ) {
- return err(strm, Z_STREAM_ERROR);
- }
-
- strm.state = null;
-
- return status === BUSY_STATE ? err(strm, Z_DATA_ERROR) : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state
- */
-//function deflateCopy(dest, source) {
-//
-//}
-
-exports.deflateInit = deflateInit;
-exports.deflateInit2 = deflateInit2;
-exports.deflateReset = deflateReset;
-exports.deflateResetKeep = deflateResetKeep;
-exports.deflateSetHeader = deflateSetHeader;
-exports.deflate = deflate;
-exports.deflateEnd = deflateEnd;
-exports.deflateInfo = 'pako deflate (from Nodeca project)';
-
-/* Not implemented
-exports.deflateBound = deflateBound;
-exports.deflateCopy = deflateCopy;
-exports.deflateSetDictionary = deflateSetDictionary;
-exports.deflateParams = deflateParams;
-exports.deflatePending = deflatePending;
-exports.deflatePrime = deflatePrime;
-exports.deflateTune = deflateTune;
-*/
-},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(_dereq_,module,exports){
-'use strict';
-
-
-function GZheader() {
- /* true if compressed data believed to be text */
- this.text = 0;
- /* modification time */
- this.time = 0;
- /* extra flags (not used when writing a gzip file) */
- this.xflags = 0;
- /* operating system */
- this.os = 0;
- /* pointer to extra field or Z_NULL if none */
- this.extra = null;
- /* extra field length (valid if extra != Z_NULL) */
- this.extra_len = 0; // Actually, we don't need it in JS,
- // but leave for few code modifications
-
- //
- // Setup limits is not necessary because in js we should not preallocate memory
- // for inflate use constant limit in 65536 bytes
- //
-
- /* space at extra (only when reading header) */
- // this.extra_max = 0;
- /* pointer to zero-terminated file name or Z_NULL */
- this.name = '';
- /* space at name (only when reading header) */
- // this.name_max = 0;
- /* pointer to zero-terminated comment or Z_NULL */
- this.comment = '';
- /* space at comment (only when reading header) */
- // this.comm_max = 0;
- /* true if there was or will be a header crc */
- this.hcrc = 0;
- /* true when done reading gzip header (not used when writing a gzip file) */
- this.done = false;
-}
-
-module.exports = GZheader;
-},{}],34:[function(_dereq_,module,exports){
-'use strict';
-
-// See state defs from inflate.js
-var BAD = 30; /* got a data error -- remain here until reset */
-var TYPE = 12; /* i: waiting for type bits, including last-flag bit */
-
-/*
- Decode literal, length, and distance codes and write out the resulting
- literal and match bytes until either not enough input or output is
- available, an end-of-block is encountered, or a data error is encountered.
- When large enough input and output buffers are supplied to inflate(), for
- example, a 16K input buffer and a 64K output buffer, more than 95% of the
- inflate execution time is spent in this routine.
-
- Entry assumptions:
-
- state.mode === LEN
- strm.avail_in >= 6
- strm.avail_out >= 258
- start >= strm.avail_out
- state.bits < 8
-
- On return, state.mode is one of:
-
- LEN -- ran out of enough output space or enough available input
- TYPE -- reached end of block code, inflate() to interpret next block
- BAD -- error in block data
-
- Notes:
-
- - The maximum input bits used by a length/distance pair is 15 bits for the
- length code, 5 bits for the length extra, 15 bits for the distance code,
- and 13 bits for the distance extra. This totals 48 bits, or six bytes.
- Therefore if strm.avail_in >= 6, then there is enough input to avoid
- checking for available input while decoding.
-
- - The maximum bytes that a single length/distance pair can output is 258
- bytes, which is the maximum length that can be coded. inflate_fast()
- requires strm.avail_out >= 258 for each loop to avoid checking for
- output space.
- */
-module.exports = function inflate_fast(strm, start) {
- var state;
- var _in; /* local strm.input */
- var last; /* have enough input while in < last */
- var _out; /* local strm.output */
- var beg; /* inflate()'s initial strm.output */
- var end; /* while out < end, enough space available */
-//#ifdef INFLATE_STRICT
- var dmax; /* maximum distance from zlib header */
-//#endif
- var wsize; /* window size or zero if not using window */
- var whave; /* valid bytes in the window */
- var wnext; /* window write index */
- var window; /* allocated sliding window, if wsize != 0 */
- var hold; /* local strm.hold */
- var bits; /* local strm.bits */
- var lcode; /* local strm.lencode */
- var dcode; /* local strm.distcode */
- var lmask; /* mask for first level of length codes */
- var dmask; /* mask for first level of distance codes */
- var here; /* retrieved table entry */
- var op; /* code bits, operation, extra bits, or */
- /* window position, window bytes to copy */
- var len; /* match length, unused bytes */
- var dist; /* match distance */
- var from; /* where to copy match from */
- var from_source;
-
-
- var input, output; // JS specific, because we have no pointers
-
- /* copy state to local variables */
- state = strm.state;
- //here = state.here;
- _in = strm.next_in;
- input = strm.input;
- last = _in + (strm.avail_in - 5);
- _out = strm.next_out;
- output = strm.output;
- beg = _out - (start - strm.avail_out);
- end = _out + (strm.avail_out - 257);
-//#ifdef INFLATE_STRICT
- dmax = state.dmax;
-//#endif
- wsize = state.wsize;
- whave = state.whave;
- wnext = state.wnext;
- window = state.window;
- hold = state.hold;
- bits = state.bits;
- lcode = state.lencode;
- dcode = state.distcode;
- lmask = (1 << state.lenbits) - 1;
- dmask = (1 << state.distbits) - 1;
-
-
- /* decode literals and length/distances until end-of-block or not enough
- input data or output space */
-
- top:
- do {
- if (bits < 15) {
- hold += input[_in++] << bits;
- bits += 8;
- hold += input[_in++] << bits;
- bits += 8;
- }
-
- here = lcode[hold & lmask];
-
- dolen:
- for (;;) { // Goto emulation
- op = here >>> 24/*here.bits*/;
- hold >>>= op;
- bits -= op;
- op = (here >>> 16) & 0xff/*here.op*/;
- if (op === 0) { /* literal */
- //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
- // "inflate: literal '%c'\n" :
- // "inflate: literal 0x%02x\n", here.val));
- output[_out++] = here & 0xffff/*here.val*/;
- }
- else if (op & 16) { /* length base */
- len = here & 0xffff/*here.val*/;
- op &= 15; /* number of extra bits */
- if (op) {
- if (bits < op) {
- hold += input[_in++] << bits;
- bits += 8;
- }
- len += hold & ((1 << op) - 1);
- hold >>>= op;
- bits -= op;
- }
- //Tracevv((stderr, "inflate: length %u\n", len));
- if (bits < 15) {
- hold += input[_in++] << bits;
- bits += 8;
- hold += input[_in++] << bits;
- bits += 8;
- }
- here = dcode[hold & dmask];
-
- dodist:
- for (;;) { // goto emulation
- op = here >>> 24/*here.bits*/;
- hold >>>= op;
- bits -= op;
- op = (here >>> 16) & 0xff/*here.op*/;
-
- if (op & 16) { /* distance base */
- dist = here & 0xffff/*here.val*/;
- op &= 15; /* number of extra bits */
- if (bits < op) {
- hold += input[_in++] << bits;
- bits += 8;
- if (bits < op) {
- hold += input[_in++] << bits;
- bits += 8;
- }
- }
- dist += hold & ((1 << op) - 1);
-//#ifdef INFLATE_STRICT
- if (dist > dmax) {
- strm.msg = 'invalid distance too far back';
- state.mode = BAD;
- break top;
- }
-//#endif
- hold >>>= op;
- bits -= op;
- //Tracevv((stderr, "inflate: distance %u\n", dist));
- op = _out - beg; /* max distance in output */
- if (dist > op) { /* see if copy from window */
- op = dist - op; /* distance back in window */
- if (op > whave) {
- if (state.sane) {
- strm.msg = 'invalid distance too far back';
- state.mode = BAD;
- break top;
- }
-
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-// if (len <= op - whave) {
-// do {
-// output[_out++] = 0;
-// } while (--len);
-// continue top;
-// }
-// len -= op - whave;
-// do {
-// output[_out++] = 0;
-// } while (--op > whave);
-// if (op === 0) {
-// from = _out - dist;
-// do {
-// output[_out++] = output[from++];
-// } while (--len);
-// continue top;
-// }
-//#endif
- }
- from = 0; // window index
- from_source = window;
- if (wnext === 0) { /* very common case */
- from += wsize - op;
- if (op < len) { /* some from window */
- len -= op;
- do {
- output[_out++] = window[from++];
- } while (--op);
- from = _out - dist; /* rest from output */
- from_source = output;
- }
- }
- else if (wnext < op) { /* wrap around window */
- from += wsize + wnext - op;
- op -= wnext;
- if (op < len) { /* some from end of window */
- len -= op;
- do {
- output[_out++] = window[from++];
- } while (--op);
- from = 0;
- if (wnext < len) { /* some from start of window */
- op = wnext;
- len -= op;
- do {
- output[_out++] = window[from++];
- } while (--op);
- from = _out - dist; /* rest from output */
- from_source = output;
- }
- }
- }
- else { /* contiguous in window */
- from += wnext - op;
- if (op < len) { /* some from window */
- len -= op;
- do {
- output[_out++] = window[from++];
- } while (--op);
- from = _out - dist; /* rest from output */
- from_source = output;
- }
- }
- while (len > 2) {
- output[_out++] = from_source[from++];
- output[_out++] = from_source[from++];
- output[_out++] = from_source[from++];
- len -= 3;
- }
- if (len) {
- output[_out++] = from_source[from++];
- if (len > 1) {
- output[_out++] = from_source[from++];
- }
- }
- }
- else {
- from = _out - dist; /* copy direct from output */
- do { /* minimum length is three */
- output[_out++] = output[from++];
- output[_out++] = output[from++];
- output[_out++] = output[from++];
- len -= 3;
- } while (len > 2);
- if (len) {
- output[_out++] = output[from++];
- if (len > 1) {
- output[_out++] = output[from++];
- }
- }
- }
- }
- else if ((op & 64) === 0) { /* 2nd level distance code */
- here = dcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
- continue dodist;
- }
- else {
- strm.msg = 'invalid distance code';
- state.mode = BAD;
- break top;
- }
-
- break; // need to emulate goto via "continue"
- }
- }
- else if ((op & 64) === 0) { /* 2nd level length code */
- here = lcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
- continue dolen;
- }
- else if (op & 32) { /* end-of-block */
- //Tracevv((stderr, "inflate: end of block\n"));
- state.mode = TYPE;
- break top;
- }
- else {
- strm.msg = 'invalid literal/length code';
- state.mode = BAD;
- break top;
- }
-
- break; // need to emulate goto via "continue"
- }
- } while (_in < last && _out < end);
-
- /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
- len = bits >> 3;
- _in -= len;
- bits -= len << 3;
- hold &= (1 << bits) - 1;
-
- /* update state and return */
- strm.next_in = _in;
- strm.next_out = _out;
- strm.avail_in = (_in < last ? 5 + (last - _in) : 5 - (_in - last));
- strm.avail_out = (_out < end ? 257 + (end - _out) : 257 - (_out - end));
- state.hold = hold;
- state.bits = bits;
- return;
-};
-
-},{}],35:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-var adler32 = _dereq_('./adler32');
-var crc32 = _dereq_('./crc32');
-var inflate_fast = _dereq_('./inffast');
-var inflate_table = _dereq_('./inftrees');
-
-var CODES = 0;
-var LENS = 1;
-var DISTS = 2;
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-/* Allowed flush values; see deflate() and inflate() below for details */
-//var Z_NO_FLUSH = 0;
-//var Z_PARTIAL_FLUSH = 1;
-//var Z_SYNC_FLUSH = 2;
-//var Z_FULL_FLUSH = 3;
-var Z_FINISH = 4;
-var Z_BLOCK = 5;
-var Z_TREES = 6;
-
-
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-var Z_OK = 0;
-var Z_STREAM_END = 1;
-var Z_NEED_DICT = 2;
-//var Z_ERRNO = -1;
-var Z_STREAM_ERROR = -2;
-var Z_DATA_ERROR = -3;
-var Z_MEM_ERROR = -4;
-var Z_BUF_ERROR = -5;
-//var Z_VERSION_ERROR = -6;
-
-/* The deflate compression method */
-var Z_DEFLATED = 8;
-
-
-/* STATES ====================================================================*/
-/* ===========================================================================*/
-
-
-var HEAD = 1; /* i: waiting for magic header */
-var FLAGS = 2; /* i: waiting for method and flags (gzip) */
-var TIME = 3; /* i: waiting for modification time (gzip) */
-var OS = 4; /* i: waiting for extra flags and operating system (gzip) */
-var EXLEN = 5; /* i: waiting for extra length (gzip) */
-var EXTRA = 6; /* i: waiting for extra bytes (gzip) */
-var NAME = 7; /* i: waiting for end of file name (gzip) */
-var COMMENT = 8; /* i: waiting for end of comment (gzip) */
-var HCRC = 9; /* i: waiting for header crc (gzip) */
-var DICTID = 10; /* i: waiting for dictionary check value */
-var DICT = 11; /* waiting for inflateSetDictionary() call */
-var TYPE = 12; /* i: waiting for type bits, including last-flag bit */
-var TYPEDO = 13; /* i: same, but skip check to exit inflate on new block */
-var STORED = 14; /* i: waiting for stored size (length and complement) */
-var COPY_ = 15; /* i/o: same as COPY below, but only first time in */
-var COPY = 16; /* i/o: waiting for input or output to copy stored block */
-var TABLE = 17; /* i: waiting for dynamic block table lengths */
-var LENLENS = 18; /* i: waiting for code length code lengths */
-var CODELENS = 19; /* i: waiting for length/lit and distance code lengths */
-var LEN_ = 20; /* i: same as LEN below, but only first time in */
-var LEN = 21; /* i: waiting for length/lit/eob code */
-var LENEXT = 22; /* i: waiting for length extra bits */
-var DIST = 23; /* i: waiting for distance code */
-var DISTEXT = 24; /* i: waiting for distance extra bits */
-var MATCH = 25; /* o: waiting for output space to copy string */
-var LIT = 26; /* o: waiting for output space to write literal */
-var CHECK = 27; /* i: waiting for 32-bit check value */
-var LENGTH = 28; /* i: waiting for 32-bit length (gzip) */
-var DONE = 29; /* finished check, done -- remain here until reset */
-var BAD = 30; /* got a data error -- remain here until reset */
-var MEM = 31; /* got an inflate() memory error -- remain here until reset */
-var SYNC = 32; /* looking for synchronization bytes to restart inflate() */
-
-/* ===========================================================================*/
-
-
-
-var ENOUGH_LENS = 852;
-var ENOUGH_DISTS = 592;
-//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS);
-
-var MAX_WBITS = 15;
-/* 32K LZ77 window */
-var DEF_WBITS = MAX_WBITS;
-
-
-function ZSWAP32(q) {
- return (((q >>> 24) & 0xff) +
- ((q >>> 8) & 0xff00) +
- ((q & 0xff00) << 8) +
- ((q & 0xff) << 24));
-}
-
-
-function InflateState() {
- this.mode = 0; /* current inflate mode */
- this.last = false; /* true if processing last block */
- this.wrap = 0; /* bit 0 true for zlib, bit 1 true for gzip */
- this.havedict = false; /* true if dictionary provided */
- this.flags = 0; /* gzip header method and flags (0 if zlib) */
- this.dmax = 0; /* zlib header max distance (INFLATE_STRICT) */
- this.check = 0; /* protected copy of check value */
- this.total = 0; /* protected copy of output count */
- // TODO: may be {}
- this.head = null; /* where to save gzip header information */
-
- /* sliding window */
- this.wbits = 0; /* log base 2 of requested window size */
- this.wsize = 0; /* window size or zero if not using window */
- this.whave = 0; /* valid bytes in the window */
- this.wnext = 0; /* window write index */
- this.window = null; /* allocated sliding window, if needed */
-
- /* bit accumulator */
- this.hold = 0; /* input bit accumulator */
- this.bits = 0; /* number of bits in "in" */
-
- /* for string and stored block copying */
- this.length = 0; /* literal or length of data to copy */
- this.offset = 0; /* distance back to copy string from */
-
- /* for table and code decoding */
- this.extra = 0; /* extra bits needed */
-
- /* fixed and dynamic code tables */
- this.lencode = null; /* starting table for length/literal codes */
- this.distcode = null; /* starting table for distance codes */
- this.lenbits = 0; /* index bits for lencode */
- this.distbits = 0; /* index bits for distcode */
-
- /* dynamic table building */
- this.ncode = 0; /* number of code length code lengths */
- this.nlen = 0; /* number of length code lengths */
- this.ndist = 0; /* number of distance code lengths */
- this.have = 0; /* number of code lengths in lens[] */
- this.next = null; /* next available space in codes[] */
-
- this.lens = new utils.Buf16(320); /* temporary storage for code lengths */
- this.work = new utils.Buf16(288); /* work area for code table building */
-
- /*
- because we don't have pointers in js, we use lencode and distcode directly
- as buffers so we don't need codes
- */
- //this.codes = new utils.Buf32(ENOUGH); /* space for code tables */
- this.lendyn = null; /* dynamic table for length/literal codes (JS specific) */
- this.distdyn = null; /* dynamic table for distance codes (JS specific) */
- this.sane = 0; /* if false, allow invalid distance too far */
- this.back = 0; /* bits back of last unprocessed length/lit */
- this.was = 0; /* initial length of match */
-}
-
-function inflateResetKeep(strm) {
- var state;
-
- if (!strm || !strm.state) { return Z_STREAM_ERROR; }
- state = strm.state;
- strm.total_in = strm.total_out = state.total = 0;
- strm.msg = ''; /*Z_NULL*/
- if (state.wrap) { /* to support ill-conceived Java test suite */
- strm.adler = state.wrap & 1;
- }
- state.mode = HEAD;
- state.last = 0;
- state.havedict = 0;
- state.dmax = 32768;
- state.head = null/*Z_NULL*/;
- state.hold = 0;
- state.bits = 0;
- //state.lencode = state.distcode = state.next = state.codes;
- state.lencode = state.lendyn = new utils.Buf32(ENOUGH_LENS);
- state.distcode = state.distdyn = new utils.Buf32(ENOUGH_DISTS);
-
- state.sane = 1;
- state.back = -1;
- //Tracev((stderr, "inflate: reset\n"));
- return Z_OK;
-}
-
-function inflateReset(strm) {
- var state;
-
- if (!strm || !strm.state) { return Z_STREAM_ERROR; }
- state = strm.state;
- state.wsize = 0;
- state.whave = 0;
- state.wnext = 0;
- return inflateResetKeep(strm);
-
-}
-
-function inflateReset2(strm, windowBits) {
- var wrap;
- var state;
-
- /* get the state */
- if (!strm || !strm.state) { return Z_STREAM_ERROR; }
- state = strm.state;
-
- /* extract wrap request from windowBits parameter */
- if (windowBits < 0) {
- wrap = 0;
- windowBits = -windowBits;
- }
- else {
- wrap = (windowBits >> 4) + 1;
- if (windowBits < 48) {
- windowBits &= 15;
- }
- }
-
- /* set number of window bits, free window if different */
- if (windowBits && (windowBits < 8 || windowBits > 15)) {
- return Z_STREAM_ERROR;
- }
- if (state.window !== null && state.wbits !== windowBits) {
- state.window = null;
- }
-
- /* update state and reset the rest of it */
- state.wrap = wrap;
- state.wbits = windowBits;
- return inflateReset(strm);
-}
-
-function inflateInit2(strm, windowBits) {
- var ret;
- var state;
-
- if (!strm) { return Z_STREAM_ERROR; }
- //strm.msg = Z_NULL; /* in case we return an error */
-
- state = new InflateState();
-
- //if (state === Z_NULL) return Z_MEM_ERROR;
- //Tracev((stderr, "inflate: allocated\n"));
- strm.state = state;
- state.window = null/*Z_NULL*/;
- ret = inflateReset2(strm, windowBits);
- if (ret !== Z_OK) {
- strm.state = null/*Z_NULL*/;
- }
- return ret;
-}
-
-function inflateInit(strm) {
- return inflateInit2(strm, DEF_WBITS);
-}
-
-
-/*
- Return state with length and distance decoding tables and index sizes set to
- fixed code decoding. Normally this returns fixed tables from inffixed.h.
- If BUILDFIXED is defined, then instead this routine builds the tables the
- first time it's called, and returns those tables the first time and
- thereafter. This reduces the size of the code by about 2K bytes, in
- exchange for a little execution time. However, BUILDFIXED should not be
- used for threaded applications, since the rewriting of the tables and virgin
- may not be thread-safe.
- */
-var virgin = true;
-
-var lenfix, distfix; // We have no pointers in JS, so keep tables separate
-
-function fixedtables(state) {
- /* build fixed huffman tables if first call (may not be thread safe) */
- if (virgin) {
- var sym;
-
- lenfix = new utils.Buf32(512);
- distfix = new utils.Buf32(32);
-
- /* literal/length table */
- sym = 0;
- while (sym < 144) { state.lens[sym++] = 8; }
- while (sym < 256) { state.lens[sym++] = 9; }
- while (sym < 280) { state.lens[sym++] = 7; }
- while (sym < 288) { state.lens[sym++] = 8; }
-
- inflate_table(LENS, state.lens, 0, 288, lenfix, 0, state.work, {bits: 9});
-
- /* distance table */
- sym = 0;
- while (sym < 32) { state.lens[sym++] = 5; }
-
- inflate_table(DISTS, state.lens, 0, 32, distfix, 0, state.work, {bits: 5});
-
- /* do this just once */
- virgin = false;
- }
-
- state.lencode = lenfix;
- state.lenbits = 9;
- state.distcode = distfix;
- state.distbits = 5;
-}
-
-
-/*
- Update the window with the last wsize (normally 32K) bytes written before
- returning. If window does not exist yet, create it. This is only called
- when a window is already in use, or when output has been written during this
- inflate call, but the end of the deflate stream has not been reached yet.
- It is also called to create a window for dictionary data when a dictionary
- is loaded.
-
- Providing output buffers larger than 32K to inflate() should provide a speed
- advantage, since only the last 32K of output is copied to the sliding window
- upon return from inflate(), and since all distances after the first 32K of
- output will fall in the output data, making match copies simpler and faster.
- The advantage may be dependent on the size of the processor's data caches.
- */
-function updatewindow(strm, src, end, copy) {
- var dist;
- var state = strm.state;
-
- /* if it hasn't been done already, allocate space for the window */
- if (state.window === null) {
- state.wsize = 1 << state.wbits;
- state.wnext = 0;
- state.whave = 0;
-
- state.window = new utils.Buf8(state.wsize);
- }
-
- /* copy state->wsize or less output bytes into the circular window */
- if (copy >= state.wsize) {
- utils.arraySet(state.window,src, end - state.wsize, state.wsize, 0);
- state.wnext = 0;
- state.whave = state.wsize;
- }
- else {
- dist = state.wsize - state.wnext;
- if (dist > copy) {
- dist = copy;
- }
- //zmemcpy(state->window + state->wnext, end - copy, dist);
- utils.arraySet(state.window,src, end - copy, dist, state.wnext);
- copy -= dist;
- if (copy) {
- //zmemcpy(state->window, end - copy, copy);
- utils.arraySet(state.window,src, end - copy, copy, 0);
- state.wnext = copy;
- state.whave = state.wsize;
- }
- else {
- state.wnext += dist;
- if (state.wnext === state.wsize) { state.wnext = 0; }
- if (state.whave < state.wsize) { state.whave += dist; }
- }
- }
- return 0;
-}
-
-function inflate(strm, flush) {
- var state;
- var input, output; // input/output buffers
- var next; /* next input INDEX */
- var put; /* next output INDEX */
- var have, left; /* available input and output */
- var hold; /* bit buffer */
- var bits; /* bits in bit buffer */
- var _in, _out; /* save starting available input and output */
- var copy; /* number of stored or match bytes to copy */
- var from; /* where to copy match bytes from */
- var from_source;
- var here = 0; /* current decoding table entry */
- var here_bits, here_op, here_val; // paked "here" denormalized (JS specific)
- //var last; /* parent table entry */
- var last_bits, last_op, last_val; // paked "last" denormalized (JS specific)
- var len; /* length to copy for repeats, bits to drop */
- var ret; /* return code */
- var hbuf = new utils.Buf8(4); /* buffer for gzip header crc calculation */
- var opts;
-
- var n; // temporary var for NEED_BITS
-
- var order = /* permutation of code lengths */
- [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
-
-
- if (!strm || !strm.state || !strm.output ||
- (!strm.input && strm.avail_in !== 0)) {
- return Z_STREAM_ERROR;
- }
-
- state = strm.state;
- if (state.mode === TYPE) { state.mode = TYPEDO; } /* skip check */
-
-
- //--- LOAD() ---
- put = strm.next_out;
- output = strm.output;
- left = strm.avail_out;
- next = strm.next_in;
- input = strm.input;
- have = strm.avail_in;
- hold = state.hold;
- bits = state.bits;
- //---
-
- _in = have;
- _out = left;
- ret = Z_OK;
-
- inf_leave: // goto emulation
- for (;;) {
- switch (state.mode) {
- case HEAD:
- if (state.wrap === 0) {
- state.mode = TYPEDO;
- break;
- }
- //=== NEEDBITS(16);
- while (bits < 16) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- if ((state.wrap & 2) && hold === 0x8b1f) { /* gzip header */
- state.check = 0/*crc32(0L, Z_NULL, 0)*/;
- //=== CRC2(state.check, hold);
- hbuf[0] = hold & 0xff;
- hbuf[1] = (hold >>> 8) & 0xff;
- state.check = crc32(state.check, hbuf, 2, 0);
- //===//
-
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- state.mode = FLAGS;
- break;
- }
- state.flags = 0; /* expect zlib header */
- if (state.head) {
- state.head.done = false;
- }
- if (!(state.wrap & 1) || /* check if zlib header allowed */
- (((hold & 0xff)/*BITS(8)*/ << 8) + (hold >> 8)) % 31) {
- strm.msg = 'incorrect header check';
- state.mode = BAD;
- break;
- }
- if ((hold & 0x0f)/*BITS(4)*/ !== Z_DEFLATED) {
- strm.msg = 'unknown compression method';
- state.mode = BAD;
- break;
- }
- //--- DROPBITS(4) ---//
- hold >>>= 4;
- bits -= 4;
- //---//
- len = (hold & 0x0f)/*BITS(4)*/ + 8;
- if (state.wbits === 0) {
- state.wbits = len;
- }
- else if (len > state.wbits) {
- strm.msg = 'invalid window size';
- state.mode = BAD;
- break;
- }
- state.dmax = 1 << len;
- //Tracev((stderr, "inflate: zlib header ok\n"));
- strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
- state.mode = hold & 0x200 ? DICTID : TYPE;
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- break;
- case FLAGS:
- //=== NEEDBITS(16); */
- while (bits < 16) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- state.flags = hold;
- if ((state.flags & 0xff) !== Z_DEFLATED) {
- strm.msg = 'unknown compression method';
- state.mode = BAD;
- break;
- }
- if (state.flags & 0xe000) {
- strm.msg = 'unknown header flags set';
- state.mode = BAD;
- break;
- }
- if (state.head) {
- state.head.text = ((hold >> 8) & 1);
- }
- if (state.flags & 0x0200) {
- //=== CRC2(state.check, hold);
- hbuf[0] = hold & 0xff;
- hbuf[1] = (hold >>> 8) & 0xff;
- state.check = crc32(state.check, hbuf, 2, 0);
- //===//
- }
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- state.mode = TIME;
- /* falls through */
- case TIME:
- //=== NEEDBITS(32); */
- while (bits < 32) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- if (state.head) {
- state.head.time = hold;
- }
- if (state.flags & 0x0200) {
- //=== CRC4(state.check, hold)
- hbuf[0] = hold & 0xff;
- hbuf[1] = (hold >>> 8) & 0xff;
- hbuf[2] = (hold >>> 16) & 0xff;
- hbuf[3] = (hold >>> 24) & 0xff;
- state.check = crc32(state.check, hbuf, 4, 0);
- //===
- }
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- state.mode = OS;
- /* falls through */
- case OS:
- //=== NEEDBITS(16); */
- while (bits < 16) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- if (state.head) {
- state.head.xflags = (hold & 0xff);
- state.head.os = (hold >> 8);
- }
- if (state.flags & 0x0200) {
- //=== CRC2(state.check, hold);
- hbuf[0] = hold & 0xff;
- hbuf[1] = (hold >>> 8) & 0xff;
- state.check = crc32(state.check, hbuf, 2, 0);
- //===//
- }
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- state.mode = EXLEN;
- /* falls through */
- case EXLEN:
- if (state.flags & 0x0400) {
- //=== NEEDBITS(16); */
- while (bits < 16) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- state.length = hold;
- if (state.head) {
- state.head.extra_len = hold;
- }
- if (state.flags & 0x0200) {
- //=== CRC2(state.check, hold);
- hbuf[0] = hold & 0xff;
- hbuf[1] = (hold >>> 8) & 0xff;
- state.check = crc32(state.check, hbuf, 2, 0);
- //===//
- }
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- }
- else if (state.head) {
- state.head.extra = null/*Z_NULL*/;
- }
- state.mode = EXTRA;
- /* falls through */
- case EXTRA:
- if (state.flags & 0x0400) {
- copy = state.length;
- if (copy > have) { copy = have; }
- if (copy) {
- if (state.head) {
- len = state.head.extra_len - state.length;
- if (!state.head.extra) {
- // Use untyped array for more conveniend processing later
- state.head.extra = new Array(state.head.extra_len);
- }
- utils.arraySet(
- state.head.extra,
- input,
- next,
- // extra field is limited to 65536 bytes
- // - no need for additional size check
- copy,
- /*len + copy > state.head.extra_max - len ? state.head.extra_max : copy,*/
- len
- );
- //zmemcpy(state.head.extra + len, next,
- // len + copy > state.head.extra_max ?
- // state.head.extra_max - len : copy);
- }
- if (state.flags & 0x0200) {
- state.check = crc32(state.check, input, copy, next);
- }
- have -= copy;
- next += copy;
- state.length -= copy;
- }
- if (state.length) { break inf_leave; }
- }
- state.length = 0;
- state.mode = NAME;
- /* falls through */
- case NAME:
- if (state.flags & 0x0800) {
- if (have === 0) { break inf_leave; }
- copy = 0;
- do {
- // TODO: 2 or 1 bytes?
- len = input[next + copy++];
- /* use constant limit because in js we should not preallocate memory */
- if (state.head && len &&
- (state.length < 65536 /*state.head.name_max*/)) {
- state.head.name += String.fromCharCode(len);
- }
- } while (len && copy < have);
-
- if (state.flags & 0x0200) {
- state.check = crc32(state.check, input, copy, next);
- }
- have -= copy;
- next += copy;
- if (len) { break inf_leave; }
- }
- else if (state.head) {
- state.head.name = null;
- }
- state.length = 0;
- state.mode = COMMENT;
- /* falls through */
- case COMMENT:
- if (state.flags & 0x1000) {
- if (have === 0) { break inf_leave; }
- copy = 0;
- do {
- len = input[next + copy++];
- /* use constant limit because in js we should not preallocate memory */
- if (state.head && len &&
- (state.length < 65536 /*state.head.comm_max*/)) {
- state.head.comment += String.fromCharCode(len);
- }
- } while (len && copy < have);
- if (state.flags & 0x0200) {
- state.check = crc32(state.check, input, copy, next);
- }
- have -= copy;
- next += copy;
- if (len) { break inf_leave; }
- }
- else if (state.head) {
- state.head.comment = null;
- }
- state.mode = HCRC;
- /* falls through */
- case HCRC:
- if (state.flags & 0x0200) {
- //=== NEEDBITS(16); */
- while (bits < 16) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- if (hold !== (state.check & 0xffff)) {
- strm.msg = 'header crc mismatch';
- state.mode = BAD;
- break;
- }
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- }
- if (state.head) {
- state.head.hcrc = ((state.flags >> 9) & 1);
- state.head.done = true;
- }
- strm.adler = state.check = 0 /*crc32(0L, Z_NULL, 0)*/;
- state.mode = TYPE;
- break;
- case DICTID:
- //=== NEEDBITS(32); */
- while (bits < 32) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- strm.adler = state.check = ZSWAP32(hold);
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- state.mode = DICT;
- /* falls through */
- case DICT:
- if (state.havedict === 0) {
- //--- RESTORE() ---
- strm.next_out = put;
- strm.avail_out = left;
- strm.next_in = next;
- strm.avail_in = have;
- state.hold = hold;
- state.bits = bits;
- //---
- return Z_NEED_DICT;
- }
- strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
- state.mode = TYPE;
- /* falls through */
- case TYPE:
- if (flush === Z_BLOCK || flush === Z_TREES) { break inf_leave; }
- /* falls through */
- case TYPEDO:
- if (state.last) {
- //--- BYTEBITS() ---//
- hold >>>= bits & 7;
- bits -= bits & 7;
- //---//
- state.mode = CHECK;
- break;
- }
- //=== NEEDBITS(3); */
- while (bits < 3) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- state.last = (hold & 0x01)/*BITS(1)*/;
- //--- DROPBITS(1) ---//
- hold >>>= 1;
- bits -= 1;
- //---//
-
- switch ((hold & 0x03)/*BITS(2)*/) {
- case 0: /* stored block */
- //Tracev((stderr, "inflate: stored block%s\n",
- // state.last ? " (last)" : ""));
- state.mode = STORED;
- break;
- case 1: /* fixed block */
- fixedtables(state);
- //Tracev((stderr, "inflate: fixed codes block%s\n",
- // state.last ? " (last)" : ""));
- state.mode = LEN_; /* decode codes */
- if (flush === Z_TREES) {
- //--- DROPBITS(2) ---//
- hold >>>= 2;
- bits -= 2;
- //---//
- break inf_leave;
- }
- break;
- case 2: /* dynamic block */
- //Tracev((stderr, "inflate: dynamic codes block%s\n",
- // state.last ? " (last)" : ""));
- state.mode = TABLE;
- break;
- case 3:
- strm.msg = 'invalid block type';
- state.mode = BAD;
- }
- //--- DROPBITS(2) ---//
- hold >>>= 2;
- bits -= 2;
- //---//
- break;
- case STORED:
- //--- BYTEBITS() ---// /* go to byte boundary */
- hold >>>= bits & 7;
- bits -= bits & 7;
- //---//
- //=== NEEDBITS(32); */
- while (bits < 32) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- if ((hold & 0xffff) !== ((hold >>> 16) ^ 0xffff)) {
- strm.msg = 'invalid stored block lengths';
- state.mode = BAD;
- break;
- }
- state.length = hold & 0xffff;
- //Tracev((stderr, "inflate: stored length %u\n",
- // state.length));
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- state.mode = COPY_;
- if (flush === Z_TREES) { break inf_leave; }
- /* falls through */
- case COPY_:
- state.mode = COPY;
- /* falls through */
- case COPY:
- copy = state.length;
- if (copy) {
- if (copy > have) { copy = have; }
- if (copy > left) { copy = left; }
- if (copy === 0) { break inf_leave; }
- //--- zmemcpy(put, next, copy); ---
- utils.arraySet(output, input, next, copy, put);
- //---//
- have -= copy;
- next += copy;
- left -= copy;
- put += copy;
- state.length -= copy;
- break;
- }
- //Tracev((stderr, "inflate: stored end\n"));
- state.mode = TYPE;
- break;
- case TABLE:
- //=== NEEDBITS(14); */
- while (bits < 14) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- state.nlen = (hold & 0x1f)/*BITS(5)*/ + 257;
- //--- DROPBITS(5) ---//
- hold >>>= 5;
- bits -= 5;
- //---//
- state.ndist = (hold & 0x1f)/*BITS(5)*/ + 1;
- //--- DROPBITS(5) ---//
- hold >>>= 5;
- bits -= 5;
- //---//
- state.ncode = (hold & 0x0f)/*BITS(4)*/ + 4;
- //--- DROPBITS(4) ---//
- hold >>>= 4;
- bits -= 4;
- //---//
-//#ifndef PKZIP_BUG_WORKAROUND
- if (state.nlen > 286 || state.ndist > 30) {
- strm.msg = 'too many length or distance symbols';
- state.mode = BAD;
- break;
- }
-//#endif
- //Tracev((stderr, "inflate: table sizes ok\n"));
- state.have = 0;
- state.mode = LENLENS;
- /* falls through */
- case LENLENS:
- while (state.have < state.ncode) {
- //=== NEEDBITS(3);
- while (bits < 3) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- state.lens[order[state.have++]] = (hold & 0x07);//BITS(3);
- //--- DROPBITS(3) ---//
- hold >>>= 3;
- bits -= 3;
- //---//
- }
- while (state.have < 19) {
- state.lens[order[state.have++]] = 0;
- }
- // We have separate tables & no pointers. 2 commented lines below not needed.
- //state.next = state.codes;
- //state.lencode = state.next;
- // Switch to use dynamic table
- state.lencode = state.lendyn;
- state.lenbits = 7;
-
- opts = {bits: state.lenbits};
- ret = inflate_table(CODES, state.lens, 0, 19, state.lencode, 0, state.work, opts);
- state.lenbits = opts.bits;
-
- if (ret) {
- strm.msg = 'invalid code lengths set';
- state.mode = BAD;
- break;
- }
- //Tracev((stderr, "inflate: code lengths ok\n"));
- state.have = 0;
- state.mode = CODELENS;
- /* falls through */
- case CODELENS:
- while (state.have < state.nlen + state.ndist) {
- for (;;) {
- here = state.lencode[hold & ((1 << state.lenbits) - 1)];/*BITS(state.lenbits)*/
- here_bits = here >>> 24;
- here_op = (here >>> 16) & 0xff;
- here_val = here & 0xffff;
-
- if ((here_bits) <= bits) { break; }
- //--- PULLBYTE() ---//
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- //---//
- }
- if (here_val < 16) {
- //--- DROPBITS(here.bits) ---//
- hold >>>= here_bits;
- bits -= here_bits;
- //---//
- state.lens[state.have++] = here_val;
- }
- else {
- if (here_val === 16) {
- //=== NEEDBITS(here.bits + 2);
- n = here_bits + 2;
- while (bits < n) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- //--- DROPBITS(here.bits) ---//
- hold >>>= here_bits;
- bits -= here_bits;
- //---//
- if (state.have === 0) {
- strm.msg = 'invalid bit length repeat';
- state.mode = BAD;
- break;
- }
- len = state.lens[state.have - 1];
- copy = 3 + (hold & 0x03);//BITS(2);
- //--- DROPBITS(2) ---//
- hold >>>= 2;
- bits -= 2;
- //---//
- }
- else if (here_val === 17) {
- //=== NEEDBITS(here.bits + 3);
- n = here_bits + 3;
- while (bits < n) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- //--- DROPBITS(here.bits) ---//
- hold >>>= here_bits;
- bits -= here_bits;
- //---//
- len = 0;
- copy = 3 + (hold & 0x07);//BITS(3);
- //--- DROPBITS(3) ---//
- hold >>>= 3;
- bits -= 3;
- //---//
- }
- else {
- //=== NEEDBITS(here.bits + 7);
- n = here_bits + 7;
- while (bits < n) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- //--- DROPBITS(here.bits) ---//
- hold >>>= here_bits;
- bits -= here_bits;
- //---//
- len = 0;
- copy = 11 + (hold & 0x7f);//BITS(7);
- //--- DROPBITS(7) ---//
- hold >>>= 7;
- bits -= 7;
- //---//
- }
- if (state.have + copy > state.nlen + state.ndist) {
- strm.msg = 'invalid bit length repeat';
- state.mode = BAD;
- break;
- }
- while (copy--) {
- state.lens[state.have++] = len;
- }
- }
- }
-
- /* handle error breaks in while */
- if (state.mode === BAD) { break; }
-
- /* check for end-of-block code (better have one) */
- if (state.lens[256] === 0) {
- strm.msg = 'invalid code -- missing end-of-block';
- state.mode = BAD;
- break;
- }
-
- /* build code tables -- note: do not change the lenbits or distbits
- values here (9 and 6) without reading the comments in inftrees.h
- concerning the ENOUGH constants, which depend on those values */
- state.lenbits = 9;
-
- opts = {bits: state.lenbits};
- ret = inflate_table(LENS, state.lens, 0, state.nlen, state.lencode, 0, state.work, opts);
- // We have separate tables & no pointers. 2 commented lines below not needed.
- // state.next_index = opts.table_index;
- state.lenbits = opts.bits;
- // state.lencode = state.next;
-
- if (ret) {
- strm.msg = 'invalid literal/lengths set';
- state.mode = BAD;
- break;
- }
-
- state.distbits = 6;
- //state.distcode.copy(state.codes);
- // Switch to use dynamic table
- state.distcode = state.distdyn;
- opts = {bits: state.distbits};
- ret = inflate_table(DISTS, state.lens, state.nlen, state.ndist, state.distcode, 0, state.work, opts);
- // We have separate tables & no pointers. 2 commented lines below not needed.
- // state.next_index = opts.table_index;
- state.distbits = opts.bits;
- // state.distcode = state.next;
-
- if (ret) {
- strm.msg = 'invalid distances set';
- state.mode = BAD;
- break;
- }
- //Tracev((stderr, 'inflate: codes ok\n'));
- state.mode = LEN_;
- if (flush === Z_TREES) { break inf_leave; }
- /* falls through */
- case LEN_:
- state.mode = LEN;
- /* falls through */
- case LEN:
- if (have >= 6 && left >= 258) {
- //--- RESTORE() ---
- strm.next_out = put;
- strm.avail_out = left;
- strm.next_in = next;
- strm.avail_in = have;
- state.hold = hold;
- state.bits = bits;
- //---
- inflate_fast(strm, _out);
- //--- LOAD() ---
- put = strm.next_out;
- output = strm.output;
- left = strm.avail_out;
- next = strm.next_in;
- input = strm.input;
- have = strm.avail_in;
- hold = state.hold;
- bits = state.bits;
- //---
-
- if (state.mode === TYPE) {
- state.back = -1;
- }
- break;
- }
- state.back = 0;
- for (;;) {
- here = state.lencode[hold & ((1 << state.lenbits) -1)]; /*BITS(state.lenbits)*/
- here_bits = here >>> 24;
- here_op = (here >>> 16) & 0xff;
- here_val = here & 0xffff;
-
- if (here_bits <= bits) { break; }
- //--- PULLBYTE() ---//
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- //---//
- }
- if (here_op && (here_op & 0xf0) === 0) {
- last_bits = here_bits;
- last_op = here_op;
- last_val = here_val;
- for (;;) {
- here = state.lencode[last_val +
- ((hold & ((1 << (last_bits + last_op)) -1))/*BITS(last.bits + last.op)*/ >> last_bits)];
- here_bits = here >>> 24;
- here_op = (here >>> 16) & 0xff;
- here_val = here & 0xffff;
-
- if ((last_bits + here_bits) <= bits) { break; }
- //--- PULLBYTE() ---//
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- //---//
- }
- //--- DROPBITS(last.bits) ---//
- hold >>>= last_bits;
- bits -= last_bits;
- //---//
- state.back += last_bits;
- }
- //--- DROPBITS(here.bits) ---//
- hold >>>= here_bits;
- bits -= here_bits;
- //---//
- state.back += here_bits;
- state.length = here_val;
- if (here_op === 0) {
- //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
- // "inflate: literal '%c'\n" :
- // "inflate: literal 0x%02x\n", here.val));
- state.mode = LIT;
- break;
- }
- if (here_op & 32) {
- //Tracevv((stderr, "inflate: end of block\n"));
- state.back = -1;
- state.mode = TYPE;
- break;
- }
- if (here_op & 64) {
- strm.msg = 'invalid literal/length code';
- state.mode = BAD;
- break;
- }
- state.extra = here_op & 15;
- state.mode = LENEXT;
- /* falls through */
- case LENEXT:
- if (state.extra) {
- //=== NEEDBITS(state.extra);
- n = state.extra;
- while (bits < n) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- state.length += hold & ((1 << state.extra) -1)/*BITS(state.extra)*/;
- //--- DROPBITS(state.extra) ---//
- hold >>>= state.extra;
- bits -= state.extra;
- //---//
- state.back += state.extra;
- }
- //Tracevv((stderr, "inflate: length %u\n", state.length));
- state.was = state.length;
- state.mode = DIST;
- /* falls through */
- case DIST:
- for (;;) {
- here = state.distcode[hold & ((1 << state.distbits) -1)];/*BITS(state.distbits)*/
- here_bits = here >>> 24;
- here_op = (here >>> 16) & 0xff;
- here_val = here & 0xffff;
-
- if ((here_bits) <= bits) { break; }
- //--- PULLBYTE() ---//
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- //---//
- }
- if ((here_op & 0xf0) === 0) {
- last_bits = here_bits;
- last_op = here_op;
- last_val = here_val;
- for (;;) {
- here = state.distcode[last_val +
- ((hold & ((1 << (last_bits + last_op)) -1))/*BITS(last.bits + last.op)*/ >> last_bits)];
- here_bits = here >>> 24;
- here_op = (here >>> 16) & 0xff;
- here_val = here & 0xffff;
-
- if ((last_bits + here_bits) <= bits) { break; }
- //--- PULLBYTE() ---//
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- //---//
- }
- //--- DROPBITS(last.bits) ---//
- hold >>>= last_bits;
- bits -= last_bits;
- //---//
- state.back += last_bits;
- }
- //--- DROPBITS(here.bits) ---//
- hold >>>= here_bits;
- bits -= here_bits;
- //---//
- state.back += here_bits;
- if (here_op & 64) {
- strm.msg = 'invalid distance code';
- state.mode = BAD;
- break;
- }
- state.offset = here_val;
- state.extra = (here_op) & 15;
- state.mode = DISTEXT;
- /* falls through */
- case DISTEXT:
- if (state.extra) {
- //=== NEEDBITS(state.extra);
- n = state.extra;
- while (bits < n) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- state.offset += hold & ((1 << state.extra) -1)/*BITS(state.extra)*/;
- //--- DROPBITS(state.extra) ---//
- hold >>>= state.extra;
- bits -= state.extra;
- //---//
- state.back += state.extra;
- }
-//#ifdef INFLATE_STRICT
- if (state.offset > state.dmax) {
- strm.msg = 'invalid distance too far back';
- state.mode = BAD;
- break;
- }
-//#endif
- //Tracevv((stderr, "inflate: distance %u\n", state.offset));
- state.mode = MATCH;
- /* falls through */
- case MATCH:
- if (left === 0) { break inf_leave; }
- copy = _out - left;
- if (state.offset > copy) { /* copy from window */
- copy = state.offset - copy;
- if (copy > state.whave) {
- if (state.sane) {
- strm.msg = 'invalid distance too far back';
- state.mode = BAD;
- break;
- }
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-// Trace((stderr, "inflate.c too far\n"));
-// copy -= state.whave;
-// if (copy > state.length) { copy = state.length; }
-// if (copy > left) { copy = left; }
-// left -= copy;
-// state.length -= copy;
-// do {
-// output[put++] = 0;
-// } while (--copy);
-// if (state.length === 0) { state.mode = LEN; }
-// break;
-//#endif
- }
- if (copy > state.wnext) {
- copy -= state.wnext;
- from = state.wsize - copy;
- }
- else {
- from = state.wnext - copy;
- }
- if (copy > state.length) { copy = state.length; }
- from_source = state.window;
- }
- else { /* copy from output */
- from_source = output;
- from = put - state.offset;
- copy = state.length;
- }
- if (copy > left) { copy = left; }
- left -= copy;
- state.length -= copy;
- do {
- output[put++] = from_source[from++];
- } while (--copy);
- if (state.length === 0) { state.mode = LEN; }
- break;
- case LIT:
- if (left === 0) { break inf_leave; }
- output[put++] = state.length;
- left--;
- state.mode = LEN;
- break;
- case CHECK:
- if (state.wrap) {
- //=== NEEDBITS(32);
- while (bits < 32) {
- if (have === 0) { break inf_leave; }
- have--;
- // Use '|' insdead of '+' to make sure that result is signed
- hold |= input[next++] << bits;
- bits += 8;
- }
- //===//
- _out -= left;
- strm.total_out += _out;
- state.total += _out;
- if (_out) {
- strm.adler = state.check =
- /*UPDATE(state.check, put - _out, _out);*/
- (state.flags ? crc32(state.check, output, _out, put - _out) : adler32(state.check, output, _out, put - _out));
-
- }
- _out = left;
- // NB: crc32 stored as signed 32-bit int, ZSWAP32 returns signed too
- if ((state.flags ? hold : ZSWAP32(hold)) !== state.check) {
- strm.msg = 'incorrect data check';
- state.mode = BAD;
- break;
- }
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- //Tracev((stderr, "inflate: check matches trailer\n"));
- }
- state.mode = LENGTH;
- /* falls through */
- case LENGTH:
- if (state.wrap && state.flags) {
- //=== NEEDBITS(32);
- while (bits < 32) {
- if (have === 0) { break inf_leave; }
- have--;
- hold += input[next++] << bits;
- bits += 8;
- }
- //===//
- if (hold !== (state.total & 0xffffffff)) {
- strm.msg = 'incorrect length check';
- state.mode = BAD;
- break;
- }
- //=== INITBITS();
- hold = 0;
- bits = 0;
- //===//
- //Tracev((stderr, "inflate: length matches trailer\n"));
- }
- state.mode = DONE;
- /* falls through */
- case DONE:
- ret = Z_STREAM_END;
- break inf_leave;
- case BAD:
- ret = Z_DATA_ERROR;
- break inf_leave;
- case MEM:
- return Z_MEM_ERROR;
- case SYNC:
- /* falls through */
- default:
- return Z_STREAM_ERROR;
- }
- }
-
- // inf_leave <- here is real place for "goto inf_leave", emulated via "break inf_leave"
-
- /*
- Return from inflate(), updating the total counts and the check value.
- If there was no progress during the inflate() call, return a buffer
- error. Call updatewindow() to create and/or update the window state.
- Note: a memory error from inflate() is non-recoverable.
- */
-
- //--- RESTORE() ---
- strm.next_out = put;
- strm.avail_out = left;
- strm.next_in = next;
- strm.avail_in = have;
- state.hold = hold;
- state.bits = bits;
- //---
-
- if (state.wsize || (_out !== strm.avail_out && state.mode < BAD &&
- (state.mode < CHECK || flush !== Z_FINISH))) {
- if (updatewindow(strm, strm.output, strm.next_out, _out - strm.avail_out)) {
- state.mode = MEM;
- return Z_MEM_ERROR;
- }
- }
- _in -= strm.avail_in;
- _out -= strm.avail_out;
- strm.total_in += _in;
- strm.total_out += _out;
- state.total += _out;
- if (state.wrap && _out) {
- strm.adler = state.check = /*UPDATE(state.check, strm.next_out - _out, _out);*/
- (state.flags ? crc32(state.check, output, _out, strm.next_out - _out) : adler32(state.check, output, _out, strm.next_out - _out));
- }
- strm.data_type = state.bits + (state.last ? 64 : 0) +
- (state.mode === TYPE ? 128 : 0) +
- (state.mode === LEN_ || state.mode === COPY_ ? 256 : 0);
- if (((_in === 0 && _out === 0) || flush === Z_FINISH) && ret === Z_OK) {
- ret = Z_BUF_ERROR;
- }
- return ret;
-}
-
-function inflateEnd(strm) {
-
- if (!strm || !strm.state /*|| strm->zfree == (free_func)0*/) {
- return Z_STREAM_ERROR;
- }
-
- var state = strm.state;
- if (state.window) {
- state.window = null;
- }
- strm.state = null;
- return Z_OK;
-}
-
-function inflateGetHeader(strm, head) {
- var state;
-
- /* check state */
- if (!strm || !strm.state) { return Z_STREAM_ERROR; }
- state = strm.state;
- if ((state.wrap & 2) === 0) { return Z_STREAM_ERROR; }
-
- /* save header structure */
- state.head = head;
- head.done = false;
- return Z_OK;
-}
-
-
-exports.inflateReset = inflateReset;
-exports.inflateReset2 = inflateReset2;
-exports.inflateResetKeep = inflateResetKeep;
-exports.inflateInit = inflateInit;
-exports.inflateInit2 = inflateInit2;
-exports.inflate = inflate;
-exports.inflateEnd = inflateEnd;
-exports.inflateGetHeader = inflateGetHeader;
-exports.inflateInfo = 'pako inflate (from Nodeca project)';
-
-/* Not implemented
-exports.inflateCopy = inflateCopy;
-exports.inflateGetDictionary = inflateGetDictionary;
-exports.inflateMark = inflateMark;
-exports.inflatePrime = inflatePrime;
-exports.inflateSetDictionary = inflateSetDictionary;
-exports.inflateSync = inflateSync;
-exports.inflateSyncPoint = inflateSyncPoint;
-exports.inflateUndermine = inflateUndermine;
-*/
-},{"../utils/common":27,"./adler32":29,"./crc32":31,"./inffast":34,"./inftrees":36}],36:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-
-var MAXBITS = 15;
-var ENOUGH_LENS = 852;
-var ENOUGH_DISTS = 592;
-//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS);
-
-var CODES = 0;
-var LENS = 1;
-var DISTS = 2;
-
-var lbase = [ /* Length codes 257..285 base */
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
- 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
-];
-
-var lext = [ /* Length codes 257..285 extra */
- 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78
-];
-
-var dbase = [ /* Distance codes 0..29 base */
- 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
- 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
- 8193, 12289, 16385, 24577, 0, 0
-];
-
-var dext = [ /* Distance codes 0..29 extra */
- 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
- 23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
- 28, 28, 29, 29, 64, 64
-];
-
-module.exports = function inflate_table(type, lens, lens_index, codes, table, table_index, work, opts)
-{
- var bits = opts.bits;
- //here = opts.here; /* table entry for duplication */
-
- var len = 0; /* a code's length in bits */
- var sym = 0; /* index of code symbols */
- var min = 0, max = 0; /* minimum and maximum code lengths */
- var root = 0; /* number of index bits for root table */
- var curr = 0; /* number of index bits for current table */
- var drop = 0; /* code bits to drop for sub-table */
- var left = 0; /* number of prefix codes available */
- var used = 0; /* code entries in table used */
- var huff = 0; /* Huffman code */
- var incr; /* for incrementing code, index */
- var fill; /* index for replicating entries */
- var low; /* low bits for current root entry */
- var mask; /* mask for low root bits */
- var next; /* next available space in table */
- var base = null; /* base value table to use */
- var base_index = 0;
-// var shoextra; /* extra bits table to use */
- var end; /* use base and extra for symbol > end */
- var count = new utils.Buf16(MAXBITS+1); //[MAXBITS+1]; /* number of codes of each length */
- var offs = new utils.Buf16(MAXBITS+1); //[MAXBITS+1]; /* offsets in table for each length */
- var extra = null;
- var extra_index = 0;
-
- var here_bits, here_op, here_val;
-
- /*
- Process a set of code lengths to create a canonical Huffman code. The
- code lengths are lens[0..codes-1]. Each length corresponds to the
- symbols 0..codes-1. The Huffman code is generated by first sorting the
- symbols by length from short to long, and retaining the symbol order
- for codes with equal lengths. Then the code starts with all zero bits
- for the first code of the shortest length, and the codes are integer
- increments for the same length, and zeros are appended as the length
- increases. For the deflate format, these bits are stored backwards
- from their more natural integer increment ordering, and so when the
- decoding tables are built in the large loop below, the integer codes
- are incremented backwards.
-
- This routine assumes, but does not check, that all of the entries in
- lens[] are in the range 0..MAXBITS. The caller must assure this.
- 1..MAXBITS is interpreted as that code length. zero means that that
- symbol does not occur in this code.
-
- The codes are sorted by computing a count of codes for each length,
- creating from that a table of starting indices for each length in the
- sorted table, and then entering the symbols in order in the sorted
- table. The sorted table is work[], with that space being provided by
- the caller.
-
- The length counts are used for other purposes as well, i.e. finding
- the minimum and maximum length codes, determining if there are any
- codes at all, checking for a valid set of lengths, and looking ahead
- at length counts to determine sub-table sizes when building the
- decoding tables.
- */
-
- /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
- for (len = 0; len <= MAXBITS; len++) {
- count[len] = 0;
- }
- for (sym = 0; sym < codes; sym++) {
- count[lens[lens_index + sym]]++;
- }
-
- /* bound code lengths, force root to be within code lengths */
- root = bits;
- for (max = MAXBITS; max >= 1; max--) {
- if (count[max] !== 0) { break; }
- }
- if (root > max) {
- root = max;
- }
- if (max === 0) { /* no symbols to code at all */
- //table.op[opts.table_index] = 64; //here.op = (var char)64; /* invalid code marker */
- //table.bits[opts.table_index] = 1; //here.bits = (var char)1;
- //table.val[opts.table_index++] = 0; //here.val = (var short)0;
- table[table_index++] = (1 << 24) | (64 << 16) | 0;
-
-
- //table.op[opts.table_index] = 64;
- //table.bits[opts.table_index] = 1;
- //table.val[opts.table_index++] = 0;
- table[table_index++] = (1 << 24) | (64 << 16) | 0;
-
- opts.bits = 1;
- return 0; /* no symbols, but wait for decoding to report error */
- }
- for (min = 1; min < max; min++) {
- if (count[min] !== 0) { break; }
- }
- if (root < min) {
- root = min;
- }
-
- /* check for an over-subscribed or incomplete set of lengths */
- left = 1;
- for (len = 1; len <= MAXBITS; len++) {
- left <<= 1;
- left -= count[len];
- if (left < 0) {
- return -1;
- } /* over-subscribed */
- }
- if (left > 0 && (type === CODES || max !== 1)) {
- return -1; /* incomplete set */
- }
-
- /* generate offsets into symbol table for each length for sorting */
- offs[1] = 0;
- for (len = 1; len < MAXBITS; len++) {
- offs[len + 1] = offs[len] + count[len];
- }
-
- /* sort symbols by length, by symbol order within each length */
- for (sym = 0; sym < codes; sym++) {
- if (lens[lens_index + sym] !== 0) {
- work[offs[lens[lens_index + sym]]++] = sym;
- }
- }
-
- /*
- Create and fill in decoding tables. In this loop, the table being
- filled is at next and has curr index bits. The code being used is huff
- with length len. That code is converted to an index by dropping drop
- bits off of the bottom. For codes where len is less than drop + curr,
- those top drop + curr - len bits are incremented through all values to
- fill the table with replicated entries.
-
- root is the number of index bits for the root table. When len exceeds
- root, sub-tables are created pointed to by the root entry with an index
- of the low root bits of huff. This is saved in low to check for when a
- new sub-table should be started. drop is zero when the root table is
- being filled, and drop is root when sub-tables are being filled.
-
- When a new sub-table is needed, it is necessary to look ahead in the
- code lengths to determine what size sub-table is needed. The length
- counts are used for this, and so count[] is decremented as codes are
- entered in the tables.
-
- used keeps track of how many table entries have been allocated from the
- provided *table space. It is checked for LENS and DIST tables against
- the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
- the initial root table size constants. See the comments in inftrees.h
- for more information.
-
- sym increments through all symbols, and the loop terminates when
- all codes of length max, i.e. all codes, have been processed. This
- routine permits incomplete codes, so another loop after this one fills
- in the rest of the decoding tables with invalid code markers.
- */
-
- /* set up for code type */
- // poor man optimization - use if-else instead of switch,
- // to avoid deopts in old v8
- if (type === CODES) {
- base = extra = work; /* dummy value--not used */
- end = 19;
- } else if (type === LENS) {
- base = lbase;
- base_index -= 257;
- extra = lext;
- extra_index -= 257;
- end = 256;
- } else { /* DISTS */
- base = dbase;
- extra = dext;
- end = -1;
- }
-
- /* initialize opts for loop */
- huff = 0; /* starting code */
- sym = 0; /* starting code symbol */
- len = min; /* starting code length */
- next = table_index; /* current table to fill in */
- curr = root; /* current table index bits */
- drop = 0; /* current bits to drop from code for index */
- low = -1; /* trigger new sub-table when len > root */
- used = 1 << root; /* use root table entries */
- mask = used - 1; /* mask for comparing low */
-
- /* check available table space */
- if ((type === LENS && used > ENOUGH_LENS) ||
- (type === DISTS && used > ENOUGH_DISTS)) {
- return 1;
- }
-
- var i=0;
- /* process all codes and make table entries */
- for (;;) {
- i++;
- /* create table entry */
- here_bits = len - drop;
- if (work[sym] < end) {
- here_op = 0;
- here_val = work[sym];
- }
- else if (work[sym] > end) {
- here_op = extra[extra_index + work[sym]];
- here_val = base[base_index + work[sym]];
- }
- else {
- here_op = 32 + 64; /* end of block */
- here_val = 0;
- }
-
- /* replicate for those indices with low len bits equal to huff */
- incr = 1 << (len - drop);
- fill = 1 << curr;
- min = fill; /* save offset to next table */
- do {
- fill -= incr;
- table[next + (huff >> drop) + fill] = (here_bits << 24) | (here_op << 16) | here_val |0;
- } while (fill !== 0);
-
- /* backwards increment the len-bit code huff */
- incr = 1 << (len - 1);
- while (huff & incr) {
- incr >>= 1;
- }
- if (incr !== 0) {
- huff &= incr - 1;
- huff += incr;
- } else {
- huff = 0;
- }
-
- /* go to next symbol, update count, len */
- sym++;
- if (--count[len] === 0) {
- if (len === max) { break; }
- len = lens[lens_index + work[sym]];
- }
-
- /* create new sub-table if needed */
- if (len > root && (huff & mask) !== low) {
- /* if first time, transition to sub-tables */
- if (drop === 0) {
- drop = root;
- }
-
- /* increment past last table */
- next += min; /* here min is 1 << curr */
-
- /* determine length of next table */
- curr = len - drop;
- left = 1 << curr;
- while (curr + drop < max) {
- left -= count[curr + drop];
- if (left <= 0) { break; }
- curr++;
- left <<= 1;
- }
-
- /* check for enough space */
- used += 1 << curr;
- if ((type === LENS && used > ENOUGH_LENS) ||
- (type === DISTS && used > ENOUGH_DISTS)) {
- return 1;
- }
-
- /* point entry in root table to sub-table */
- low = huff & mask;
- /*table.op[low] = curr;
- table.bits[low] = root;
- table.val[low] = next - opts.table_index;*/
- table[low] = (root << 24) | (curr << 16) | (next - table_index) |0;
- }
- }
-
- /* fill in remaining table entry if code is incomplete (guaranteed to have
- at most one remaining entry, since if the code is incomplete, the
- maximum code length that was allowed to get this far is one bit) */
- if (huff !== 0) {
- //table.op[next + huff] = 64; /* invalid code marker */
- //table.bits[next + huff] = len - drop;
- //table.val[next + huff] = 0;
- table[next + huff] = ((len - drop) << 24) | (64 << 16) |0;
- }
-
- /* set return parameters */
- //opts.table_index += used;
- opts.bits = root;
- return 0;
-};
-
-},{"../utils/common":27}],37:[function(_dereq_,module,exports){
-'use strict';
-
-module.exports = {
- '2': 'need dictionary', /* Z_NEED_DICT 2 */
- '1': 'stream end', /* Z_STREAM_END 1 */
- '0': '', /* Z_OK 0 */
- '-1': 'file error', /* Z_ERRNO (-1) */
- '-2': 'stream error', /* Z_STREAM_ERROR (-2) */
- '-3': 'data error', /* Z_DATA_ERROR (-3) */
- '-4': 'insufficient memory', /* Z_MEM_ERROR (-4) */
- '-5': 'buffer error', /* Z_BUF_ERROR (-5) */
- '-6': 'incompatible version' /* Z_VERSION_ERROR (-6) */
-};
-},{}],38:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-//var Z_FILTERED = 1;
-//var Z_HUFFMAN_ONLY = 2;
-//var Z_RLE = 3;
-var Z_FIXED = 4;
-//var Z_DEFAULT_STRATEGY = 0;
-
-/* Possible values of the data_type field (though see inflate()) */
-var Z_BINARY = 0;
-var Z_TEXT = 1;
-//var Z_ASCII = 1; // = Z_TEXT
-var Z_UNKNOWN = 2;
-
-/*============================================================================*/
-
-
-function zero(buf) { var len = buf.length; while (--len >= 0) { buf[len] = 0; } }
-
-// From zutil.h
-
-var STORED_BLOCK = 0;
-var STATIC_TREES = 1;
-var DYN_TREES = 2;
-/* The three kinds of block type */
-
-var MIN_MATCH = 3;
-var MAX_MATCH = 258;
-/* The minimum and maximum match lengths */
-
-// From deflate.h
-/* ===========================================================================
- * Internal compression state.
- */
-
-var LENGTH_CODES = 29;
-/* number of length codes, not counting the special END_BLOCK code */
-
-var LITERALS = 256;
-/* number of literal bytes 0..255 */
-
-var L_CODES = LITERALS + 1 + LENGTH_CODES;
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-var D_CODES = 30;
-/* number of distance codes */
-
-var BL_CODES = 19;
-/* number of codes used to transfer the bit lengths */
-
-var HEAP_SIZE = 2*L_CODES + 1;
-/* maximum heap size */
-
-var MAX_BITS = 15;
-/* All codes must not exceed MAX_BITS bits */
-
-var Buf_size = 16;
-/* size of bit buffer in bi_buf */
-
-
-/* ===========================================================================
- * Constants
- */
-
-var MAX_BL_BITS = 7;
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-var END_BLOCK = 256;
-/* end of block literal code */
-
-var REP_3_6 = 16;
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-var REPZ_3_10 = 17;
-/* repeat a zero length 3-10 times (3 bits of repeat count) */
-
-var REPZ_11_138 = 18;
-/* repeat a zero length 11-138 times (7 bits of repeat count) */
-
-var extra_lbits = /* extra bits for each length code */
- [0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0];
-
-var extra_dbits = /* extra bits for each distance code */
- [0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13];
-
-var extra_blbits = /* extra bits for each bit length code */
- [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7];
-
-var bl_order =
- [16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-// We pre-fill arrays with 0 to avoid uninitialized gaps
-
-var DIST_CODE_LEN = 512; /* see definition of array dist_code below */
-
-// !!!! Use flat array insdead of structure, Freq = i*2, Len = i*2+1
-var static_ltree = new Array((L_CODES+2) * 2);
-zero(static_ltree);
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-var static_dtree = new Array(D_CODES * 2);
-zero(static_dtree);
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-var _dist_code = new Array(DIST_CODE_LEN);
-zero(_dist_code);
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-var _length_code = new Array(MAX_MATCH-MIN_MATCH+1);
-zero(_length_code);
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-var base_length = new Array(LENGTH_CODES);
-zero(base_length);
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-var base_dist = new Array(D_CODES);
-zero(base_dist);
-/* First normalized distance for each code (0 = distance of 1) */
-
-
-var StaticTreeDesc = function (static_tree, extra_bits, extra_base, elems, max_length) {
-
- this.static_tree = static_tree; /* static tree or NULL */
- this.extra_bits = extra_bits; /* extra bits for each code or NULL */
- this.extra_base = extra_base; /* base index for extra_bits */
- this.elems = elems; /* max number of elements in the tree */
- this.max_length = max_length; /* max bit length for the codes */
-
- // show if `static_tree` has data or dummy - needed for monomorphic objects
- this.has_stree = static_tree && static_tree.length;
-};
-
-
-var static_l_desc;
-var static_d_desc;
-var static_bl_desc;
-
-
-var TreeDesc = function(dyn_tree, stat_desc) {
- this.dyn_tree = dyn_tree; /* the dynamic tree */
- this.max_code = 0; /* largest code with non zero frequency */
- this.stat_desc = stat_desc; /* the corresponding static tree */
-};
-
-
-
-function d_code(dist) {
- return dist < 256 ? _dist_code[dist] : _dist_code[256 + (dist >>> 7)];
-}
-
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-function put_short (s, w) {
-// put_byte(s, (uch)((w) & 0xff));
-// put_byte(s, (uch)((ush)(w) >> 8));
- s.pending_buf[s.pending++] = (w) & 0xff;
- s.pending_buf[s.pending++] = (w >>> 8) & 0xff;
-}
-
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-function send_bits(s, value, length) {
- if (s.bi_valid > (Buf_size - length)) {
- s.bi_buf |= (value << s.bi_valid) & 0xffff;
- put_short(s, s.bi_buf);
- s.bi_buf = value >> (Buf_size - s.bi_valid);
- s.bi_valid += length - Buf_size;
- } else {
- s.bi_buf |= (value << s.bi_valid) & 0xffff;
- s.bi_valid += length;
- }
-}
-
-
-function send_code(s, c, tree) {
- send_bits(s, tree[c*2]/*.Code*/, tree[c*2 + 1]/*.Len*/);
-}
-
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-function bi_reverse(code, len) {
- var res = 0;
- do {
- res |= code & 1;
- code >>>= 1;
- res <<= 1;
- } while (--len > 0);
- return res >>> 1;
-}
-
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-function bi_flush(s) {
- if (s.bi_valid === 16) {
- put_short(s, s.bi_buf);
- s.bi_buf = 0;
- s.bi_valid = 0;
-
- } else if (s.bi_valid >= 8) {
- s.pending_buf[s.pending++] = s.bi_buf & 0xff;
- s.bi_buf >>= 8;
- s.bi_valid -= 8;
- }
-}
-
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- * above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- * array bl_count contains the frequencies for each bit length.
- * The length opt_len is updated; static_len is also updated if stree is
- * not null.
- */
-function gen_bitlen(s, desc)
-// deflate_state *s;
-// tree_desc *desc; /* the tree descriptor */
-{
- var tree = desc.dyn_tree;
- var max_code = desc.max_code;
- var stree = desc.stat_desc.static_tree;
- var has_stree = desc.stat_desc.has_stree;
- var extra = desc.stat_desc.extra_bits;
- var base = desc.stat_desc.extra_base;
- var max_length = desc.stat_desc.max_length;
- var h; /* heap index */
- var n, m; /* iterate over the tree elements */
- var bits; /* bit length */
- var xbits; /* extra bits */
- var f; /* frequency */
- var overflow = 0; /* number of elements with bit length too large */
-
- for (bits = 0; bits <= MAX_BITS; bits++) {
- s.bl_count[bits] = 0;
- }
-
- /* In a first pass, compute the optimal bit lengths (which may
- * overflow in the case of the bit length tree).
- */
- tree[s.heap[s.heap_max]*2 + 1]/*.Len*/ = 0; /* root of the heap */
-
- for (h = s.heap_max+1; h < HEAP_SIZE; h++) {
- n = s.heap[h];
- bits = tree[tree[n*2 +1]/*.Dad*/ * 2 + 1]/*.Len*/ + 1;
- if (bits > max_length) {
- bits = max_length;
- overflow++;
- }
- tree[n*2 + 1]/*.Len*/ = bits;
- /* We overwrite tree[n].Dad which is no longer needed */
-
- if (n > max_code) { continue; } /* not a leaf node */
-
- s.bl_count[bits]++;
- xbits = 0;
- if (n >= base) {
- xbits = extra[n-base];
- }
- f = tree[n * 2]/*.Freq*/;
- s.opt_len += f * (bits + xbits);
- if (has_stree) {
- s.static_len += f * (stree[n*2 + 1]/*.Len*/ + xbits);
- }
- }
- if (overflow === 0) { return; }
-
- // Trace((stderr,"\nbit length overflow\n"));
- /* This happens for example on obj2 and pic of the Calgary corpus */
-
- /* Find the first bit length which could increase: */
- do {
- bits = max_length-1;
- while (s.bl_count[bits] === 0) { bits--; }
- s.bl_count[bits]--; /* move one leaf down the tree */
- s.bl_count[bits+1] += 2; /* move one overflow item as its brother */
- s.bl_count[max_length]--;
- /* The brother of the overflow item also moves one step up,
- * but this does not affect bl_count[max_length]
- */
- overflow -= 2;
- } while (overflow > 0);
-
- /* Now recompute all bit lengths, scanning in increasing frequency.
- * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
- * lengths instead of fixing only the wrong ones. This idea is taken
- * from 'ar' written by Haruhiko Okumura.)
- */
- for (bits = max_length; bits !== 0; bits--) {
- n = s.bl_count[bits];
- while (n !== 0) {
- m = s.heap[--h];
- if (m > max_code) { continue; }
- if (tree[m*2 + 1]/*.Len*/ !== bits) {
- // Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
- s.opt_len += (bits - tree[m*2 + 1]/*.Len*/)*tree[m*2]/*.Freq*/;
- tree[m*2 + 1]/*.Len*/ = bits;
- }
- n--;
- }
- }
-}
-
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- * zero code length.
- */
-function gen_codes(tree, max_code, bl_count)
-// ct_data *tree; /* the tree to decorate */
-// int max_code; /* largest code with non zero frequency */
-// ushf *bl_count; /* number of codes at each bit length */
-{
- var next_code = new Array(MAX_BITS+1); /* next code value for each bit length */
- var code = 0; /* running code value */
- var bits; /* bit index */
- var n; /* code index */
-
- /* The distribution counts are first used to generate the code values
- * without bit reversal.
- */
- for (bits = 1; bits <= MAX_BITS; bits++) {
- next_code[bits] = code = (code + bl_count[bits-1]) << 1;
- }
- /* Check that the bit counts in bl_count are consistent. The last code
- * must be all ones.
- */
- //Assert (code + bl_count[MAX_BITS]-1 == (1< length code (0..28) */
- length = 0;
- for (code = 0; code < LENGTH_CODES-1; code++) {
- base_length[code] = length;
- for (n = 0; n < (1< dist code (0..29) */
- dist = 0;
- for (code = 0 ; code < 16; code++) {
- base_dist[code] = dist;
- for (n = 0; n < (1<>= 7; /* from now on, all distances are divided by 128 */
- for ( ; code < D_CODES; code++) {
- base_dist[code] = dist << 7;
- for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
- _dist_code[256 + dist++] = code;
- }
- }
- //Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
- /* Construct the codes of the static literal tree */
- for (bits = 0; bits <= MAX_BITS; bits++) {
- bl_count[bits] = 0;
- }
-
- n = 0;
- while (n <= 143) {
- static_ltree[n*2 + 1]/*.Len*/ = 8;
- n++;
- bl_count[8]++;
- }
- while (n <= 255) {
- static_ltree[n*2 + 1]/*.Len*/ = 9;
- n++;
- bl_count[9]++;
- }
- while (n <= 279) {
- static_ltree[n*2 + 1]/*.Len*/ = 7;
- n++;
- bl_count[7]++;
- }
- while (n <= 287) {
- static_ltree[n*2 + 1]/*.Len*/ = 8;
- n++;
- bl_count[8]++;
- }
- /* Codes 286 and 287 do not exist, but we must include them in the
- * tree construction to get a canonical Huffman tree (longest code
- * all ones)
- */
- gen_codes(static_ltree, L_CODES+1, bl_count);
-
- /* The static distance tree is trivial: */
- for (n = 0; n < D_CODES; n++) {
- static_dtree[n*2 + 1]/*.Len*/ = 5;
- static_dtree[n*2]/*.Code*/ = bi_reverse(n, 5);
- }
-
- // Now data ready and we can init static trees
- static_l_desc = new StaticTreeDesc(static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS);
- static_d_desc = new StaticTreeDesc(static_dtree, extra_dbits, 0, D_CODES, MAX_BITS);
- static_bl_desc =new StaticTreeDesc(new Array(0), extra_blbits, 0, BL_CODES, MAX_BL_BITS);
-
- //static_init_done = true;
-}
-
-
-/* ===========================================================================
- * Initialize a new block.
- */
-function init_block(s) {
- var n; /* iterates over tree elements */
-
- /* Initialize the trees. */
- for (n = 0; n < L_CODES; n++) { s.dyn_ltree[n*2]/*.Freq*/ = 0; }
- for (n = 0; n < D_CODES; n++) { s.dyn_dtree[n*2]/*.Freq*/ = 0; }
- for (n = 0; n < BL_CODES; n++) { s.bl_tree[n*2]/*.Freq*/ = 0; }
-
- s.dyn_ltree[END_BLOCK*2]/*.Freq*/ = 1;
- s.opt_len = s.static_len = 0;
- s.last_lit = s.matches = 0;
-}
-
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-function bi_windup(s)
-{
- if (s.bi_valid > 8) {
- put_short(s, s.bi_buf);
- } else if (s.bi_valid > 0) {
- //put_byte(s, (Byte)s->bi_buf);
- s.pending_buf[s.pending++] = s.bi_buf;
- }
- s.bi_buf = 0;
- s.bi_valid = 0;
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-function copy_block(s, buf, len, header)
-//DeflateState *s;
-//charf *buf; /* the input data */
-//unsigned len; /* its length */
-//int header; /* true if block header must be written */
-{
- bi_windup(s); /* align on byte boundary */
-
- if (header) {
- put_short(s, len);
- put_short(s, ~len);
- }
-// while (len--) {
-// put_byte(s, *buf++);
-// }
- utils.arraySet(s.pending_buf, s.window, buf, len, s.pending);
- s.pending += len;
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-function smaller(tree, n, m, depth) {
- var _n2 = n*2;
- var _m2 = m*2;
- return (tree[_n2]/*.Freq*/ < tree[_m2]/*.Freq*/ ||
- (tree[_n2]/*.Freq*/ === tree[_m2]/*.Freq*/ && depth[n] <= depth[m]));
-}
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-function pqdownheap(s, tree, k)
-// deflate_state *s;
-// ct_data *tree; /* the tree to restore */
-// int k; /* node to move down */
-{
- var v = s.heap[k];
- var j = k << 1; /* left son of k */
- while (j <= s.heap_len) {
- /* Set j to the smallest of the two sons: */
- if (j < s.heap_len &&
- smaller(tree, s.heap[j+1], s.heap[j], s.depth)) {
- j++;
- }
- /* Exit if v is smaller than both sons */
- if (smaller(tree, v, s.heap[j], s.depth)) { break; }
-
- /* Exchange v with the smallest son */
- s.heap[k] = s.heap[j];
- k = j;
-
- /* And continue down the tree, setting j to the left son of k */
- j <<= 1;
- }
- s.heap[k] = v;
-}
-
-
-// inlined manually
-// var SMALLEST = 1;
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-function compress_block(s, ltree, dtree)
-// deflate_state *s;
-// const ct_data *ltree; /* literal tree */
-// const ct_data *dtree; /* distance tree */
-{
- var dist; /* distance of matched string */
- var lc; /* match length or unmatched char (if dist == 0) */
- var lx = 0; /* running index in l_buf */
- var code; /* the code to send */
- var extra; /* number of extra bits to send */
-
- if (s.last_lit !== 0) {
- do {
- dist = (s.pending_buf[s.d_buf + lx*2] << 8) | (s.pending_buf[s.d_buf + lx*2 + 1]);
- lc = s.pending_buf[s.l_buf + lx];
- lx++;
-
- if (dist === 0) {
- send_code(s, lc, ltree); /* send a literal byte */
- //Tracecv(isgraph(lc), (stderr," '%c' ", lc));
- } else {
- /* Here, lc is the match length - MIN_MATCH */
- code = _length_code[lc];
- send_code(s, code+LITERALS+1, ltree); /* send the length code */
- extra = extra_lbits[code];
- if (extra !== 0) {
- lc -= base_length[code];
- send_bits(s, lc, extra); /* send the extra length bits */
- }
- dist--; /* dist is now the match distance - 1 */
- code = d_code(dist);
- //Assert (code < D_CODES, "bad d_code");
-
- send_code(s, code, dtree); /* send the distance code */
- extra = extra_dbits[code];
- if (extra !== 0) {
- dist -= base_dist[code];
- send_bits(s, dist, extra); /* send the extra distance bits */
- }
- } /* literal or match pair ? */
-
- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
- //Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
- // "pendingBuf overflow");
-
- } while (lx < s.last_lit);
- }
-
- send_code(s, END_BLOCK, ltree);
-}
-
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- * and corresponding code. The length opt_len is updated; static_len is
- * also updated if stree is not null. The field max_code is set.
- */
-function build_tree(s, desc)
-// deflate_state *s;
-// tree_desc *desc; /* the tree descriptor */
-{
- var tree = desc.dyn_tree;
- var stree = desc.stat_desc.static_tree;
- var has_stree = desc.stat_desc.has_stree;
- var elems = desc.stat_desc.elems;
- var n, m; /* iterate over heap elements */
- var max_code = -1; /* largest code with non zero frequency */
- var node; /* new node being created */
-
- /* Construct the initial heap, with least frequent element in
- * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
- * heap[0] is not used.
- */
- s.heap_len = 0;
- s.heap_max = HEAP_SIZE;
-
- for (n = 0; n < elems; n++) {
- if (tree[n * 2]/*.Freq*/ !== 0) {
- s.heap[++s.heap_len] = max_code = n;
- s.depth[n] = 0;
-
- } else {
- tree[n*2 + 1]/*.Len*/ = 0;
- }
- }
-
- /* The pkzip format requires that at least one distance code exists,
- * and that at least one bit should be sent even if there is only one
- * possible code. So to avoid special checks later on we force at least
- * two codes of non zero frequency.
- */
- while (s.heap_len < 2) {
- node = s.heap[++s.heap_len] = (max_code < 2 ? ++max_code : 0);
- tree[node * 2]/*.Freq*/ = 1;
- s.depth[node] = 0;
- s.opt_len--;
-
- if (has_stree) {
- s.static_len -= stree[node*2 + 1]/*.Len*/;
- }
- /* node is 0 or 1 so it does not have extra bits */
- }
- desc.max_code = max_code;
-
- /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
- * establish sub-heaps of increasing lengths:
- */
- for (n = (s.heap_len >> 1/*int /2*/); n >= 1; n--) { pqdownheap(s, tree, n); }
-
- /* Construct the Huffman tree by repeatedly combining the least two
- * frequent nodes.
- */
- node = elems; /* next internal node of the tree */
- do {
- //pqremove(s, tree, n); /* n = node of least frequency */
- /*** pqremove ***/
- n = s.heap[1/*SMALLEST*/];
- s.heap[1/*SMALLEST*/] = s.heap[s.heap_len--];
- pqdownheap(s, tree, 1/*SMALLEST*/);
- /***/
-
- m = s.heap[1/*SMALLEST*/]; /* m = node of next least frequency */
-
- s.heap[--s.heap_max] = n; /* keep the nodes sorted by frequency */
- s.heap[--s.heap_max] = m;
-
- /* Create a new node father of n and m */
- tree[node * 2]/*.Freq*/ = tree[n * 2]/*.Freq*/ + tree[m * 2]/*.Freq*/;
- s.depth[node] = (s.depth[n] >= s.depth[m] ? s.depth[n] : s.depth[m]) + 1;
- tree[n*2 + 1]/*.Dad*/ = tree[m*2 + 1]/*.Dad*/ = node;
-
- /* and insert the new node in the heap */
- s.heap[1/*SMALLEST*/] = node++;
- pqdownheap(s, tree, 1/*SMALLEST*/);
-
- } while (s.heap_len >= 2);
-
- s.heap[--s.heap_max] = s.heap[1/*SMALLEST*/];
-
- /* At this point, the fields freq and dad are set. We can now
- * generate the bit lengths.
- */
- gen_bitlen(s, desc);
-
- /* The field len is now set, we can generate the bit codes */
- gen_codes(tree, max_code, s.bl_count);
-}
-
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-function scan_tree(s, tree, max_code)
-// deflate_state *s;
-// ct_data *tree; /* the tree to be scanned */
-// int max_code; /* and its largest code of non zero frequency */
-{
- var n; /* iterates over all tree elements */
- var prevlen = -1; /* last emitted length */
- var curlen; /* length of current code */
-
- var nextlen = tree[0*2 + 1]/*.Len*/; /* length of next code */
-
- var count = 0; /* repeat count of the current code */
- var max_count = 7; /* max repeat count */
- var min_count = 4; /* min repeat count */
-
- if (nextlen === 0) {
- max_count = 138;
- min_count = 3;
- }
- tree[(max_code+1)*2 + 1]/*.Len*/ = 0xffff; /* guard */
-
- for (n = 0; n <= max_code; n++) {
- curlen = nextlen;
- nextlen = tree[(n+1)*2 + 1]/*.Len*/;
-
- if (++count < max_count && curlen === nextlen) {
- continue;
-
- } else if (count < min_count) {
- s.bl_tree[curlen * 2]/*.Freq*/ += count;
-
- } else if (curlen !== 0) {
-
- if (curlen !== prevlen) { s.bl_tree[curlen * 2]/*.Freq*/++; }
- s.bl_tree[REP_3_6*2]/*.Freq*/++;
-
- } else if (count <= 10) {
- s.bl_tree[REPZ_3_10*2]/*.Freq*/++;
-
- } else {
- s.bl_tree[REPZ_11_138*2]/*.Freq*/++;
- }
-
- count = 0;
- prevlen = curlen;
-
- if (nextlen === 0) {
- max_count = 138;
- min_count = 3;
-
- } else if (curlen === nextlen) {
- max_count = 6;
- min_count = 3;
-
- } else {
- max_count = 7;
- min_count = 4;
- }
- }
-}
-
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-function send_tree(s, tree, max_code)
-// deflate_state *s;
-// ct_data *tree; /* the tree to be scanned */
-// int max_code; /* and its largest code of non zero frequency */
-{
- var n; /* iterates over all tree elements */
- var prevlen = -1; /* last emitted length */
- var curlen; /* length of current code */
-
- var nextlen = tree[0*2 + 1]/*.Len*/; /* length of next code */
-
- var count = 0; /* repeat count of the current code */
- var max_count = 7; /* max repeat count */
- var min_count = 4; /* min repeat count */
-
- /* tree[max_code+1].Len = -1; */ /* guard already set */
- if (nextlen === 0) {
- max_count = 138;
- min_count = 3;
- }
-
- for (n = 0; n <= max_code; n++) {
- curlen = nextlen;
- nextlen = tree[(n+1)*2 + 1]/*.Len*/;
-
- if (++count < max_count && curlen === nextlen) {
- continue;
-
- } else if (count < min_count) {
- do { send_code(s, curlen, s.bl_tree); } while (--count !== 0);
-
- } else if (curlen !== 0) {
- if (curlen !== prevlen) {
- send_code(s, curlen, s.bl_tree);
- count--;
- }
- //Assert(count >= 3 && count <= 6, " 3_6?");
- send_code(s, REP_3_6, s.bl_tree);
- send_bits(s, count-3, 2);
-
- } else if (count <= 10) {
- send_code(s, REPZ_3_10, s.bl_tree);
- send_bits(s, count-3, 3);
-
- } else {
- send_code(s, REPZ_11_138, s.bl_tree);
- send_bits(s, count-11, 7);
- }
-
- count = 0;
- prevlen = curlen;
- if (nextlen === 0) {
- max_count = 138;
- min_count = 3;
-
- } else if (curlen === nextlen) {
- max_count = 6;
- min_count = 3;
-
- } else {
- max_count = 7;
- min_count = 4;
- }
- }
-}
-
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-function build_bl_tree(s) {
- var max_blindex; /* index of last bit length code of non zero freq */
-
- /* Determine the bit length frequencies for literal and distance trees */
- scan_tree(s, s.dyn_ltree, s.l_desc.max_code);
- scan_tree(s, s.dyn_dtree, s.d_desc.max_code);
-
- /* Build the bit length tree: */
- build_tree(s, s.bl_desc);
- /* opt_len now includes the length of the tree representations, except
- * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
- */
-
- /* Determine the number of bit length codes to send. The pkzip format
- * requires that at least 4 bit length codes be sent. (appnote.txt says
- * 3 but the actual value used is 4.)
- */
- for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
- if (s.bl_tree[bl_order[max_blindex]*2 + 1]/*.Len*/ !== 0) {
- break;
- }
- }
- /* Update opt_len to include the bit length tree and counts */
- s.opt_len += 3*(max_blindex+1) + 5+5+4;
- //Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
- // s->opt_len, s->static_len));
-
- return max_blindex;
-}
-
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-function send_all_trees(s, lcodes, dcodes, blcodes)
-// deflate_state *s;
-// int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
- var rank; /* index in bl_order */
-
- //Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
- //Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
- // "too many codes");
- //Tracev((stderr, "\nbl counts: "));
- send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
- send_bits(s, dcodes-1, 5);
- send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */
- for (rank = 0; rank < blcodes; rank++) {
- //Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
- send_bits(s, s.bl_tree[bl_order[rank]*2 + 1]/*.Len*/, 3);
- }
- //Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
- send_tree(s, s.dyn_ltree, lcodes-1); /* literal tree */
- //Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
- send_tree(s, s.dyn_dtree, dcodes-1); /* distance tree */
- //Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- * a) There are no non-portable control characters belonging to the
- * "black list" (0..6, 14..25, 28..31).
- * b) There is at least one printable character belonging to the
- * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- * "gray list" that is ignored in this detection algorithm:
- * (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-function detect_data_type(s) {
- /* black_mask is the bit mask of black-listed bytes
- * set bits 0..6, 14..25, and 28..31
- * 0xf3ffc07f = binary 11110011111111111100000001111111
- */
- var black_mask = 0xf3ffc07f;
- var n;
-
- /* Check for non-textual ("black-listed") bytes. */
- for (n = 0; n <= 31; n++, black_mask >>>= 1) {
- if ((black_mask & 1) && (s.dyn_ltree[n*2]/*.Freq*/ !== 0)) {
- return Z_BINARY;
- }
- }
-
- /* Check for textual ("white-listed") bytes. */
- if (s.dyn_ltree[9 * 2]/*.Freq*/ !== 0 || s.dyn_ltree[10 * 2]/*.Freq*/ !== 0 ||
- s.dyn_ltree[13 * 2]/*.Freq*/ !== 0) {
- return Z_TEXT;
- }
- for (n = 32; n < LITERALS; n++) {
- if (s.dyn_ltree[n * 2]/*.Freq*/ !== 0) {
- return Z_TEXT;
- }
- }
-
- /* There are no "black-listed" or "white-listed" bytes:
- * this stream either is empty or has tolerated ("gray-listed") bytes only.
- */
- return Z_BINARY;
-}
-
-
-var static_init_done = false;
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-function _tr_init(s)
-{
-
- if (!static_init_done) {
- tr_static_init();
- static_init_done = true;
- }
-
- s.l_desc = new TreeDesc(s.dyn_ltree, static_l_desc);
- s.d_desc = new TreeDesc(s.dyn_dtree, static_d_desc);
- s.bl_desc = new TreeDesc(s.bl_tree, static_bl_desc);
-
- s.bi_buf = 0;
- s.bi_valid = 0;
-
- /* Initialize the first block of the first file: */
- init_block(s);
-}
-
-
-/* ===========================================================================
- * Send a stored block
- */
-function _tr_stored_block(s, buf, stored_len, last)
-//DeflateState *s;
-//charf *buf; /* input block */
-//ulg stored_len; /* length of input block */
-//int last; /* one if this is the last block for a file */
-{
- send_bits(s, (STORED_BLOCK<<1)+(last ? 1 : 0), 3); /* send block type */
- copy_block(s, buf, stored_len, true); /* with header */
-}
-
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- */
-function _tr_align(s) {
- send_bits(s, STATIC_TREES<<1, 3);
- send_code(s, END_BLOCK, static_ltree);
- bi_flush(s);
-}
-
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
- */
-function _tr_flush_block(s, buf, stored_len, last)
-//DeflateState *s;
-//charf *buf; /* input block, or NULL if too old */
-//ulg stored_len; /* length of input block */
-//int last; /* one if this is the last block for a file */
-{
- var opt_lenb, static_lenb; /* opt_len and static_len in bytes */
- var max_blindex = 0; /* index of last bit length code of non zero freq */
-
- /* Build the Huffman trees unless a stored block is forced */
- if (s.level > 0) {
-
- /* Check if the file is binary or text */
- if (s.strm.data_type === Z_UNKNOWN) {
- s.strm.data_type = detect_data_type(s);
- }
-
- /* Construct the literal and distance trees */
- build_tree(s, s.l_desc);
- // Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
- // s->static_len));
-
- build_tree(s, s.d_desc);
- // Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
- // s->static_len));
- /* At this point, opt_len and static_len are the total bit lengths of
- * the compressed block data, excluding the tree representations.
- */
-
- /* Build the bit length tree for the above two trees, and get the index
- * in bl_order of the last bit length code to send.
- */
- max_blindex = build_bl_tree(s);
-
- /* Determine the best encoding. Compute the block lengths in bytes. */
- opt_lenb = (s.opt_len+3+7) >>> 3;
- static_lenb = (s.static_len+3+7) >>> 3;
-
- // Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
- // opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
- // s->last_lit));
-
- if (static_lenb <= opt_lenb) { opt_lenb = static_lenb; }
-
- } else {
- // Assert(buf != (char*)0, "lost buf");
- opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
- }
-
- if ((stored_len+4 <= opt_lenb) && (buf !== -1)) {
- /* 4: two words for the lengths */
-
- /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
- * Otherwise we can't have processed more than WSIZE input bytes since
- * the last block flush, because compression would have been
- * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
- * transform a block into a stored block.
- */
- _tr_stored_block(s, buf, stored_len, last);
-
- } else if (s.strategy === Z_FIXED || static_lenb === opt_lenb) {
-
- send_bits(s, (STATIC_TREES<<1) + (last ? 1 : 0), 3);
- compress_block(s, static_ltree, static_dtree);
-
- } else {
- send_bits(s, (DYN_TREES<<1) + (last ? 1 : 0), 3);
- send_all_trees(s, s.l_desc.max_code+1, s.d_desc.max_code+1, max_blindex+1);
- compress_block(s, s.dyn_ltree, s.dyn_dtree);
- }
- // Assert (s->compressed_len == s->bits_sent, "bad compressed size");
- /* The above check is made mod 2^32, for files larger than 512 MB
- * and uLong implemented on 32 bits.
- */
- init_block(s);
-
- if (last) {
- bi_windup(s);
- }
- // Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
- // s->compressed_len-7*last));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-function _tr_tally(s, dist, lc)
-// deflate_state *s;
-// unsigned dist; /* distance of matched string */
-// unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
- //var out_length, in_length, dcode;
-
- s.pending_buf[s.d_buf + s.last_lit * 2] = (dist >>> 8) & 0xff;
- s.pending_buf[s.d_buf + s.last_lit * 2 + 1] = dist & 0xff;
-
- s.pending_buf[s.l_buf + s.last_lit] = lc & 0xff;
- s.last_lit++;
-
- if (dist === 0) {
- /* lc is the unmatched char */
- s.dyn_ltree[lc*2]/*.Freq*/++;
- } else {
- s.matches++;
- /* Here, lc is the match length - MIN_MATCH */
- dist--; /* dist = match distance - 1 */
- //Assert((ush)dist < (ush)MAX_DIST(s) &&
- // (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
- // (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match");
-
- s.dyn_ltree[(_length_code[lc]+LITERALS+1) * 2]/*.Freq*/++;
- s.dyn_dtree[d_code(dist) * 2]/*.Freq*/++;
- }
-
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-
-//#ifdef TRUNCATE_BLOCK
-// /* Try to guess if it is profitable to stop the current block here */
-// if ((s.last_lit & 0x1fff) === 0 && s.level > 2) {
-// /* Compute an upper bound for the compressed length */
-// out_length = s.last_lit*8;
-// in_length = s.strstart - s.block_start;
-//
-// for (dcode = 0; dcode < D_CODES; dcode++) {
-// out_length += s.dyn_dtree[dcode*2]/*.Freq*/ * (5 + extra_dbits[dcode]);
-// }
-// out_length >>>= 3;
-// //Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-// // s->last_lit, in_length, out_length,
-// // 100L - out_length*100L/in_length));
-// if (s.matches < (s.last_lit>>1)/*int /2*/ && out_length < (in_length>>1)/*int /2*/) {
-// return true;
-// }
-// }
-//#endif
-
- return (s.last_lit === s.lit_bufsize-1);
- /* We avoid equality with lit_bufsize because of wraparound at 64K
- * on 16 bit machines and because stored blocks are restricted to
- * 64K-1 bytes.
- */
-}
-
-exports._tr_init = _tr_init;
-exports._tr_stored_block = _tr_stored_block;
-exports._tr_flush_block = _tr_flush_block;
-exports._tr_tally = _tr_tally;
-exports._tr_align = _tr_align;
-},{"../utils/common":27}],39:[function(_dereq_,module,exports){
-'use strict';
-
-
-function ZStream() {
- /* next input byte */
- this.input = null; // JS specific, because we have no pointers
- this.next_in = 0;
- /* number of bytes available at input */
- this.avail_in = 0;
- /* total number of input bytes read so far */
- this.total_in = 0;
- /* next output byte should be put there */
- this.output = null; // JS specific, because we have no pointers
- this.next_out = 0;
- /* remaining free space at output */
- this.avail_out = 0;
- /* total number of bytes output so far */
- this.total_out = 0;
- /* last error message, NULL if no error */
- this.msg = ''/*Z_NULL*/;
- /* not visible by applications */
- this.state = null;
- /* best guess about the data type: binary or text */
- this.data_type = 2/*Z_UNKNOWN*/;
- /* adler32 value of the uncompressed data */
- this.adler = 0;
-}
-
-module.exports = ZStream;
-},{}]},{},[9])
-(9)
-});
\ No newline at end of file
diff --git a/cps/static/js/compress/jszip.min.js b/cps/static/js/compress/jszip.min.js
new file mode 100644
index 000000000..3b36cd8b2
--- /dev/null
+++ b/cps/static/js/compress/jszip.min.js
@@ -0,0 +1,14 @@
+/*!
+
+JSZip - A Javascript class for generating and reading zip files
+
+
+(c) 2009-2014 Stuart Knightley
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
+
+JSZip uses the library pako released under the MIT license :
+https://github.com/nodeca/pako/blob/master/LICENSE
+*/
+!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f-this.zero;return-1},d.prototype.readData=function(a){if(this.checkOffset(a),0===a)return[];var b=this.data.slice(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"./dataReader":6}],2:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a,b){for(var c,e,f,g,h,i,j,k="",l=0;l>2,h=(3&c)<<4|e>>4,i=(15&e)<<2|f>>6,j=63&f,isNaN(e)?i=j=64:isNaN(f)&&(j=64),k=k+d.charAt(g)+d.charAt(h)+d.charAt(i)+d.charAt(j);return k},c.decode=function(a,b){var c,e,f,g,h,i,j,k="",l=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");l>4,e=(15&h)<<4|i>>2,f=(3&i)<<6|j,k+=String.fromCharCode(c),64!=i&&(k+=String.fromCharCode(e)),64!=j&&(k+=String.fromCharCode(f));return k}},{}],3:[function(a,b,c){"use strict";function d(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}d.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=d},{}],4:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a,b){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":9}],5:[function(a,b,c){"use strict";var d=a("./utils"),e=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var c="string"!==d.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=c?a[i]:a.charCodeAt(i),g=255&(b^h),f=e[g],b=b>>>8^f;return-1^b}},{"./utils":22}],6:[function(a,b,c){"use strict";function d(a){this.data=null,this.length=0,this.index=0,this.zero=0}var e=a("./utils");d.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.lengtha)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(a){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return e.transformTo("string",this.readData(a))},readData:function(a){},lastIndexOfSignature:function(a){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=d},{"./utils":22}],7:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.compressionOptions=null,c.comment=null,c.unixPermissions=null,c.dosPermissions=null},{}],8:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":22}],9:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a,b){return e.deflateRaw(a,{level:b.level||-1})},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:25}],10:[function(a,b,c){"use strict";function d(a,b){return this instanceof d?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new d;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new d(a,b)}var e=a("./base64");d.prototype=a("./object"),d.prototype.load=a("./load"),d.support=a("./support"),d.defaults=a("./defaults"),d.utils=a("./deprecatedPublicUtils"),d.base64={encode:function(a){return e.encode(a)},decode:function(a){return e.decode(a)}},d.compressions=a("./compressions"),b.exports=d},{"./base64":2,"./compressions":4,"./defaults":7,"./deprecatedPublicUtils":8,"./load":11,"./object":14,"./support":18}],11:[function(a,b,c){"use strict";var d=a("./base64"),e=a("./utf8"),f=a("./utils"),g=a("./zipEntries");b.exports=function(a,b){var c,h,i,j;for(b=f.extend(b||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:e.utf8decode}),b.base64&&(a=d.decode(a)),h=new g(a,b),c=h.files,i=0;ic;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=e.extend(a,h),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var d,f=e.getTypeOf(b);if(c=u(c),"string"==typeof c.unixPermissions&&(c.unixPermissions=parseInt(c.unixPermissions,8)),c.unixPermissions&&16384&c.unixPermissions&&(c.dir=!0),c.dosPermissions&&16&c.dosPermissions&&(c.dir=!0),c.dir&&(a=x(a)),c.createFolders&&(d=w(a))&&y.call(this,d,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null,f=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=e.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof k))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=e.transformTo("uint8array",b))}var g=new s(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a){return"/"!=a.slice(-1)&&(a+="/"),a},y=function(a,b){return b="undefined"!=typeof b?b:!1,a=x(a),this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},z=function(a,b,c){var d,g=new k;return a._data instanceof k?(g.uncompressedSize=a._data.uncompressedSize,g.crc32=a._data.crc32,0===g.uncompressedSize||a.dir?(b=j.STORE,g.compressedContent="",g.crc32=0):a._data.compressionMethod===b.magic?g.compressedContent=a._data.getCompressedContent():(d=a._data.getContent(),g.compressedContent=b.compress(e.transformTo(b.compressInputType,d),c))):(d=q(a),d&&0!==d.length&&!a.dir||(b=j.STORE,d=""),g.uncompressedSize=d.length,g.crc32=f(d),g.compressedContent=b.compress(e.transformTo(b.compressInputType,d),c)),g.compressedSize=g.compressedContent.length,g.compressionMethod=b.magic,g},A=function(a,b){var c=a;return a||(c=b?16893:33204),(65535&c)<<16},B=function(a,b){return 63&(a||0)},C=function(a,b,c,d,h,i){var j,k,l,n,o=(c.compressedContent,i!==m.utf8encode),p=e.transformTo("string",i(b.name)),q=e.transformTo("string",m.utf8encode(b.name)),r=b.comment||"",s=e.transformTo("string",i(r)),u=e.transformTo("string",m.utf8encode(r)),v=q.length!==b.name.length,w=u.length!==r.length,x=b.options,y="",z="",C="";l=b._initialMetadata.dir!==b.dir?b.dir:x.dir,n=b._initialMetadata.date!==b.date?b.date:x.date;var D=0,E=0;l&&(D|=16),"UNIX"===h?(E=798,D|=A(b.unixPermissions,l)):(E=20,D|=B(b.dosPermissions,l)),j=n.getHours(),j<<=6,j|=n.getMinutes(),j<<=5,j|=n.getSeconds()/2,k=n.getFullYear()-1980,k<<=4,k|=n.getMonth()+1,k<<=5,k|=n.getDate(),v&&(z=t(1,1)+t(f(p),4)+q,y+="up"+t(z.length,2)+z),w&&(C=t(1,1)+t(this.crc32(s),4)+u,y+="uc"+t(C.length,2)+C);var F="";F+="\n\x00",F+=o||!v&&!w?"\x00\x00":"\x00\b",F+=c.compressionMethod,F+=t(j,2),F+=t(k,2),F+=t(c.crc32,4),F+=t(c.compressedSize,4),F+=t(c.uncompressedSize,4),F+=t(p.length,2),F+=t(y.length,2);var G=g.LOCAL_FILE_HEADER+F+p+y,H=g.CENTRAL_FILE_HEADER+t(E,2)+F+t(s.length,2)+"\x00\x00\x00\x00"+t(D,4)+t(d,4)+p+y+s;return{fileRecord:G,dirRecord:H,compressedObject:c}},D={load:function(a,b){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,f,g=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],f=new s(d.name,d._data,e.extend(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,f)&&g.push(f));return g},file:function(a,b,c){if(1===arguments.length){if(e.isRegExp(a)){var d=a;return this.filter(function(a,b){return!b.dir&&d.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(e.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=y.call(this,b),d=this.clone();return d.root=c.name,d},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;dh;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));e.uint8array?b.push(k(a.subarray(c,h))):b.push(k(a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":12,"./support":18,"./utils":22}],22:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;cg&&b>1;)try{"array"===f||"nodebuffer"===f?d.push(String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e)))):d.push(String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;cb?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)},c.extend=function(){var a,b,c={};for(a=0;ae;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;aa){var b=!this.isSignature(0,j.LOCAL_FILE_HEADER);throw b?new Error("Can't find end of central directory : is this a zip file ? If it is, see http://stuk.github.io/jszip/documentation/howto/read_zip.html"):new Error("Corrupted zip : can't find end of central directory")}this.reader.setIndex(a);var c=a;if(this.checkSignature(j.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===i.MAX_VALUE_16BITS||this.diskWithCentralDirStart===i.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===i.MAX_VALUE_16BITS||this.centralDirRecords===i.MAX_VALUE_16BITS||this.centralDirSize===i.MAX_VALUE_32BITS||this.centralDirOffset===i.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(j.ZIP64_CENTRAL_DIRECTORY_LOCATOR),0>a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");if(this.reader.setIndex(a),this.checkSignature(j.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),!this.isSignature(this.relativeOffsetEndOfZip64CentralDir,j.ZIP64_CENTRAL_DIRECTORY_END)&&(this.relativeOffsetEndOfZip64CentralDir=this.reader.lastIndexOfSignature(j.ZIP64_CENTRAL_DIRECTORY_END),this.relativeOffsetEndOfZip64CentralDir<0))throw new Error("Corrupted zip : can't find the ZIP64 end of central directory");this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(j.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}var d=this.centralDirOffset+this.centralDirSize;this.zip64&&(d+=20,d+=12+this.zip64EndOfCentralSize);var e=c-d;if(e>0)this.isSignature(c,j.CENTRAL_FILE_HEADER)||(this.reader.zero=e);else if(0>e)throw new Error("Corrupted zip: missing "+Math.abs(e)+" bytes.")},prepareReader:function(a){var b=i.getTypeOf(a);if(i.checkSupport(b),"string"!==b||l.uint8array)if("nodebuffer"===b)this.reader=new f(a);else if(l.uint8array)this.reader=new g(i.transformTo("uint8array",a));else{if(!l.array)throw new Error("Unexpected error: unsupported type '"+b+"'");this.reader=new h(i.transformTo("array",a))}else this.reader=new e(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=d},{"./arrayReader":1,"./nodeBufferReader":13,"./object":14,"./signature":15,"./stringReader":16,"./support":18,"./uint8ArrayReader":19,"./utils":22,"./zipEntry":24}],24:[function(a,b,c){"use strict";function d(a,b){this.options=a,this.loadOptions=b}var e=a("./stringReader"),f=a("./utils"),g=a("./compressedObject"),h=a("./object"),i=a("./support"),j=0,k=3;d.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,e){return function(){var a=f.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==e)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readData(this.fileNameLength),a.skip(c),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=f.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+f.pretty(this.compressionMethod)+" unknown (inner file : "+f.transformTo("string",this.fileName)+")");if(this.decompressed=new g,this.decompressed.compressedSize=this.compressedSize,this.decompressed.uncompressedSize=this.uncompressedSize,this.decompressed.crc32=this.crc32,this.decompressed.compressionMethod=this.compressionMethod,this.decompressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.decompressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.decompressed=f.transformTo("string",this.decompressed.getContent()),
+h.crc32(this.decompressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readInt(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readData(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var a=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),a===j&&(this.dosPermissions=63&this.externalFileAttributes),a===k&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(a){if(this.extraFields[1]){var b=new e(this.extraFields[1].value);this.uncompressedSize===f.MAX_VALUE_32BITS&&(this.uncompressedSize=b.readInt(8)),this.compressedSize===f.MAX_VALUE_32BITS&&(this.compressedSize=b.readInt(8)),this.localHeaderOffset===f.MAX_VALUE_32BITS&&(this.localHeaderOffset=b.readInt(8)),this.diskNumberStart===f.MAX_VALUE_32BITS&&(this.diskNumberStart=b.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var c=h.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==p)throw new Error(k[c]);b.header&&h.deflateSetHeader(this.strm,b.header)}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function f(a,b){return b=b||{},b.raw=!0,e(a,b)}function g(a,b){return b=b||{},b.gzip=!0,e(a,b)}var h=a("./zlib/deflate"),i=a("./utils/common"),j=a("./utils/strings"),k=a("./zlib/messages"),l=a("./zlib/zstream"),m=Object.prototype.toString,n=0,o=4,p=0,q=1,r=2,s=-1,t=0,u=8;d.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?o:n,"string"==typeof a?e.input=j.string2buf(a):"[object ArrayBuffer]"===m.call(a)?e.input=new Uint8Array(a):e.input=a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new i.Buf8(f),e.next_out=0,e.avail_out=f),c=h.deflate(e,d),c!==q&&c!==p)return this.onEnd(c),this.ended=!0,!1;0!==e.avail_out&&(0!==e.avail_in||d!==o&&d!==r)||("string"===this.options.to?this.onData(j.buf2binstring(i.shrinkBuf(e.output,e.next_out))):this.onData(i.shrinkBuf(e.output,e.next_out)))}while((e.avail_in>0||0===e.avail_out)&&c!==q);return d===o?(c=h.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===p):d===r?(this.onEnd(p),e.avail_out=0,!0):!0},d.prototype.onData=function(a){this.chunks.push(a)},d.prototype.onEnd=function(a){a===p&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=i.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=d,c.deflate=e,c.deflateRaw=f,c.gzip=g},{"./utils/common":28,"./utils/strings":29,"./zlib/deflate":33,"./zlib/messages":38,"./zlib/zstream":40}],27:[function(a,b,c){"use strict";function d(a){if(!(this instanceof d))return new d(a);this.options=h.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var c=g.inflateInit2(this.strm,b.windowBits);if(c!==j.Z_OK)throw new Error(k[c]);this.header=new m,g.inflateGetHeader(this.strm,this.header)}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function f(a,b){return b=b||{},b.raw=!0,e(a,b)}var g=a("./zlib/inflate"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/constants"),k=a("./zlib/messages"),l=a("./zlib/zstream"),m=a("./zlib/gzheader"),n=Object.prototype.toString;d.prototype.push=function(a,b){var c,d,e,f,k,l=this.strm,m=this.options.chunkSize,o=!1;if(this.ended)return!1;d=b===~~b?b:b===!0?j.Z_FINISH:j.Z_NO_FLUSH,"string"==typeof a?l.input=i.binstring2buf(a):"[object ArrayBuffer]"===n.call(a)?l.input=new Uint8Array(a):l.input=a,l.next_in=0,l.avail_in=l.input.length;do{if(0===l.avail_out&&(l.output=new h.Buf8(m),l.next_out=0,l.avail_out=m),c=g.inflate(l,j.Z_NO_FLUSH),c===j.Z_BUF_ERROR&&o===!0&&(c=j.Z_OK,o=!1),c!==j.Z_STREAM_END&&c!==j.Z_OK)return this.onEnd(c),this.ended=!0,!1;l.next_out&&(0!==l.avail_out&&c!==j.Z_STREAM_END&&(0!==l.avail_in||d!==j.Z_FINISH&&d!==j.Z_SYNC_FLUSH)||("string"===this.options.to?(e=i.utf8border(l.output,l.next_out),f=l.next_out-e,k=i.buf2string(l.output,e),l.next_out=f,l.avail_out=m-f,f&&h.arraySet(l.output,l.output,e,f,0),this.onData(k)):this.onData(h.shrinkBuf(l.output,l.next_out)))),0===l.avail_in&&0===l.avail_out&&(o=!0)}while((l.avail_in>0||0===l.avail_out)&&c!==j.Z_STREAM_END);return c===j.Z_STREAM_END&&(d=j.Z_FINISH),d===j.Z_FINISH?(c=g.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===j.Z_OK):d===j.Z_SYNC_FLUSH?(this.onEnd(j.Z_OK),l.avail_out=0,!0):!0},d.prototype.onData=function(a){this.chunks.push(a)},d.prototype.onEnd=function(a){a===j.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=d,c.inflate=e,c.inflateRaw=f,c.ungzip=e},{"./utils/common":28,"./utils/strings":29,"./zlib/constants":31,"./zlib/gzheader":34,"./zlib/inflate":36,"./zlib/messages":38,"./zlib/zstream":40}],28:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;c>b;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;c>b;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],29:[function(a,b,c){"use strict";function d(a,b){if(65537>b&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;b>d;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;256>j;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=new e.Buf8(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;d>c;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;h>c;)if(f=a[c++],128>f)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&h>c;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:65536>f?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":28}],30:[function(a,b,c){"use strict";function d(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0}b.exports=d},{}],31:[function(a,b,c){"use strict";b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],32:[function(a,b,c){"use strict";function d(){for(var a,b=[],c=0;256>c;c++){a=c;for(var d=0;8>d;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function e(a,b,c,d){var e=f,g=d+c;a^=-1;for(var h=d;g>h;h++)a=a>>>8^e[255&(a^b[h])];return-1^a}var f=d();b.exports=e},{}],33:[function(a,b,c){"use strict";function d(a,b){return a.msg=H[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(D.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){E._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,D.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=F(a.adler,b,e,c):2===a.state.wrap&&(a.adler=G(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-ka?a.strstart-(a.w_size-ka):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ja,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&m>f);if(d=ja-(m-f),f=m-ja,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-ka)){D.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=ia)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===I)return ta;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return ta;if(a.strstart-a.block_start>=a.w_size-ka&&(h(a,!1),0===a.strm.avail_out))return ta}return a.insert=0,b===L?(h(a,!0),0===a.strm.avail_out?va:wa):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?ta:ta}function o(a,b){for(var c,d;;){if(a.lookahead=ia&&(a.ins_h=(a.ins_h<=ia)if(d=E._tr_tally(a,a.strstart-a.match_start,a.match_length-ia),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=ia){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<=ia&&(a.ins_h=(a.ins_h<4096)&&(a.match_length=ia-1)),a.prev_length>=ia&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-ia,d=E._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-ia),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<=ia&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ja;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&f>e);a.match_length=ja-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=ia?(c=E._tr_tally(a,1,a.match_length-ia),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=E._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return ta}return a.insert=0,b===L?(h(a,!0),0===a.strm.avail_out?va:wa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ta:ua}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===I)return ta;break}if(a.match_length=0,c=E._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return ta}return a.insert=0,b===L?(h(a,!0),0===a.strm.avail_out?va:wa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ta:ua}function s(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e}function t(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=C[a.level].max_lazy,a.good_match=C[a.level].good_length,a.nice_match=C[a.level].nice_length,a.max_chain_length=C[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=ia-1,a.match_available=0,a.ins_h=0}function u(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=Z,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new D.Buf16(2*ga),this.dyn_dtree=new D.Buf16(2*(2*ea+1)),this.bl_tree=new D.Buf16(2*(2*fa+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new D.Buf16(ha+1),this.heap=new D.Buf16(2*da+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new D.Buf16(2*da+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function v(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=Y,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?ma:ra,a.adler=2===b.wrap?0:1,b.last_flush=I,E._tr_init(b),N):d(a,P)}function w(a){var b=v(a);return b===N&&t(a.state),b}function x(a,b){return a&&a.state?2!==a.state.wrap?P:(a.state.gzhead=b,N):P}function y(a,b,c,e,f,g){if(!a)return P;var h=1;if(b===S&&(b=6),0>e?(h=0,e=-e):e>15&&(h=2,e-=16),1>f||f>$||c!==Z||8>e||e>15||0>b||b>9||0>g||g>W)return d(a,P);8===e&&(e=9);var i=new u;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<>1,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,w(a)}function z(a,b){return y(a,b,Z,_,aa,X)}function A(a,b){var c,h,k,l;if(!a||!a.state||b>M||0>b)return a?d(a,P):P;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===sa&&b!==L)return d(a,0===a.avail_out?R:P);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===ma)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=U||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=G(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=na):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=U||h.level<2?4:0),i(h,xa),h.status=ra);else{var m=Z+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=U||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=la),m+=31-m%31,h.status=ra,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===na)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=G(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=G(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=oa)}else h.status=oa;if(h.status===oa)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=G(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindexk&&(a.adler=G(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=pa)}else h.status=pa;if(h.status===pa)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=G(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindexk&&(a.adler=G(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=qa)}else h.status=qa;if(h.status===qa&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=ra)):h.status=ra),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,N}else if(0===a.avail_in&&e(b)<=e(c)&&b!==L)return d(a,R);if(h.status===sa&&0!==a.avail_in)return d(a,R);if(0!==a.avail_in||0!==h.lookahead||b!==I&&h.status!==sa){var o=h.strategy===U?r(h,b):h.strategy===V?q(h,b):C[h.level].func(h,b);if(o!==va&&o!==wa||(h.status=sa),o===ta||o===va)return 0===a.avail_out&&(h.last_flush=-1),N;if(o===ua&&(b===J?E._tr_align(h):b!==M&&(E._tr_stored_block(h,0,0,!1),b===K&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,N}return b!==L?N:h.wrap<=0?O:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?N:O)}function B(a){var b;return a&&a.state?(b=a.state.status,b!==ma&&b!==na&&b!==oa&&b!==pa&&b!==qa&&b!==ra&&b!==sa?d(a,P):(a.state=null,b===ra?d(a,Q):N)):P}var C,D=a("../utils/common"),E=a("./trees"),F=a("./adler32"),G=a("./crc32"),H=a("./messages"),I=0,J=1,K=3,L=4,M=5,N=0,O=1,P=-2,Q=-3,R=-5,S=-1,T=1,U=2,V=3,W=4,X=0,Y=2,Z=8,$=9,_=15,aa=8,ba=29,ca=256,da=ca+1+ba,ea=30,fa=19,ga=2*da+1,ha=15,ia=3,ja=258,ka=ja+ia+1,la=32,ma=42,na=69,oa=73,pa=91,qa=103,ra=113,sa=666,ta=1,ua=2,va=3,wa=4,xa=3;C=[new s(0,0,0,0,n),new s(4,4,8,4,o),new s(4,5,16,8,o),new s(4,6,32,32,o),new s(4,4,16,16,p),new s(8,16,32,32,p),new s(8,16,128,128,p),new s(8,32,128,256,p),new s(32,128,258,1024,p),new s(32,258,258,4096,p)],c.deflateInit=z,c.deflateInit2=y,c.deflateReset=w,c.deflateResetKeep=v,c.deflateSetHeader=x,c.deflate=A,c.deflateEnd=B,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":28,"./adler32":30,"./crc32":32,"./messages":38,"./trees":39}],34:[function(a,b,c){"use strict";function d(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=d},{}],35:[function(a,b,c){"use strict";var d=30,e=12;b.exports=function(a,b){var c,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;c=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=c.dmax,l=c.wsize,m=c.whave,n=c.wnext,o=c.window,p=c.hold,q=c.bits,r=c.lencode,s=c.distcode,t=(1<q&&(p+=B[f++]<>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<q&&(p+=B[f++]<>>=w,q-=w),15>q&&(p+=B[f++]<>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<q&&(p+=B[f++]<q&&(p+=B[f++]<k){a.msg="invalid distance too far back",c.mode=d;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&c.sane){a.msg="invalid distance too far back",c.mode=d;break a}if(z=0,A=o,0===n){if(z+=l-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(w>n){if(z+=l+n-w,w-=n,x>w){x-=w;do C[h++]=o[z++];while(--w);if(z=0,x>n){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(g>f&&j>h);x=q>>3,f-=x,q-=x<<3,p&=(1<f?5+(g-f):5-(f-g),a.avail_out=j>h?257+(j-h):257-(h-j),c.hold=p,c.bits=q}},{}],36:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new r.Buf16(320),this.work=new r.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=K,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new r.Buf32(oa),b.distcode=b.distdyn=new r.Buf32(pa),b.sane=1,b.back=-1,C):F}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):F}function h(a,b){var c,d;return a&&a.state?(d=a.state,0>b?(c=0,b=-b):(c=(b>>4)+1,48>b&&(b&=15)),b&&(8>b||b>15)?F:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):F}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==C&&(a.state=null),c):F}function j(a){return i(a,ra)}function k(a){if(sa){var b;for(p=new r.Buf32(512),q=new r.Buf32(32),b=0;144>b;)a.lens[b++]=8;for(;256>b;)a.lens[b++]=9;for(;280>b;)a.lens[b++]=7;for(;288>b;)a.lens[b++]=8;for(v(x,a.lens,0,288,p,0,a.work,{bits:9}),b=0;32>b;)a.lens[b++]=5;v(y,a.lens,0,32,q,0,a.work,{bits:5}),sa=!1}a.lencode=p,a.lenbits=9,a.distcode=q,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<=f.wsize?(r.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),r.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(r.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whaven;){if(0===i)break a;i--,m+=e[g++]<>>8&255,c.check=t(c.check,Ba,2,0),m=0,n=0,c.mode=L;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=la;break}if((15&m)!==J){a.msg="unknown compression method",c.mode=la;break}if(m>>>=4,n-=4,wa=(15&m)+8,0===c.wbits)c.wbits=wa;else if(wa>c.wbits){a.msg="invalid window size",c.mode=la;break}c.dmax=1<n;){if(0===i)break a;i--,m+=e[g++]<>8&1),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=t(c.check,Ba,2,0)),m=0,n=0,c.mode=M;case M:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<>>8&255,Ba[2]=m>>>16&255,Ba[3]=m>>>24&255,c.check=t(c.check,Ba,4,0)),m=0,n=0,c.mode=N;case N:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<>8),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=t(c.check,Ba,2,0)),m=0,n=0,c.mode=O;case O:if(1024&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<>>8&255,c.check=t(c.check,Ba,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=P;case P:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wa=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),r.arraySet(c.head.extra,e,g,q,wa)),512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=Q;case Q:if(2048&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.name+=String.fromCharCode(wa));while(wa&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=R;case R:if(4096&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.comment+=String.fromCharCode(wa));while(wa&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wa)break a}else c.head&&(c.head.comment=null);c.mode=S;case S:if(512&c.flags){for(;16>n;){
+if(0===i)break a;i--,m+=e[g++]<>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=V;break;case T:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<>>=7&n,n-=7&n,c.mode=ia;break}for(;3>n;){if(0===i)break a;i--,m+=e[g++]<>>=1,n-=1,3&m){case 0:c.mode=X;break;case 1:if(k(c),c.mode=ba,b===B){m>>>=2,n-=2;break a}break;case 2:c.mode=$;break;case 3:a.msg="invalid block type",c.mode=la}m>>>=2,n-=2;break;case X:for(m>>>=7&n,n-=7&n;32>n;){if(0===i)break a;i--,m+=e[g++]<>>16^65535)){a.msg="invalid stored block lengths",c.mode=la;break}if(c.length=65535&m,m=0,n=0,c.mode=Y,b===B)break a;case Y:c.mode=Z;case Z:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;r.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=V;break;case $:for(;14>n;){if(0===i)break a;i--,m+=e[g++]<>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=la;break}c.have=0,c.mode=_;case _:for(;c.haven;){if(0===i)break a;i--,m+=e[g++]<>>=3,n-=3}for(;c.have<19;)c.lens[Ca[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,ya={bits:c.lenbits},xa=v(w,c.lens,0,19,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid code lengths set",c.mode=la;break}c.have=0,c.mode=aa;case aa:for(;c.have>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=qa);){if(0===i)break a;i--,m+=e[g++]<sa)m>>>=qa,n-=qa,c.lens[c.have++]=sa;else{if(16===sa){for(za=qa+2;za>n;){if(0===i)break a;i--,m+=e[g++]<>>=qa,n-=qa,0===c.have){a.msg="invalid bit length repeat",c.mode=la;break}wa=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sa){for(za=qa+3;za>n;){if(0===i)break a;i--,m+=e[g++]<>>=qa,n-=qa,wa=0,q=3+(7&m),m>>>=3,n-=3}else{for(za=qa+7;za>n;){if(0===i)break a;i--,m+=e[g++]<>>=qa,n-=qa,wa=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=la;break}for(;q--;)c.lens[c.have++]=wa}}if(c.mode===la)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=la;break}if(c.lenbits=9,ya={bits:c.lenbits},xa=v(x,c.lens,0,c.nlen,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid literal/lengths set",c.mode=la;break}if(c.distbits=6,c.distcode=c.distdyn,ya={bits:c.distbits},xa=v(y,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,ya),c.distbits=ya.bits,xa){a.msg="invalid distances set",c.mode=la;break}if(c.mode=ba,b===B)break a;case ba:c.mode=ca;case ca:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,u(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===V&&(c.back=-1);break}for(c.back=0;Aa=c.lencode[m&(1<>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=qa);){if(0===i)break a;i--,m+=e[g++]<>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=ta+qa);){if(0===i)break a;i--,m+=e[g++]<>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,c.length=sa,0===ra){c.mode=ha;break}if(32&ra){c.back=-1,c.mode=V;break}if(64&ra){a.msg="invalid literal/length code",c.mode=la;break}c.extra=15&ra,c.mode=da;case da:if(c.extra){for(za=c.extra;za>n;){if(0===i)break a;i--,m+=e[g++]<>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=ea;case ea:for(;Aa=c.distcode[m&(1<>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=qa);){if(0===i)break a;i--,m+=e[g++]<>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(n>=ta+qa);){if(0===i)break a;i--,m+=e[g++]<>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,64&ra){a.msg="invalid distance code",c.mode=la;break}c.offset=sa,c.extra=15&ra,c.mode=fa;case fa:if(c.extra){for(za=c.extra;za>n;){if(0===i)break a;i--,m+=e[g++]<>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=la;break}c.mode=ga;case ga:if(0===j)break a;if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=la;break}q>c.wnext?(q-=c.wnext,oa=c.wsize-q):oa=c.wnext-q,q>c.length&&(q=c.length),pa=c.window}else pa=f,oa=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pa[oa++];while(--q);0===c.length&&(c.mode=ca);break;case ha:if(0===j)break a;f[h++]=c.length,j--,c.mode=ca;break;case ia:if(c.wrap){for(;32>n;){if(0===i)break a;i--,m|=e[g++]<n;){if(0===i)break a;i--,m+=e[g++]<=D;D++)P[D]=0;for(E=0;o>E;E++)P[b[c+E]]++;for(H=C,G=e;G>=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;G>F&&0===P[F];F++);for(F>H&&(H=F),K=1,D=1;e>=D;D++)if(K<<=1,K-=P[D],0>K)return-1;if(K>0&&(a===h||1!==G))return-1;for(Q[1]=0,D=1;e>D;D++)Q[D+1]=Q[D]+P[D];for(E=0;o>E;E++)0!==b[c+E]&&(r[Q[b[c+E]]++]=E);if(a===h?(N=R=r,y=19):a===i?(N=k,O-=257,R=l,S-=257,y=256):(N=m,R=n,y=-1),M=0,E=0,D=F,x=q,I=H,J=0,v=-1,L=1<f||a===j&&L>g)return 1;for(var T=0;;){T++,z=D-J,r[E]y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[c+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<I+J&&(K-=P[I+J],!(0>=K));)I++,K<<=1;if(L+=1<f||a===j&&L>g)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":28}],38:[function(a,b,c){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],39:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length}function f(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b}function g(a){return 256>a?ia[a]:ia[256+(a>>>7)]}function h(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function i(a,b,c){a.bi_valid>X-c?(a.bi_buf|=b<>X-a.bi_valid,a.bi_valid+=c-X):(a.bi_buf|=b<>>=1,c<<=1;while(--b>0);return c>>>1}function l(a){16===a.bi_valid?(h(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function m(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;W>=f;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,c=a.heap_max+1;V>c;c++)d=a.heap[c],f=i[2*i[2*d+1]+1]+1,f>o&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function n(a,b,c){var d,e,f=new Array(W+1),g=0;for(d=1;W>=d;d++)f[d]=g=g+c[d-1]<<1;for(e=0;b>=e;e++){var h=a[2*e+1];0!==h&&(a[2*e]=k(f[h]++,h))}}function o(){var a,b,c,d,f,g=new Array(W+1);for(c=0,d=0;Q-1>d;d++)for(ka[d]=c,a=0;a<1<d;d++)for(la[d]=f,a=0;a<1<>=7;T>d;d++)for(la[d]=f<<7,a=0;a<1<=b;b++)g[b]=0;for(a=0;143>=a;)ga[2*a+1]=8,a++,g[8]++;for(;255>=a;)ga[2*a+1]=9,a++,g[9]++;for(;279>=a;)ga[2*a+1]=7,a++,g[7]++;for(;287>=a;)ga[2*a+1]=8,a++,g[8]++;for(n(ga,S+1,g),a=0;T>a;a++)ha[2*a+1]=5,ha[2*a]=k(a,5);ma=new e(ga,ba,R+1,S,W),na=new e(ha,ca,0,T,W),oa=new e(new Array(0),da,0,U,Y)}function p(a){var b;for(b=0;S>b;b++)a.dyn_ltree[2*b]=0;for(b=0;T>b;b++)a.dyn_dtree[2*b]=0;for(b=0;U>b;b++)a.bl_tree[2*b]=0;a.dyn_ltree[2*Z]=1,a.opt_len=a.static_len=0,a.last_lit=a.matches=0}function q(a){a.bi_valid>8?h(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function r(a,b,c,d){q(a),d&&(h(a,c),h(a,~c)),G.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function s(a,b,c,d){var e=2*b,f=2*c;return a[e]c;c++)0!==f[2*c]?(a.heap[++a.heap_len]=j=c,a.depth[c]=0):f[2*c+1]=0;for(;a.heap_len<2;)e=a.heap[++a.heap_len]=2>j?++j:0,f[2*e]=1,a.depth[e]=0,a.opt_len--,h&&(a.static_len-=g[2*e+1]);for(b.max_code=j,c=a.heap_len>>1;c>=1;c--)t(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],t(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,t(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],m(a,b),n(f,j,a.bl_count)}function w(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;c>=d;d++)e=g,g=b[2*(d+1)+1],++hh?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*$]++):10>=h?a.bl_tree[2*_]++:a.bl_tree[2*aa]++,h=0,f=e,0===g?(i=138,j=3):e===g?(i=6,j=3):(i=7,j=4))}function x(a,b,c){var d,e,f=-1,g=b[1],h=0,k=7,l=4;for(0===g&&(k=138,l=3),d=0;c>=d;d++)if(e=g,g=b[2*(d+1)+1],!(++hh){do j(a,e,a.bl_tree);while(0!==--h)}else 0!==e?(e!==f&&(j(a,e,a.bl_tree),h--),j(a,$,a.bl_tree),i(a,h-3,2)):10>=h?(j(a,_,a.bl_tree),i(a,h-3,3)):(j(a,aa,a.bl_tree),i(a,h-11,7));h=0,f=e,0===g?(k=138,l=3):e===g?(k=6,l=3):(k=7,l=4)}}function y(a){var b;for(w(a,a.dyn_ltree,a.l_desc.max_code),w(a,a.dyn_dtree,a.d_desc.max_code),v(a,a.bl_desc),b=U-1;b>=3&&0===a.bl_tree[2*ea[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function z(a,b,c,d){var e;for(i(a,b-257,5),i(a,c-1,5),i(a,d-4,4),e=0;d>e;e++)i(a,a.bl_tree[2*ea[e]+1],3);x(a,a.dyn_ltree,b-1),x(a,a.dyn_dtree,c-1)}function A(a){var b,c=4093624447;for(b=0;31>=b;b++,c>>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return I;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return J;for(b=32;R>b;b++)if(0!==a.dyn_ltree[2*b])return J;return I}function B(a){pa||(o(),pa=!0),a.l_desc=new f(a.dyn_ltree,ma),a.d_desc=new f(a.dyn_dtree,na),a.bl_desc=new f(a.bl_tree,oa),a.bi_buf=0,a.bi_valid=0,p(a)}function C(a,b,c,d){i(a,(L<<1)+(d?1:0),3),r(a,b,c,!0)}function D(a){i(a,M<<1,3),j(a,Z,ga),l(a)}function E(a,b,c,d){var e,f,g=0;a.level>0?(a.strm.data_type===K&&(a.strm.data_type=A(a)),v(a,a.l_desc),v(a,a.d_desc),g=y(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,e>=f&&(e=f)):e=f=c+5,e>=c+4&&-1!==b?C(a,b,c,d):a.strategy===H||f===e?(i(a,(M<<1)+(d?1:0),3),u(a,ga,ha)):(i(a,(N<<1)+(d?1:0),3),z(a,a.l_desc.max_code+1,a.d_desc.max_code+1,g+1),u(a,a.dyn_ltree,a.dyn_dtree)),p(a),d&&q(a)}function F(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(ja[c]+R+1)]++,a.dyn_dtree[2*g(b)]++),a.last_lit===a.lit_bufsize-1}var G=a("../utils/common"),H=4,I=0,J=1,K=2,L=0,M=1,N=2,O=3,P=258,Q=29,R=256,S=R+1+Q,T=30,U=19,V=2*S+1,W=15,X=16,Y=7,Z=256,$=16,_=17,aa=18,ba=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ca=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],da=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],ea=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],fa=512,ga=new Array(2*(S+2));d(ga);var ha=new Array(2*T);d(ha);var ia=new Array(fa);d(ia);var ja=new Array(P-O+1);d(ja);var ka=new Array(Q);d(ka);var la=new Array(T);d(la);var ma,na,oa,pa=!1;c._tr_init=B,c._tr_stored_block=C,c._tr_flush_block=E,c._tr_tally=F,c._tr_align=D},{"../utils/common":28}],40:[function(a,b,c){"use strict";function d(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=d},{}]},{},[10])(10)});
\ No newline at end of file
diff --git a/cps/static/js/compress/jszip_epub.min.js b/cps/static/js/compress/jszip_epub.min.js
new file mode 100644
index 000000000..ff4cfd5e8
--- /dev/null
+++ b/cps/static/js/compress/jszip_epub.min.js
@@ -0,0 +1,13 @@
+/*!
+
+JSZip v3.10.1 - A JavaScript class for generating and reading zip files
+
+
+(c) 2009-2016 Stuart Knightley
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown.
+
+JSZip uses the library pako released under the MIT license :
+https://github.com/nodeca/pako/blob/main/LICENSE
+*/
+
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e>2,s=(3&t)<<4|r>>4,a=1>6:64,o=2>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+c,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var e=this.bytesWritten,t=0;t=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&sh&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(d&(1<>>=y,p-=y),p<15&&(d+=z[n++]<>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<>>=y,p-=y,(y=s-a)>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){e.msg="invalid window size",r.mode=30;break}r.dmax=1<>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(d=r.length)&&(d=o),d&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[s++]<>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break e;o--,u+=n[s++]<>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l