diff --git a/alembic/env.py b/alembic/env.py index ac05474b..7e7be98a 100644 --- a/alembic/env.py +++ b/alembic/env.py @@ -18,7 +18,7 @@ fileConfig(config.config_file_name) from wrolpi.common import Base # Import all models so they are registered with the Base metadata from wrolpi.files.models import FileGroup, Directory # noqa: F401 -from wrolpi.files.ebooks import EBook # noqa: F401 +from modules.docs.models import Doc # noqa: F401 from wrolpi.tags import Tag # noqa: F401 from wrolpi.flags import WROLPiFlag # noqa: F401 from wrolpi.downloader import Download # noqa: F401 diff --git a/alembic/versions/e7f8a9b0c1d2_rename_ebook_to_doc.py b/alembic/versions/e7f8a9b0c1d2_rename_ebook_to_doc.py new file mode 100644 index 00000000..13be66ac --- /dev/null +++ b/alembic/versions/e7f8a9b0c1d2_rename_ebook_to_doc.py @@ -0,0 +1,172 @@ +"""Rename ebook table to doc and add new columns. + +Revision ID: a1b2c3d4e5f6 +Revises: d371333159ab +Create Date: 2026-03-15 15:30:00.000000 + +""" +import os + +from alembic import op +import sqlalchemy as sa +from sqlalchemy.orm import Session + +# revision identifiers, used by Alembic. +revision = 'e7f8a9b0c1d2' +down_revision = 'd371333159ab' +branch_labels = None +depends_on = None + +DOCKERIZED = True if os.environ.get('DOCKER', '').lower().startswith('t') else False +BATCH_SIZE = 1000 + + +def upgrade(): + bind = op.get_bind() + session = Session(bind=bind) + + if not DOCKERIZED: + bind.execute(sa.text("SET ROLE 'wrolpi'")) + + # Rename ebook table to doc. + print("Migrating ebook -> doc...") + op.rename_table('ebook', 'doc') + + # Rename the index. + op.execute('ALTER INDEX IF EXISTS ebook_size_idx RENAME TO doc_size_idx') + op.execute('ALTER INDEX IF EXISTS ebook_file_group_id_key RENAME TO doc_file_group_id_key') + op.execute('ALTER INDEX IF EXISTS ebook_pkey RENAME TO doc_pkey') + + # Rename the sequence. + op.execute('ALTER SEQUENCE IF EXISTS ebook_id_seq RENAME TO doc_id_seq') + + # Add new columns. + op.add_column('doc', sa.Column('publisher', sa.String(), nullable=True)) + op.add_column('doc', sa.Column('language', sa.String(), nullable=True)) + op.add_column('doc', sa.Column('page_count', sa.Integer(), nullable=True)) + op.add_column('doc', sa.Column('subject', sa.String(), nullable=True)) + op.add_column('doc', sa.Column('description', sa.Text(), nullable=True)) + + # Widen size from Integer to BigInteger. + op.alter_column('doc', 'size', type_=sa.BigInteger(), existing_type=sa.Integer()) + + # Update file_group.model: 'ebook' -> 'doc'. + # Mark all touched file_groups as not indexed so metadata is re-extracted on next refresh. + total = 0 + while True: + result = bind.execute(sa.text( + "UPDATE file_group SET model = 'doc', indexed = false" + " WHERE id IN (SELECT id FROM file_group WHERE model = 'ebook' LIMIT :batch_size)" + ), {'batch_size': BATCH_SIZE}) + if result.rowcount == 0: + break + total += result.rowcount + print(f" Updated {total} ebook file_groups -> doc...") + session.commit() + print(f" Updated {total} ebook file_groups -> doc (done)") + + # Update file_group.model: 'pdf' -> 'doc'. + total = 0 + while True: + result = bind.execute(sa.text( + "UPDATE file_group SET model = 'doc', indexed = false" + " WHERE id IN (SELECT id FROM file_group WHERE model = 'pdf' LIMIT :batch_size)" + ), {'batch_size': BATCH_SIZE}) + if result.rowcount == 0: + break + total += result.rowcount + print(f" Updated {total} pdf file_groups -> doc...") + session.commit() + print(f" Updated {total} pdf file_groups -> doc (done)") + + # Create Doc records for existing PDFs that had no model table. + # Metadata will be extracted when the doc_modeler re-indexes these files. + total = 0 + while True: + result = bind.execute(sa.text(""" + INSERT INTO doc (file_group_id) + SELECT fg.id + FROM file_group fg + LEFT JOIN doc d ON d.file_group_id = fg.id + WHERE fg.mimetype = 'application/pdf' + AND d.id IS NULL + AND fg.primary_path IS NOT NULL + LIMIT :batch_size + """), {'batch_size': BATCH_SIZE}) + if result.rowcount == 0: + break + total += result.rowcount + print(f" Created {total} new doc records for existing PDFs...") + session.commit() + print(f" Created {total} new doc records for existing PDFs (done)") + + +def downgrade(): + bind = op.get_bind() + session = Session(bind=bind) + + if not DOCKERIZED: + bind.execute(sa.text("SET ROLE 'wrolpi'")) + + # Delete doc records that were PDFs (have no ebook equivalent). + total = 0 + while True: + result = bind.execute(sa.text(""" + DELETE FROM doc + WHERE id IN ( + SELECT d.id FROM doc d + JOIN file_group fg ON fg.id = d.file_group_id + WHERE fg.mimetype = 'application/pdf' + LIMIT :batch_size + ) + """), {'batch_size': BATCH_SIZE}) + if result.rowcount == 0: + break + total += result.rowcount + print(f" Deleted {total} PDF doc records...") + session.commit() + print(f" Deleted {total} PDF doc records (done)") + + # Revert file_group.model and re-mark as not indexed. + for old_model, mimetype_clause in [ + ('ebook', "mimetype LIKE 'application/epub%'"), + ('ebook', "mimetype = 'application/x-mobipocket-ebook'"), + ('pdf', "mimetype = 'application/pdf'"), + ]: + total = 0 + while True: + result = bind.execute(sa.text(f""" + UPDATE file_group SET model = :old_model, indexed = false + WHERE id IN ( + SELECT id FROM file_group + WHERE model = 'doc' AND {mimetype_clause} + LIMIT :batch_size + ) + """), {'old_model': old_model, 'batch_size': BATCH_SIZE}) + if result.rowcount == 0: + break + total += result.rowcount + print(f" Reverted {total} file_groups -> {old_model} ({mimetype_clause})...") + session.commit() + print(f" Reverted {total} file_groups -> {old_model} ({mimetype_clause}) (done)") + + # Revert size column type. + op.alter_column('doc', 'size', type_=sa.Integer(), existing_type=sa.BigInteger()) + + # Drop new columns. + op.drop_column('doc', 'description') + op.drop_column('doc', 'subject') + op.drop_column('doc', 'page_count') + op.drop_column('doc', 'language') + op.drop_column('doc', 'publisher') + + # Rename sequences back. + op.execute('ALTER SEQUENCE IF EXISTS doc_id_seq RENAME TO ebook_id_seq') + + # Rename indexes back. + op.execute('ALTER INDEX IF EXISTS doc_pkey RENAME TO ebook_pkey') + op.execute('ALTER INDEX IF EXISTS doc_file_group_id_key RENAME TO ebook_file_group_id_key') + op.execute('ALTER INDEX IF EXISTS doc_size_idx RENAME TO ebook_size_idx') + + # Rename table back. + op.rename_table('doc', 'ebook') diff --git a/app/package-lock.json b/app/package-lock.json index 5704aabb..0c6cfd6d 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -97,6 +97,7 @@ "version": "7.20.12", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", @@ -903,6 +904,7 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz", "integrity": "sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==", + "peer": true, "dependencies": { "@babel/helper-plugin-utils": "^7.18.6" }, @@ -1464,6 +1466,7 @@ "version": "7.20.13", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz", "integrity": "sha512-MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw==", + "peer": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.18.6", "@babel/helper-module-imports": "^7.18.6", @@ -3283,6 +3286,7 @@ "version": "2.11.6", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -4066,6 +4070,7 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.27.tgz", "integrity": "sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==", "license": "MIT", + "peer": true, "dependencies": { "@types/prop-types": "*", "csstype": "^3.2.2" @@ -4076,6 +4081,7 @@ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz", "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==", "license": "MIT", + "peer": true, "peerDependencies": { "@types/react": "^18.0.0" } @@ -4190,6 +4196,7 @@ "version": "5.50.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz", "integrity": "sha512-vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ==", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "5.50.0", "@typescript-eslint/type-utils": "5.50.0", @@ -4241,6 +4248,7 @@ "version": "5.50.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.50.0.tgz", "integrity": "sha512-KCcSyNaogUDftK2G9RXfQyOCt51uB5yqC6pkUYqhYh8Kgt+DwR5M0EwEAxGPy/+DH6hnmKeGsNhiZRQxjH71uQ==", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "5.50.0", "@typescript-eslint/types": "5.50.0", @@ -4571,6 +4579,7 @@ "version": "8.15.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4693,6 +4702,7 @@ "version": "6.14.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -5550,6 +5560,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -6347,6 +6358,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -6633,6 +6645,7 @@ "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.2.tgz", "integrity": "sha512-ARbnUorjcCM3XiPwgHKuqsyr5W9Qn+pIIBPaoilnoBkLdSC2oLQjV1BUpnmc7KR+b7Avah3Ly2RMFnfxr96E/A==", "hasInstallScript": true, + "peer": true, "dependencies": { "@cypress/request": "^3.0.6", "@cypress/xvfb": "^1.2.4", @@ -7393,6 +7406,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "peer": true, "dependencies": { "ansi-colors": "^4.1.1", "strip-ansi": "^6.0.1" @@ -7672,6 +7686,7 @@ "version": "8.33.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz", "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==", + "peer": true, "dependencies": { "@eslint/eslintrc": "^1.4.1", "@humanwhocodes/config-array": "^0.11.8", @@ -8085,6 +8100,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -10570,6 +10586,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz", "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==", + "peer": true, "dependencies": { "@jest/core": "^27.5.1", "import-local": "^3.0.2", @@ -13214,6 +13231,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -14022,6 +14040,7 @@ "url": "https://tidelift.com/funding/github/npm/postcss" } ], + "peer": true, "dependencies": { "nanoid": "^3.3.4", "picocolors": "^1.0.0", @@ -15080,6 +15099,7 @@ "version": "6.0.11", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", + "peer": true, "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -15269,6 +15289,7 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "peer": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -15459,6 +15480,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "peer": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -15612,6 +15634,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -15723,6 +15746,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -16228,6 +16252,7 @@ "version": "2.80.0", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.80.0.tgz", "integrity": "sha512-cIFJOD1DESzpjOBl763Kp1AH7UE/0fcdHe6rZXUdQ9c50uvgigvW97u3IcSeBwOkgqL/PXPBktBCh0KEu5L8XQ==", + "peer": true, "bin": { "rollup": "dist/bin/rollup" }, @@ -16503,6 +16528,7 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-2.1.4.tgz", "integrity": "sha512-7CxjBoFUfH7fUvtn+SPkkIocthUD9kV3niF1mUMa9TbeyPAf2brtRCZBlT2OpHaXmkscFzGjEfhbJo9gKfotzQ==", + "peer": true, "dependencies": { "@babel/runtime": "^7.10.5", "@fluentui/react-component-event-listener": "~0.63.0", @@ -17581,6 +17607,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -17652,7 +17679,8 @@ "node_modules/three": { "version": "0.154.0", "resolved": "https://registry.npmjs.org/three/-/three-0.154.0.tgz", - "integrity": "sha512-Uzz8C/5GesJzv8i+Y2prEMYUwodwZySPcNhuJUdsVMH2Yn4Nm8qlbQe6qRN5fOhg55XB0WiLfTPBxVHxpE60ug==" + "integrity": "sha512-Uzz8C/5GesJzv8i+Y2prEMYUwodwZySPcNhuJUdsVMH2Yn4Nm8qlbQe6qRN5fOhg55XB0WiLfTPBxVHxpE60ug==", + "peer": true }, "node_modules/three-stdlib": { "version": "2.17.2", @@ -17895,6 +17923,7 @@ "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "peer": true, "engines": { "node": ">=10" }, @@ -17948,6 +17977,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -18259,6 +18289,7 @@ "version": "5.105.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.0.tgz", "integrity": "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw==", + "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -18328,6 +18359,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -18377,6 +18409,7 @@ "version": "4.11.1", "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "peer": true, "dependencies": { "@types/bonjour": "^3.5.9", "@types/connect-history-api-fallback": "^1.3.5", @@ -18431,6 +18464,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -18543,6 +18577,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -18825,6 +18860,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -19264,6 +19300,7 @@ "version": "7.20.12", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", + "peer": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", @@ -19813,6 +19850,7 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz", "integrity": "sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==", + "peer": true, "requires": { "@babel/helper-plugin-utils": "^7.18.6" } @@ -20158,6 +20196,7 @@ "version": "7.20.13", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz", "integrity": "sha512-MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw==", + "peer": true, "requires": { "@babel/helper-annotate-as-pure": "^7.18.6", "@babel/helper-module-imports": "^7.18.6", @@ -21423,7 +21462,8 @@ "@popperjs/core": { "version": "2.11.6", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", - "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==" + "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "peer": true }, "@react-three/fiber": { "version": "8.16.5", @@ -21996,6 +22036,7 @@ "version": "18.3.27", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.27.tgz", "integrity": "sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==", + "peer": true, "requires": { "@types/prop-types": "*", "csstype": "^3.2.2" @@ -22005,6 +22046,7 @@ "version": "18.3.7", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz", "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==", + "peer": true, "requires": {} }, "@types/react-reconciler": { @@ -22117,6 +22159,7 @@ "version": "5.50.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz", "integrity": "sha512-vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ==", + "peer": true, "requires": { "@typescript-eslint/scope-manager": "5.50.0", "@typescript-eslint/type-utils": "5.50.0", @@ -22142,6 +22185,7 @@ "version": "5.50.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.50.0.tgz", "integrity": "sha512-KCcSyNaogUDftK2G9RXfQyOCt51uB5yqC6pkUYqhYh8Kgt+DwR5M0EwEAxGPy/+DH6hnmKeGsNhiZRQxjH71uQ==", + "peer": true, "requires": { "@typescript-eslint/scope-manager": "5.50.0", "@typescript-eslint/types": "5.50.0", @@ -22391,7 +22435,8 @@ "acorn": { "version": "8.15.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==" + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "peer": true }, "acorn-globals": { "version": "6.0.0", @@ -22478,6 +22523,7 @@ "version": "6.14.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -23095,6 +23141,7 @@ "version": "4.28.1", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", + "peer": true, "requires": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -23636,6 +23683,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -23844,6 +23892,7 @@ "version": "13.15.2", "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.2.tgz", "integrity": "sha512-ARbnUorjcCM3XiPwgHKuqsyr5W9Qn+pIIBPaoilnoBkLdSC2oLQjV1BUpnmc7KR+b7Avah3Ly2RMFnfxr96E/A==", + "peer": true, "requires": { "@cypress/request": "^3.0.6", "@cypress/xvfb": "^1.2.4", @@ -24402,6 +24451,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "peer": true, "requires": { "ansi-colors": "^4.1.1", "strip-ansi": "^6.0.1" @@ -24620,6 +24670,7 @@ "version": "8.33.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz", "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==", + "peer": true, "requires": { "@eslint/eslintrc": "^1.4.1", "@humanwhocodes/config-array": "^0.11.8", @@ -24995,6 +25046,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -26660,6 +26712,7 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz", "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==", + "peer": true, "requires": { "@jest/core": "^27.5.1", "import-local": "^3.0.2", @@ -28588,6 +28641,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -29152,6 +29206,7 @@ "version": "8.4.21", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "peer": true, "requires": { "nanoid": "^3.3.4", "picocolors": "^1.0.0", @@ -29735,6 +29790,7 @@ "version": "6.0.11", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", + "peer": true, "requires": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -29874,6 +29930,7 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "peer": true, "requires": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -30016,6 +30073,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "peer": true, "requires": { "loose-envify": "^1.1.0" } @@ -30129,6 +30187,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "peer": true, "requires": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -30205,7 +30264,8 @@ "react-refresh": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", - "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==" + "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==", + "peer": true }, "react-router": { "version": "7.12.0", @@ -30566,6 +30626,7 @@ "version": "2.80.0", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.80.0.tgz", "integrity": "sha512-cIFJOD1DESzpjOBl763Kp1AH7UE/0fcdHe6rZXUdQ9c50uvgigvW97u3IcSeBwOkgqL/PXPBktBCh0KEu5L8XQ==", + "peer": true, "requires": { "fsevents": "~2.3.2" } @@ -30751,6 +30812,7 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-2.1.4.tgz", "integrity": "sha512-7CxjBoFUfH7fUvtn+SPkkIocthUD9kV3niF1mUMa9TbeyPAf2brtRCZBlT2OpHaXmkscFzGjEfhbJo9gKfotzQ==", + "peer": true, "requires": { "@babel/runtime": "^7.10.5", "@fluentui/react-component-event-listener": "~0.63.0", @@ -31572,6 +31634,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -31623,7 +31686,8 @@ "three": { "version": "0.154.0", "resolved": "https://registry.npmjs.org/three/-/three-0.154.0.tgz", - "integrity": "sha512-Uzz8C/5GesJzv8i+Y2prEMYUwodwZySPcNhuJUdsVMH2Yn4Nm8qlbQe6qRN5fOhg55XB0WiLfTPBxVHxpE60ug==" + "integrity": "sha512-Uzz8C/5GesJzv8i+Y2prEMYUwodwZySPcNhuJUdsVMH2Yn4Nm8qlbQe6qRN5fOhg55XB0WiLfTPBxVHxpE60ug==", + "peer": true }, "three-stdlib": { "version": "2.17.2", @@ -31820,7 +31884,8 @@ "type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "peer": true }, "type-is": { "version": "1.6.18", @@ -31857,7 +31922,8 @@ "typescript": { "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "peer": true }, "unbox-primitive": { "version": "1.0.2", @@ -32084,6 +32150,7 @@ "version": "5.105.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.0.tgz", "integrity": "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw==", + "peer": true, "requires": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -32116,6 +32183,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -32179,6 +32247,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -32216,6 +32285,7 @@ "version": "4.11.1", "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "peer": true, "requires": { "@types/bonjour": "^3.5.9", "@types/connect-history-api-fallback": "^1.3.5", @@ -32252,6 +32322,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -32498,6 +32569,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "peer": true, "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", diff --git a/app/src/App.js b/app/src/App.js index d5c1bf8a..61d648a5 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -22,6 +22,7 @@ import {SemanticToastContainer} from "react-semantic-toasts-2"; import {FilePreviewProvider} from "./components/FilePreview"; import {TagsProvider} from "./Tags"; import {ZimRoute} from "./components/Zim"; +import {DocsRoute} from "./components/Docs"; import ErrorBoundary from "./components/ErrorBoundary"; import {KeyboardShortcutsProvider} from "./components/KeyboardShortcutsProvider"; @@ -90,6 +91,7 @@ const router = createBrowserRouter(createRoutesFromElements(}/> }/> }/> + }/> }/> }/> }/> diff --git a/app/src/api.js b/app/src/api.js index 5bc725e2..bd90df62 100644 --- a/app/src/api.js +++ b/app/src/api.js @@ -811,6 +811,38 @@ export async function fetchDomains() { } } +export async function fetchAuthors() { + const response = await apiGet(`${COLLECTIONS_API}?kind=author`); + if (response.ok) { + let data = await response.json(); + return [data['collections'], data['totals']['collections']]; + } else { + const message = await getErrorMessage(response, 'Unable to fetch Authors. See server logs.'); + toast({ + type: 'error', + title: 'Authors Error', + description: message, + time: 5000, + }); + } +} + +export async function fetchSubjects() { + const response = await apiGet(`${COLLECTIONS_API}?kind=subject`); + if (response.ok) { + let data = await response.json(); + return [data['collections'], data['totals']['collections']]; + } else { + const message = await getErrorMessage(response, 'Unable to fetch Subjects. See server logs.'); + toast({ + type: 'error', + title: 'Subjects Error', + description: message, + time: 5000, + }); + } +} + export async function fetchChannels() { const response = await apiGet(`${COLLECTIONS_API}?kind=channel`); if (response.ok) { @@ -1378,6 +1410,11 @@ export function downloadArchiveMember(path, member) { window.open(`${API_URI}/files/zip/download?${params}`, '_blank'); } +export function getArchiveMemberUrl(path, member) { + const params = new URLSearchParams({path, member}); + return `${API_URI}/files/zip/download?${params}`; +} + export async function fetchFilesProgress() { const response = await apiGet(`${API_URI}/files/worker_status`); if (response.ok) { @@ -1817,6 +1854,8 @@ export async function searchSuggestions(search_str) { return { channels: content.channels, domains: content.domains, + authors: content.authors || [], + subjects: content.subjects || [], } } else { console.error('Failed to get file search suggestions!'); @@ -2056,3 +2095,60 @@ export async function fetchSuggestedUserAgent() { } return ''; } + +// Docs API +const DOCS_API = '/api/docs'; + +export async function getDocStatistics() { + return await apiGet(`${DOCS_API}/statistics`); +} + +export async function getDoc(docId) { + return await apiGet(`${DOCS_API}/${docId}`); +} + +export async function getDocByFileGroup(fileGroupId) { + return await apiGet(`${DOCS_API}/view/${fileGroupId}`); +} + +export async function deleteDocs(docIds) { + const ids = Array.isArray(docIds) ? docIds.join(',') : docIds; + return await apiDelete(`${DOCS_API}/${ids}`); +} + +export async function searchDocs(offset, limit, searchStr, order, tagNames, author, subject) { + offset = parseInt(offset || 0); + limit = parseInt(limit || DEFAULT_LIMIT); + let body = {offset, limit}; + if (searchStr) { + body['search_str'] = searchStr; + } + if (order) { + body['order_by'] = order; + } + if (tagNames && tagNames.length > 0) { + body['tag_names'] = tagNames; + } + if (author) { + body['author'] = author; + } + if (subject) { + body['subject'] = subject; + } + + console.debug('searching docs', body); + const response = await apiPost(`${DOCS_API}/search`, body); + if (response.ok) { + let data = await response.json(); + return [data['file_groups'], data['totals']['file_groups']]; + } else { + const message = await getErrorMessage(response, 'Cannot search docs. See server logs.'); + toast({ + type: 'error', + title: 'Unable to search docs', + description: message, + time: 5000, + }); + throw Error(message); + } +} diff --git a/app/src/components/Archive.js b/app/src/components/Archive.js index 86a51a6e..8296945a 100644 --- a/app/src/components/Archive.js +++ b/app/src/components/Archive.js @@ -346,6 +346,8 @@ function ArchivePage() { export function ArchiveCard({file}) { const {s} = useContext(ThemeContext); + const {sort} = useSearchOrder(); + const sortField = sort ? sort.replace(/^-/, '') : null; const {data, directory} = file; // Resolve data paths (filename-only) to full relative paths using directory @@ -386,7 +388,16 @@ export function ArchiveCard({file}) { {domain} } - {isoDatetimeToAgoPopup(dt, false)} + {sortField === 'published_modified_datetime' + ? isoDatetimeToAgoPopup(file.published_modified_datetime, false) + : sortField === 'download_datetime' + ? isoDatetimeToAgoPopup(file.download_datetime, false) + : sortField === 'size' + ? humanFileSize(file.size) + : sortField === 'viewed' + ? isoDatetimeToAgoPopup(file.viewed, false) + : isoDatetimeToAgoPopup(dt, false) + } diff --git a/app/src/components/CbzViewer.js b/app/src/components/CbzViewer.js new file mode 100644 index 00000000..ab29b4f2 --- /dev/null +++ b/app/src/components/CbzViewer.js @@ -0,0 +1,152 @@ +import React, {useCallback, useEffect, useRef, useState} from 'react'; +import {getArchiveContents, getArchiveMemberUrl} from '../api'; +import {Icon, Label, Loader, Message} from 'semantic-ui-react'; +import {Button} from './Theme'; +import {useLocalStorage} from './Common'; + +const IMAGE_EXTENSIONS = /\.(jpe?g|png|gif|webp|bmp|tiff?)$/i; + +/** + * Recursively flatten archive tree entries into a list of file paths. + */ +function flattenEntries(entries, prefix = '') { + let paths = []; + for (const entry of entries) { + const fullPath = entry.path || (prefix ? `${prefix}/${entry.name}` : entry.name); + if (entry.is_dir && entry.children) { + paths = paths.concat(flattenEntries(entry.children, fullPath)); + } else if (!entry.is_dir) { + paths.push(fullPath); + } + } + return paths; +} + +export function CbzViewer({path}) { + const [pages, setPages] = useState(null); + const [currentPage, setCurrentPage] = useState(0); + const [rtl, setRtl] = useLocalStorage('cbzViewerRtl', false); + const [fullscreen, setFullscreen] = useState(false); + const [error, setError] = useState(null); + + useEffect(() => { + const load = async () => { + try { + const contents = await getArchiveContents(path); + if (!contents) { + setError('Could not read archive contents.'); + return; + } + const images = flattenEntries(contents.entries) + .filter(name => IMAGE_EXTENSIONS.test(name)) + .sort(); + const urls = images.map(member => getArchiveMemberUrl(path, member)); + setPages(urls); + setCurrentPage(0); + } catch (e) { + setError(e.message || 'Could not read archive contents.'); + } + }; + load(); + }, [path]); + + const goNext = useCallback(() => { + setCurrentPage(p => Math.min(p + 1, (pages?.length || 1) - 1)); + }, [pages]); + + const goPrev = useCallback(() => { + setCurrentPage(p => Math.max(p - 1, 0)); + }, []); + + const onLeftClick = rtl ? goNext : goPrev; + const onRightClick = rtl ? goPrev : goNext; + const imageContainerRef = useRef(null); + + const handleFullscreen = useCallback(() => { + setFullscreen(f => !f); + }, []); + + useEffect(() => { + const handleKey = (e) => { + if (e.key === 'ArrowLeft') onLeftClick(); + else if (e.key === 'ArrowRight') onRightClick(); + else if (e.key === 'Escape') setFullscreen(false); + }; + window.addEventListener('keydown', handleKey); + return () => window.removeEventListener('keydown', handleKey); + }, [onLeftClick, onRightClick]); + + if (error) { + return + Cannot load comic +

{error}

+
; + } + if (!pages) return ; + if (pages.length === 0) { + return + No images found +

This archive does not contain any image files.

+
; + } + + const hasPrev = currentPage > 0; + const hasNext = currentPage < pages.length - 1; + + return
+
+ {`Page +
+
+
+
+
+
+ +
+ + + + + +
+
; +} diff --git a/app/src/components/Common.js b/app/src/components/Common.js index daa0e7e4..3b369582 100644 --- a/app/src/components/Common.js +++ b/app/src/components/Common.js @@ -19,7 +19,7 @@ import { Search, Transition } from 'semantic-ui-react'; -import {Link, NavLink, useNavigate, useSearchParams} from "react-router"; +import {Link, NavLink, useNavigate} from "react-router"; import Message from "semantic-ui-react/dist/commonjs/collections/Message"; import {useHotspot, useSearchDirectories, useSearchOrder, useThrottle, useWROLMode} from "../hooks/customHooks"; import {Media, SettingsContext, StatusContext, ThemeContext} from "../contexts/contexts"; @@ -701,15 +701,9 @@ export function textEllipsis(str, maxLength = 100, {side = "end", ellipsis = ".. } export function TabLinks({links}) { - const [searchParams] = useSearchParams(); - - const getTo = (to) => { - return `${to}?${searchParams.toString()}`; - } - return {links.map((link) => { return ['audio']; } else if (filter === 'ebook') { return ['application/epub+zip', 'application/x-mobipocket-ebook']; + } else if (filter === 'doc') { + return ['application/epub+zip', 'application/x-mobipocket-ebook', 'application/pdf', + 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'application/vnd.oasis.opendocument.text', 'application/x-cbz', 'application/x-cbr']; } else if (filter === 'image') { return ['image']; } else if (filter === 'zip') { diff --git a/app/src/components/Docs.js b/app/src/components/Docs.js new file mode 100644 index 00000000..dbbb4871 --- /dev/null +++ b/app/src/components/Docs.js @@ -0,0 +1,532 @@ +import React, {useContext, useEffect, useState} from 'react'; +import {Link, Route, Routes, useLocation, useNavigate, useParams} from "react-router"; +import {Grid, Icon as SIcon, Label, Loader, StatisticLabel, StatisticValue} from "semantic-ui-react"; +import {deleteDocs, getDocStatistics, tagFileGroup, untagFileGroup} from "../api"; +import {Media, ThemeContext} from "../contexts/contexts"; +import { + APIButton, + BackButton, + encodeMediaPath, + ErrorMessage, + humanFileSize, + isoDatetimeToAgoPopup, + PageContainer, + PreviewPath, + SearchInput, + SortButton, + TabLinks, + toLocaleString, + useTitle +} from "./Common"; +import {Button, darkTheme, Header, Icon, Segment, Statistic, Tab} from "./Theme"; +import {FilesView} from "./Files"; +import {useAuthors, useDoc, useOneQuery, useSearchDocs, useSubjects} from "../hooks/customHooks"; +import {TagsSelector} from "../Tags"; +import {toast} from "react-semantic-toasts-2"; +import {CollectionTable} from "./collections/CollectionTable"; +import {CbzViewer} from "./CbzViewer"; +import _ from "lodash"; + +function DocsPage() { + useTitle('Documents'); + const searchInputRef = React.useRef(); + + const { + docs, + totalPages, + activePage, + setPage, + searchStr, + setSearchStr, + author, + subject, + fetchDocs, + } = useSearchDocs(); + + const [selectedDocs, setSelectedDocs] = useState([]); + + const onSelect = (path, checked) => { + if (checked && path) { + setSelectedDocs([...selectedDocs, path]); + } else if (path) { + setSelectedDocs(selectedDocs.filter(i => i !== path)); + } + } + + const onDelete = async () => { + const docIds = docs.filter(i => selectedDocs.indexOf(i['primary_path']) >= 0).map(i => i['id']); + await deleteDocs(docIds); + await fetchDocs(); + setSelectedDocs([]); + } + + const invertSelection = () => { + const newSelectedDocs = docs.map(doc => doc['key']).filter(i => selectedDocs.indexOf(i) < 0); + setSelectedDocs(newSelectedDocs); + } + + const clearSelection = (e) => { + if (e) e.preventDefault(); + setSelectedDocs([]); + } + + const selectElm =
+ Delete + + +
; + + let docOrders = [ + {value: 'published_datetime', text: 'Published Date', short: 'P.Date'}, + {value: 'size', text: 'Size'}, + {value: 'title', text: 'Title'}, + ]; + if (searchStr) { + docOrders = [{value: 'rank', text: 'Rank'}, ...docOrders]; + } + + const {body, paginator, selectButton, viewButton, limitDropdown, tagQuerySelector} = FilesView( + { + files: docs, + activePage: activePage, + totalPages: totalPages, + selectElem: selectElm, + selectedKeys: selectedDocs, + onSelect: onSelect, + setPage: setPage, + }, + ); + + const [localSearchStr, setLocalSearchStr] = React.useState(searchStr || ''); + const searchInput = setLocalSearchStr(null)} + searchStr={localSearchStr} + onSubmit={setSearchStr} + placeholder='Search Documents...' + inputRef={searchInputRef} + />; + + return <> + {author &&
Author: {author}
} + {subject &&
Subject: {subject}
} + + + + {selectButton} + {viewButton} + {limitDropdown} + {tagQuerySelector} + + + + {searchInput} + + + + + + + {selectButton} + {viewButton} + {limitDropdown} + {tagQuerySelector} + + {searchInput} + + + + {body} + {paginator} + ; +} + +function DocPage() { + const {fileGroupId} = useParams(); + const navigate = useNavigate(); + const {docFile, doc, fetchDoc} = useDoc(parseInt(fileGroupId)); + const {theme} = useContext(ThemeContext); + + const title = docFile ? (docFile.title || docFile.name) : null; + useTitle(title); + + if (docFile === null) { + return ; + } + if (docFile === undefined) { + return <> +
Unknown document
+
This document does not exist
+ ; + } + + const {data, size, directory} = docFile; + + // Cover image. + const coverPath = data && data.cover_path ? data.cover_path : null; + const coverUrl = coverPath ? `/media/${encodeMediaPath(coverPath)}` : null; + + // Primary file URLs. + const primaryPath = docFile.primary_path; + const downloadUrl = primaryPath ? `/download/${encodeMediaPath(primaryPath)}` : null; + const isEpub = docFile.mimetype && docFile.mimetype.startsWith('application/epub'); + const mt = docFile.mimetype || ''; + const primaryExt = (primaryPath || '').toLowerCase().split('.').pop(); + const isCbz = mt.includes('cbz') || mt.includes('cbr') || mt.includes('comicbook+zip') || mt.includes('comicbook-rar') + || ['cbz', 'cbr', 'cbt', 'cb7'].includes(primaryExt); + const viewerUrl = isEpub ? `/epub/epub.html?url=${downloadUrl}` : null; + const openUrl = viewerUrl || (primaryPath ? `/media/${encodeMediaPath(primaryPath)}` : null); + + const handleDelete = async () => { + if (doc && doc.id) { + await deleteDocs([doc.id]); + toast({ + type: 'success', + title: 'Document Deleted', + description: 'Document was successfully deleted.', + time: 2000, + }); + navigate(-1); + } + }; + + const localAddTag = async (name) => { + await tagFileGroup(docFile, name); + await fetchDoc(); + }; + + const localRemoveTag = async (name) => { + await untagFileGroup(docFile, name); + await fetchDoc(); + }; + + const publishedDatetimeString = docFile.published_datetime + ? isoDatetimeToAgoPopup(docFile.published_datetime, true) + : null; + + // Format badge based on mimetype. + const formatLabel = () => { + const mt = docFile.mimetype || ''; + if (mt.startsWith('application/epub')) return 'EPUB'; + if (mt === 'application/x-mobipocket-ebook') return 'MOBI'; + if (mt === 'application/pdf') return 'PDF'; + if (mt.includes('wordprocessingml')) return 'DOCX'; + if (mt === 'application/msword') return 'DOC'; + if (mt.includes('opendocument.text')) return 'ODT'; + if (mt.includes('cbz') || mt.includes('comicbook+zip')) return 'CBZ'; + if (mt.includes('cbr') || mt.includes('comicbook-rar')) return 'CBR'; + if (mt.includes('cbt')) return 'CBT'; + if (mt.includes('cb7') || mt.includes('x-7z')) return 'CB7'; + return mt.split('/').pop().toUpperCase(); + }; + + // About pane. + const aboutPane = { + menuItem: 'About', render: () => + {doc && doc.description && <> +
Description
+

{doc.description}

+ } + + {doc && doc.publisher && <> +
Publisher
+

{doc.publisher}

+ } + + {doc && doc.language && <> +
Language
+

{doc.language}

+ } + + {doc && doc.subject && <> +
Subject
+

{doc.subject}

+ } + + {doc && doc.page_count && <> +
Page Count
+

{doc.page_count}

+ } + +
Size
+

{humanFileSize(size)}

+
+ }; + + // Files pane. + const filesPane = { + menuItem: 'Files', render: () => + {docFile.files && docFile.files.map((file, idx) => +
+ + {file.path} + + {file.size && + ({humanFileSize(file.size)}) + } +
+ )} + +
Directory
+

{directory || 'Unknown'}

+
+ }; + + const tabPanes = [aboutPane, filesPane]; + const tabMenu = theme === darkTheme ? {inverted: true, attached: true} : {attached: true}; + + // Inline reader: epub viewer iframe or PDF iframe. + const isPdf = docFile.mimetype === 'application/pdf'; + const canEmbed = isEpub || isPdf; + const embedUrl = isEpub ? viewerUrl : (isPdf && primaryPath ? `/media/${encodeMediaPath(primaryPath)}` : null); + + return <> + + + {isCbz && primaryPath && } + + {canEmbed && embedUrl && !isCbz &&
+