diff --git a/.gitignore b/.gitignore index 5530633..f09bff4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,143 +1,144 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional stylelint cache -.stylelintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variable files -.env -.env.* -!.env.example - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist -.output - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# vuepress v2.x temp and cache directory -.temp -.cache - -# Sveltekit cache directory -.svelte-kit/ - -# vitepress build output -**/.vitepress/dist - -# vitepress cache directory -**/.vitepress/cache - -# Docusaurus cache and generated files -.docusaurus - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# Firebase cache directory -.firebase/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v3 -.pnp.* -.yarn/* -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions - -# Vite files -vite.config.js.timestamp-* -vite.config.ts.timestamp-* -.vite/ - -todo.txt \ No newline at end of file +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional stylelint cache +.stylelintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variable files +.env +.env.* +!.env.example + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist +.output + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# vuepress v2.x temp and cache directory +.temp +.cache + +# Sveltekit cache directory +.svelte-kit/ + +# vitepress build output +**/.vitepress/dist + +# vitepress cache directory +**/.vitepress/cache + +# Docusaurus cache and generated files +.docusaurus + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# Firebase cache directory +.firebase/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v3 +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions + +# Vite files +vite.config.js.timestamp-* +vite.config.ts.timestamp-* +.vite/ + +todo.txt +chatgpt_continuation.md5 diff --git a/CHANGELOG.md b/CHANGELOG.md index fd1f4f8..0bb9862 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,22 @@ All notable changes to `pdf-tools` are documented here. The project follows a pragmatic versioning scheme while the app is still below `1.0.0`: minor versions mark coherent user-facing milestones; patch versions mark fixes and small improvements. +## 0.3.2 — Multi-file merge queue release + +### Added + +- Added a multi-file merge queue for selecting, loading, reviewing, reordering, removing, and merging several incoming PDFs. +- Added queue merge modes for replacing the current document, appending after the current workspace, or inserting at a chosen one-based page position. +- Added merge queue helper tests for queue ordering, readiness checks, insert-position clamping, and merged filename generation. +- Added PDF merge service tests for queue-only and base-plus-incoming merge results. + +### Changed + +- Changed the file picker to accept multiple PDFs. A single file with no active workspace still opens directly; otherwise selected files are added to the merge queue. +- Replaced the old single-file merge card with a queue-based merge panel. +- Merging now creates a new unsaved workspace from the materialized merge result, preserving the current workspace state before append/insert merges. +- Bumped the app/package version to `0.3.2`. + ## 0.3.1 — Split ZIP export release ### Added diff --git a/LICENSE b/LICENSE index 29ebfa5..1f84167 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,661 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see . \ No newline at end of file diff --git a/index.html b/index.html index c4d8dc6..4d89304 100644 --- a/index.html +++ b/index.html @@ -4,6 +4,12 @@ Self-hosted PDF Workbench + + + + + +
diff --git a/package-lock.json b/package-lock.json index 1a40dce..e71fe7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pdf-tools", - "version": "0.3.1", + "version": "0.3.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pdf-tools", - "version": "0.3.1", + "version": "0.3.2", "dependencies": { "fflate": "^0.8.3", "pdf-lib": "^1.17.1", @@ -117,7 +117,6 @@ "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -448,7 +447,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=20.19.0" }, @@ -497,7 +495,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=20.19.0" } @@ -1470,7 +1467,8 @@ "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@types/chai": { "version": "5.2.3", @@ -1517,7 +1515,6 @@ "integrity": "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "undici-types": ">=7.24.0 <7.24.7" } @@ -1528,7 +1525,6 @@ "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -1539,7 +1535,6 @@ "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "dev": true, "license": "MIT", - "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -1589,7 +1584,6 @@ "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.59.3", "@typescript-eslint/types": "8.59.3", @@ -1913,7 +1907,6 @@ "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -1954,6 +1947,7 @@ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=8" } @@ -1964,6 +1958,7 @@ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=10" }, @@ -1977,6 +1972,7 @@ "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, "license": "Apache-2.0", + "peer": true, "dependencies": { "dequal": "^2.0.3" } @@ -2057,7 +2053,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.10.12", "caniuse-lite": "^1.0.30001782", @@ -2198,6 +2193,7 @@ "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=6" } @@ -2217,7 +2213,8 @@ "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/electron-to-chromium": { "version": "1.5.357", @@ -2275,7 +2272,6 @@ "integrity": "sha512-loXy6bWOoP3EP6JA7jo6p5jMpBJmHmsNZM5SFRHLdh1MGOPurMnNBj4ZlAbaqUAaQWbCr7jHV4P7gzAyryZWkQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", @@ -2529,7 +2525,7 @@ }, "node_modules/fflate": { "version": "0.8.3", - "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz", + "resolved": "https://packages.applied-caas-gateway1.internal.api.openai.org/artifactory/api/npm/npm-public/fflate/-/fflate-0.8.3.tgz", "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==", "license": "MIT" }, @@ -2735,7 +2731,6 @@ "integrity": "sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@asamuzakjp/css-color": "^5.1.11", "@asamuzakjp/dom-selector": "^7.1.1", @@ -3135,6 +3130,7 @@ "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", "dev": true, "license": "MIT", + "peer": true, "bin": { "lz-string": "bin/bin.js" } @@ -3356,7 +3352,6 @@ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -3425,6 +3420,7 @@ "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -3449,7 +3445,6 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.2.6.tgz", "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==", "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -3459,7 +3454,6 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.6.tgz", "integrity": "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==", "license": "MIT", - "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -3472,7 +3466,8 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/require-from-string": { "version": "2.0.2", @@ -3743,7 +3738,6 @@ "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -3840,7 +3834,6 @@ "integrity": "sha512-MFtjBYgzmSxmgA4RAfjIyXWpGe1oALnjgUTzzV7QLx/TKxCzjtMH6Fd9/eVK+5Fg1qNoz5VAwsmMs/NofrmJvw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "lightningcss": "^1.32.0", "picomatch": "^4.0.4", @@ -4164,7 +4157,6 @@ "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==", "dev": true, "license": "MIT", - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } diff --git a/package.json b/package.json index dd35f06..a877917 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdf-tools", - "version": "0.3.1", + "version": "0.3.2", "private": true, "type": "module", "scripts": { diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000..68f34ab Binary files /dev/null and b/public/apple-touch-icon.png differ diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png new file mode 100644 index 0000000..7270bb9 Binary files /dev/null and b/public/favicon-96x96.png differ diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..9f2a5a5 Binary files /dev/null and b/public/favicon.ico differ diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100644 index 0000000..eba78b7 --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1,17 @@ +RealFaviconGeneratorhttps://realfavicongenerator.net + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/site.webmanifest b/public/site.webmanifest new file mode 100644 index 0000000..3d0c1e1 --- /dev/null +++ b/public/site.webmanifest @@ -0,0 +1,21 @@ +{ + "name": "PDFTools", + "short_name": "PDFTools", + "icons": [ + { + "src": "/web-app-manifest-192x192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "/web-app-manifest-512x512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} \ No newline at end of file diff --git a/public/web-app-manifest-192x192.png b/public/web-app-manifest-192x192.png new file mode 100644 index 0000000..060e2a6 Binary files /dev/null and b/public/web-app-manifest-192x192.png differ diff --git a/public/web-app-manifest-512x512.png b/public/web-app-manifest-512x512.png new file mode 100644 index 0000000..0f875c6 Binary files /dev/null and b/public/web-app-manifest-512x512.png differ diff --git a/src/App.tsx b/src/App.tsx index 96b6dfb..ef2e8ff 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -9,6 +9,7 @@ import ActionDialog, { type ActionDialogAction, } from './components/ActionDialog'; import HelpDialog from './components/HelpDialog'; +import MergeQueuePanel from './components/MergeQueuePanel'; import { PDFDocument } from 'pdf-lib'; import type { StoredWorkspace, @@ -32,7 +33,7 @@ import { import type { PageRef, PdfFile } from './pdf/pdfTypes'; import { loadPdfFromFile, - mergePdfFiles, + mergePdfFilesAtPosition, splitIntoSinglePages, exportPages, } from './pdf/pdfService'; @@ -47,6 +48,13 @@ import { createSelectionWorkspaceName, getSelectedPagesInVisualOrder, } from './workspace/workspaceSelection'; +import { useMergeQueue } from './merge/useMergeQueue'; +import { + clampMergeInsertAt, + createMergedPdfName, + defaultMergeInsertPosition, +} from './merge/mergeQueueHelpers'; +import type { MergeMode } from './merge/mergeTypes'; function isEditableKeyboardTarget(target: EventTarget | null): boolean { if (!(target instanceof HTMLElement)) return false; @@ -80,13 +88,23 @@ const App: React.FC = () => { const [previewPageId, setPreviewPageId] = useState(null); - const [pendingFile, setPendingFile] = useState(null); - const [showMergeOptions, setShowMergeOptions] = useState(false); - const [mergeMode, setMergeMode] = useState< - 'overwrite' | 'append' | 'insertAt' - >('append'); + const [mergeQueueOpen, setMergeQueueOpen] = useState(false); + const [mergeMode, setMergeMode] = useState('append'); const [mergeInsertAt, setMergeInsertAt] = useState(''); + const { + items: mergeQueueItems, + addFiles: addFilesToMergeQueue, + removeItem: removeMergeQueueItem, + moveItemUp: moveMergeQueueItemUp, + moveItemDown: moveMergeQueueItemDown, + clearQueue: clearMergeQueue, + readyPdfs: readyMergePdfs, + canMerge: canMergeQueue, + hasErrors: mergeQueueHasErrors, + isLoading: mergeQueueIsLoading, + } = useMergeQueue(); + const { splitDownloads, splitZipDownload, @@ -422,89 +440,111 @@ const App: React.FC = () => { } }; - const handleFileLoaded = (file: File) => { - if (!pdf || pages.length === 0) { - void loadFileAsNew(file); - } else { - setPendingFile(file); - setShowMergeOptions(true); - setMergeMode('append'); - setMergeInsertAt(String(pages.length + 1)); + const queueFilesForMerge = (files: File[]) => { + if (files.length === 0) return; + + const queueWasEmpty = mergeQueueItems.length === 0; + + addFilesToMergeQueue(files); + setMergeQueueOpen(true); + + if (queueWasEmpty) { + if (!pdf || pages.length === 0) { + setMergeMode('overwrite'); + setMergeInsertAt('1'); + } else { + setMergeMode('append'); + setMergeInsertAt(defaultMergeInsertPosition(pages.length)); + } } }; + const handleFilesLoaded = (files: File[]) => { + const pdfFiles = files.filter( + (file) => + file.type === 'application/pdf' || + file.name.toLowerCase().endsWith('.pdf') + ); + + if (pdfFiles.length === 0) return; + + if (!pdf && pages.length === 0 && pdfFiles.length === 1) { + void loadFileAsNew(pdfFiles[0]); + return; + } + + queueFilesForMerge(pdfFiles); + }; + const handleMergeCancel = () => { - setPendingFile(null); - setShowMergeOptions(false); + clearMergeQueue(); + setMergeQueueOpen(false); }; const handleMergeConfirm = async () => { - if (!pendingFile) return; - - if (!pdf || mergeMode === 'overwrite') { - await loadFileAsNew(pendingFile); - setPendingFile(null); - setShowMergeOptions(false); - return; - } + if (!canMergeQueue || readyMergePdfs.length === 0) return; setError(null); setIsBusy(true); try { - // 1) Materialize the current in-memory workspace (page refs + rotations) - const currentBlob = await exportPages(pdf, pages); - const currentArrayBuffer = await currentBlob.arrayBuffer(); - const currentDoc = await PDFDocument.load(currentArrayBuffer); - const currentPdf: PdfFile = { - id: pdf.id, - name: pdf.name, - doc: currentDoc, - arrayBuffer: currentArrayBuffer, - pageCount: pages.length, - }; + let basePdf: PdfFile | null = null; + let insertAt = 0; - // 2) Load the new PDF - const newPdf = await loadPdfFromFile(pendingFile); + if (pdf && pages.length > 0 && mergeMode !== 'overwrite') { + const currentBlob = await exportPages(pdf, pages); + const currentArrayBuffer = await currentBlob.arrayBuffer(); + const currentDoc = await PDFDocument.load(currentArrayBuffer); - // 3) Determine insert position (0-based) - let insertAt = pages.length; // default: append at end - if (mergeMode === 'insertAt') { - const parsed = parseInt(mergeInsertAt, 10); - if (Number.isFinite(parsed)) { - insertAt = Math.min(Math.max(parsed - 1, 0), pages.length); - } - } else if (mergeMode === 'append') { - insertAt = pages.length; + basePdf = { + id: pdf.id, + name: pdf.name, + doc: currentDoc, + arrayBuffer: currentArrayBuffer, + pageCount: pages.length, + }; + + insertAt = + mergeMode === 'insertAt' + ? clampMergeInsertAt(mergeInsertAt, pages.length) + : pages.length; } - // 4) Merge - const mergedPdf = await mergePdfFiles(currentPdf, newPdf, insertAt); - const mergedPages = createInitialPageRefs(mergedPdf.pageCount); + const mergedPdf = await mergePdfFilesAtPosition({ + basePdf, + incomingPdfs: readyMergePdfs, + insertAt, + name: createMergedPdfName( + pdf?.name ?? null, + readyMergePdfs.map((item) => item.name), + mergeMode + ), + }); - // 5) Reset state to the merged document setPdf(mergedPdf); replaceWorkspaceState({ - pages: mergedPages, + pages: createInitialPageRefs(mergedPdf.pageCount), selectedPageIds: [], lastSelectedVisualIndex: null, history: [], redoHistory: [], dirty: true, - message: null, + message: `Merged ${readyMergePdfs.length} queued ${ + readyMergePdfs.length === 1 ? 'PDF' : 'PDFs' + } into a new unsaved workspace.`, }); clearGeneratedOutputs(); clearThumbnailCache(); setPreviewPageId(null); setWorkspaceName(defaultWorkspaceNameFromPdfName(mergedPdf.name)); setActiveWorkspaceId(null); + clearMergeQueue(); + setMergeQueueOpen(false); } catch (e) { console.error(e); - setError('Failed to merge PDF (see console).'); + setError('Failed to merge PDF queue (see console).'); } finally { setIsBusy(false); - setPendingFile(null); - setShowMergeOptions(false); } }; @@ -1100,7 +1140,29 @@ const App: React.FC = () => { return ( setHelpOpen(true)}> - + + + {mergeQueueOpen && mergeQueueItems.length > 0 && ( + 0} + currentPdfName={pdf?.name ?? null} + currentPageCount={pages.length} + mergeMode={mergeMode} + mergeInsertAt={mergeInsertAt} + isBusy={isBusy} + canMerge={canMergeQueue} + isLoading={mergeQueueIsLoading} + hasErrors={mergeQueueHasErrors} + onMergeModeChange={setMergeMode} + onMergeInsertAtChange={setMergeInsertAt} + onMoveUp={moveMergeQueueItemUp} + onMoveDown={moveMergeQueueItemDown} + onRemove={removeMergeQueueItem} + onCancel={handleMergeCancel} + onConfirm={handleMergeConfirm} + /> + )} { onRedo={handleRedo} /> - {showMergeOptions && pendingFile && pdf && pages.length > 0 && ( -
-

Open file: merge or replace?

-

- You already have {pdf.name} with {pages.length}{' '} - pages open. What should happen with{' '} - {pendingFile.name}? -

- -
- - - - - -
- -
- - -
-
- )} - void; + onFilesLoaded: (files: File[]) => void; } -const FileLoader: React.FC = ({ pdf, onFileLoaded }) => { +const FileLoader: React.FC = ({ pdf, onFilesLoaded }) => { const handleChange = (e: React.ChangeEvent) => { - const file = e.target.files?.[0]; - if (file) { - onFileLoaded(file); + const files = Array.from(e.target.files ?? []); + if (files.length > 0) { + onFilesLoaded(files); e.target.value = ''; } }; @@ -18,8 +18,16 @@ const FileLoader: React.FC = ({ pdf, onFileLoaded }) => { return (

1. Load PDF

-

Select a PDF file. Processing happens entirely in your browser.

- +

+ Select one PDF to open it directly, or select several PDFs to place them + in the merge queue. Processing happens entirely in your browser. +

+ {pdf && (
diff --git a/src/components/HelpDialog.tsx b/src/components/HelpDialog.tsx index 3e3f7fb..4be14b7 100644 --- a/src/components/HelpDialog.tsx +++ b/src/components/HelpDialog.tsx @@ -34,7 +34,7 @@ const shortcuts = [ const tutorialSteps = [ { title: '1. Open a PDF or load a workspace', - body: 'Start by selecting a local PDF file. If you saved workspaces before, you can restore one from browser storage instead.', + body: 'Start by selecting a local PDF file. Select several PDFs to open the merge queue, or restore a saved workspace from browser storage.', }, { title: '2. Arrange pages visually', @@ -50,7 +50,7 @@ const tutorialSteps = [ }, { title: '5. Split and download results', - body: 'Splitting creates individual one-page PDF downloads and a ZIP archive that contains all generated page files.', + body: 'Splitting creates individual one-page PDF downloads and a ZIP archive that contains all generated page files. For merging, review the incoming PDF queue, reorder it if needed, then replace, append, or insert the queued PDFs.', }, { title: '6. Save your workspace or export a PDF', @@ -102,7 +102,7 @@ const HelpDialog: React.FC = ({ open, onClose }) => {

Help & tutorial

PDF Workbench is a browser-only page workspace. Use it to quickly - rearrange, split, merge, rotate, duplicate, and export PDFs + rearrange, split, queue-merge, rotate, duplicate, and export PDFs without uploading documents to a server.

diff --git a/src/components/MergeQueuePanel.tsx b/src/components/MergeQueuePanel.tsx new file mode 100644 index 0000000..bc4b01b --- /dev/null +++ b/src/components/MergeQueuePanel.tsx @@ -0,0 +1,232 @@ +import React from 'react'; +import type { MergeQueueItem, MergeMode } from '../merge/mergeTypes'; + +interface MergeQueuePanelProps { + items: MergeQueueItem[]; + hasCurrentPdf: boolean; + currentPdfName: string | null; + currentPageCount: number; + mergeMode: MergeMode; + mergeInsertAt: string; + isBusy: boolean; + canMerge: boolean; + isLoading: boolean; + hasErrors: boolean; + onMergeModeChange: (mode: MergeMode) => void; + onMergeInsertAtChange: (value: string) => void; + onMoveUp: (itemId: string) => void; + onMoveDown: (itemId: string) => void; + onRemove: (itemId: string) => void; + onCancel: () => void; + onConfirm: () => void; +} + +function formatFileSize(size: number): string { + if (size < 1024) return `${size} B`; + if (size < 1024 * 1024) return `${(size / 1024).toFixed(1)} KB`; + return `${(size / (1024 * 1024)).toFixed(1)} MB`; +} + +const MergeQueuePanel: React.FC = ({ + items, + hasCurrentPdf, + currentPdfName, + currentPageCount, + mergeMode, + mergeInsertAt, + isBusy, + canMerge, + isLoading, + hasErrors, + onMergeModeChange, + onMergeInsertAtChange, + onMoveUp, + onMoveDown, + onRemove, + onCancel, + onConfirm, +}) => { + const queuedPageCount = items.reduce( + (sum, item) => sum + (item.pageCount ?? 0), + 0 + ); + + return ( +
+

Merge PDF queue

+

+ Add several PDFs, reorder the queue, then merge them into a new unsaved + workspace. Processing still happens entirely in your browser. +

+ + {hasCurrentPdf ? ( +

+ Current workspace:{' '} + {currentPdfName ?? 'Untitled document'} with{' '} + {currentPageCount} {currentPageCount === 1 ? 'page' : 'pages'}. +

+ ) : ( +

+ No current workspace is open. The queue will become a new workspace. +

+ )} + +
+ {items.map((item, index) => ( +
+
#{index + 1}
+
+ {item.name} + + {formatFileSize(item.size)} ·{' '} + {item.status === 'ready' && item.pageCount != null + ? `${item.pageCount} ${item.pageCount === 1 ? 'page' : 'pages'}` + : item.status === 'loading' + ? 'Loading…' + : (item.error ?? 'Error')} + +
+
+ + + +
+
+ ))} +
+ +

+ Queue total:{' '} + + {items.length} {items.length === 1 ? 'PDF' : 'PDFs'} + + {queuedPageCount > 0 && ( + <> + {' '} + · {queuedPageCount} {queuedPageCount === 1 ? 'page' : 'pages'} + + )} +

+ +
+ + + + + +
+ + {mergeMode === 'overwrite' && hasCurrentPdf && ( +

+ Replace mode discards the current in-memory workspace after the merge. + Save it first if you want to keep the current state separately. +

+ )} + + {hasErrors && ( +

+ One or more queued files could not be loaded. Remove failed items + before merging. +

+ )} + +
+ + +
+
+ ); +}; + +export default MergeQueuePanel; diff --git a/src/merge/mergeQueueHelpers.test.ts b/src/merge/mergeQueueHelpers.test.ts new file mode 100644 index 0000000..09abc64 --- /dev/null +++ b/src/merge/mergeQueueHelpers.test.ts @@ -0,0 +1,82 @@ +import { describe, expect, it } from 'vitest'; +import type { MergeQueueItem } from './mergeTypes'; +import { + canMergeQueue, + clampMergeInsertAt, + createMergedPdfName, + getReadyMergeQueuePdfs, + moveMergeQueueItem, +} from './mergeQueueHelpers'; + +function makeItem( + id: string, + status: MergeQueueItem['status'] +): MergeQueueItem { + return { + id, + file: new File(['x'], `${id}.pdf`, { type: 'application/pdf' }), + name: `${id}.pdf`, + size: 1, + pageCount: status === 'ready' ? 1 : null, + pdf: + status === 'ready' + ? { + id: `pdf-${id}`, + name: `${id}.pdf`, + // The helper tests never dereference the PDFDocument. + doc: {} as never, + pageCount: 1, + arrayBuffer: new ArrayBuffer(0), + } + : null, + status, + }; +} + +describe('merge queue helpers', () => { + it('moves queued items up and down without mutating the original array', () => { + const items = [ + makeItem('a', 'ready'), + makeItem('b', 'ready'), + makeItem('c', 'ready'), + ]; + + expect(moveMergeQueueItem(items, 'b', 'up').map((item) => item.id)).toEqual( + ['b', 'a', 'c'] + ); + expect( + moveMergeQueueItem(items, 'b', 'down').map((item) => item.id) + ).toEqual(['a', 'c', 'b']); + expect(items.map((item) => item.id)).toEqual(['a', 'b', 'c']); + }); + + it('only allows merging when every queued item is ready', () => { + const readyItems = [makeItem('a', 'ready'), makeItem('b', 'ready')]; + const mixedItems = [makeItem('a', 'ready'), makeItem('b', 'loading')]; + + expect(canMergeQueue(readyItems)).toBe(true); + expect(getReadyMergeQueuePdfs(readyItems)).toHaveLength(2); + expect(canMergeQueue(mixedItems)).toBe(false); + expect(canMergeQueue([])).toBe(false); + }); + + it('clamps one-based merge positions to zero-based insert slots', () => { + expect(clampMergeInsertAt('1', 10)).toBe(0); + expect(clampMergeInsertAt('5', 10)).toBe(4); + expect(clampMergeInsertAt('99', 10)).toBe(10); + expect(clampMergeInsertAt('-10', 10)).toBe(0); + expect(clampMergeInsertAt('not-a-number', 10)).toBe(10); + }); + + it('creates readable merged PDF filenames', () => { + expect(createMergedPdfName('base.pdf', ['a.pdf', 'b.pdf'], 'append')).toBe( + 'base_plus_2_pdfs.pdf' + ); + expect(createMergedPdfName('base.pdf', ['a.pdf'], 'overwrite')).toBe( + 'a_merged.pdf' + ); + expect(createMergedPdfName(null, ['a.pdf', 'b.pdf'], 'overwrite')).toBe( + 'merged_2_pdfs.pdf' + ); + }); +}); diff --git a/src/merge/mergeQueueHelpers.ts b/src/merge/mergeQueueHelpers.ts new file mode 100644 index 0000000..5ccde2b --- /dev/null +++ b/src/merge/mergeQueueHelpers.ts @@ -0,0 +1,86 @@ +import type { PdfFile } from '../pdf/pdfTypes'; +import type { MergeMode, MergeQueueItem } from './mergeTypes'; + +export function createMergeQueueItemId(): string { + return `merge_${Math.random().toString(36).slice(2)}`; +} + +export function moveMergeQueueItem( + items: MergeQueueItem[], + itemId: string, + direction: 'up' | 'down' +): MergeQueueItem[] { + const index = items.findIndex((item) => item.id === itemId); + if (index < 0) return items; + + const targetIndex = direction === 'up' ? index - 1 : index + 1; + if (targetIndex < 0 || targetIndex >= items.length) return items; + + const next = [...items]; + const [item] = next.splice(index, 1); + next.splice(targetIndex, 0, item); + return next; +} + +export function getReadyMergeQueuePdfs(items: MergeQueueItem[]): PdfFile[] { + return items + .filter((item) => item.status === 'ready' && item.pdf) + .map((item) => item.pdf as PdfFile); +} + +export function canMergeQueue(items: MergeQueueItem[]): boolean { + return ( + items.length > 0 && + items.every((item) => item.status === 'ready' && item.pdf !== null) + ); +} + +export function hasMergeQueueErrors(items: MergeQueueItem[]): boolean { + return items.some((item) => item.status === 'error'); +} + +export function isMergeQueueLoading(items: MergeQueueItem[]): boolean { + return items.some((item) => item.status === 'loading'); +} + +export function clampMergeInsertAt(value: string, pageCount: number): number { + const parsed = Number.parseInt(value, 10); + if (!Number.isFinite(parsed)) return pageCount; + + return Math.min(Math.max(parsed - 1, 0), pageCount); +} + +export function defaultMergeInsertPosition(pageCount: number): string { + return String(pageCount + 1); +} + +export function createMergedPdfName( + currentPdfName: string | null, + incomingPdfNames: string[], + mode: MergeMode +): string { + const incomingBaseNames = incomingPdfNames.map(stripPdfExtension); + + if (incomingBaseNames.length === 0) { + return currentPdfName ?? 'merged.pdf'; + } + + if ( + incomingBaseNames.length === 1 && + (!currentPdfName || mode === 'overwrite') + ) { + return `${incomingBaseNames[0]}_merged.pdf`; + } + + if (currentPdfName && mode !== 'overwrite') { + const currentBaseName = stripPdfExtension(currentPdfName); + return `${currentBaseName}_plus_${incomingBaseNames.length}_pdfs.pdf`; + } + + return `merged_${incomingBaseNames.length}_pdfs.pdf`; +} + +function stripPdfExtension(filename: string): string { + const base = filename.replace(/\.pdf$/i, '').trim(); + return base || 'document'; +} diff --git a/src/merge/mergeTypes.ts b/src/merge/mergeTypes.ts new file mode 100644 index 0000000..d049d03 --- /dev/null +++ b/src/merge/mergeTypes.ts @@ -0,0 +1,16 @@ +import type { PdfFile } from '../pdf/pdfTypes'; + +export type MergeMode = 'overwrite' | 'append' | 'insertAt'; + +export type MergeQueueItemStatus = 'loading' | 'ready' | 'error'; + +export interface MergeQueueItem { + id: string; + file: File; + name: string; + size: number; + pageCount: number | null; + pdf: PdfFile | null; + status: MergeQueueItemStatus; + error?: string; +} diff --git a/src/merge/useMergeQueue.ts b/src/merge/useMergeQueue.ts new file mode 100644 index 0000000..a24e4d4 --- /dev/null +++ b/src/merge/useMergeQueue.ts @@ -0,0 +1,102 @@ +import { useCallback, useState } from 'react'; +import { loadPdfFromFile } from '../pdf/pdfService'; +import { + canMergeQueue, + createMergeQueueItemId, + getReadyMergeQueuePdfs, + hasMergeQueueErrors, + isMergeQueueLoading, + moveMergeQueueItem, +} from './mergeQueueHelpers'; +import type { MergeQueueItem } from './mergeTypes'; + +export function useMergeQueue() { + const [items, setItems] = useState([]); + + const addFiles = useCallback((files: File[]) => { + const pdfFiles = files.filter( + (file) => + file.type === 'application/pdf' || + file.name.toLowerCase().endsWith('.pdf') + ); + + if (pdfFiles.length === 0) return; + + const queuedItems: MergeQueueItem[] = pdfFiles.map((file) => ({ + id: createMergeQueueItemId(), + file, + name: file.name, + size: file.size, + pageCount: null, + pdf: null, + status: 'loading', + })); + + setItems((current) => [...current, ...queuedItems]); + + queuedItems.forEach((item) => { + void (async () => { + try { + const loadedPdf = await loadPdfFromFile(item.file); + + setItems((current) => + current.map((currentItem) => + currentItem.id === item.id + ? { + ...currentItem, + pdf: loadedPdf, + pageCount: loadedPdf.pageCount, + status: 'ready', + error: undefined, + } + : currentItem + ) + ); + } catch (error) { + console.error(error); + + setItems((current) => + current.map((currentItem) => + currentItem.id === item.id + ? { + ...currentItem, + status: 'error', + error: 'Could not load this PDF.', + } + : currentItem + ) + ); + } + })(); + }); + }, []); + + const removeItem = useCallback((itemId: string) => { + setItems((current) => current.filter((item) => item.id !== itemId)); + }, []); + + const moveItemUp = useCallback((itemId: string) => { + setItems((current) => moveMergeQueueItem(current, itemId, 'up')); + }, []); + + const moveItemDown = useCallback((itemId: string) => { + setItems((current) => moveMergeQueueItem(current, itemId, 'down')); + }, []); + + const clearQueue = useCallback(() => { + setItems([]); + }, []); + + return { + items, + addFiles, + removeItem, + moveItemUp, + moveItemDown, + clearQueue, + readyPdfs: getReadyMergeQueuePdfs(items), + canMerge: canMergeQueue(items), + hasErrors: hasMergeQueueErrors(items), + isLoading: isMergeQueueLoading(items), + }; +} diff --git a/src/pdf/pdfMergeService.test.ts b/src/pdf/pdfMergeService.test.ts new file mode 100644 index 0000000..9b0dfee --- /dev/null +++ b/src/pdf/pdfMergeService.test.ts @@ -0,0 +1,57 @@ +import { PDFDocument } from 'pdf-lib'; +import { describe, expect, it } from 'vitest'; +import type { PdfFile } from './pdfTypes'; +import { mergePdfFilesAtPosition } from './pdfService'; + +async function makePdf(name: string, pageCount: number): Promise { + const doc = await PDFDocument.create(); + for (let i = 0; i < pageCount; i += 1) { + doc.addPage([100, 100]); + } + + const bytes = await doc.save(); + const arrayBuffer = new ArrayBuffer(bytes.byteLength); + new Uint8Array(arrayBuffer).set(bytes); + + return { + id: name, + name, + doc, + pageCount, + arrayBuffer, + }; +} + +describe('mergePdfFilesAtPosition', () => { + it('merges a queue without a current base PDF', async () => { + const first = await makePdf('first.pdf', 1); + const second = await makePdf('second.pdf', 2); + + const merged = await mergePdfFilesAtPosition({ + basePdf: null, + incomingPdfs: [first, second], + insertAt: 0, + name: 'merged.pdf', + }); + + expect(merged.name).toBe('merged.pdf'); + expect(merged.pageCount).toBe(3); + expect(merged.doc.getPageCount()).toBe(3); + }); + + it('inserts queued PDFs into a current base PDF at the requested slot', async () => { + const base = await makePdf('base.pdf', 3); + const incoming = await makePdf('incoming.pdf', 2); + + const merged = await mergePdfFilesAtPosition({ + basePdf: base, + incomingPdfs: [incoming], + insertAt: 1, + name: 'base_plus_incoming.pdf', + }); + + expect(merged.name).toBe('base_plus_incoming.pdf'); + expect(merged.pageCount).toBe(5); + expect(merged.doc.getPageCount()).toBe(5); + }); +}); diff --git a/src/pdf/pdfService.ts b/src/pdf/pdfService.ts index c9477d2..14e7093 100644 --- a/src/pdf/pdfService.ts +++ b/src/pdf/pdfService.ts @@ -77,6 +77,76 @@ export async function mergePdfFiles( }; } +interface MergePdfFilesAtPositionOptions { + basePdf: PdfFile | null; + incomingPdfs: PdfFile[]; + insertAt: number; + name: string; +} + +export async function mergePdfFilesAtPosition({ + basePdf, + incomingPdfs, + insertAt, + name, +}: MergePdfFilesAtPositionOptions): Promise { + if (!basePdf && incomingPdfs.length === 0) { + throw new Error('At least one PDF is required for merging'); + } + + const mergedDoc = await PDFDocument.create(); + + const addAllPages = async (sourcePdf: PdfFile) => { + const sourceDoc = + sourcePdf.doc ?? (await PDFDocument.load(sourcePdf.arrayBuffer)); + const pageCount = sourceDoc.getPageCount(); + const pages = await mergedDoc.copyPages( + sourceDoc, + Array.from({ length: pageCount }, (_, i) => i) + ); + pages.forEach((page) => mergedDoc.addPage(page)); + }; + + if (!basePdf) { + for (const incomingPdf of incomingPdfs) { + await addAllPages(incomingPdf); + } + } else { + const baseDoc = + basePdf.doc ?? (await PDFDocument.load(basePdf.arrayBuffer)); + const basePageCount = baseDoc.getPageCount(); + const clampedInsertAt = Math.min(Math.max(insertAt, 0), basePageCount); + + const basePages = await mergedDoc.copyPages( + baseDoc, + Array.from({ length: basePageCount }, (_, i) => i) + ); + + for (let i = 0; i < clampedInsertAt; i += 1) { + mergedDoc.addPage(basePages[i]); + } + + for (const incomingPdf of incomingPdfs) { + await addAllPages(incomingPdf); + } + + for (let i = clampedInsertAt; i < basePages.length; i += 1) { + mergedDoc.addPage(basePages[i]); + } + } + + const bytes = await mergedDoc.save(); + const buffer = pdfBytesToArrayBuffer(bytes); + + return { + id: createId(), + name, + arrayBuffer: buffer, + pageCount: mergedDoc.getPageCount(), + doc: mergedDoc, + }; +} + export async function splitIntoSinglePages( pdf: PdfFile ): Promise { diff --git a/src/styles.css b/src/styles.css index 50dd35e..a0e694e 100644 --- a/src/styles.css +++ b/src/styles.css @@ -398,3 +398,94 @@ button.secondary { align-items: flex-start; } } + +.merge-queue-list { + display: flex; + flex-direction: column; + gap: 0.5rem; + margin: 0.75rem 0; +} + +.merge-queue-item { + display: grid; + grid-template-columns: auto 1fr auto; + align-items: center; + gap: 0.75rem; + border: 1px solid #bfdbfe; + border-radius: 0.75rem; + background: rgba(255, 255, 255, 0.8); + padding: 0.6rem; +} + +.merge-queue-order { + border-radius: 999px; + background: #dbeafe; + color: #1e3a8a; + font-size: 0.8rem; + font-weight: 700; + padding: 0.2rem 0.5rem; +} + +.merge-queue-details { + display: flex; + flex-direction: column; + gap: 0.1rem; + min-width: 0; + font-size: 0.9rem; +} + +.merge-queue-details strong { + overflow-wrap: anywhere; +} + +.merge-queue-details span { + color: #4b5563; + font-size: 0.8rem; +} + +.merge-queue-actions { + display: flex; + flex-wrap: wrap; + justify-content: flex-end; + gap: 0.35rem; +} + +.merge-queue-actions button.secondary { + padding: 0.3rem 0.55rem; + font-size: 0.8rem; +} + +.merge-mode-group { + display: flex; + flex-direction: column; + gap: 0.5rem; + margin-top: 0.75rem; + font-size: 0.9rem; +} + +.merge-mode-group label { + display: flex; + align-items: center; + gap: 0.4rem; +} + +.merge-warning { + margin: 0.75rem 0 0; + border: 1px solid #fed7aa; + border-radius: 0.5rem; + background: #fff7ed; + color: #9a3412; + padding: 0.55rem 0.65rem; + font-size: 0.85rem; +} + +@media (max-width: 700px) { + .merge-queue-item { + grid-template-columns: 1fr; + align-items: stretch; + } + + .merge-queue-actions { + justify-content: flex-start; + } +} diff --git a/src/version.ts b/src/version.ts index 1006439..61b737a 100644 --- a/src/version.ts +++ b/src/version.ts @@ -1 +1 @@ -export const APP_VERSION = '0.3.1'; +export const APP_VERSION = '0.3.2';