diff --git a/.eslintrc b/.eslintrc index 0807290..cf46c54 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,23 +1,20 @@ { - "root": true, - "parser": "@typescript-eslint/parser", - "env": { "node": true }, - "plugins": [ - "@typescript-eslint" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended" - ], - "parserOptions": { - "sourceType": "module" - }, - "rules": { - "no-unused-vars": "off", - "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }], - "@typescript-eslint/ban-ts-comment": "off", - "no-prototype-builtins": "off", - "@typescript-eslint/no-empty-function": "off" - } - } \ No newline at end of file + "root": true, + "parser": "@typescript-eslint/parser", + "env": { "node": true }, + "plugins": ["@typescript-eslint", "only-warn"], + "extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended"], + "parserOptions": { + "sourceType": "module" + }, + "rules": { + "no-unused-vars": "off", + "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }], + "@typescript-eslint/ban-ts-comment": "off", + "no-prototype-builtins": "off", + "@typescript-eslint/no-empty-function": "off", + "@typescript-eslint/no-inferrable-types": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/explicit-function-return-type": ["warn"] + } +} diff --git a/.github/ISSUE_TEMPLATE/api-request.md b/.github/ISSUE_TEMPLATE/api-request.md index b4f1d58..e442a26 100644 --- a/.github/ISSUE_TEMPLATE/api-request.md +++ b/.github/ISSUE_TEMPLATE/api-request.md @@ -4,7 +4,6 @@ about: Suggest a new API to be added to this plugin. title: '' labels: API request assignees: '' - --- **Name** @@ -16,6 +15,5 @@ A link to their API documentation **What does the API do/offer** A short description of what data the API offers - -- [ ] Is the API free to use -- [ ] Does the API require authentication +- [ ] Is the API free to use +- [ ] Does the API require authentication diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6fa1d5a..5391c55 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -4,17 +4,17 @@ about: Create a report to help us improve title: '' labels: bug assignees: '' - --- -- [ ] The Plugin is up to date -- [ ] Obsidian is up to date +- [ ] The Plugin is up to date +- [ ] Obsidian is up to date **Describe the bug** A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: + 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' @@ -27,11 +27,12 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Occurs on** -- [ ] Windows -- [ ] macOS -- [ ] Linux -- [ ] Android -- [ ] iOS + +- [ ] Windows +- [ ] macOS +- [ ] Linux +- [ ] Android +- [ ] iOS **Plugin version** x.x.x diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index e93eab6..4880517 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -4,7 +4,6 @@ about: Suggest an idea for this project title: '' labels: feature request assignees: '' - --- **Is your feature request related to a problem? Please describe.** diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2167923..bc02e9a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: push: # Sequence of patterns matched against refs/tags tags: - - "*" # Push events to matching any tag format, i.e. 1.0, 20.15.10 + - '*' # Push events to matching any tag format, i.e. 1.0, 20.15.10 env: PLUGIN_NAME: obsidian-media-db-plugin # Change this to the name of your plugin-id folder @@ -14,69 +14,74 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Use Node.js - uses: actions/setup-node@v1 - with: - node-version: "14.x" # You might need to adjust this value to your own version - - name: Build - id: build - run: | - yarn - yarn run build --if-present - mkdir ${{ env.PLUGIN_NAME }} - cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }} - zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }} - ls - echo "::set-output name=tag_name::$(git tag --sort version:refname | tail -n 1)" - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - VERSION: ${{ github.ref }} - with: - tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} - draft: false - prerelease: false - - name: Upload zip file - id: upload-zip - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./${{ env.PLUGIN_NAME }}.zip - asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip - asset_content_type: application/zip - - name: Upload main.js - id: upload-main - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./main.js - asset_name: main.js - asset_content_type: text/javascript - - name: Upload manifest.json - id: upload-manifest - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./manifest.json - asset_name: manifest.json - asset_content_type: application/json - - name: Upload styles.css - id: upload-css - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./styles.css - asset_name: styles.css - asset_content_type: text/css + - uses: actions/checkout@v3 + - name: Use Node.js + uses: actions/setup-node@v3 + with: + node-version: '16.x' # You might need to adjust this value to your own version + - name: Build + id: build + run: | + yarn + yarn run build --if-present + mkdir ${{ env.PLUGIN_NAME }} + cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }} + zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }} + ls + echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> $GITHUB_OUTPUT + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VERSION: ${{ github.ref }} + with: + tag_name: ${{ github.ref }} + release_name: ${{ github.ref }} + draft: false + prerelease: false + + - name: Upload zip file + id: upload-zip + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./${{ env.PLUGIN_NAME }}.zip + asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip + asset_content_type: application/zip + + - name: Upload main.js + id: upload-main + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./main.js + asset_name: main.js + asset_content_type: text/javascript + + - name: Upload manifest.json + id: upload-manifest + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./manifest.json + asset_name: manifest.json + asset_content_type: application/json + + - name: Upload styles.css + id: upload-css + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./styles.css + asset_name: styles.css + asset_content_type: text/css diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..a728015 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,5 @@ +/lib +node_modules +package-lock.json +data.json +main.js diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000..4ac9adf --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,7 @@ +{ + "printWidth": 180, + "useTabs": true, + "semi": true, + "singleQuote": true, + "arrowParens": "avoid" +} diff --git a/LICENSE.md b/LICENSE.md index f288702..61c085e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,190 +1,191 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +# GNU GENERAL PUBLIC LICENSE - 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. +Version 3, 29 June 2007 - Preamble +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. - The GNU General Public License is a free, copyleft license for +## Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, the GNU General Public License is 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. We, the Free Software Foundation, use the +software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to +any other work released this way by its authors. You can apply it to your programs, too. - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you +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. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have +To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - For example, if you distribute copies of such a program, whether +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they know their rights. - Developers that use the GNU GPL protect your rights with two steps: +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and +For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - Some devices are designed to deny users access to install or run +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we +use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we +products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - Finally, every program is threatened constantly by software patents. +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that +make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and +The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS +## TERMS AND CONDITIONS - 0. Definitions. +### 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. +"This License" refers to version 3 of the GNU General Public License. - "Copyright" also means copyright-like laws that apply to other kinds of +"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 +"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 +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 +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 +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 +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, +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 +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" +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 +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. +### 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 +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 +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 +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 +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 "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 +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 +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 +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 +The Corresponding Source for a work in source code form is that same work. - 2. Basic Permissions. +### 2. Basic Permissions. - All rights granted under this License are granted for the term of +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 +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 +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 +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 +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 +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 +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. +### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - No covered work shall be deemed part of an effective technological +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 +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 @@ -192,9 +193,9 @@ 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. +### 4. Conveying Verbatim Copies. - You may convey verbatim copies of the Program's source code as you +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 @@ -202,257 +203,257 @@ 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, +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. +### 5. Conveying Modified Source Versions. - You may convey a work based on the Program, or the modifications to +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. +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". +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. +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. +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 +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 +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. +### 6. Conveying Non-Source Forms. - You may convey a covered work in object code form under the terms +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. +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. +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. +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. +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. +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 +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 +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 +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 +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, +"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 +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 +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 +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 +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 +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, +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. +### 7. Additional Terms. - "Additional permissions" are terms that supplement the terms of this +"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 +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 +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 +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 +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 +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 +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 +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 +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 +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. +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 +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 +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 +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 +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. +### 8. Termination. - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or +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 +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 +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 +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 +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. +### 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 +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, +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 +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. +### 10. Automatic Licensing of Downstream Recipients. - Each time you convey a covered work, the recipient automatically +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 +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 +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 +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 @@ -460,43 +461,43 @@ 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 +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. +### 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 +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 +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 +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 +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 +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 +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, +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, @@ -504,13 +505,13 @@ 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 +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 +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 @@ -518,10 +519,10 @@ 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 +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 +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 @@ -533,73 +534,73 @@ 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 +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. +### 12. No Surrender of Others' Freedom. - If conditions are imposed on you (whether by court order, agreement or +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 +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 +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. Use with the GNU Affero General Public License. +### 13. Use with the GNU Affero General Public License. - Notwithstanding any other provision of this License, you have +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 Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this +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 special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. - 14. Revised Versions of this License. +### 14. Revised Versions of this License. - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will +The Free Software Foundation may publish revised and/or new versions of +the GNU 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 +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU 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 +Foundation. If the Program does not specify a version number of the GNU 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 +If the Program specifies that a proxy can decide which future versions of the GNU 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 +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. +### 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 +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 +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. +### 16. Limitation of Liability. - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +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 @@ -609,66 +610,13 @@ 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. +### 17. Interpretation of Sections 15 and 16. - If the disclaimer of warranty and limitation of liability provided +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 General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - 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 GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +## END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md index f1f5aee..bf1042e 100644 --- a/README.md +++ b/README.md @@ -3,81 +3,94 @@ A plugin that can query multiple APIs for movies, series, anime, games, music and wiki articles, and import them into your vault. ### Features + #### Search by Title + Search a movie, series, anime, game, music release or wiki article by its name across multiple APIs. #### Search by ID + Allows you to search by an ID that varies from API to API. Concrete information on this feature can be found in the description of the individual APIs. #### Templates -The plugin allows you to set a template note that gets added to the end of any note created by this plugin. -The plugin also offers simple "template tgs". E.g. if the template includes `{{ title }}`, it will be replaced by the title of the movie, show or game. + +The plugin allows you to set a template note that gets added to the end of any note created by this plugin. +The plugin also offers simple "template tgs". E.g. if the template includes `{{ title }}`, it will be replaced by the title of the movie, show or game. Note that "template tags" are surrounded with two curly braces and that the spaces inside the curly braces are important. For arrays there are two special ways of displaying them. -- using `{{ LIST:variable_name }}` will result in - ``` - - element 1 - - element 2 - - element 3 - - ... - ``` -- using `{{ ENUM:variable_name }}` will result in - ``` - element 1, element 2, element 3, ... - ``` + +- using `{{ LIST:variable_name }}` will result in + ``` + - element 1 + - element 2 + - element 3 + - ... + ``` +- using `{{ ENUM:variable_name }}` will result in + ``` + element 1, element 2, element 3, ... + ``` Available variables that can be used in template tags are the same variables from the metadata of the note. I also published my own templates [here](https://github.com/mProjectsCode/obsidian-media-db-templates). #### Metadata field customization + Allows you to rename the metadata fields this plugin generates through mappings. A mapping has to follow this syntax `[origional property name] -> [new property name]`. -Multiple mappings are separated by a new line. +Multiple mappings are separated by a new line. So e.g.: + ``` title -> name year -> releaseYear ``` #### Bulk Import + The plugin allows you to import your preexisting media collection and upgrade them to Media DB entries. ##### Prerequisites -The preexisting media notes must be inside a folder in your vault. + +The preexisting media notes must be inside a folder in your vault. For the plugin to be able to query them they need one metadata field that is used as the title the piece of media is searched by. This can be achieved by for example using a `csv` import plugin to import an existing list from outside of obsidian. ##### Importing -To start the import process, right-click on the folder and select the `Import folder as Media DB entries` option. + +To start the import process, right-click on the folder and select the `Import folder as Media DB entries` option. Then specify the API to search, if the current note content and metadata should be appended to the Media DB entry and the name of the metadata field that contains the title of the piece of media. Then the plugin will go through every file in the folder and prompt you to select from the search results. ##### Post import + After all files have been imported or the import was canceled, you will find the new entries as well as an error report that contains any errors or skipped/canceled files in the folder specified in the setting of the plugin. ### How to install + **The plugin is now released, so it can be installed directly through obsidian's plugin installer.** Alternatively, you can manually download the zip archive from the latest release here on GitHub. After downloading, extract the archive into the `.obsidian/plugins` folder in your vault. The folder structure should look like this: -``` -[path to your vault] -|_ .obsidian - |_ plugins - |_ obsidian-media-db-plugin - |_ main.js - |_ manifest.json - |_ styles.css + +``` +[path to your vault] +|_ .obsidian + |_ plugins + |_ obsidian-media-db-plugin + |_ main.js + |_ manifest.json + |_ styles.css ``` - ### How to use + (pictures are coming) Once you have installed this plugin, you will find a database icon in the left ribbon. @@ -88,15 +101,17 @@ After clicking search, a new popup will open prompting you to select from the se Now you select the result you want and the plugin will cast it's magic and create a new note in your vault, that contains the metadata of the selected search result. ### Currently supported media types -- movies (including specials) -- series (including OVAs) -- games -- music releases -- wiki articles + +- movies (including specials) +- series (including OVAs) +- games +- music releases +- wiki articles ### Currently supported APIs: + | Name | Description | Supported formats | Authentification | Rate limiting | SFW filter support | -|------------------------------------------------------|---------------------------------------------------------------------------------------------------|--------------------------------|------------------------------------------------------------------------------|--------------------------------|--------------------| +| ---------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------ | ---------------------------------------------------------------------------- | ------------------------------ | ------------------ | | [Jikan](https://jikan.moe/) | Jikan is an API that uses [My Anime List](https://myanimelist.net) and offers metadata for anime. | series, movies, specials, OVAs | No | 60 per minute and 3 per second | Yes | | [OMDb](https://www.omdbapi.com/) | OMDb is an API that offers metadata for movie, series and games. | series, movies, games | Yes, you can get a free key here [here](https://www.omdbapi.com/apikey.aspx) | 1000 per day | No | | [MusicBrainz](https://musicbrainz.org/) | MusicBrainz is an API that offers information about music releases. | music releases | No | 50 per second | No | @@ -104,59 +119,79 @@ Now you select the result you want and the plugin will cast it's magic and creat | [Steam](https://store.steampowered.com/) | The Steam API offers information on all steam games. | games | No | 10000 per day | No | #### Notes -- [Jikan](https://jikan.moe/) - - sometimes the api is very slow, this is normal - - you need to use the title the anime has on [My Anime List](https://myanimelist.net), which is in most cases the japanese title - - e.g. instead of "Demon Slayer" you have to search "Kimetsu no Yaiba" + +- [Jikan](https://jikan.moe/) + - sometimes the api is very slow, this is normal + - you need to use the title the anime has on [My Anime List](https://myanimelist.net), which is in most cases the japanese title + - e.g. instead of "Demon Slayer" you have to search "Kimetsu no Yaiba" #### Search by ID -- [Jikan](https://jikan.moe/) - - the ID you need is the ID of the anime on [My Anime List](https://myanimelist.net) - - you can find this ID in the URL - - e.g. for "Beyond the Boundary" the URL looks like this `https://myanimelist.net/anime/18153/Kyoukai_no_Kanata` so the ID is `18153` -- [OMDb](https://www.omdbapi.com/) - - the ID you need is the ID of the movie or show on [IMDb](https://www.imdb.com) - - you can find this ID in the URL - - e.g. for "Rogue One" the URL looks like this `https://www.imdb.com/title/tt3748528/` so the ID is `tt3748528` -- [MusicBrainz](https://musicbrainz.org/) - - the id of a release is not easily accessible, you are better off just searching by title -- [Wikipedia](https://en.wikipedia.org/wiki/Main_Page) - - [here](https://en.wikipedia.org/wiki/Wikipedia:Finding_a_Wikidata_ID) is a guide to finding the Wikipedia ID for an article -- [Steam](https://store.steampowered.com/) - - you can find this ID in the URL - - e.g. for "Factorio" the URL looks like this `https://store.steampowered.com/app/427520/Factorio/` so the ID is `427520` + +- [Jikan](https://jikan.moe/) + - the ID you need is the ID of the anime on [My Anime List](https://myanimelist.net) + - you can find this ID in the URL + - e.g. for "Beyond the Boundary" the URL looks like this `https://myanimelist.net/anime/18153/Kyoukai_no_Kanata` so the ID is `18153` +- [OMDb](https://www.omdbapi.com/) + - the ID you need is the ID of the movie or show on [IMDb](https://www.imdb.com) + - you can find this ID in the URL + - e.g. for "Rogue One" the URL looks like this `https://www.imdb.com/title/tt3748528/` so the ID is `tt3748528` +- [MusicBrainz](https://musicbrainz.org/) + - the id of a release is not easily accessible, you are better off just searching by title +- [Wikipedia](https://en.wikipedia.org/wiki/Main_Page) + - [here](https://en.wikipedia.org/wiki/Wikipedia:Finding_a_Wikidata_ID) is a guide to finding the Wikipedia ID for an article +- [Steam](https://store.steampowered.com/) + - you can find this ID in the URL + - e.g. for "Factorio" the URL looks like this `https://store.steampowered.com/app/427520/Factorio/` so the ID is `427520` ### Problems, unexpected behavior or improvement suggestions? + You are more than welcome to open an issue on [GitHub](https://github.com/mProjectsCode/obsidian-media-db-plugin/issues). ### Changelog +#### 0.5.0 + +- New simple search modal, select the media type and search all applicable APIs +- More data for Board Games +- Actors and Streaming Platforms for Movies and Series +- Separate new file location for all media types +- Separate command for each media type +- Fix problems with closing of preview modal + #### 0.3.2 -- Added Board Game Geek API (documentation pending) -- More information in the search results -- various fixes + +- Added Board Game Geek API (documentation pending) +- More information in the search results +- various fixes #### 0.3.1 -- various fixes + +- various fixes #### 0.3.0 -- Added bulk import. Import a folder of media notes as Media DB entries (thanks to [PaperOrb](https://github.com/PaperOrb) on GitHub for their input and for helping me test this feature) -- Added a custom result select modal that allows you to select multiple results at once -- Fixed a bug where the note creation would fail when the metadata included a field with the values `null` or `undefined` + +- Added bulk import. Import a folder of media notes as Media DB entries (thanks to [PaperOrb](https://github.com/PaperOrb) on GitHub for their input and for helping me test this feature) +- Added a custom result select modal that allows you to select multiple results at once +- Fixed a bug where the note creation would fail when the metadata included a field with the values `null` or `undefined` #### 0.2.1 -- fixed a small bug with the initial selection of an API in the ID search modal + +- fixed a small bug with the initial selection of an API in the ID search modal #### 0.2.0 -- Added the option to rename metadata fields through property mappings -- fixed note creation falling, when the folder set in the settings did not exist + +- Added the option to rename metadata fields through property mappings +- fixed note creation falling, when the folder set in the settings did not exist ### Contributions + Thank you for wanting to contribute to this project. Contributions are always welcome. If you have an idea, feel free to open a feature request under the issue tab or even create a pull request. ### Credits + Credits go to: -- https://github.com/anpigon/obsidian-book-search-plugin for some inspiration and the idea to make this plugin -- https://github.com/liamcain/obsidian-periodic-notes for 99% of `Suggest.ts` and `FolderSuggest.ts` + +- https://github.com/anpigon/obsidian-book-search-plugin for some inspiration and the idea to make this plugin +- https://github.com/liamcain/obsidian-periodic-notes for 99% of `Suggest.ts` and `FolderSuggest.ts` diff --git a/__mocks__/obsidian.ts b/__mocks__/obsidian.ts index 08af600..5ae0205 100644 --- a/__mocks__/obsidian.ts +++ b/__mocks__/obsidian.ts @@ -1,32 +1,32 @@ -import { RequestUrlParam, RequestUrlResponse } from "obsidian"; +import { RequestUrlParam, RequestUrlResponse } from 'obsidian'; export function requestUrl(request: RequestUrlParam): Promise { - return fetch(request.url, { - method: request.method, - headers: request.headers, - body: request.body, - }).then(async (response) => { - if (response.status >= 400 && request.throw) { - throw new Error(`Request failed, ${response.status}`); - } + return fetch(request.url, { + method: request.method, + headers: request.headers, + body: request.body, + }).then(async response => { + if (response.status >= 400 && request.throw) { + throw new Error(`Request failed, ${response.status}`); + } - // Turn response headers into Record object - const headers: Record = {}; - response.headers.forEach((value, key) => { - headers[key] = value; - }); + // Turn response headers into Record object + const headers: Record = {}; + response.headers.forEach((value, key) => { + headers[key] = value; + }); - const arraybuffer = await response.arrayBuffer(); - const text = arraybuffer ? new TextDecoder().decode(arraybuffer) : ''; - const json = text ? JSON.parse(text) : {}; + const arraybuffer = await response.arrayBuffer(); + const text = arraybuffer ? new TextDecoder().decode(arraybuffer) : ''; + const json = text ? JSON.parse(text) : {}; - let response_body: RequestUrlResponse = { - status: response.status, - headers: headers, - arrayBuffer: arraybuffer, - json: json, - text: text, - }; - return response_body; - }); -} \ No newline at end of file + let response_body: RequestUrlResponse = { + status: response.status, + headers: headers, + arrayBuffer: arraybuffer, + json: json, + text: text, + }; + return response_body; + }); +} diff --git a/esbuild.config.mjs b/esbuild.config.mjs index 09c99bc..5295cff 100644 --- a/esbuild.config.mjs +++ b/esbuild.config.mjs @@ -4,57 +4,59 @@ import builtins from 'builtin-modules'; import esbuildSvelte from 'esbuild-svelte'; import sveltePreprocess from 'svelte-preprocess'; -const banner = - `/* +const banner = `/* THIS IS A GENERATED/BUNDLED FILE BY ESBUILD if you want to view the source, please visit the github repository of this plugin */ `; -const prod = (process.argv[2] === 'production'); +const prod = process.argv[2] === 'production'; -esbuild.build({ - banner: { - js: banner, - }, - entryPoints: ['src/main.ts'], - bundle: true, - external: [ - 'obsidian', - 'electron', - '@codemirror/autocomplete', - '@codemirror/closebrackets', - '@codemirror/collab', - '@codemirror/commands', - '@codemirror/comment', - '@codemirror/fold', - '@codemirror/gutter', - '@codemirror/highlight', - '@codemirror/history', - '@codemirror/language', - '@codemirror/lint', - '@codemirror/matchbrackets', - '@codemirror/panel', - '@codemirror/rangeset', - '@codemirror/rectangular-selection', - '@codemirror/search', - '@codemirror/state', - '@codemirror/stream-parser', - '@codemirror/text', - '@codemirror/tooltip', - '@codemirror/view', - ...builtins], - format: 'cjs', - watch: !prod, - target: 'es2016', - logLevel: 'info', - sourcemap: prod ? false : 'inline', - treeShaking: true, - outfile: 'main.js', - plugins: [ - esbuildSvelte({ - compilerOptions: { css: true }, - preprocess: sveltePreprocess(), - }), - ], -}).catch(() => process.exit(1)); +esbuild + .build({ + banner: { + js: banner, + }, + entryPoints: ['src/main.ts'], + bundle: true, + external: [ + 'obsidian', + 'electron', + '@codemirror/autocomplete', + '@codemirror/closebrackets', + '@codemirror/collab', + '@codemirror/commands', + '@codemirror/comment', + '@codemirror/fold', + '@codemirror/gutter', + '@codemirror/highlight', + '@codemirror/history', + '@codemirror/language', + '@codemirror/lint', + '@codemirror/matchbrackets', + '@codemirror/panel', + '@codemirror/rangeset', + '@codemirror/rectangular-selection', + '@codemirror/search', + '@codemirror/state', + '@codemirror/stream-parser', + '@codemirror/text', + '@codemirror/tooltip', + '@codemirror/view', + ...builtins, + ], + format: 'cjs', + watch: !prod, + target: 'es2016', + logLevel: 'info', + sourcemap: prod ? false : 'inline', + treeShaking: true, + outfile: 'main.js', + plugins: [ + esbuildSvelte({ + compilerOptions: { css: true }, + preprocess: sveltePreprocess(), + }), + ], + }) + .catch(() => process.exit(1)); diff --git a/jest.config.js b/jest.config.js index 332efa0..6807d50 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,13 +1,7 @@ module.exports = { - "roots": [ - "/src", - "" - ], - "testMatch": [ - "**/__tests__/**/*.+(ts|tsx|js)", - "**/?(*.)+(spec|test).+(ts|tsx|js)" - ], - "transform": { - "^.+\\.(ts|tsx)$": "ts-jest" - }, -} \ No newline at end of file + roots: ['/src', ''], + testMatch: ['**/__tests__/**/*.+(ts|tsx|js)', '**/?(*.)+(spec|test).+(ts|tsx|js)'], + transform: { + '^.+\\.(ts|tsx)$': 'ts-jest', + }, +}; diff --git a/manifest.json b/manifest.json index 9e5e796..096f75c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian-media-db-plugin", "name": "Media DB Plugin", - "version": "0.4.1", + "version": "0.5.0", "minAppVersion": "0.14.0", "description": "A plugin that can query multiple APIs for movies, series, anime, games, music and wiki articles, and import them into your vault.", "author": "Moritz Jung", diff --git a/package-lock.json b/package-lock.json index 1ec9025..412a4f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "obsidian-media-db-plugin", - "version": "0.3.2", + "version": "0.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "obsidian-media-db-plugin", - "version": "0.3.2", + "version": "0.4.1", "license": "GPL-3.0", "dependencies": { "ts-node": "^10.8.1", @@ -22,9 +22,11 @@ "builtin-modules": "^3.2.0", "esbuild": "0.13.12", "esbuild-svelte": "^0.7.1", + "eslint-plugin-only-warn": "^1.0.3", "jest": "^28.1.2", "jest-fetch-mock": "^3.0.3", "obsidian": "latest", + "prettier": "2.7.1", "svelte": "^3.50.1", "svelte-preprocess": "^4.10.7", "ts-jest": "^28.0.5", @@ -2493,6 +2495,15 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-plugin-only-warn": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-only-warn/-/eslint-plugin-only-warn-1.0.3.tgz", + "integrity": "sha512-XQOX/TfLoLw6h8ky51d29uUjXRTQHqBGXPylDEmy5fe/w7LIOnp8MA24b1OSMEn9BQoKow1q3g1kLe5/9uBTvw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -4353,6 +4364,21 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-format": { "version": "28.1.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz", @@ -7229,6 +7255,12 @@ } } }, + "eslint-plugin-only-warn": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-only-warn/-/eslint-plugin-only-warn-1.0.3.tgz", + "integrity": "sha512-XQOX/TfLoLw6h8ky51d29uUjXRTQHqBGXPylDEmy5fe/w7LIOnp8MA24b1OSMEn9BQoKow1q3g1kLe5/9uBTvw==", + "dev": true + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -8623,6 +8655,12 @@ "dev": true, "peer": true }, + "prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true + }, "pretty-format": { "version": "28.1.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz", diff --git a/package.json b/package.json index 649dfc2..8a0a246 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,14 @@ { "name": "obsidian-media-db-plugin", - "version": "0.4.1", + "version": "0.5.0", "description": "A plugin that can query multiple APIs for movies, series, anime, games, music and wiki articles, and import them into your vault.", "main": "main.js", "scripts": { "dev": "node esbuild.config.mjs", "build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production", "version": "node version-bump.mjs && git add manifest.json versions.json", - "test": "jest" + "test": "jest", + "format": "prettier --write ." }, "keywords": [], "author": "Moritz Jung", @@ -22,6 +23,7 @@ "builtin-modules": "^3.2.0", "esbuild": "0.13.12", "esbuild-svelte": "^0.7.1", + "eslint-plugin-only-warn": "^1.0.3", "jest": "^28.1.2", "jest-fetch-mock": "^3.0.3", "obsidian": "latest", @@ -29,7 +31,8 @@ "svelte-preprocess": "^4.10.7", "ts-jest": "^28.0.5", "tslib": "2.3.1", - "typescript": "4.4.4" + "typescript": "4.4.4", + "prettier": "2.7.1" }, "dependencies": { "ts-node": "^10.8.1", diff --git a/src/api/APIManager.ts b/src/api/APIManager.ts index 4220f12..d3390d0 100644 --- a/src/api/APIManager.ts +++ b/src/api/APIManager.ts @@ -1,5 +1,5 @@ -import {APIModel} from './APIModel'; -import {MediaTypeModel} from '../models/MediaTypeModel'; +import { APIModel } from './APIModel'; +import { MediaTypeModel } from '../models/MediaTypeModel'; export class APIManager { apis: APIModel[]; diff --git a/src/api/APIModel.ts b/src/api/APIModel.ts index 9d2dd78..c424508 100644 --- a/src/api/APIModel.ts +++ b/src/api/APIModel.ts @@ -1,10 +1,11 @@ -import {MediaTypeModel} from '../models/MediaTypeModel'; +import { MediaTypeModel } from '../models/MediaTypeModel'; +import { MediaType } from '../utils/MediaType'; export abstract class APIModel { apiName: string; apiUrl: string; apiDescription: string; - types: string[]; + types: MediaType[]; /** * This function should query the api and return a list of matches. The matches should be caped at 20. @@ -15,12 +16,11 @@ export abstract class APIModel { abstract getById(id: string): Promise; - hasType(type: string): boolean { + hasType(type: MediaType): boolean { return this.types.contains(type); } - // for future use (https://github.com/mProjectsCode/obsidian-media-db-plugin/issues/5) - hasTypeOverlap(types: string[]): boolean { + hasTypeOverlap(types: MediaType[]): boolean { for (const type of types) { if (this.hasType(type)) { return true; diff --git a/src/api/apis/BoardGameGeekAPI.ts b/src/api/apis/BoardGameGeekAPI.ts index 4198720..fb8a470 100644 --- a/src/api/apis/BoardGameGeekAPI.ts +++ b/src/api/apis/BoardGameGeekAPI.ts @@ -1,9 +1,9 @@ -import {APIModel} from '../APIModel'; -import {MediaTypeModel} from '../../models/MediaTypeModel'; +import { APIModel } from '../APIModel'; +import { MediaTypeModel } from '../../models/MediaTypeModel'; import MediaDbPlugin from '../../main'; -import {BoardGameModel} from 'src/models/BoardGameModel'; -import {debugLog} from '../../utils/Utils'; -import {requestUrl} from 'obsidian'; +import { BoardGameModel } from 'src/models/BoardGameModel'; +import { requestUrl } from 'obsidian'; +import { MediaType } from '../../utils/MediaType'; export class BoardGameGeekAPI extends APIModel { plugin: MediaDbPlugin; @@ -15,7 +15,7 @@ export class BoardGameGeekAPI extends APIModel { this.apiName = 'BoardGameGeekAPI'; this.apiDescription = 'A free API for BoardGameGeek things.'; this.apiUrl = 'https://api.geekdo.com/xmlapi'; - this.types = ['boardgames']; + this.types = [MediaType.BoardGame]; } async searchByTitle(title: string): Promise { @@ -33,22 +33,24 @@ export class BoardGameGeekAPI extends APIModel { const data = fetchData.text; const response = new window.DOMParser().parseFromString(data, 'text/xml'); - debugLog(response); + console.debug(response); - let ret: MediaTypeModel[] = []; + const ret: MediaTypeModel[] = []; for (const boardgame of Array.from(response.querySelectorAll('boardgame'))) { const id = boardgame.attributes.getNamedItem('objectid')!.value; - const title = boardgame.querySelector('name')!.textContent!; + const title = boardgame.querySelector('name[primary=true]')?.textContent ?? boardgame.querySelector('name')!.textContent!; const year = boardgame.querySelector('yearpublished')?.textContent ?? ''; - ret.push(new BoardGameModel({ - dataSource: this.apiName, - id, - title, - englishTitle: title, - year, - } as BoardGameModel)); + ret.push( + new BoardGameModel({ + dataSource: this.apiName, + id, + title, + englishTitle: title, + year, + } as BoardGameModel) + ); } return ret; @@ -68,17 +70,22 @@ export class BoardGameGeekAPI extends APIModel { const data = fetchData.text; const response = new window.DOMParser().parseFromString(data, 'text/xml'); - debugLog(response); + console.debug(response); const boardgame = response.querySelector('boardgame')!; - const title = boardgame.querySelector('name')!.textContent!; + const title = boardgame.querySelector('name[primary=true]')!.textContent!; const year = boardgame.querySelector('yearpublished')?.textContent ?? ''; const image = boardgame.querySelector('image')?.textContent ?? undefined; - const onlineRating = Number.parseFloat(boardgame.querySelector('statistics ratings average')?.textContent ?? ''); + const onlineRating = Number.parseFloat(boardgame.querySelector('statistics ratings average')?.textContent ?? '0'); const genres = Array.from(boardgame.querySelectorAll('boardgamecategory')).map(n => n!.textContent!); + const complexityRating = Number.parseFloat(boardgame.querySelector('averageweight')?.textContent ?? '0'); + const minPlayers = Number.parseFloat(boardgame.querySelector('minplayers')?.textContent ?? '0'); + const maxPlayers = Number.parseFloat(boardgame.querySelector('maxplayers')?.textContent ?? '0'); + const playtime = (boardgame.querySelector('playingtime')?.textContent ?? 'unknown') + ' minutes'; + const publishers = Array.from(boardgame.querySelectorAll('boardgamepublisher')).map(n => n!.textContent!); const model = new BoardGameModel({ - title, + title: title, englishTitle: title, year: year === '0' ? '' : year, dataSource: this.apiName, @@ -87,7 +94,13 @@ export class BoardGameGeekAPI extends APIModel { genres: genres, onlineRating: onlineRating, + complexityRating: complexityRating, + minPlayers: minPlayers, + maxPlayers: maxPlayers, + playtime: playtime, + publishers: publishers, image: image, + released: true, userData: { @@ -97,6 +110,5 @@ export class BoardGameGeekAPI extends APIModel { } as BoardGameModel); return model; - } } diff --git a/src/api/apis/LocGovAPI.ts b/src/api/apis/LocGovAPI.ts index c90cdd0..97addde 100644 --- a/src/api/apis/LocGovAPI.ts +++ b/src/api/apis/LocGovAPI.ts @@ -1,7 +1,6 @@ -import {APIModel} from '../APIModel'; -import {MediaTypeModel} from '../../models/MediaTypeModel'; +import { APIModel } from '../APIModel'; +import { MediaTypeModel } from '../../models/MediaTypeModel'; import MediaDbPlugin from '../../main'; -import {debugLog} from '../../utils/Utils'; // WIP export class LocGovAPI extends APIModel { @@ -25,14 +24,14 @@ export class LocGovAPI extends APIModel { const searchUrl = `https://www.loc.gov/search/?q=${encodeURIComponent(title)}&fo=json&c=20`; const fetchData = await fetch(searchUrl); - debugLog(fetchData); + console.debug(fetchData); if (fetchData.status !== 200) { throw Error(`MDB | Received status code ${fetchData.status} from an API.`); } const data = await fetchData.json(); - debugLog(data); + console.debug(data); let ret: MediaTypeModel[] = []; throw new Error('MDB | Under construction, API implementation not finished'); @@ -50,7 +49,7 @@ export class LocGovAPI extends APIModel { } const data = await fetchData.json(); - debugLog(data); + console.debug(data); const result = data.data; const type = this.typeMappings.get(result.type.toLowerCase()); diff --git a/src/api/apis/MALAPI.ts b/src/api/apis/MALAPI.ts index 66e1935..a728316 100644 --- a/src/api/apis/MALAPI.ts +++ b/src/api/apis/MALAPI.ts @@ -1,9 +1,9 @@ -import {APIModel} from '../APIModel'; -import {MediaTypeModel} from '../../models/MediaTypeModel'; -import {MovieModel} from '../../models/MovieModel'; +import { APIModel } from '../APIModel'; +import { MediaTypeModel } from '../../models/MediaTypeModel'; +import { MovieModel } from '../../models/MovieModel'; import MediaDbPlugin from '../../main'; -import {SeriesModel} from '../../models/SeriesModel'; -import {debugLog} from '../../utils/Utils'; +import { SeriesModel } from '../../models/SeriesModel'; +import { MediaType } from '../../utils/MediaType'; export class MALAPI extends APIModel { plugin: MediaDbPlugin; @@ -16,7 +16,7 @@ export class MALAPI extends APIModel { this.apiName = 'MALAPI'; this.apiDescription = 'A free API for Anime. Some results may take a long time to load.'; this.apiUrl = 'https://jikan.moe/'; - this.types = ['movie', 'series', 'anime']; + this.types = [MediaType.Movie, MediaType.Series]; this.typeMappings = new Map(); this.typeMappings.set('movie', 'movie'); this.typeMappings.set('special', 'special'); @@ -30,46 +30,52 @@ export class MALAPI extends APIModel { const searchUrl = `https://api.jikan.moe/v4/anime?q=${encodeURIComponent(title)}&limit=20${this.plugin.settings.sfwFilter ? '&sfw' : ''}`; const fetchData = await fetch(searchUrl); - debugLog(fetchData); + console.debug(fetchData); if (fetchData.status !== 200) { throw Error(`MDB | Received status code ${fetchData.status} from an API.`); } const data = await fetchData.json(); - debugLog(data); + console.debug(data); - let ret: MediaTypeModel[] = []; + const ret: MediaTypeModel[] = []; for (const result of data.data) { const type = this.typeMappings.get(result.type?.toLowerCase()); if (type === undefined) { - ret.push(new MovieModel({ - subType: '', - title: result.title, - englishTitle: result.title_english ?? result.title, - year: result.year ?? result.aired?.prop?.from?.year ?? '', - dataSource: this.apiName, - id: result.mal_id, - } as MovieModel)); + ret.push( + new MovieModel({ + subType: '', + title: result.title, + englishTitle: result.title_english ?? result.title, + year: result.year ?? result.aired?.prop?.from?.year ?? '', + dataSource: this.apiName, + id: result.mal_id, + } as MovieModel) + ); } if (type === 'movie' || type === 'special') { - ret.push(new MovieModel({ - subType: type, - title: result.title, - englishTitle: result.title_english ?? result.title, - year: result.year ?? result.aired?.prop?.from?.year ?? '', - dataSource: this.apiName, - id: result.mal_id, - } as MovieModel)); + ret.push( + new MovieModel({ + subType: type, + title: result.title, + englishTitle: result.title_english ?? result.title, + year: result.year ?? result.aired?.prop?.from?.year ?? '', + dataSource: this.apiName, + id: result.mal_id, + } as MovieModel) + ); } else if (type === 'series' || type === 'ova') { - ret.push(new SeriesModel({ - subType: type, - title: result.title, - englishTitle: result.title_english ?? result.title, - year: result.year ?? result.aired?.prop?.from?.year ?? '', - dataSource: this.apiName, - id: result.mal_id, - } as SeriesModel)); + ret.push( + new SeriesModel({ + subType: type, + title: result.title, + englishTitle: result.title_english ?? result.title, + year: result.year ?? result.aired?.prop?.from?.year ?? '', + dataSource: this.apiName, + id: result.mal_id, + } as SeriesModel) + ); } } @@ -79,7 +85,7 @@ export class MALAPI extends APIModel { async getById(id: string): Promise { console.log(`MDB | api "${this.apiName}" queried by ID`); - const searchUrl = `https://api.jikan.moe/v4/anime/${encodeURIComponent(id)}`; + const searchUrl = `https://api.jikan.moe/v4/anime/${encodeURIComponent(id)}/full`; const fetchData = await fetch(searchUrl); if (fetchData.status !== 200) { @@ -87,7 +93,7 @@ export class MALAPI extends APIModel { } const data = await fetchData.json(); - debugLog(data); + console.debug(data); const result = data.data; const type = this.typeMappings.get(result.type?.toLowerCase()); @@ -105,10 +111,12 @@ export class MALAPI extends APIModel { producer: result.studios?.map((x: any) => x.name).join(', ') ?? 'unknown', duration: result.duration ?? 'unknown', onlineRating: result.score ?? 0, + actors: [], image: result.images?.jpg?.image_url ?? '', released: true, - premiere: (new Date(result.aired?.from)).toLocaleDateString() ?? 'unknown', + premiere: new Date(result.aired?.from).toLocaleDateString() ?? 'unknown', + streamingServices: result.streaming?.map((x: any) => x.name) ?? [], userData: { watched: false, @@ -134,10 +142,12 @@ export class MALAPI extends APIModel { producer: result.studios?.map((x: any) => x.name).join(', ') ?? 'unknown', duration: result.duration ?? 'unknown', onlineRating: result.score ?? 0, + actors: [], image: result.images?.jpg?.image_url ?? '', released: true, - premiere: (new Date(result.aired?.from)).toLocaleDateString() ?? 'unknown', + premiere: new Date(result.aired?.from).toLocaleDateString() ?? 'unknown', + streamingServices: result.streaming?.map((x: any) => x.name) ?? [], userData: { watched: false, @@ -162,11 +172,12 @@ export class MALAPI extends APIModel { episodes: result.episodes, duration: result.duration ?? 'unknown', onlineRating: result.score ?? 0, + streamingServices: result.streaming?.map((x: any) => x.name) ?? [], image: result.images?.jpg?.image_url ?? '', released: true, - airedFrom: (new Date(result.aired?.from)).toLocaleDateString() ?? 'unknown', - airedTo: (new Date(result.aired?.to)).toLocaleDateString() ?? 'unknown', + airedFrom: new Date(result.aired?.from).toLocaleDateString() ?? 'unknown', + airedTo: new Date(result.aired?.to).toLocaleDateString() ?? 'unknown', airing: result.airing, userData: { diff --git a/src/api/apis/MusicBrainzAPI.ts b/src/api/apis/MusicBrainzAPI.ts index 1bcd84b..a731ecc 100644 --- a/src/api/apis/MusicBrainzAPI.ts +++ b/src/api/apis/MusicBrainzAPI.ts @@ -1,9 +1,10 @@ -import {APIModel} from '../APIModel'; -import {MediaTypeModel} from '../../models/MediaTypeModel'; +import { APIModel } from '../APIModel'; +import { MediaTypeModel } from '../../models/MediaTypeModel'; import MediaDbPlugin from '../../main'; -import {requestUrl} from 'obsidian'; -import {MusicReleaseModel} from '../../models/MusicReleaseModel'; -import {contactEmail, debugLog, mediaDbVersion, pluginName} from '../../utils/Utils'; +import { requestUrl } from 'obsidian'; +import { MusicReleaseModel } from '../../models/MusicReleaseModel'; +import { contactEmail, mediaDbVersion, pluginName } from '../../utils/Utils'; +import { MediaType } from '../../utils/MediaType'; export class MusicBrainzAPI extends APIModel { plugin: MediaDbPlugin; @@ -15,7 +16,7 @@ export class MusicBrainzAPI extends APIModel { this.apiName = 'MusicBrainz API'; this.apiDescription = 'Free API for music albums.'; this.apiUrl = 'https://musicbrainz.org/'; - this.types = ['music']; + this.types = [MediaType.MusicRelease]; } async searchByTitle(title: string): Promise { @@ -30,29 +31,31 @@ export class MusicBrainzAPI extends APIModel { }, }); - debugLog(fetchData); + console.debug(fetchData); if (fetchData.status !== 200) { throw Error(`MDB | Received status code ${fetchData.status} from an API.`); } const data = await fetchData.json; - debugLog(data); - let ret: MediaTypeModel[] = []; + console.debug(data); + const ret: MediaTypeModel[] = []; for (const result of data['release-groups']) { - ret.push(new MusicReleaseModel({ - type: 'musicRelease', - title: result.title, - englishTitle: result.title, - year: (new Date(result['first-release-date'])).getFullYear().toString(), - dataSource: this.apiName, - url: '', - id: result.id, + ret.push( + new MusicReleaseModel({ + type: 'musicRelease', + title: result.title, + englishTitle: result.title, + year: new Date(result['first-release-date']).getFullYear().toString(), + dataSource: this.apiName, + url: '', + id: result.id, - artists: result['artist-credit'].map((a: any) => a.name), - subType: result['primary-type'], - } as MusicReleaseModel)); + artists: result['artist-credit'].map((a: any) => a.name), + subType: result['primary-type'], + } as MusicReleaseModel) + ); } return ret; @@ -74,14 +77,14 @@ export class MusicBrainzAPI extends APIModel { } const data = await fetchData.json; - debugLog(data); + console.debug(data); const result = data; const model = new MusicReleaseModel({ type: 'musicRelease', title: result.title, englishTitle: result.title, - year: (new Date(result['first-release-date'])).getFullYear().toString(), + year: new Date(result['first-release-date']).getFullYear().toString(), dataSource: this.apiName, url: '', id: result.id, diff --git a/src/api/apis/OMDbAPI.ts b/src/api/apis/OMDbAPI.ts index 2c8bafb..5460c7a 100644 --- a/src/api/apis/OMDbAPI.ts +++ b/src/api/apis/OMDbAPI.ts @@ -1,10 +1,10 @@ -import {APIModel} from '../APIModel'; -import {MediaTypeModel} from '../../models/MediaTypeModel'; -import {MovieModel} from '../../models/MovieModel'; +import { APIModel } from '../APIModel'; +import { MediaTypeModel } from '../../models/MediaTypeModel'; +import { MovieModel } from '../../models/MovieModel'; import MediaDbPlugin from '../../main'; -import {SeriesModel} from '../../models/SeriesModel'; -import {GameModel} from '../../models/GameModel'; -import {debugLog} from '../../utils/Utils'; +import { SeriesModel } from '../../models/SeriesModel'; +import { GameModel } from '../../models/GameModel'; +import { MediaType } from '../../utils/MediaType'; export class OMDbAPI extends APIModel { plugin: MediaDbPlugin; @@ -17,7 +17,7 @@ export class OMDbAPI extends APIModel { this.apiName = 'OMDbAPI'; this.apiDescription = 'A free API for Movies, Series and Games.'; this.apiUrl = 'http://www.omdbapi.com/'; - this.types = ['movie', 'series']; + this.types = [MediaType.Movie, MediaType.Series, MediaType.Game]; this.typeMappings = new Map(); this.typeMappings.set('movie', 'movie'); this.typeMappings.set('series', 'series'); @@ -46,9 +46,9 @@ export class OMDbAPI extends APIModel { return []; } - debugLog(data.Search); + console.debug(data.Search); - let ret: MediaTypeModel[] = []; + const ret: MediaTypeModel[] = []; for (const result of data.Search) { const type = this.typeMappings.get(result.Type.toLowerCase()); @@ -56,32 +56,38 @@ export class OMDbAPI extends APIModel { continue; } if (type === 'movie') { - ret.push(new MovieModel({ - type: type, - title: result.Title, - englishTitle: result.Title, - year: result.Year, - dataSource: this.apiName, - id: result.imdbID, - } as MovieModel)); + ret.push( + new MovieModel({ + type: type, + title: result.Title, + englishTitle: result.Title, + year: result.Year, + dataSource: this.apiName, + id: result.imdbID, + } as MovieModel) + ); } else if (type === 'series') { - ret.push(new SeriesModel({ - type: type, - title: result.Title, - englishTitle: result.Title, - year: result.Year, - dataSource: this.apiName, - id: result.imdbID, - } as SeriesModel)); + ret.push( + new SeriesModel({ + type: type, + title: result.Title, + englishTitle: result.Title, + year: result.Year, + dataSource: this.apiName, + id: result.imdbID, + } as SeriesModel) + ); } else if (type === 'game') { - ret.push(new GameModel({ - type: type, - title: result.Title, - englishTitle: result.Title, - year: result.Year, - dataSource: this.apiName, - id: result.imdbID, - } as GameModel)); + ret.push( + new GameModel({ + type: type, + title: result.Title, + englishTitle: result.Title, + year: result.Year, + dataSource: this.apiName, + id: result.imdbID, + } as GameModel) + ); } } @@ -102,7 +108,7 @@ export class OMDbAPI extends APIModel { } const result = await fetchData.json(); - debugLog(result); + console.debug(result); if (result.Response === 'False') { throw Error(`MDB | Received error from ${this.apiName}: ${result.Error}`); @@ -127,10 +133,12 @@ export class OMDbAPI extends APIModel { producer: result.Director ?? 'unknown', duration: result.Runtime ?? 'unknown', onlineRating: Number.parseFloat(result.imdbRating ?? 0), + actors: result.Actors?.split(', ') ?? [], image: result.Poster ?? '', released: true, - premiere: (new Date(result.Released)).toLocaleDateString() ?? 'unknown', + streamingServices: [], + premiere: new Date(result.Released).toLocaleDateString() ?? 'unknown', userData: { watched: false, @@ -155,11 +163,13 @@ export class OMDbAPI extends APIModel { episodes: 0, duration: result.Runtime ?? 'unknown', onlineRating: Number.parseFloat(result.imdbRating ?? 0), + actors: result.Actors?.split(', ') ?? [], image: result.Poster ?? '', released: true, + streamingServices: [], airing: false, - airedFrom: (new Date(result.Released)).toLocaleDateString() ?? 'unknown', + airedFrom: new Date(result.Released).toLocaleDateString() ?? 'unknown', airedTo: 'unknown', userData: { @@ -185,7 +195,7 @@ export class OMDbAPI extends APIModel { image: result.Poster ?? '', released: true, - releaseDate: (new Date(result.Released)).toLocaleDateString() ?? 'unknown', + releaseDate: new Date(result.Released).toLocaleDateString() ?? 'unknown', userData: { played: false, diff --git a/src/api/apis/SteamAPI.ts b/src/api/apis/SteamAPI.ts index c51095d..ae36d3a 100644 --- a/src/api/apis/SteamAPI.ts +++ b/src/api/apis/SteamAPI.ts @@ -1,10 +1,9 @@ -import {APIModel} from '../APIModel'; -import {MediaTypeModel} from '../../models/MediaTypeModel'; +import { APIModel } from '../APIModel'; +import { MediaTypeModel } from '../../models/MediaTypeModel'; import MediaDbPlugin from '../../main'; -import {GameModel} from '../../models/GameModel'; -import {debugLog} from '../../utils/Utils'; -import {requestUrl} from 'obsidian'; -import {MediaType} from '../../utils/MediaType'; +import { GameModel } from '../../models/GameModel'; +import { requestUrl } from 'obsidian'; +import { MediaType } from '../../utils/MediaType'; export class SteamAPI extends APIModel { plugin: MediaDbPlugin; @@ -17,7 +16,7 @@ export class SteamAPI extends APIModel { this.apiName = 'SteamAPI'; this.apiDescription = 'A free API for all Steam games.'; this.apiUrl = 'http://www.steampowered.com/'; - this.types = ['games']; + this.types = [MediaType.Game]; this.typeMappings = new Map(); this.typeMappings.set('game', 'game'); } @@ -36,9 +35,9 @@ export class SteamAPI extends APIModel { const data = await fetchData.json; - debugLog(data); + console.debug(data); - let filteredData = []; + const filteredData = []; for (const app of data.applist.apps) { if (app.name.toLowerCase().includes(title.toLowerCase())) { @@ -49,17 +48,19 @@ export class SteamAPI extends APIModel { } } - let ret: MediaTypeModel[] = []; + const ret: MediaTypeModel[] = []; for (const result of filteredData) { - ret.push(new GameModel({ - type: MediaType.Game, - title: result.name, - englishTitle: result.name, - year: '', - dataSource: this.apiName, - id: result.appid, - } as GameModel)); + ret.push( + new GameModel({ + type: MediaType.Game, + title: result.name, + englishTitle: result.name, + year: '', + dataSource: this.apiName, + id: result.appid, + } as GameModel) + ); } return ret; @@ -68,7 +69,7 @@ export class SteamAPI extends APIModel { async getById(id: string): Promise { console.log(`MDB | api "${this.apiName}" queried by ID`); - const searchUrl = `http://store.steampowered.com/api/appdetails?appids=${encodeURIComponent(id)}`; + const searchUrl = `http://store.steampowered.com/api/appdetails?appids=${encodeURIComponent(id)}&l=en`; const fetchData = await requestUrl({ url: searchUrl, }); @@ -77,7 +78,7 @@ export class SteamAPI extends APIModel { throw Error(`MDB | Received status code ${fetchData.status} from an API.`); } - debugLog(await fetchData.json); + console.debug(await fetchData.json); let result: any; for (const [key, value] of Object.entries(await fetchData.json)) { @@ -92,13 +93,13 @@ export class SteamAPI extends APIModel { throw Error(`MDB | API returned invalid data.`); } - debugLog(result); + console.debug(result); const model = new GameModel({ type: MediaType.Game, title: result.name, englishTitle: result.name, - year: (new Date(result.release_date.date)).getFullYear().toString(), + year: new Date(result.release_date.date).getFullYear().toString(), dataSource: this.apiName, url: `https://store.steampowered.com/app/${result.steam_appid}`, id: result.steam_appid, @@ -108,7 +109,7 @@ export class SteamAPI extends APIModel { image: result.header_image ?? '', released: !result.release_date?.comming_soon, - releaseDate: (new Date(result.release_date?.date)).toLocaleDateString() ?? 'unknown', + releaseDate: new Date(result.release_date?.date).toLocaleDateString() ?? 'unknown', userData: { played: false, @@ -117,6 +118,5 @@ export class SteamAPI extends APIModel { } as GameModel); return model; - } } diff --git a/src/api/apis/WikipediaAPI.ts b/src/api/apis/WikipediaAPI.ts index cd73890..5193bb4 100644 --- a/src/api/apis/WikipediaAPI.ts +++ b/src/api/apis/WikipediaAPI.ts @@ -1,8 +1,8 @@ -import {APIModel} from '../APIModel'; -import {MediaTypeModel} from '../../models/MediaTypeModel'; +import { APIModel } from '../APIModel'; +import { MediaTypeModel } from '../../models/MediaTypeModel'; import MediaDbPlugin from '../../main'; -import {WikiModel} from '../../models/WikiModel'; -import {debugLog} from '../../utils/Utils'; +import { WikiModel } from '../../models/WikiModel'; +import { MediaType } from '../../utils/MediaType'; export class WikipediaAPI extends APIModel { plugin: MediaDbPlugin; @@ -14,7 +14,7 @@ export class WikipediaAPI extends APIModel { this.apiName = 'Wikipedia API'; this.apiDescription = 'The API behind Wikipedia'; this.apiUrl = 'https://www.wikipedia.com'; - this.types = ['wiki']; + this.types = [MediaType.Wiki]; } async searchByTitle(title: string): Promise { @@ -22,25 +22,27 @@ export class WikipediaAPI extends APIModel { const searchUrl = `https://en.wikipedia.org/w/api.php?action=query&list=search&srsearch=${encodeURIComponent(title)}&srlimit=20&utf8=&format=json&origin=*`; const fetchData = await fetch(searchUrl); - debugLog(fetchData); + console.debug(fetchData); if (fetchData.status !== 200) { throw Error(`MDB | Received status code ${fetchData.status} from an API.`); } const data = await fetchData.json(); - debugLog(data); - let ret: MediaTypeModel[] = []; + console.debug(data); + const ret: MediaTypeModel[] = []; for (const result of data.query.search) { - ret.push(new WikiModel({ - type: 'wiki', - title: result.title, - englishTitle: result.title, - year: '', - dataSource: this.apiName, - id: result.pageid, - } as WikiModel)); + ret.push( + new WikiModel({ + type: 'wiki', + title: result.title, + englishTitle: result.title, + year: '', + dataSource: this.apiName, + id: result.pageid, + } as WikiModel) + ); } return ret; @@ -57,7 +59,7 @@ export class WikipediaAPI extends APIModel { } const data = await fetchData.json(); - debugLog(data); + console.debug(data); const result: any = Object.entries(data?.query?.pages)[0][1]; const model = new WikiModel({ @@ -70,7 +72,7 @@ export class WikipediaAPI extends APIModel { id: result.pageid, wikiUrl: result.fullurl, - lastUpdated: (new Date(result.touched)).toLocaleDateString() ?? 'unknown', + lastUpdated: new Date(result.touched).toLocaleDateString() ?? 'unknown', length: result.length, userData: {}, diff --git a/src/main.ts b/src/main.ts index 280d308..76abff4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,20 +1,20 @@ -import {MarkdownView, Notice, parseYaml, Plugin, stringifyYaml, TFile, TFolder} from 'obsidian'; -import {getDefaultSettings, MediaDbPluginSettings, MediaDbSettingTab} from './settings/Settings'; -import {APIManager} from './api/APIManager'; -import {MediaTypeModel} from './models/MediaTypeModel'; -import {CreateNoteOptions, dateTimeToString, markdownTable, replaceIllegalFileNameCharactersInString} from './utils/Utils'; -import {OMDbAPI} from './api/apis/OMDbAPI'; -import {MALAPI} from './api/apis/MALAPI'; -import {WikipediaAPI} from './api/apis/WikipediaAPI'; -import {MusicBrainzAPI} from './api/apis/MusicBrainzAPI'; -import {MediaTypeManager} from './utils/MediaTypeManager'; -import {SteamAPI} from './api/apis/SteamAPI'; -import {BoardGameGeekAPI} from './api/apis/BoardGameGeekAPI'; -import {PropertyMapper} from './settings/PropertyMapper'; -import {YAMLConverter} from './utils/YAMLConverter'; -import {MediaDbFolderImportModal} from './modals/MediaDbFolderImportModal'; -import {PropertyMapping, PropertyMappingModel} from './settings/PropertyMapping'; -import {ModalHelper, ModalResultCode} from './utils/ModalHelper'; +import { MarkdownView, Notice, parseYaml, Plugin, stringifyYaml, TFile, TFolder } from 'obsidian'; +import { getDefaultSettings, MediaDbPluginSettings, MediaDbSettingTab } from './settings/Settings'; +import { APIManager } from './api/APIManager'; +import { MediaTypeModel } from './models/MediaTypeModel'; +import { CreateNoteOptions, dateTimeToString, markdownTable, replaceIllegalFileNameCharactersInString, unCamelCase } from './utils/Utils'; +import { OMDbAPI } from './api/apis/OMDbAPI'; +import { MALAPI } from './api/apis/MALAPI'; +import { WikipediaAPI } from './api/apis/WikipediaAPI'; +import { MusicBrainzAPI } from './api/apis/MusicBrainzAPI'; +import { MEDIA_TYPES, MediaTypeManager } from './utils/MediaTypeManager'; +import { SteamAPI } from './api/apis/SteamAPI'; +import { BoardGameGeekAPI } from './api/apis/BoardGameGeekAPI'; +import { PropertyMapper } from './settings/PropertyMapper'; +import { YAMLConverter } from './utils/YAMLConverter'; +import { MediaDbFolderImportModal } from './modals/MediaDbFolderImportModal'; +import { PropertyMapping, PropertyMappingModel } from './settings/PropertyMapping'; +import { ModalHelper, ModalResultCode, SearchModalOptions } from './utils/ModalHelper'; export default class MediaDbPlugin extends Plugin { settings: MediaDbPluginSettings; @@ -25,7 +25,7 @@ export default class MediaDbPlugin extends Plugin { frontMatterRexExpPattern: string = '^(---)\\n[\\s\\S]*?\\n---'; - async onload() { + async onload(): Promise { this.apiManager = new APIManager(); // register APIs this.apiManager.registerAPI(new OMDbAPI(this)); @@ -45,33 +45,46 @@ export default class MediaDbPlugin extends Plugin { this.addSettingTab(new MediaDbSettingTab(this.app, this)); this.mediaTypeManager.updateTemplates(this.settings); + this.mediaTypeManager.updateFolders(this.settings); // add icon to the left ribbon - const ribbonIconEl = this.addRibbonIcon('database', 'Add new Media DB entry', (evt: MouseEvent) => - this.createEntryWithAdvancedSearchModal(), - ); + const ribbonIconEl = this.addRibbonIcon('database', 'Add new Media DB entry', () => this.createEntryWithAdvancedSearchModal()); ribbonIconEl.addClass('obsidian-media-db-plugin-ribbon-class'); - this.registerEvent(this.app.workspace.on('file-menu', (menu, file) => { - if (file instanceof TFolder) { - menu.addItem(item => { - item.setTitle('Import folder as Media DB entries') - .setIcon('database') - .onClick(() => this.createEntriesFromFolder(file)); - }); - } - })); + this.registerEvent( + this.app.workspace.on('file-menu', (menu, file) => { + if (file instanceof TFolder) { + menu.addItem(item => { + item.setTitle('Import folder as Media DB entries') + .setIcon('database') + .onClick(() => this.createEntriesFromFolder(file)); + }); + } + }) + ); // register command to open search modal this.addCommand({ id: 'open-media-db-search-modal', - name: 'Add new Media DB entry', + name: 'Create Media DB entry', + callback: () => this.createEntryWithSearchModal(), + }); + for (const mediaType of MEDIA_TYPES) { + this.addCommand({ + id: `open-media-db-search-modal-with-${mediaType}`, + name: `Create Media DB entry (${unCamelCase(mediaType)})`, + callback: () => this.createEntryWithSearchModal({ preselectedTypes: [mediaType] }), + }); + } + this.addCommand({ + id: 'open-media-db-advanced-search-modal', + name: 'Create Media DB entry (advanced search)', callback: () => this.createEntryWithAdvancedSearchModal(), }); // register command to open id search modal this.addCommand({ id: 'open-media-db-id-search-modal', - name: 'Add new Media DB entry by id', + name: 'Create Media DB entry by id', callback: () => this.createEntryWithIdSearchModal(), }); // register command to update the open note @@ -123,9 +136,8 @@ export default class MediaDbPlugin extends Plugin { * - replace the detail query * - maybe custom link syntax */ - async createLinkWithSearchModal() { - - let apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async (advancedSearchModalData) => { + async createLinkWithSearchModal(): Promise { + const apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async advancedSearchModalData => { return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis); }); @@ -133,7 +145,7 @@ export default class MediaDbPlugin extends Plugin { return; } - const selectResults: MediaTypeModel[] = await this.modalHelper.openSelectModal({elements: apiSearchResults, multiSelect: false}, async (selectModalData) => { + const selectResults: MediaTypeModel[] = await this.modalHelper.openSelectModal({ elements: apiSearchResults, multiSelect: false }, async selectModalData => { return await this.queryDetails(selectModalData.selected); }); @@ -151,15 +163,43 @@ export default class MediaDbPlugin extends Plugin { } } - async createEntryWithSearchModal() { + async createEntryWithSearchModal(searchModalOptions?: SearchModalOptions): Promise { + let types: string[] = []; + let apiSearchResults: MediaTypeModel[] = await this.modalHelper.openSearchModal(searchModalOptions ?? {}, async searchModalData => { + types = searchModalData.types; + const apis = this.apiManager.apis.filter(x => x.hasTypeOverlap(searchModalData.types)).map(x => x.apiName); + return await this.apiManager.query(searchModalData.query, apis); + }); + if (!apiSearchResults) { + // TODO: add new notice saying no results found? + return; + } + + // filter the results + apiSearchResults = apiSearchResults.filter(x => types.contains(x.type)); + + let selectResults: MediaTypeModel[]; + let proceed: boolean; + + while (!proceed) { + selectResults = await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => { + return await this.queryDetails(selectModalData.selected); + }); + if (!selectResults) { + return; + } + + proceed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => { + return previewModalData.confirmed; + }); + } + + await this.createMediaDbNotes(selectResults); } - /** - * TODO: further refactor: extract it into own method, pass the action (api query) as lambda as well as an options object - */ - async createEntryWithAdvancedSearchModal() { - let apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async (advancedSearchModalData) => { + async createEntryWithAdvancedSearchModal(): Promise { + const apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async advancedSearchModalData => { return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis); }); @@ -172,14 +212,14 @@ export default class MediaDbPlugin extends Plugin { let proceed: boolean; while (!proceed) { - selectResults = await this.modalHelper.openSelectModal({elements: apiSearchResults}, async (selectModalData) => { + selectResults = await this.modalHelper.openSelectModal({ elements: apiSearchResults }, async selectModalData => { return await this.queryDetails(selectModalData.selected); }); if (!selectResults) { return; } - proceed = await this.modalHelper.openPreviewModal({elements: selectResults}, async (previewModalData) => { + proceed = await this.modalHelper.openPreviewModal({ elements: selectResults }, async previewModalData => { return previewModalData.confirmed; }); } @@ -192,29 +232,29 @@ export default class MediaDbPlugin extends Plugin { let proceed: boolean; while (!proceed) { - idSearchResult = await this.modalHelper.openIdSearchModal({}, async (idSearchModalData) => { + idSearchResult = await this.modalHelper.openIdSearchModal({}, async idSearchModalData => { return await this.apiManager.queryDetailedInfoById(idSearchModalData.query, idSearchModalData.api); }); if (!idSearchResult) { return; } - proceed = await this.modalHelper.openPreviewModal({elements: [idSearchResult]}, async (previewModalData) => { + proceed = await this.modalHelper.openPreviewModal({ elements: [idSearchResult] }, async previewModalData => { return previewModalData.confirmed; }); } - await this.createMediaDbNoteFromModel(idSearchResult, {attachTemplate: true, openNote: true}); + await this.createMediaDbNoteFromModel(idSearchResult, { attachTemplate: true, openNote: true }); } async createMediaDbNotes(models: MediaTypeModel[], attachFile?: TFile): Promise { for (const model of models) { - await this.createMediaDbNoteFromModel(model, {attachTemplate: true, attachFile: attachFile}); + await this.createMediaDbNoteFromModel(model, { attachTemplate: true, attachFile: attachFile }); } } async queryDetails(models: MediaTypeModel[]): Promise { - let detailModels: MediaTypeModel[] = []; + const detailModels: MediaTypeModel[] = []; for (const model of models) { try { detailModels.push(await this.apiManager.queryDetailedInfo(model)); @@ -230,7 +270,11 @@ export default class MediaDbPlugin extends Plugin { try { console.debug('MDB | creating new note'); - let fileContent = await this.generateMediaDbNoteContents(mediaTypeModel, options); + const fileContent = await this.generateMediaDbNoteContents(mediaTypeModel, options); + + if (!options.folder) { + options.folder = await this.mediaTypeManager.getFolder(mediaTypeModel, this.app); + } await this.createNote(this.mediaTypeManager.getFileName(mediaTypeModel), fileContent, options); } catch (e) { @@ -239,24 +283,24 @@ export default class MediaDbPlugin extends Plugin { } } - async generateMediaDbNoteContents(mediaTypeModel: MediaTypeModel, options: CreateNoteOptions) { + async generateMediaDbNoteContents(mediaTypeModel: MediaTypeModel, options: CreateNoteOptions): Promise { let fileMetadata = this.modelPropertyMapper.convertObject(mediaTypeModel.toMetaDataObject()); let fileContent = ''; const template = options.attachTemplate ? await this.mediaTypeManager.getTemplate(mediaTypeModel, this.app) : ''; - ({fileMetadata, fileContent} = await this.attachFile(fileMetadata, fileContent, options.attachFile)); - ({fileMetadata, fileContent} = await this.attachTemplate(fileMetadata, fileContent, template)); + ({ fileMetadata, fileContent } = await this.attachFile(fileMetadata, fileContent, options.attachFile)); + ({ fileMetadata, fileContent } = await this.attachTemplate(fileMetadata, fileContent, template)); fileContent = `---\n${this.settings.useCustomYamlStringifier ? YAMLConverter.toYaml(fileMetadata) : stringifyYaml(fileMetadata)}---\n` + fileContent; return fileContent; } - async attachFile(fileMetadata: any, fileContent: string, fileToAttach?: TFile): Promise<{ fileMetadata: any, fileContent: string }> { + async attachFile(fileMetadata: any, fileContent: string, fileToAttach?: TFile): Promise<{ fileMetadata: any; fileContent: string }> { if (!fileToAttach) { - return {fileMetadata: fileMetadata, fileContent: fileContent}; + return { fileMetadata: fileMetadata, fileContent: fileContent }; } - let attachFileMetadata: any = this.getMetadataFromFileCache(fileToAttach); + const attachFileMetadata: any = this.getMetadataFromFileCache(fileToAttach); fileMetadata = Object.assign(attachFileMetadata, fileMetadata); let attachFileContent: string = await this.app.vault.read(fileToAttach); @@ -265,22 +309,22 @@ export default class MediaDbPlugin extends Plugin { attachFileContent = attachFileContent.startsWith('\n') ? attachFileContent.substring(1) : attachFileContent; fileContent += attachFileContent; - return {fileMetadata: fileMetadata, fileContent: fileContent}; + return { fileMetadata: fileMetadata, fileContent: fileContent }; } - async attachTemplate(fileMetadata: any, fileContent: string, template: string): Promise<{ fileMetadata: any, fileContent: string }> { + async attachTemplate(fileMetadata: any, fileContent: string, template: string): Promise<{ fileMetadata: any; fileContent: string }> { if (!template) { - return {fileMetadata: fileMetadata, fileContent: fileContent}; + return { fileMetadata: fileMetadata, fileContent: fileContent }; } - let templateMetadata: any = this.getMetaDataFromFileContent(template); + const templateMetadata: any = this.getMetaDataFromFileContent(template); fileMetadata = Object.assign(templateMetadata, fileMetadata); const regExp = new RegExp(this.frontMatterRexExpPattern); const attachFileContent = template.replace(regExp, ''); fileContent += attachFileContent; - return {fileMetadata: fileMetadata, fileContent: fileContent}; + return { fileMetadata: fileMetadata, fileContent: fileContent }; } getMetaDataFromFileContent(fileContent: string): any { @@ -309,7 +353,7 @@ export default class MediaDbPlugin extends Plugin { return metadata; } - getMetadataFromFileCache(file: TFile) { + getMetadataFromFileCache(file: TFile): any { let metadata: any = this.app.metadataCache.getFileCache(file).frontmatter; if (metadata) { metadata = Object.assign({}, metadata); // copy @@ -327,12 +371,9 @@ export default class MediaDbPlugin extends Plugin { * @param fileContent * @param options */ - async createNote(fileName: string, fileContent: string, options: CreateNoteOptions) { + async createNote(fileName: string, fileContent: string, options: CreateNoteOptions): Promise { // find and possibly create the folder set in settings or passed in folder - const folder = options.folder ?? this.app.vault.getAbstractFileByPath(this.settings.folder); - if (!folder) { - await this.app.vault.createFolder(folder.path); - } + const folder = options.folder ?? this.app.vault.getAbstractFileByPath('/'); fileName = replaceIllegalFileNameCharactersInString(fileName); const filePath = `${folder.path}/${fileName}.md`; @@ -354,7 +395,7 @@ export default class MediaDbPlugin extends Plugin { console.warn('MDB | no active leaf, not opening newly created note'); return; } - await activeLeaf.openFile(targetFile, {state: {mode: 'source'}}); + await activeLeaf.openFile(targetFile, { state: { mode: 'source' } }); } } @@ -362,7 +403,7 @@ export default class MediaDbPlugin extends Plugin { * Update the active note by querying the API again. * Tries to read the type, id and dataSource of the active note. If successful it will query the api, delete the old note and create a new one. */ - async updateActiveNote(onlyMetadata: boolean = false) { + async updateActiveNote(onlyMetadata: boolean = false): Promise { const activeFile: TFile = this.app.workspace.getActiveFile(); if (!activeFile) { throw new Error('MDB | there is no active note'); @@ -377,7 +418,7 @@ export default class MediaDbPlugin extends Plugin { throw new Error('MDB | active note is not a Media DB entry or is missing metadata'); } - let oldMediaTypeModel = this.mediaTypeManager.createMediaTypeModelFromMediaType(metadata, metadata.type); + const oldMediaTypeModel = this.mediaTypeManager.createMediaTypeModelFromMediaType(metadata, metadata.type); // console.debug(oldMediaTypeModel); let newMediaTypeModel = await this.apiManager.queryDetailedInfoById(metadata.id, metadata.dataSource); @@ -391,36 +432,35 @@ export default class MediaDbPlugin extends Plugin { // deletion not happening anymore why is this log statement still here console.debug('MDB | deleting old entry'); if (onlyMetadata) { - await this.createMediaDbNoteFromModel(newMediaTypeModel, {attachFile: activeFile, folder: activeFile.parent, openNote: true}); + await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachFile: activeFile, folder: activeFile.parent, openNote: true }); } else { - await this.createMediaDbNoteFromModel(newMediaTypeModel, {attachTemplate: true, folder: activeFile.parent, openNote: true}); + await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachTemplate: true, folder: activeFile.parent, openNote: true }); } - } - async createEntriesFromFolder(folder: TFolder) { - const erroredFiles: { filePath: string, error: string }[] = []; + async createEntriesFromFolder(folder: TFolder): Promise { + const erroredFiles: { filePath: string; error: string }[] = []; let canceled: boolean = false; - const {selectedAPI, titleFieldName, appendContent} = await new Promise<{ selectedAPI: string, titleFieldName: string, appendContent: boolean }>((resolve, reject) => { - new MediaDbFolderImportModal(this.app, this, ((selectedAPI: string, titleFieldName: string, appendContent: boolean) => { - resolve({selectedAPI, titleFieldName, appendContent}); - })).open(); + const { selectedAPI, titleFieldName, appendContent } = await new Promise<{ selectedAPI: string; titleFieldName: string; appendContent: boolean }>(resolve => { + new MediaDbFolderImportModal(this.app, this, (selectedAPI: string, titleFieldName: string, appendContent: boolean) => { + resolve({ selectedAPI, titleFieldName, appendContent }); + }).open(); }); for (const child of folder.children) { if (child instanceof TFile) { const file: TFile = child; if (canceled) { - erroredFiles.push({filePath: file.path, error: 'user canceled'}); + erroredFiles.push({ filePath: file.path, error: 'user canceled' }); continue; } - let metadata: any = this.getMetadataFromFileCache(file); + const metadata: any = this.getMetadataFromFileCache(file); - let title = metadata[titleFieldName]; + const title = metadata[titleFieldName]; if (!title) { - erroredFiles.push({filePath: file.path, error: `metadata field \'${titleFieldName}\' not found or empty`}); + erroredFiles.push({ filePath: file.path, error: `metadata field '${titleFieldName}' not found or empty` }); continue; } @@ -428,37 +468,37 @@ export default class MediaDbPlugin extends Plugin { try { results = await this.apiManager.query(title, [selectedAPI]); } catch (e) { - erroredFiles.push({filePath: file.path, error: e.toString()}); + erroredFiles.push({ filePath: file.path, error: e.toString() }); continue; } if (!results || results.length === 0) { - erroredFiles.push({filePath: file.path, error: `no search results`}); + erroredFiles.push({ filePath: file.path, error: `no search results` }); continue; } - let {selectModalResult, selectModal} = await this.modalHelper.createSelectModal({elements: results, skipButton: true, modalTitle: `Results for \'${title}\'`}); + const { selectModalResult, selectModal } = await this.modalHelper.createSelectModal({ elements: results, skipButton: true, modalTitle: `Results for '${title}'` }); if (selectModalResult.code === ModalResultCode.ERROR) { - erroredFiles.push({filePath: file.path, error: selectModalResult.error.message}); + erroredFiles.push({ filePath: file.path, error: selectModalResult.error.message }); selectModal.close(); continue; } if (selectModalResult.code === ModalResultCode.CLOSE) { - erroredFiles.push({filePath: file.path, error: 'user canceled'}); + erroredFiles.push({ filePath: file.path, error: 'user canceled' }); selectModal.close(); canceled = true; continue; } if (selectModalResult.code === ModalResultCode.SKIP) { - erroredFiles.push({filePath: file.path, error: 'user skipped'}); + erroredFiles.push({ filePath: file.path, error: 'user skipped' }); selectModal.close(); continue; } if (selectModalResult.data.selected.length === 0) { - erroredFiles.push({filePath: file.path, error: `no search results selected`}); + erroredFiles.push({ filePath: file.path, error: `no search results selected` }); continue; } @@ -474,34 +514,35 @@ export default class MediaDbPlugin extends Plugin { } } - async createErroredFilesReport(erroredFiles: { filePath: string, error: string }[]): Promise { - const title = `bulk import error report ${dateTimeToString(new Date())}`; - const filePath = `${this.settings.folder.replace(/\/$/, '')}/${title}.md`; + async createErroredFilesReport(erroredFiles: { filePath: string; error: string }[]): Promise { + const title = `MDB - bulk import error report ${dateTimeToString(new Date())}`; + const filePath = `${title}.md`; const table = [['file', 'error']].concat(erroredFiles.map(x => [x.filePath, x.error])); - let fileContent = `# ${title}\n\n${markdownTable(table)}`; - - const targetFile = await this.app.vault.create(filePath, fileContent); + const fileContent = `# ${title}\n\n${markdownTable(table)}`; + await this.app.vault.create(filePath, fileContent); } - async loadSettings() { + async loadSettings(): Promise { // console.log(DEFAULT_SETTINGS); const diskSettings: MediaDbPluginSettings = await this.loadData(); const defaultSettings: MediaDbPluginSettings = getDefaultSettings(this); const loadedSettings: MediaDbPluginSettings = Object.assign({}, defaultSettings, diskSettings); // migrate the settings loaded from the disk to match the structure of the default settings - let newPropertyMappings: PropertyMappingModel[] = []; + const newPropertyMappings: PropertyMappingModel[] = []; for (const defaultPropertyMappingModel of defaultSettings.propertyMappingModels) { - let newPropertyMappingModel: PropertyMappingModel = loadedSettings.propertyMappingModels.find(x => x.type === defaultPropertyMappingModel.type); - if (newPropertyMappingModel === undefined) { // if the propertyMappingModel exists in the default settings but not the loaded settings, add it + const newPropertyMappingModel: PropertyMappingModel = loadedSettings.propertyMappingModels.find(x => x.type === defaultPropertyMappingModel.type); + if (newPropertyMappingModel === undefined) { + // if the propertyMappingModel exists in the default settings but not the loaded settings, add it newPropertyMappings.push(defaultPropertyMappingModel); - } else { // if the propertyMappingModel also exists in the loaded settings, add it from there - let newProperties: PropertyMapping[] = []; + } else { + // if the propertyMappingModel also exists in the loaded settings, add it from there + const newProperties: PropertyMapping[] = []; for (const defaultProperty of defaultPropertyMappingModel.properties) { - let newProperty = newPropertyMappingModel.properties.find(x => x.property === defaultProperty.property); + const newProperty = newPropertyMappingModel.properties.find(x => x.property === defaultProperty.property); if (newProperty === undefined) { // default property is an instance newProperties.push(defaultProperty); @@ -519,8 +560,9 @@ export default class MediaDbPlugin extends Plugin { this.settings = loadedSettings; } - async saveSettings() { + async saveSettings(): Promise { this.mediaTypeManager.updateTemplates(this.settings); + this.mediaTypeManager.updateFolders(this.settings); await this.saveData(this.settings); } diff --git a/src/modals/MediaDbAdvancedSearchModal.ts b/src/modals/MediaDbAdvancedSearchModal.ts index fa7ac6b..9a79ac1 100644 --- a/src/modals/MediaDbAdvancedSearchModal.ts +++ b/src/modals/MediaDbAdvancedSearchModal.ts @@ -1,7 +1,7 @@ -import {ButtonComponent, Modal, Notice, Setting, TextComponent, ToggleComponent} from 'obsidian'; -import {MediaTypeModel} from '../models/MediaTypeModel'; +import { ButtonComponent, Modal, Notice, Setting, TextComponent, ToggleComponent } from 'obsidian'; +import { MediaTypeModel } from '../models/MediaTypeModel'; import MediaDbPlugin from '../main'; -import {ADVANCED_SEARCH_MODAL_DEFAULT_OPTIONS, AdvancedSearchModalData, AdvancedSearchModalOptions} from '../utils/ModalHelper'; +import { ADVANCED_SEARCH_MODAL_DEFAULT_OPTIONS, AdvancedSearchModalData, AdvancedSearchModalOptions } from '../utils/ModalHelper'; export class MediaDbAdvancedSearchModal extends Modal { plugin: MediaDbPlugin; @@ -9,14 +9,13 @@ export class MediaDbAdvancedSearchModal extends Modal { query: string; isBusy: boolean; title: string; - selectedApis: { name: string, selected: boolean }[]; + selectedApis: { name: string; selected: boolean }[]; searchBtn: ButtonComponent; submitCallback?: (res: AdvancedSearchModalData) => void; closeCallback?: (err?: Error) => void; - constructor(plugin: MediaDbPlugin, advancedSearchModalOptions: AdvancedSearchModalOptions) { advancedSearchModalOptions = Object.assign({}, ADVANCED_SEARCH_MODAL_DEFAULT_OPTIONS, advancedSearchModalOptions); super(plugin.app); @@ -27,7 +26,7 @@ export class MediaDbAdvancedSearchModal extends Modal { this.query = advancedSearchModalOptions.prefilledSearchString; for (const api of this.plugin.apiManager.apis) { - this.selectedApis.push({name: api.apiName, selected: advancedSearchModalOptions.preselectedAPIs.contains(api.apiName)}); + this.selectedApis.push({ name: api.apiName, selected: advancedSearchModalOptions.preselectedAPIs.contains(api.apiName) }); } } @@ -39,7 +38,7 @@ export class MediaDbAdvancedSearchModal extends Modal { this.closeCallback = closeCallback; } - keyPressCallback(event: KeyboardEvent) { + keyPressCallback(event: KeyboardEvent): void { if (event.key === 'Enter') { this.search(); } @@ -63,14 +62,14 @@ export class MediaDbAdvancedSearchModal extends Modal { this.searchBtn.setDisabled(false); this.searchBtn.setButtonText('Searching...'); - this.submitCallback({query: this.query, apis: apis}); + this.submitCallback({ query: this.query, apis: apis }); } } - onOpen() { - const {contentEl} = this; + onOpen(): void { + const { contentEl } = this; - contentEl.createEl('h2', {text: this.title}); + contentEl.createEl('h2', { text: this.title }); const placeholder = 'Search by title'; const searchComponent = new TextComponent(contentEl); @@ -83,29 +82,29 @@ export class MediaDbAdvancedSearchModal extends Modal { contentEl.appendChild(searchComponent.inputEl); searchComponent.inputEl.focus(); - contentEl.createDiv({cls: 'media-db-plugin-spacer'}); - contentEl.createEl('h3', {text: 'APIs to search'}); + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); + contentEl.createEl('h3', { text: 'APIs to search' }); // const apiToggleComponents: Component[] = []; for (const api of this.plugin.apiManager.apis) { - const apiToggleListElementWrapper = contentEl.createEl('div', {cls: 'media-db-plugin-list-wrapper'}); + const apiToggleListElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' }); - const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', {cls: 'media-db-plugin-list-text-wrapper'}); - apiToggleTextWrapper.createEl('span', {text: api.apiName, cls: 'media-db-plugin-list-text'}); - apiToggleTextWrapper.createEl('small', {text: api.apiDescription, cls: 'media-db-plugin-list-text'}); + const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' }); + apiToggleTextWrapper.createEl('span', { text: api.apiName, cls: 'media-db-plugin-list-text' }); + apiToggleTextWrapper.createEl('small', { text: api.apiDescription, cls: 'media-db-plugin-list-text' }); - const apiToggleComponentWrapper = apiToggleListElementWrapper.createEl('div', {cls: 'media-db-plugin-list-toggle'}); + const apiToggleComponentWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-toggle' }); const apiToggleComponent = new ToggleComponent(apiToggleComponentWrapper); apiToggleComponent.setTooltip(api.apiName); apiToggleComponent.setValue(this.selectedApis.find(x => x.name === api.apiName).selected); - apiToggleComponent.onChange((value) => { + apiToggleComponent.onChange(value => { this.selectedApis.find(x => x.name === api.apiName).selected = value; }); apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl); } - contentEl.createDiv({cls: 'media-db-plugin-spacer'}); + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); new Setting(contentEl) .addButton(btn => { @@ -124,10 +123,9 @@ export class MediaDbAdvancedSearchModal extends Modal { }); } - onClose() { + onClose(): void { this.closeCallback(); - const {contentEl} = this; + const { contentEl } = this; contentEl.empty(); } - } diff --git a/src/modals/MediaDbFolderImportModal.ts b/src/modals/MediaDbFolderImportModal.ts index 9c1f64a..04c908f 100644 --- a/src/modals/MediaDbFolderImportModal.ts +++ b/src/modals/MediaDbFolderImportModal.ts @@ -1,4 +1,4 @@ -import {App, ButtonComponent, DropdownComponent, Modal, Setting, TextComponent, ToggleComponent} from 'obsidian'; +import { App, ButtonComponent, DropdownComponent, Modal, Setting, TextComponent, ToggleComponent } from 'obsidian'; import MediaDbPlugin from '../main'; export class MediaDbFolderImportModal extends Modal { @@ -16,19 +16,19 @@ export class MediaDbFolderImportModal extends Modal { this.selectedApi = plugin.apiManager.apis[0].apiName; } - submit() { + submit(): void { this.onSubmit(this.selectedApi, this.titleFieldName, this.appendContent); this.close(); } - onOpen() { - const {contentEl} = this; + onOpen(): void { + const { contentEl } = this; - contentEl.createEl('h2', {text: 'Import folder as Media DB entries'}); + contentEl.createEl('h2', { text: 'Import folder as Media DB entries' }); - const apiSelectorWrapper = contentEl.createEl('div', {cls: 'media-db-plugin-list-wrapper'}); - const apiSelectorTextWrapper = apiSelectorWrapper.createEl('div', {cls: 'media-db-plugin-list-text-wrapper'}); - apiSelectorTextWrapper.createEl('span', {text: 'API to search', cls: 'media-db-plugin-list-text'}); + const apiSelectorWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' }); + const apiSelectorTextWrapper = apiSelectorWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' }); + apiSelectorTextWrapper.createEl('span', { text: 'API to search', cls: 'media-db-plugin-list-text' }); const apiSelectorComponent = new DropdownComponent(apiSelectorWrapper); apiSelectorComponent.onChange((value: string) => { @@ -39,41 +39,39 @@ export class MediaDbFolderImportModal extends Modal { } apiSelectorWrapper.appendChild(apiSelectorComponent.selectEl); + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); + contentEl.createEl('h3', { text: 'Append note content to Media DB entry.' }); - contentEl.createDiv({cls: 'media-db-plugin-spacer'}); - contentEl.createEl('h3', {text: 'Append note content to Media DB entry.'}); - - const appendContentToggleElementWrapper = contentEl.createEl('div', {cls: 'media-db-plugin-list-wrapper'}); - const appendContentToggleTextWrapper = appendContentToggleElementWrapper.createEl('div', {cls: 'media-db-plugin-list-text-wrapper'}); + const appendContentToggleElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' }); + const appendContentToggleTextWrapper = appendContentToggleElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' }); appendContentToggleTextWrapper.createEl('span', { text: 'If this is enabled, the plugin will override metadata fields with the same name.', cls: 'media-db-plugin-list-text', }); - const appendContentToggleComponentWrapper = appendContentToggleElementWrapper.createEl('div', {cls: 'media-db-plugin-list-toggle'}); + const appendContentToggleComponentWrapper = appendContentToggleElementWrapper.createEl('div', { cls: 'media-db-plugin-list-toggle' }); const appendContentToggle = new ToggleComponent(appendContentToggleElementWrapper); appendContentToggle.setValue(false); - appendContentToggle.onChange(value => this.appendContent = value); + appendContentToggle.onChange(value => (this.appendContent = value)); appendContentToggleComponentWrapper.appendChild(appendContentToggle.toggleEl); - - contentEl.createDiv({cls: 'media-db-plugin-spacer'}); - contentEl.createEl('h3', {text: 'The name of the metadata field that should be used as the title to query.'}); + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); + contentEl.createEl('h3', { text: 'The name of the metadata field that should be used as the title to query.' }); const placeholder = 'title'; const titleFieldNameComponent = new TextComponent(contentEl); titleFieldNameComponent.inputEl.style.width = '100%'; titleFieldNameComponent.setPlaceholder(placeholder); - titleFieldNameComponent.onChange(value => this.titleFieldName = value); - titleFieldNameComponent.inputEl.addEventListener('keydown', (ke) => { + titleFieldNameComponent.onChange(value => (this.titleFieldName = value)); + titleFieldNameComponent.inputEl.addEventListener('keydown', ke => { if (ke.key === 'Enter') { this.submit(); } }); contentEl.appendChild(titleFieldNameComponent.inputEl); - contentEl.createDiv({cls: 'media-db-plugin-spacer'}); + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); new Setting(contentEl) .addButton(btn => { @@ -92,8 +90,8 @@ export class MediaDbFolderImportModal extends Modal { }); } - onClose() { - const {contentEl} = this; + onClose(): void { + const { contentEl } = this; contentEl.empty(); } } diff --git a/src/modals/MediaDbIdSearchModal.ts b/src/modals/MediaDbIdSearchModal.ts index ec29cac..b100b46 100644 --- a/src/modals/MediaDbIdSearchModal.ts +++ b/src/modals/MediaDbIdSearchModal.ts @@ -1,7 +1,7 @@ -import {ButtonComponent, DropdownComponent, Modal, Notice, Setting, TextComponent} from 'obsidian'; -import {MediaTypeModel} from '../models/MediaTypeModel'; +import { ButtonComponent, DropdownComponent, Modal, Notice, Setting, TextComponent } from 'obsidian'; +import { MediaTypeModel } from '../models/MediaTypeModel'; import MediaDbPlugin from '../main'; -import {ID_SEARCH_MODAL_DEFAULT_OPTIONS, IdSearchModalData, IdSearchModalOptions} from '../utils/ModalHelper'; +import { ID_SEARCH_MODAL_DEFAULT_OPTIONS, IdSearchModalData, IdSearchModalOptions } from '../utils/ModalHelper'; export class MediaDbIdSearchModal extends Modal { plugin: MediaDbPlugin; @@ -16,7 +16,6 @@ export class MediaDbIdSearchModal extends Modal { submitCallback?: (res: IdSearchModalData, err?: Error) => void; closeCallback?: (err?: Error) => void; - constructor(plugin: MediaDbPlugin, idSearchModalOptions: IdSearchModalOptions) { idSearchModalOptions = Object.assign({}, ID_SEARCH_MODAL_DEFAULT_OPTIONS, idSearchModalOptions); super(plugin.app); @@ -34,7 +33,7 @@ export class MediaDbIdSearchModal extends Modal { this.closeCallback = closeCallback; } - keyPressCallback(event: KeyboardEvent) { + keyPressCallback(event: KeyboardEvent): void { if (event.key === 'Enter') { this.search(); } @@ -56,14 +55,14 @@ export class MediaDbIdSearchModal extends Modal { this.searchBtn.setDisabled(false); this.searchBtn.setButtonText('Searching...'); - this.submitCallback({query: this.query, api: this.selectedApi}); + this.submitCallback({ query: this.query, api: this.selectedApi }); } } - onOpen() { - const {contentEl} = this; + onOpen(): void { + const { contentEl } = this; - contentEl.createEl('h2', {text: this.title}); + contentEl.createEl('h2', { text: this.title }); const placeholder = 'Search by id'; const searchComponent = new TextComponent(contentEl); @@ -75,11 +74,11 @@ export class MediaDbIdSearchModal extends Modal { contentEl.appendChild(searchComponent.inputEl); searchComponent.inputEl.focus(); - contentEl.createDiv({cls: 'media-db-plugin-spacer'}); + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); - const apiSelectorWrapper = contentEl.createEl('div', {cls: 'media-db-plugin-list-wrapper'}); - const apiSelectorTExtWrapper = apiSelectorWrapper.createEl('div', {cls: 'media-db-plugin-list-text-wrapper'}); - apiSelectorTExtWrapper.createEl('span', {text: 'API to search', cls: 'media-db-plugin-list-text'}); + const apiSelectorWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' }); + const apiSelectorTExtWrapper = apiSelectorWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' }); + apiSelectorTExtWrapper.createEl('span', { text: 'API to search', cls: 'media-db-plugin-list-text' }); const apiSelectorComponent = new DropdownComponent(apiSelectorWrapper); apiSelectorComponent.onChange((value: string) => { @@ -90,7 +89,7 @@ export class MediaDbIdSearchModal extends Modal { } apiSelectorWrapper.appendChild(apiSelectorComponent.selectEl); - contentEl.createDiv({cls: 'media-db-plugin-spacer'}); + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); new Setting(contentEl) .addButton(btn => { @@ -109,10 +108,9 @@ export class MediaDbIdSearchModal extends Modal { }); } - onClose() { + onClose(): void { this.closeCallback(); - const {contentEl} = this; + const { contentEl } = this; contentEl.empty(); } - } diff --git a/src/modals/MediaDbPreviewModal.ts b/src/modals/MediaDbPreviewModal.ts index ef69a8c..647cd48 100644 --- a/src/modals/MediaDbPreviewModal.ts +++ b/src/modals/MediaDbPreviewModal.ts @@ -1,8 +1,8 @@ -import {ButtonComponent, MarkdownRenderer, Modal, Setting} from 'obsidian'; +import { ButtonComponent, MarkdownRenderer, Modal, Setting } from 'obsidian'; import MediaDbPlugin from 'src/main'; -import {MediaTypeModel} from 'src/models/MediaTypeModel'; -import {PREVIEW_MODAL_DEFAULT_OPTIONS, PreviewModalData, PreviewModalOptions} from '../utils/ModalHelper'; -import {CreateNoteOptions} from '../utils/Utils'; +import { MediaTypeModel } from 'src/models/MediaTypeModel'; +import { PREVIEW_MODAL_DEFAULT_OPTIONS, PreviewModalData, PreviewModalOptions } from '../utils/ModalHelper'; +import { CreateNoteOptions } from '../utils/Utils'; export class MediaDbPreviewModal extends Modal { plugin: MediaDbPlugin; @@ -37,15 +37,15 @@ export class MediaDbPreviewModal extends Modal { } async preview(): Promise { - let {contentEl} = this; + const { contentEl } = this; contentEl.addClass('media-db-plugin-preview-modal'); - contentEl.createEl('h2', {text: this.title}); + contentEl.createEl('h2', { text: this.title }); - const previewWrapper = contentEl.createDiv({cls: 'media-db-plugin-preview-wrapper'}); + const previewWrapper = contentEl.createDiv({ cls: 'media-db-plugin-preview-wrapper' }); - for (let result of this.elements) { - previewWrapper.createEl('h3', {text: result.englishTitle}); + for (const result of this.elements) { + previewWrapper.createEl('h3', { text: result.englishTitle }); const fileDiv = previewWrapper.createDiv(); let fileContent = await this.plugin.generateMediaDbNoteContents(result, this.createNoteOptions); @@ -54,19 +54,19 @@ export class MediaDbPreviewModal extends Modal { MarkdownRenderer.renderMarkdown(fileContent, fileDiv, null, null); } - contentEl.createDiv({cls: 'media-db-plugin-spacer'}); + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); const bottomSettingRow = new Setting(contentEl); bottomSettingRow.addButton(btn => { btn.setButtonText('Cancel'); - btn.onClick(() => this.closeCallback()); + btn.onClick(() => this.close()); btn.buttonEl.addClass('media-db-plugin-button'); this.cancelButton = btn; }); bottomSettingRow.addButton(btn => { btn.setButtonText('Ok'); btn.setCta(); - btn.onClick(() => this.submitCallback({confirmed: true})); + btn.onClick(() => this.submitCallback({ confirmed: true })); btn.buttonEl.addClass('media-db-plugin-button'); this.submitButton = btn; }); diff --git a/src/modals/MediaDbSearchModal.ts b/src/modals/MediaDbSearchModal.ts new file mode 100644 index 0000000..b4c89a9 --- /dev/null +++ b/src/modals/MediaDbSearchModal.ts @@ -0,0 +1,132 @@ +import { ButtonComponent, Modal, Notice, Setting, TextComponent, ToggleComponent } from 'obsidian'; +import { MediaTypeModel } from '../models/MediaTypeModel'; +import MediaDbPlugin from '../main'; +import { SEARCH_MODAL_DEFAULT_OPTIONS, SearchModalData, SearchModalOptions } from '../utils/ModalHelper'; +import { MEDIA_TYPES } from '../utils/MediaTypeManager'; +import { unCamelCase } from '../utils/Utils'; +import { MediaType } from '../utils/MediaType'; + +export class MediaDbSearchModal extends Modal { + plugin: MediaDbPlugin; + + query: string; + isBusy: boolean; + title: string; + selectedTypes: { name: MediaType; selected: boolean }[]; + + searchBtn: ButtonComponent; + + submitCallback?: (res: SearchModalData) => void; + closeCallback?: (err?: Error) => void; + + constructor(plugin: MediaDbPlugin, searchModalOptions: SearchModalOptions) { + searchModalOptions = Object.assign({}, SEARCH_MODAL_DEFAULT_OPTIONS, searchModalOptions); + super(plugin.app); + + this.plugin = plugin; + this.selectedTypes = []; + this.title = searchModalOptions.modalTitle; + this.query = searchModalOptions.prefilledSearchString; + + for (const mediaType of MEDIA_TYPES) { + this.selectedTypes.push({ name: mediaType, selected: searchModalOptions.preselectedTypes.contains(mediaType) }); + } + } + + setSubmitCallback(submitCallback: (res: SearchModalData) => void): void { + this.submitCallback = submitCallback; + } + + setCloseCallback(closeCallback: (err?: Error) => void): void { + this.closeCallback = closeCallback; + } + + keyPressCallback(event: KeyboardEvent): void { + if (event.key === 'Enter') { + this.search(); + } + } + + async search(): Promise { + if (!this.query || this.query.length < 3) { + new Notice('MDB | Query too short'); + return; + } + + const types: MediaType[] = this.selectedTypes.filter(x => x.selected).map(x => x.name); + + if (types.length === 0) { + new Notice('MDB | No Type selected'); + return; + } + + if (!this.isBusy) { + this.isBusy = true; + this.searchBtn.setDisabled(false); + this.searchBtn.setButtonText('Searching...'); + + this.submitCallback({ query: this.query, types: types }); + } + } + + onOpen(): void { + const { contentEl } = this; + + contentEl.createEl('h2', { text: this.title }); + + const placeholder = 'Search by title'; + const searchComponent = new TextComponent(contentEl); + searchComponent.inputEl.style.width = '100%'; + searchComponent.setPlaceholder(placeholder); + searchComponent.setValue(this.query); + searchComponent.onChange(value => (this.query = value)); + searchComponent.inputEl.addEventListener('keydown', this.keyPressCallback.bind(this)); + + contentEl.appendChild(searchComponent.inputEl); + searchComponent.inputEl.focus(); + + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); + contentEl.createEl('h3', { text: 'APIs to search' }); + + for (const mediaType of MEDIA_TYPES) { + const apiToggleListElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' }); + + const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' }); + apiToggleTextWrapper.createEl('span', { text: unCamelCase(mediaType), cls: 'media-db-plugin-list-text' }); + + const apiToggleComponentWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-toggle' }); + + const apiToggleComponent = new ToggleComponent(apiToggleComponentWrapper); + apiToggleComponent.setTooltip(unCamelCase(mediaType)); + apiToggleComponent.setValue(this.selectedTypes.find(x => x.name === mediaType).selected); + apiToggleComponent.onChange(value => { + this.selectedTypes.find(x => x.name === mediaType).selected = value; + }); + apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl); + } + + contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); + + new Setting(contentEl) + .addButton(btn => { + btn.setButtonText('Cancel'); + btn.onClick(() => this.close()); + btn.buttonEl.addClass('media-db-plugin-button'); + }) + .addButton(btn => { + btn.setButtonText('Ok'); + btn.setCta(); + btn.onClick(() => { + this.search(); + }); + btn.buttonEl.addClass('media-db-plugin-button'); + this.searchBtn = btn; + }); + } + + onClose(): void { + this.closeCallback(); + const { contentEl } = this; + contentEl.empty(); + } +} diff --git a/src/modals/MediaDbSearchResultModal.ts b/src/modals/MediaDbSearchResultModal.ts index bce91ee..57c12f8 100644 --- a/src/modals/MediaDbSearchResultModal.ts +++ b/src/modals/MediaDbSearchResultModal.ts @@ -1,7 +1,7 @@ -import {MediaTypeModel} from '../models/MediaTypeModel'; +import { MediaTypeModel } from '../models/MediaTypeModel'; import MediaDbPlugin from '../main'; -import {SelectModal} from './SelectModal'; -import {SELECT_MODAL_OPTIONS_DEFAULT, SelectModalData, SelectModalOptions} from '../utils/ModalHelper'; +import { SelectModal } from './SelectModal'; +import { SELECT_MODAL_OPTIONS_DEFAULT, SelectModalData, SelectModalOptions } from '../utils/ModalHelper'; export class MediaDbSearchResultModal extends SelectModal { plugin: MediaDbPlugin; @@ -13,7 +13,6 @@ export class MediaDbSearchResultModal extends SelectModal { closeCallback: (err?: Error) => void; skipCallback: () => void; - constructor(plugin: MediaDbPlugin, selectModalOptions: SelectModalOptions) { selectModalOptions = Object.assign({}, SELECT_MODAL_OPTIONS_DEFAULT, selectModalOptions); super(plugin.app, selectModalOptions.elements, selectModalOptions.multiSelect); @@ -41,27 +40,27 @@ export class MediaDbSearchResultModal extends SelectModal { } // Renders each suggestion item. - renderElement(item: MediaTypeModel, el: HTMLElement) { - el.createEl('div', {text: this.plugin.mediaTypeManager.getFileName(item)}); - el.createEl('small', {text: `${item.getSummary()}\n`}); - el.createEl('small', {text: `${item.type.toUpperCase() + (item.subType ? ` (${item.subType})` : '')} from ${item.dataSource}`}); + renderElement(item: MediaTypeModel, el: HTMLElement): void { + el.createEl('div', { text: this.plugin.mediaTypeManager.getFileName(item) }); + el.createEl('small', { text: `${item.getSummary()}\n` }); + el.createEl('small', { text: `${item.type.toUpperCase() + (item.subType ? ` (${item.subType})` : '')} from ${item.dataSource}` }); } // Perform action on the selected suggestion. - submit() { + submit(): void { if (!this.busy) { this.busy = true; this.submitButton.setButtonText('Creating entry...'); - this.submitCallback({selected: this.selectModalElements.filter(x => x.isActive()).map(x => x.value)}); + this.submitCallback({ selected: this.selectModalElements.filter(x => x.isActive()).map(x => x.value) }); } } - skip() { + skip(): void { this.skipButton.setButtonText('Skipping...'); this.skipCallback(); } - onClose() { + onClose(): void { this.closeCallback(); } } diff --git a/src/modals/SelectModal.ts b/src/modals/SelectModal.ts index 82bcccd..dd89d52 100644 --- a/src/modals/SelectModal.ts +++ b/src/modals/SelectModal.ts @@ -1,6 +1,6 @@ -import {App, ButtonComponent, Modal, Setting} from 'obsidian'; -import {SelectModalElement} from './SelectModalElement'; -import {mod} from '../utils/Utils'; +import { App, ButtonComponent, Modal, Setting } from 'obsidian'; +import { SelectModalElement } from './SelectModalElement'; +import { mod } from '../utils/Utils'; export abstract class SelectModal extends Modal { allowMultiSelect: boolean; @@ -17,7 +17,6 @@ export abstract class SelectModal extends Modal { elements: T[]; selectModalElements: SelectModalElement[]; - protected constructor(app: App, elements: T[], allowMultiSelect: boolean = true) { super(app); this.allowMultiSelect = allowMultiSelect; @@ -34,18 +33,18 @@ export abstract class SelectModal extends Modal { this.elements = elements; this.selectModalElements = []; - this.scope.register([], 'ArrowUp', (evt) => { + this.scope.register([], 'ArrowUp', evt => { this.highlightUp(); evt.preventDefault(); }); - this.scope.register([], 'ArrowDown', (evt) => { + this.scope.register([], 'ArrowDown', evt => { this.highlightDown(); evt.preventDefault(); }); this.scope.register([], 'ArrowRight', () => { this.activateHighlighted(); }); - this.scope.register([], ' ', (evt) => { + this.scope.register([], ' ', evt => { if (this.elementWrapper && this.elementWrapper === document.activeElement) { this.activateHighlighted(); evt.preventDefault(); @@ -60,7 +59,7 @@ export abstract class SelectModal extends Modal { abstract skip(): void; - disableAllOtherElements(elementId: number) { + disableAllOtherElements(elementId: number): void { for (const selectModalElement of this.selectModalElements) { if (selectModalElement.id !== elementId) { selectModalElement.setActive(false); @@ -68,7 +67,7 @@ export abstract class SelectModal extends Modal { } } - deHighlightAllOtherElements(elementId: number) { + deHighlightAllOtherElements(elementId: number): void { for (const selectModalElement of this.selectModalElements) { if (selectModalElement.id !== elementId) { selectModalElement.setHighlighted(false); @@ -76,14 +75,14 @@ export abstract class SelectModal extends Modal { } } - async onOpen() { - const {contentEl, titleEl} = this; + async onOpen(): Promise { + const { contentEl, titleEl } = this; - titleEl.createEl('h2', {text: this.title}); + titleEl.createEl('h2', { text: this.title }); contentEl.addClass('media-db-plugin-select-modal'); - contentEl.createEl('p', {text: this.description}); + contentEl.createEl('p', { text: this.description }); - this.elementWrapper = contentEl.createDiv({cls: 'media-db-plugin-select-wrapper'}); + this.elementWrapper = contentEl.createDiv({ cls: 'media-db-plugin-select-wrapper' }); this.elementWrapper.tabIndex = 0; let i = 0; @@ -123,7 +122,7 @@ export abstract class SelectModal extends Modal { }); } - activateHighlighted() { + activateHighlighted(): void { for (const selectModalElement of this.selectModalElements) { if (selectModalElement.isHighlighted()) { selectModalElement.setActive(!selectModalElement.isActive()); @@ -134,7 +133,7 @@ export abstract class SelectModal extends Modal { } } - highlightUp() { + highlightUp(): void { for (const selectModalElement of this.selectModalElements) { if (selectModalElement.isHighlighted()) { this.getPreviousSelectModalElement(selectModalElement).setHighlighted(true); @@ -146,7 +145,7 @@ export abstract class SelectModal extends Modal { this.selectModalElements.last().setHighlighted(true); } - highlightDown() { + highlightDown(): void { for (const selectModalElement of this.selectModalElements) { if (selectModalElement.isHighlighted()) { this.getNextSelectModalElement(selectModalElement).setHighlighted(true); @@ -171,5 +170,4 @@ export abstract class SelectModal extends Modal { return this.selectModalElements.filter(x => x.id === nextId).first(); } - } diff --git a/src/modals/SelectModalElement.ts b/src/modals/SelectModalElement.ts index 4aadb9e..9b661b7 100644 --- a/src/modals/SelectModalElement.ts +++ b/src/modals/SelectModalElement.ts @@ -1,4 +1,4 @@ -import {SelectModal} from './SelectModal'; +import { SelectModal } from './SelectModal'; export class SelectModalElement { selectModal: SelectModal; @@ -21,7 +21,7 @@ export class SelectModalElement { this.activeClass = 'media-db-plugin-select-element-selected'; this.hoverClass = 'media-db-plugin-select-element-hover'; - this.element = parentElement.createDiv({cls: this.cssClass}); + this.element = parentElement.createDiv({ cls: this.cssClass }); this.element.id = this.getHTMLId(); this.element.on('click', '#' + this.getHTMLId(), () => { this.setActive(!this.active); @@ -45,7 +45,7 @@ export class SelectModalElement { return this.highlighted; } - setHighlighted(value: boolean) { + setHighlighted(value: boolean): void { this.highlighted = value; if (this.highlighted) { this.addClass(this.hoverClass); @@ -83,5 +83,4 @@ export class SelectModalElement { this.element.removeClass(cssClass); } } - } diff --git a/src/models/BoardGameModel.ts b/src/models/BoardGameModel.ts index 9d878a7..70b86e5 100644 --- a/src/models/BoardGameModel.ts +++ b/src/models/BoardGameModel.ts @@ -1,11 +1,15 @@ -import {MediaTypeModel} from './MediaTypeModel'; -import {mediaDbTag, migrateObject} from '../utils/Utils'; -import {MediaType} from '../utils/MediaType'; - +import { MediaTypeModel } from './MediaTypeModel'; +import { mediaDbTag, migrateObject } from '../utils/Utils'; +import { MediaType } from '../utils/MediaType'; export class BoardGameModel extends MediaTypeModel { genres: string[]; onlineRating: number; + complexityRating: number; + minPlayers: number; + maxPlayers: number; + playtime: string; + publishers: string[]; image?: string; released: boolean; @@ -15,14 +19,20 @@ export class BoardGameModel extends MediaTypeModel { personalRating: number; }; - constructor(obj: any = {}) { super(); this.genres = undefined; this.onlineRating = undefined; + this.minPlayers = undefined; + this.maxPlayers = undefined; + this.playtime = undefined; + this.publishers = undefined; + this.complexityRating = undefined; this.image = undefined; + this.released = undefined; + this.userData = { played: undefined, personalRating: undefined, @@ -48,5 +58,4 @@ export class BoardGameModel extends MediaTypeModel { getSummary(): string { return this.englishTitle + ' (' + this.year + ')'; } - } diff --git a/src/models/GameModel.ts b/src/models/GameModel.ts index d85e410..7077ab4 100644 --- a/src/models/GameModel.ts +++ b/src/models/GameModel.ts @@ -1,7 +1,6 @@ -import {MediaTypeModel} from './MediaTypeModel'; -import {mediaDbTag, migrateObject} from '../utils/Utils'; -import {MediaType} from '../utils/MediaType'; - +import { MediaTypeModel } from './MediaTypeModel'; +import { mediaDbTag, migrateObject } from '../utils/Utils'; +import { MediaType } from '../utils/MediaType'; export class GameModel extends MediaTypeModel { genres: string[]; @@ -16,7 +15,6 @@ export class GameModel extends MediaTypeModel { personalRating: number; }; - constructor(obj: any = {}) { super(); @@ -50,5 +48,4 @@ export class GameModel extends MediaTypeModel { getSummary(): string { return this.englishTitle + ' (' + this.year + ')'; } - } diff --git a/src/models/MediaTypeModel.ts b/src/models/MediaTypeModel.ts index 4652ea9..5418c73 100644 --- a/src/models/MediaTypeModel.ts +++ b/src/models/MediaTypeModel.ts @@ -1,4 +1,4 @@ -import {MediaType} from '../utils/MediaType'; +import { MediaType } from '../utils/MediaType'; export abstract class MediaTypeModel { type: string; @@ -12,7 +12,6 @@ export abstract class MediaTypeModel { userData: object; - protected constructor() { this.type = undefined; this.subType = undefined; @@ -33,7 +32,7 @@ export abstract class MediaTypeModel { abstract getTags(): string[]; toMetaDataObject(): object { - return {...this.getWithOutUserData(), ...this.userData, tags: this.getTags().join('/')}; + return { ...this.getWithOutUserData(), ...this.userData, tags: this.getTags().join('/') }; } getWithOutUserData(): object { @@ -41,5 +40,4 @@ export abstract class MediaTypeModel { delete copy.userData; return copy; } - } diff --git a/src/models/MovieModel.ts b/src/models/MovieModel.ts index dbfbedb..83d874f 100644 --- a/src/models/MovieModel.ts +++ b/src/models/MovieModel.ts @@ -1,16 +1,17 @@ -import {MediaTypeModel} from './MediaTypeModel'; -import {mediaDbTag, migrateObject} from '../utils/Utils'; -import {MediaType} from '../utils/MediaType'; - +import { MediaTypeModel } from './MediaTypeModel'; +import { mediaDbTag, migrateObject } from '../utils/Utils'; +import { MediaType } from '../utils/MediaType'; export class MovieModel extends MediaTypeModel { genres: string[]; producer: string; duration: string; onlineRating: number; + actors: string[]; image: string; released: boolean; + streamingServices: string[]; premiere: string; userData: { @@ -26,9 +27,13 @@ export class MovieModel extends MediaTypeModel { this.producer = undefined; this.duration = undefined; this.onlineRating = undefined; + this.actors = undefined; this.image = undefined; + this.released = undefined; + this.streamingServices = undefined; this.premiere = undefined; + this.userData = { watched: undefined, lastWatched: undefined, diff --git a/src/models/MusicReleaseModel.ts b/src/models/MusicReleaseModel.ts index 329a9f6..687bbdc 100644 --- a/src/models/MusicReleaseModel.ts +++ b/src/models/MusicReleaseModel.ts @@ -1,7 +1,6 @@ -import {MediaTypeModel} from './MediaTypeModel'; -import {mediaDbTag, migrateObject} from '../utils/Utils'; -import {MediaType} from '../utils/MediaType'; - +import { MediaTypeModel } from './MediaTypeModel'; +import { mediaDbTag, migrateObject } from '../utils/Utils'; +import { MediaType } from '../utils/MediaType'; export class MusicReleaseModel extends MediaTypeModel { type: string; @@ -50,8 +49,7 @@ export class MusicReleaseModel extends MediaTypeModel { getSummary(): string { let summary = this.title + ' (' + this.year + ')'; - if (this.artists.length > 0) - summary += ' - ' + this.artists.join(', '); + if (this.artists.length > 0) summary += ' - ' + this.artists.join(', '); return summary; } } diff --git a/src/models/SeriesModel.ts b/src/models/SeriesModel.ts index 8058d55..5132f1e 100644 --- a/src/models/SeriesModel.ts +++ b/src/models/SeriesModel.ts @@ -1,7 +1,6 @@ -import {MediaTypeModel} from './MediaTypeModel'; -import {mediaDbTag, migrateObject} from '../utils/Utils'; -import {MediaType} from '../utils/MediaType'; - +import { MediaTypeModel } from './MediaTypeModel'; +import { mediaDbTag, migrateObject } from '../utils/Utils'; +import { MediaType } from '../utils/MediaType'; export class SeriesModel extends MediaTypeModel { type: string; @@ -18,9 +17,11 @@ export class SeriesModel extends MediaTypeModel { episodes: number; duration: string; onlineRating: number; + actors: string[]; image: string; released: boolean; + streamingServices: string[]; airing: boolean; airedFrom: string; airedTo: string; @@ -39,11 +40,15 @@ export class SeriesModel extends MediaTypeModel { this.episodes = undefined; this.duration = undefined; this.onlineRating = undefined; + this.actors = undefined; this.image = undefined; + this.released = undefined; + this.streamingServices = undefined; this.airing = undefined; this.airedFrom = undefined; this.airedTo = undefined; + this.userData = { watched: undefined, lastWatched: undefined, diff --git a/src/models/WikiModel.ts b/src/models/WikiModel.ts index c83b8c2..fa385bc 100644 --- a/src/models/WikiModel.ts +++ b/src/models/WikiModel.ts @@ -1,7 +1,6 @@ -import {MediaTypeModel} from './MediaTypeModel'; -import {mediaDbTag, migrateObject} from '../utils/Utils'; -import {MediaType} from '../utils/MediaType'; - +import { MediaTypeModel } from './MediaTypeModel'; +import { mediaDbTag, migrateObject } from '../utils/Utils'; +import { MediaType } from '../utils/MediaType'; export class WikiModel extends MediaTypeModel { type: string; diff --git a/src/settings/PropertyMapper.ts b/src/settings/PropertyMapper.ts index 24f0419..1ca6a28 100644 --- a/src/settings/PropertyMapper.ts +++ b/src/settings/PropertyMapper.ts @@ -1,5 +1,5 @@ -import {PropertyMappingOption} from './PropertyMapping'; -import {MEDIA_TYPES} from '../utils/MediaTypeManager'; +import { PropertyMappingOption } from './PropertyMapping'; +import { MEDIA_TYPES } from '../utils/MediaTypeManager'; import MediaDbPlugin from '../main'; export class PropertyMapper { @@ -40,7 +40,7 @@ export class PropertyMapper { // @ts-ignore newObj[propertyMapping.newProperty] = value; } else if (propertyMapping.mapping === PropertyMappingOption.Remove) { - + // do nothing } else if (propertyMapping.mapping === PropertyMappingOption.Default) { // @ts-ignore newObj[key] = value; diff --git a/src/settings/PropertyMapping.ts b/src/settings/PropertyMapping.ts index f92f626..ca32c2e 100644 --- a/src/settings/PropertyMapping.ts +++ b/src/settings/PropertyMapping.ts @@ -1,5 +1,5 @@ -import {containsOnlyLettersAndUnderscores, PropertyMappingNameConflictError, PropertyMappingValidationError} from '../utils/Utils'; -import {MediaType} from '../utils/MediaType'; +import { containsOnlyLettersAndUnderscores, PropertyMappingNameConflictError, PropertyMappingValidationError } from '../utils/Utils'; +import { MediaType } from '../utils/MediaType'; export enum PropertyMappingOption { Default = 'default', @@ -18,7 +18,7 @@ export class PropertyMappingModel { this.properties = properties ?? []; } - validate(): { res: boolean, err?: Error } { + validate(): { res: boolean; err?: Error } { console.debug(`MDB | validated property mappings for ${this.type}`); // check properties @@ -43,7 +43,9 @@ export class PropertyMappingModel { // two or more properties are mapped to the same property return { res: false, - err: new PropertyMappingNameConflictError(`Multiple remapped properties (${propertiesWithSameTarget.map(x => x.toString()).toString()}) may not share the same name.`), + err: new PropertyMappingNameConflictError( + `Multiple remapped properties (${propertiesWithSameTarget.map(x => x.toString()).toString()}) may not share the same name.` + ), }; } } @@ -93,7 +95,7 @@ export class PropertyMapping { this.locked = locked ?? false; } - validate(): { res: boolean, err?: Error } { + validate(): { res: boolean; err?: Error } { // locked property may only be default if (this.locked) { if (this.mapping === PropertyMappingOption.Remove) { @@ -111,10 +113,10 @@ export class PropertyMapping { } if (this.mapping === PropertyMappingOption.Default) { - return {res: true}; + return { res: true }; } if (this.mapping === PropertyMappingOption.Remove) { - return {res: true}; + return { res: true }; } if (!this.property || !containsOnlyLettersAndUnderscores(this.property)) { diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts index b3a08bb..4c37060 100644 --- a/src/settings/Settings.ts +++ b/src/settings/Settings.ts @@ -1,49 +1,51 @@ -import {App, Notice, PluginSettingTab, Setting} from 'obsidian'; +import { App, Notice, PluginSettingTab, Setting } from 'obsidian'; import MediaDbPlugin from '../main'; -import {FolderSuggest} from './suggesters/FolderSuggest'; -import {FileSuggest} from './suggesters/FileSuggest'; +import { FolderSuggest } from './suggesters/FolderSuggest'; +import { FileSuggest } from './suggesters/FileSuggest'; import PropertyMappingModelsComponent from './PropertyMappingModelsComponent.svelte'; -import {PropertyMapping, PropertyMappingModel, PropertyMappingOption} from './PropertyMapping'; -import {MEDIA_TYPES} from '../utils/MediaTypeManager'; -import {MediaTypeModel} from '../models/MediaTypeModel'; - +import { PropertyMapping, PropertyMappingModel, PropertyMappingOption } from './PropertyMapping'; +import { MEDIA_TYPES } from '../utils/MediaTypeManager'; +import { MediaTypeModel } from '../models/MediaTypeModel'; export interface MediaDbPluginSettings { - folder: string, - OMDbKey: string, - sfwFilter: boolean, + OMDbKey: string; + sfwFilter: boolean; useCustomYamlStringifier: boolean; - templates: boolean, + templates: boolean; + movieTemplate: string; + seriesTemplate: string; + gameTemplate: string; + wikiTemplate: string; + musicReleaseTemplate: string; + boardgameTemplate: string; - movieTemplate: string, - seriesTemplate: string, - gameTemplate: string, - wikiTemplate: string, - musicReleaseTemplate: string, - boardgameTemplate: string, + movieFileNameTemplate: string; + seriesFileNameTemplate: string; + gameFileNameTemplate: string; + wikiFileNameTemplate: string; + musicReleaseFileNameTemplate: string; + boardgameFileNameTemplate: string; - movieFileNameTemplate: string, - seriesFileNameTemplate: string, - gameFileNameTemplate: string, - wikiFileNameTemplate: string, - musicReleaseFileNameTemplate: string, - boardgameFileNameTemplate: string, + moviePropertyConversionRules: string; + seriesPropertyConversionRules: string; + gamePropertyConversionRules: string; + wikiPropertyConversionRules: string; + musicReleasePropertyConversionRules: string; + boardgamePropertyConversionRules: string; - moviePropertyConversionRules: string, - seriesPropertyConversionRules: string, - gamePropertyConversionRules: string, - wikiPropertyConversionRules: string, - musicReleasePropertyConversionRules: string, - boardgamePropertyConversionRules: string, - - propertyMappingModels: PropertyMappingModel[], + movieFolder: string; + seriesFolder: string; + gameFolder: string; + wikiFolder: string; + musicReleaseFolder: string; + boardgameFolder: string; + propertyMappingModels: PropertyMappingModel[]; } const DEFAULT_SETTINGS: MediaDbPluginSettings = { - folder: 'Media DB', OMDbKey: '', sfwFilter: true, useCustomYamlStringifier: true, @@ -70,13 +72,20 @@ const DEFAULT_SETTINGS: MediaDbPluginSettings = { musicReleasePropertyConversionRules: '', boardgamePropertyConversionRules: '', + movieFolder: 'Media DB/movies', + seriesFolder: 'Media DB/series', + gameFolder: 'Media DB/games', + wikiFolder: 'Media DB/wiki', + musicReleaseFolder: 'Media DB/music', + boardgameFolder: 'Media DB/boardgames', + propertyMappingModels: [], }; export const lockedPropertyMappings: string[] = ['type', 'id', 'dataSource']; export function getDefaultSettings(plugin: MediaDbPlugin): MediaDbPluginSettings { - let defaultSettings = DEFAULT_SETTINGS; + const defaultSettings = DEFAULT_SETTINGS; // construct property mapping defaults const propertyMappingModels: PropertyMappingModel[] = []; @@ -89,9 +98,7 @@ export function getDefaultSettings(plugin: MediaDbPlugin): MediaDbPluginSettings const propertyMappingModel: PropertyMappingModel = new PropertyMappingModel(mediaType); for (const key of Object.keys(metadataObj)) { - propertyMappingModel.properties.push( - new PropertyMapping(key, '', PropertyMappingOption.Default, lockedPropertyMappings.contains(key)), - ); + propertyMappingModel.properties.push(new PropertyMapping(key, '', PropertyMappingOption.Default, lockedPropertyMappings.contains(key))); } propertyMappingModels.push(propertyMappingModel); @@ -110,24 +117,11 @@ export class MediaDbSettingTab extends PluginSettingTab { } display(): void { - const {containerEl} = this; + const { containerEl } = this; containerEl.empty(); - containerEl.createEl('h2', {text: 'Media DB Plugin Settings'}); - - new Setting(containerEl) - .setName('New file location') - .setDesc('New media db entries will be placed here.') - .addSearch(cb => { - new FolderSuggest(this.app, cb.inputEl); - cb.setPlaceholder('Example: folder1/folder2') - .setValue(this.plugin.settings.folder) - .onChange(data => { - this.plugin.settings.folder = data; - this.plugin.saveSettings(); - }); - }); + containerEl.createEl('h2', { text: 'Media DB Plugin Settings' }); new Setting(containerEl) .setName('OMDb API key') @@ -145,37 +139,114 @@ export class MediaDbSettingTab extends PluginSettingTab { .setName('SFW filter') .setDesc('Only shows SFW results for APIs that offer filtering.') .addToggle(cb => { - cb.setValue(this.plugin.settings.sfwFilter) - .onChange(data => { - this.plugin.settings.sfwFilter = data; - this.plugin.saveSettings(); - }); + cb.setValue(this.plugin.settings.sfwFilter).onChange(data => { + this.plugin.settings.sfwFilter = data; + this.plugin.saveSettings(); + }); }); new Setting(containerEl) .setName('YAML formatter') .setDesc('Add optional quotation marks around strings in the metadata block.') .addToggle(cb => { - cb.setValue(this.plugin.settings.useCustomYamlStringifier) - .onChange(data => { - this.plugin.settings.useCustomYamlStringifier = data; - this.plugin.saveSettings(); - }); + cb.setValue(this.plugin.settings.useCustomYamlStringifier).onChange(data => { + this.plugin.settings.useCustomYamlStringifier = data; + this.plugin.saveSettings(); + }); }); new Setting(containerEl) .setName('Resolve {{ tags }} in templates') .setDesc('Whether to resolve {{ tags }} in templates. The spaces inside the curly braces are important.') .addToggle(cb => { - cb.setValue(this.plugin.settings.templates) + cb.setValue(this.plugin.settings.templates).onChange(data => { + this.plugin.settings.templates = data; + this.plugin.saveSettings(); + }); + }); + + containerEl.createEl('h3', { text: 'New File Location' }); + // region new file location + new Setting(containerEl) + .setName('Movie Folder') + .setDesc('Where newly imported movies should be places.') + .addSearch(cb => { + new FolderSuggest(this.app, cb.inputEl); + cb.setPlaceholder(DEFAULT_SETTINGS.movieFolder) + .setValue(this.plugin.settings.movieFolder) .onChange(data => { - this.plugin.settings.templates = data; + this.plugin.settings.movieFolder = data; this.plugin.saveSettings(); }); }); + new Setting(containerEl) + .setName('Series Folder') + .setDesc('Where newly imported series should be places.') + .addSearch(cb => { + new FolderSuggest(this.app, cb.inputEl); + cb.setPlaceholder(DEFAULT_SETTINGS.seriesFolder) + .setValue(this.plugin.settings.seriesFolder) + .onChange(data => { + this.plugin.settings.seriesFolder = data; + this.plugin.saveSettings(); + }); + }); - containerEl.createEl('h3', {text: 'Template Settings'}); + new Setting(containerEl) + .setName('Game Folder') + .setDesc('Where newly imported games should be places.') + .addSearch(cb => { + new FolderSuggest(this.app, cb.inputEl); + cb.setPlaceholder(DEFAULT_SETTINGS.gameFolder) + .setValue(this.plugin.settings.gameFolder) + .onChange(data => { + this.plugin.settings.gameFolder = data; + this.plugin.saveSettings(); + }); + }); + + new Setting(containerEl) + .setName('Wiki Folder') + .setDesc('Where newly imported wiki articles should be places.') + .addSearch(cb => { + new FolderSuggest(this.app, cb.inputEl); + cb.setPlaceholder(DEFAULT_SETTINGS.wikiFolder) + .setValue(this.plugin.settings.wikiFolder) + .onChange(data => { + this.plugin.settings.wikiFolder = data; + this.plugin.saveSettings(); + }); + }); + + new Setting(containerEl) + .setName('Music Folder') + .setDesc('Where newly imported music should be places.') + .addSearch(cb => { + new FolderSuggest(this.app, cb.inputEl); + cb.setPlaceholder(DEFAULT_SETTINGS.musicReleaseFolder) + .setValue(this.plugin.settings.musicReleaseFolder) + .onChange(data => { + this.plugin.settings.musicReleaseFolder = data; + this.plugin.saveSettings(); + }); + }); + + new Setting(containerEl) + .setName('Board Game Folder') + .setDesc('Where newly imported board games should be places.') + .addSearch(cb => { + new FileSuggest(this.app, cb.inputEl); + cb.setPlaceholder(DEFAULT_SETTINGS.boardgameFolder) + .setValue(this.plugin.settings.boardgameFolder) + .onChange(data => { + this.plugin.settings.boardgameFolder = data; + this.plugin.saveSettings(); + }); + }); + // endregion + + containerEl.createEl('h3', { text: 'Template Settings' }); // region templates new Setting(containerEl) .setName('Movie template') @@ -256,7 +327,7 @@ export class MediaDbSettingTab extends PluginSettingTab { }); // endregion - containerEl.createEl('h3', {text: 'File Name Settings'}); + containerEl.createEl('h3', { text: 'File Name Settings' }); // region file name templates new Setting(containerEl) .setName('Movie file name template') @@ -333,9 +404,9 @@ export class MediaDbSettingTab extends PluginSettingTab { // region Property Mappings - containerEl.createEl('h3', {text: 'Property Mappings'}); + containerEl.createEl('h3', { text: 'Property Mappings' }); - let propertyMappingExplanation = containerEl.createEl('div'); + const propertyMappingExplanation = containerEl.createEl('div'); propertyMappingExplanation.innerHTML = `

Allow you to remap the metadata fields of newly created media db entries.

@@ -350,13 +421,12 @@ export class MediaDbSettingTab extends PluginSettingTab { Don't forget to save your changes using the save button for each individual category.

`; - new PropertyMappingModelsComponent({ target: this.containerEl, props: { models: this.plugin.settings.propertyMappingModels.map(x => x.copy()), - save: (model: PropertyMappingModel) => { - let propertyMappingModels: PropertyMappingModel[] = []; + save: (model: PropertyMappingModel): void => { + const propertyMappingModels: PropertyMappingModel[] = []; for (const model2 of this.plugin.settings.propertyMappingModels) { if (model2.type === model.type) { @@ -374,7 +444,5 @@ export class MediaDbSettingTab extends PluginSettingTab { }); // endregion - } - } diff --git a/src/settings/suggesters/FileSuggest.ts b/src/settings/suggesters/FileSuggest.ts index a54595b..8da7802 100644 --- a/src/settings/suggesters/FileSuggest.ts +++ b/src/settings/suggesters/FileSuggest.ts @@ -1,5 +1,5 @@ -import {TextInputSuggest} from './Suggest'; -import {TAbstractFile, TFile} from 'obsidian'; +import { TextInputSuggest } from './Suggest'; +import { TAbstractFile, TFile } from 'obsidian'; export class FileSuggest extends TextInputSuggest { getSuggestions(inputStr: string): TFile[] { diff --git a/src/settings/suggesters/FolderSuggest.ts b/src/settings/suggesters/FolderSuggest.ts index 713d184..4164bd7 100644 --- a/src/settings/suggesters/FolderSuggest.ts +++ b/src/settings/suggesters/FolderSuggest.ts @@ -1,7 +1,7 @@ // Credits go to Liam's Periodic Notes Plugin: https://github.com/liamcain/obsidian-periodic-notes -import {TAbstractFile, TFolder} from 'obsidian'; -import {TextInputSuggest} from './Suggest'; +import { TAbstractFile, TFolder } from 'obsidian'; +import { TextInputSuggest } from './Suggest'; export class FolderSuggest extends TextInputSuggest { getSuggestions(inputStr: string): TFolder[] { @@ -10,10 +10,7 @@ export class FolderSuggest extends TextInputSuggest { const lowerCaseInputStr = inputStr.toLowerCase(); abstractFiles.forEach((folder: TAbstractFile) => { - if ( - folder instanceof TFolder && - folder.path.toLowerCase().contains(lowerCaseInputStr) - ) { + if (folder instanceof TFolder && folder.path.toLowerCase().contains(lowerCaseInputStr)) { folders.push(folder); } }); diff --git a/src/settings/suggesters/Suggest.ts b/src/settings/suggesters/Suggest.ts index cd5ce70..331db6b 100644 --- a/src/settings/suggesters/Suggest.ts +++ b/src/settings/suggesters/Suggest.ts @@ -1,8 +1,8 @@ // Credits go to Liam's Periodic Notes Plugin: https://github.com/liamcain/obsidian-periodic-notes -import {App, ISuggestOwner, Scope} from 'obsidian'; -import {createPopper, Instance as PopperInstance} from '@popperjs/core'; -import {wrapAround} from 'src/utils/Utils'; +import { App, ISuggestOwner, Scope } from 'obsidian'; +import { createPopper, Instance as PopperInstance } from '@popperjs/core'; +import { wrapAround } from 'src/utils/Utils'; export class Suggest { private owner: ISuggestOwner; @@ -16,27 +16,23 @@ export class Suggest { this.containerEl = containerEl; containerEl.on('click', '.suggestion-item', this.onSuggestionClick.bind(this)); - containerEl.on( - 'mousemove', - '.suggestion-item', - this.onSuggestionMouseover.bind(this), - ); + containerEl.on('mousemove', '.suggestion-item', this.onSuggestionMouseover.bind(this)); - scope.register([], 'ArrowUp', (event) => { + scope.register([], 'ArrowUp', event => { if (!event.isComposing) { this.setSelectedItem(this.selectedItem - 1, true); return false; } }); - scope.register([], 'ArrowDown', (event) => { + scope.register([], 'ArrowDown', event => { if (!event.isComposing) { this.setSelectedItem(this.selectedItem + 1, true); return false; } }); - scope.register([], 'Enter', (event) => { + scope.register([], 'Enter', event => { if (!event.isComposing) { this.useSelectedItem(event); return false; @@ -57,11 +53,11 @@ export class Suggest { this.setSelectedItem(item, false); } - setSuggestions(values: T[]) { + setSuggestions(values: T[]): void { this.containerEl.empty(); const suggestionEls: HTMLDivElement[] = []; - values.forEach((value) => { + values.forEach(value => { const suggestionEl = this.containerEl.createDiv('suggestion-item'); this.owner.renderSuggestion(value, suggestionEl); suggestionEls.push(suggestionEl); @@ -72,14 +68,14 @@ export class Suggest { this.setSelectedItem(0, false); } - useSelectedItem(event: MouseEvent | KeyboardEvent) { + useSelectedItem(event: MouseEvent | KeyboardEvent): void { const currentValue = this.values[this.selectedItem]; if (currentValue) { this.owner.selectSuggestion(currentValue, event); } } - setSelectedItem(selectedIndex: number, scrollIntoView: boolean) { + setSelectedItem(selectedIndex: number, scrollIntoView: boolean): void { const normalizedIndex = this.suggestions.length > 0 ? wrapAround(selectedIndex, this.suggestions.length) : 0; const prevSelectedSuggestion = this.suggestions[this.selectedItem]; const selectedSuggestion = this.suggestions[normalizedIndex]; @@ -145,7 +141,7 @@ export abstract class TextInputSuggest implements ISuggestOwner { { name: 'sameWidth', enabled: true, - fn: ({state, instance}) => { + fn: ({ state, instance }): void => { // Note: positioning needs to be calculated twice - // first pass - positioning it according to the width of the popper // second pass - position it with the width bound to the reference element diff --git a/src/tests/ParameterizedAPI.test.ts b/src/tests/ParameterizedAPI.test.ts index 72b2549..fe10037 100644 --- a/src/tests/ParameterizedAPI.test.ts +++ b/src/tests/ParameterizedAPI.test.ts @@ -1,13 +1,13 @@ -import fetchMock, {enableFetchMocks} from 'jest-fetch-mock'; -import {MediaDbPluginSettings} from 'src/settings/Settings'; -import {LocGovAPI} from '../api/apis/LocGovAPI'; -import {MALAPI} from '../api/apis/MALAPI'; -import {MusicBrainzAPI} from '../api/apis/MusicBrainzAPI'; -import {OMDbAPI} from '../api/apis/OMDbAPI'; -import {SteamAPI} from '../api/apis/SteamAPI'; -import {WikipediaAPI} from '../api/apis/WikipediaAPI'; +import fetchMock, { enableFetchMocks } from 'jest-fetch-mock'; +import { MediaDbPluginSettings } from 'src/settings/Settings'; +import { LocGovAPI } from '../api/apis/LocGovAPI'; +import { MALAPI } from '../api/apis/MALAPI'; +import { MusicBrainzAPI } from '../api/apis/MusicBrainzAPI'; +import { OMDbAPI } from '../api/apis/OMDbAPI'; +import { SteamAPI } from '../api/apis/SteamAPI'; +import { WikipediaAPI } from '../api/apis/WikipediaAPI'; import MediaDbPlugin from '../main'; -import {setMALResponseMock, setMusicBrainzResponseMock, setOMDbResponseMock, setSteamResponseMock, setWikipediaResponseMock} from './mockHelpers'; +import { setMALResponseMock, setMusicBrainzResponseMock, setOMDbResponseMock, setSteamResponseMock, setWikipediaResponseMock } from './mockHelpers'; import MALMockMovie from './ResponseMocks/MALMockMovie.json'; import MusicBrainzResponseMock from './ResponseMocks/MusicBrainzMockResponse.json'; import OMDBMockMovie from './ResponseMocks/OMDBMockResponse.json'; @@ -17,94 +17,88 @@ import WikipediaMockResponse from './ResponseMocks/WikipediaMockResponse.json'; enableFetchMocks(); export let apiMock: OMDbAPI | MALAPI | LocGovAPI | MusicBrainzAPI | SteamAPI | WikipediaAPI; -describe.each( - [ - {name: OMDbAPI}, - {name: MALAPI}, - {name: LocGovAPI}, - {name: MusicBrainzAPI}, - {name: SteamAPI}, - {name: WikipediaAPI}, - ], -)('$name.name', ({name: parameterizedApi}) => { - beforeAll(() => { - let settingsMock: MediaDbPluginSettings = {} as MediaDbPluginSettings; - let pluginMock = {} as MediaDbPlugin; - pluginMock.settings = settingsMock; - // TODO: add fake API key? - apiMock = new parameterizedApi(pluginMock); - }); - - beforeEach(() => { - fetchMock.resetMocks(); - }); - - test('searchByTitle behavior when API returns garbage data', async () => { - const garbageResponse = JSON.stringify({ - data: 'string', +describe.each([{ name: OMDbAPI }, { name: MALAPI }, { name: LocGovAPI }, { name: MusicBrainzAPI }, { name: SteamAPI }, { name: WikipediaAPI }])( + '$name.name', + ({ name: parameterizedApi }) => { + beforeAll(() => { + let settingsMock: MediaDbPluginSettings = {} as MediaDbPluginSettings; + let pluginMock = {} as MediaDbPlugin; + pluginMock.settings = settingsMock; + // TODO: add fake API key? + apiMock = new parameterizedApi(pluginMock); }); - fetchMock.mockResponseOnce(garbageResponse); - await expect(apiMock.searchByTitle('sample')).resolves.toEqual([]); - // } - expect(fetch).toHaveBeenCalledTimes(1); - }); - test('searchByTitle behavior when requestUrl/fetch returns 401', async () => { - let sampleResponse = { - data: 'string', - }; - fetchMock.mockResponse(JSON.stringify(sampleResponse), {status: 401}); - // TODO: Check API name and fix message - // TODO: Externalize string - await expect(apiMock.searchByTitle('sample')).rejects.toThrow(`MDB | Received status code ${401} from an API.`); - expect(fetchMock).toHaveBeenCalledTimes(1); - }); + beforeEach(() => { + fetchMock.resetMocks(); + }); - test('searchByTitle behavior when requestUrl/fetch returns 403', async () => { - let sampleResponse = { - data: 'string', - }; - fetchMock.mockResponse(JSON.stringify(sampleResponse), {status: 403}); - // TODO: Check API name and fix message - // TODO: Externalize string/import? - await expect(apiMock.searchByTitle('sample')).rejects.toThrow(`MDB | Received status code ${403} from an API.`); - expect(fetchMock).toHaveBeenCalledTimes(1); - }); + test('searchByTitle behavior when API returns garbage data', async () => { + const garbageResponse = JSON.stringify({ + data: 'string', + }); + fetchMock.mockResponseOnce(garbageResponse); + await expect(apiMock.searchByTitle('sample')).resolves.toEqual([]); + // } + expect(fetch).toHaveBeenCalledTimes(1); + }); - test('searchByTitle behavior when requestUrl/fetch returns 200', async () => { - let sampleResponse; - let ret; - switch (parameterizedApi) { - case OMDbAPI: - ret = setOMDbResponseMock(); - sampleResponse = OMDBMockMovie; - break; - case WikipediaAPI: - ret = setWikipediaResponseMock(); - sampleResponse = WikipediaMockResponse; - break; - case MALAPI: - // TODO: MAL needs more tests for different types of content - ret = setMALResponseMock(); - sampleResponse = MALMockMovie; - case LocGovAPI: - // TODO: Add soon - break; - case SteamAPI: - sampleResponse = SteamAPIResponseMock; - ret = setSteamResponseMock(); - break; - case MusicBrainzAPI: - sampleResponse = MusicBrainzResponseMock; - ret = setMusicBrainzResponseMock(); - break; - default: - throw Error(); - } - fetchMock.mockResponse(JSON.stringify(sampleResponse), {status: 200}); - // TODO: Check API name and fix message - // TODO: Externalize string - await expect(apiMock.searchByTitle('Hooking Season Playtest')).resolves.toEqual(ret); - expect(fetchMock).toHaveBeenCalledTimes(1); - }); -}); + test('searchByTitle behavior when requestUrl/fetch returns 401', async () => { + let sampleResponse = { + data: 'string', + }; + fetchMock.mockResponse(JSON.stringify(sampleResponse), { status: 401 }); + // TODO: Check API name and fix message + // TODO: Externalize string + await expect(apiMock.searchByTitle('sample')).rejects.toThrow(`MDB | Received status code ${401} from an API.`); + expect(fetchMock).toHaveBeenCalledTimes(1); + }); + + test('searchByTitle behavior when requestUrl/fetch returns 403', async () => { + let sampleResponse = { + data: 'string', + }; + fetchMock.mockResponse(JSON.stringify(sampleResponse), { status: 403 }); + // TODO: Check API name and fix message + // TODO: Externalize string/import? + await expect(apiMock.searchByTitle('sample')).rejects.toThrow(`MDB | Received status code ${403} from an API.`); + expect(fetchMock).toHaveBeenCalledTimes(1); + }); + + test('searchByTitle behavior when requestUrl/fetch returns 200', async () => { + let sampleResponse; + let ret; + switch (parameterizedApi) { + case OMDbAPI: + ret = setOMDbResponseMock(); + sampleResponse = OMDBMockMovie; + break; + case WikipediaAPI: + ret = setWikipediaResponseMock(); + sampleResponse = WikipediaMockResponse; + break; + case MALAPI: + // TODO: MAL needs more tests for different types of content + ret = setMALResponseMock(); + sampleResponse = MALMockMovie; + case LocGovAPI: + // TODO: Add soon + break; + case SteamAPI: + sampleResponse = SteamAPIResponseMock; + ret = setSteamResponseMock(); + break; + case MusicBrainzAPI: + sampleResponse = MusicBrainzResponseMock; + ret = setMusicBrainzResponseMock(); + break; + default: + throw Error(); + } + fetchMock.mockResponse(JSON.stringify(sampleResponse), { status: 200 }); + // TODO: Check API name and fix message + // TODO: Externalize string + await expect(apiMock.searchByTitle('Hooking Season Playtest')).resolves.toEqual(ret); + expect(fetchMock).toHaveBeenCalledTimes(1); + }); + } +); diff --git a/src/tests/ResponseMocks/MALMockMovie.json b/src/tests/ResponseMocks/MALMockMovie.json index b4d2ccf..7a605fb 100644 --- a/src/tests/ResponseMocks/MALMockMovie.json +++ b/src/tests/ResponseMocks/MALMockMovie.json @@ -27,4 +27,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/tests/TestAPI.ts b/src/tests/TestAPI.ts index 19beadf..db7d11e 100644 --- a/src/tests/TestAPI.ts +++ b/src/tests/TestAPI.ts @@ -1,11 +1,10 @@ -import {APIModel} from '../api/APIModel'; -import {MediaTypeModel} from '../models/MediaTypeModel'; +import { APIModel } from '../api/APIModel'; +import { MediaTypeModel } from '../models/MediaTypeModel'; import MediaDbPlugin from '../main'; export class TestAPI extends APIModel { plugin: MediaDbPlugin; - constructor(plugin: MediaDbPlugin) { super(); @@ -16,7 +15,6 @@ export class TestAPI extends APIModel { this.types = []; } - async getById(id: string): Promise { return undefined; } diff --git a/src/tests/mockHelpers.ts b/src/tests/mockHelpers.ts index ec763e3..4ac179f 100644 --- a/src/tests/mockHelpers.ts +++ b/src/tests/mockHelpers.ts @@ -1,9 +1,9 @@ -import {GameModel} from '../models/GameModel'; -import {MovieModel} from '../models/MovieModel'; -import {MusicReleaseModel} from '../models/MusicReleaseModel'; -import {WikiModel} from '../models/WikiModel'; -import {MediaType} from '../utils/MediaType'; -import {apiMock} from './ParameterizedAPI.test'; +import { GameModel } from '../models/GameModel'; +import { MovieModel } from '../models/MovieModel'; +import { MusicReleaseModel } from '../models/MusicReleaseModel'; +import { WikiModel } from '../models/WikiModel'; +import { MediaType } from '../utils/MediaType'; +import { apiMock } from './ParameterizedAPI.test'; import MALMockMovie from './ResponseMocks/MALMockMovie.json'; import MusicBrainzResponseMock from './ResponseMocks/MusicBrainzMockResponse.json'; import OMDBMockMovie from './ResponseMocks/OMDBMockResponse.json'; @@ -13,73 +13,83 @@ import WikipediaMockResponse from './ResponseMocks/WikipediaMockResponse.json'; export function setWikipediaResponseMock() { let ret = []; let wikiresponse = WikipediaMockResponse.query.search[0]; - ret.push(new WikiModel({ - type: 'wiki', - title: wikiresponse.title, - englishTitle: wikiresponse.title, - year: '', - dataSource: apiMock.apiName, - id: wikiresponse.pageid, - })); + ret.push( + new WikiModel({ + type: 'wiki', + title: wikiresponse.title, + englishTitle: wikiresponse.title, + year: '', + dataSource: apiMock.apiName, + id: wikiresponse.pageid, + }) + ); return ret; } export function setOMDbResponseMock() { let ret = []; let omdbresponse = OMDBMockMovie.Search[0]; - ret.push(new MovieModel({ - type: 'wiki', - title: omdbresponse.Title, - englishTitle: omdbresponse.Title, - year: omdbresponse.Year, - dataSource: apiMock.apiName, - id: omdbresponse.imdbID, - })); + ret.push( + new MovieModel({ + type: 'wiki', + title: omdbresponse.Title, + englishTitle: omdbresponse.Title, + year: omdbresponse.Year, + dataSource: apiMock.apiName, + id: omdbresponse.imdbID, + }) + ); return ret; } export function setMALResponseMock() { let ret = []; let result = MALMockMovie.data[0]; - ret.push(new MovieModel({ - type: result.type, - title: result.title, - englishTitle: result.title_english, - year: result.aired.prop.from.year, - dataSource: apiMock.apiName, - id: result.mal_id, - })); + ret.push( + new MovieModel({ + type: result.type, + title: result.title, + englishTitle: result.title_english, + year: result.aired.prop.from.year, + dataSource: apiMock.apiName, + id: result.mal_id, + }) + ); return ret; } export function setSteamResponseMock() { let ret = []; let steamResponse = SteamAPIResponseMock.applist.apps[0]; - ret.push(new GameModel({ - type: MediaType.Game, - title: steamResponse.name, - englishTitle: steamResponse.name, - year: '', - dataSource: apiMock.apiName, - id: steamResponse.appid, - })); + ret.push( + new GameModel({ + type: MediaType.Game, + title: steamResponse.name, + englishTitle: steamResponse.name, + year: '', + dataSource: apiMock.apiName, + id: steamResponse.appid, + }) + ); return ret; } export function setMusicBrainzResponseMock() { let ret = []; let result = MusicBrainzResponseMock['release-groups'][0]; - ret.push(new MusicReleaseModel({ - type: 'musicRelease', - title: result.title, - englishTitle: result.title, - year: (new Date(result['first-release-date'])).getFullYear().toString(), - dataSource: apiMock.apiName, - url: '', - id: result.id, + ret.push( + new MusicReleaseModel({ + type: 'musicRelease', + title: result.title, + englishTitle: result.title, + year: new Date(result['first-release-date']).getFullYear().toString(), + dataSource: apiMock.apiName, + url: '', + id: result.id, - artists: result['artist-credit'].map((a: any) => a.name), - subType: result['primary-type'], - } as MusicReleaseModel)); + artists: result['artist-credit'].map((a: any) => a.name), + subType: result['primary-type'], + } as MusicReleaseModel) + ); return ret; } diff --git a/src/tests/utils.test.ts b/src/tests/utils.test.ts index eb9bbd1..f8a422c 100644 --- a/src/tests/utils.test.ts +++ b/src/tests/utils.test.ts @@ -1,4 +1,4 @@ -import {containsOnlyLettersAndUnderscores, replaceIllegalFileNameCharactersInString, wrapAround} from '../utils/Utils'; +import { containsOnlyLettersAndUnderscores, replaceIllegalFileNameCharactersInString, wrapAround } from '../utils/Utils'; test('If wrapAround wraps correctly', () => { expect(wrapAround(100, 5)).toBe(0); diff --git a/src/utils/IconList.ts b/src/utils/IconList.ts new file mode 100644 index 0000000..c98aa75 --- /dev/null +++ b/src/utils/IconList.ts @@ -0,0 +1,1185 @@ +// credits to phibr0 on discord +export const ICON_LIST = [ + 'activity', + 'airplay', + 'alarm-check', + 'alarm-clock-off', + 'alarm-clock', + 'alarm-minus', + 'alarm-plus', + 'album', + 'alert-circle', + 'alert-octagon', + 'alert-triangle', + 'align-center-horizontal', + 'align-center-vertical', + 'align-center', + 'align-end-horizontal', + 'align-end-vertical', + 'align-horizontal-distribute-center', + 'align-horizontal-distribute-end', + 'align-horizontal-distribute-start', + 'align-horizontal-justify-center', + 'align-horizontal-justify-end', + 'align-horizontal-justify-start', + 'align-horizontal-space-around', + 'align-horizontal-space-between', + 'align-justify', + 'align-left', + 'align-right', + 'align-start-horizontal', + 'align-start-vertical', + 'align-vertical-distribute-center', + 'align-vertical-distribute-end', + 'align-vertical-distribute-start', + 'align-vertical-justify-center', + 'align-vertical-justify-end', + 'align-vertical-justify-start', + 'align-vertical-space-around', + 'align-vertical-space-between', + 'anchor', + 'aperture', + 'archive', + 'arrow-big-down', + 'arrow-big-left', + 'arrow-big-right', + 'arrow-big-up', + 'arrow-down-circle', + 'arrow-down-left', + 'arrow-down-right', + 'arrow-down', + 'arrow-left-circle', + 'arrow-left-right', + 'arrow-left', + 'arrow-right-circle', + 'arrow-right', + 'arrow-up-circle', + 'arrow-up-left', + 'arrow-up-right', + 'arrow-up', + 'asterisk', + 'at-sign', + 'award', + 'axe', + 'banknote', + 'bar-chart-2', + 'bar-chart', + 'baseline', + 'battery-charging', + 'battery-full', + 'battery-low', + 'battery-medium', + 'battery', + 'beaker', + 'bell-minus', + 'bell-off', + 'bell-plus', + 'bell-ring', + 'bell', + 'bike', + 'binary', + 'bitcoin', + 'bluetooth-connected', + 'bluetooth-off', + 'bluetooth-searching', + 'bluetooth', + 'bold', + 'book-open', + 'book', + 'bookmark-minus', + 'bookmark-plus', + 'bookmark', + 'bot', + 'box-select', + 'box', + 'briefcase', + 'brush', + 'bug', + 'building-2', + 'building', + 'bus', + 'calculator', + 'calendar', + 'camera-off', + 'camera', + 'car', + 'carrot', + 'cast', + 'check-circle-2', + 'check-circle', + 'check-square', + 'check', + 'chevron-down', + 'chevron-first', + 'chevron-last', + 'chevron-left', + 'chevron-right', + 'chevron-up', + 'chevrons-down-up', + 'chevrons-down', + 'chevrons-left', + 'chevrons-right', + 'chevrons-up-down', + 'chevrons-up', + 'chrome', + 'circle-slashed', + 'circle', + 'clipboard-check', + 'clipboard-copy', + 'clipboard-list', + 'clipboard-x', + 'clipboard', + 'clock-1', + 'clock-10', + 'clock-11', + 'clock-12', + 'clock-2', + 'clock-3', + 'clock-4', + 'clock-5', + 'clock-6', + 'clock-7', + 'clock-8', + 'clock-9', + 'clock', + 'cloud-drizzle', + 'cloud-fog', + 'cloud-hail', + 'cloud-lightning', + 'cloud-moon', + 'cloud-off', + 'cloud-rain-wind', + 'cloud-rain', + 'cloud-snow', + 'cloud-sun', + 'cloud', + 'cloudy', + 'clover', + 'code-2', + 'code', + 'codepen', + 'codesandbox', + 'coffee', + 'coins', + 'columns', + 'command', + 'compass', + 'contact', + 'contrast', + 'cookie', + 'copy', + 'copyleft', + 'copyright', + 'corner-down-left', + 'corner-down-right', + 'corner-left-down', + 'corner-left-up', + 'corner-right-down', + 'corner-right-up', + 'corner-up-left', + 'corner-up-right', + 'cpu', + 'credit-card', + 'crop', + 'cross', + 'crosshair', + 'crown', + 'currency', + 'database', + 'delete', + 'dice-1', + 'dice-2', + 'dice-3', + 'dice-4', + 'dice-5', + 'dice-6', + 'disc', + 'divide-circle', + 'divide-square', + 'divide', + 'dollar-sign', + 'download-cloud', + 'download', + 'dribbble', + 'droplet', + 'droplets', + 'drumstick', + 'edit-2', + 'edit-3', + 'edit', + 'egg', + 'equal-not', + 'equal', + 'eraser', + 'euro', + 'expand', + 'external-link', + 'eye-off', + 'eye', + 'facebook', + 'fast-forward', + 'feather', + 'figma', + 'file-check-2', + 'file-check', + 'file-code', + 'file-digit', + 'file-input', + 'file-minus-2', + 'file-minus', + 'file-output', + 'file-plus-2', + 'file-plus', + 'file-search', + 'file-text', + 'file-x-2', + 'file-x', + 'file', + 'files', + 'film', + 'filter', + 'flag-off', + 'flag-triangle-left', + 'flag-triangle-right', + 'flag', + 'flame', + 'flashlight-off', + 'flashlight', + 'flask-conical', + 'flask-round', + 'folder-minus', + 'folder-open', + 'folder-plus', + 'folder', + 'form-input', + 'forward', + 'frame', + 'framer', + 'frown', + 'function-square', + 'gamepad-2', + 'gamepad', + 'gauge', + 'gavel', + 'gem', + 'ghost', + 'gift', + 'git-branch-plus', + 'git-branch', + 'git-commit', + 'git-fork', + 'git-merge', + 'git-pull-request', + 'github', + 'gitlab', + 'glasses', + 'globe-2', + 'globe', + 'grab', + 'graduation-cap', + 'grid', + 'grip-horizontal', + 'grip-vertical', + 'hammer', + 'hand-metal', + 'hand', + 'hard-drive', + 'hard-hat', + 'hash', + 'haze', + 'headphones', + 'heart', + 'help-circle', + 'hexagon', + 'highlighter', + 'history', + 'home', + 'image-minus', + 'image-off', + 'image-plus', + 'image', + 'import', + 'inbox', + 'indent', + 'indian-rupee', + 'infinity', + 'info', + 'inspect', + 'instagram', + 'italic', + 'japanese-yen', + 'key', + 'keyboard', + 'landmark', + 'languages', + 'laptop-2', + 'laptop', + 'lasso-select', + 'lasso', + 'layers', + 'layout-dashboard', + 'layout-grid', + 'layout-list', + 'layout-template', + 'layout', + 'library', + 'life-buoy', + 'lightbulb-off', + 'lightbulb', + 'link-2-off', + 'link-2', + 'link', + 'linkedin', + 'list-checks', + 'list-minus', + 'list-ordered', + 'list-plus', + 'list-x', + 'list', + 'loader-2', + 'loader', + 'locate-fixed', + 'locate-off', + 'locate', + 'lock', + 'log-in', + 'log-out', + 'mail', + 'map-pin', + 'map', + 'maximize-2', + 'maximize', + 'megaphone', + 'meh', + 'menu', + 'message-circle', + 'message-square', + 'mic-off', + 'mic', + 'minimize-2', + 'minimize', + 'minus-circle', + 'minus-square', + 'minus', + 'monitor-off', + 'monitor-speaker', + 'monitor', + 'moon', + 'more-horizontal', + 'more-vertical', + 'mountain-snow', + 'mountain', + 'mouse-pointer-2', + 'mouse-pointer-click', + 'mouse-pointer', + 'mouse', + 'move-diagonal-2', + 'move-diagonal', + 'move-horizontal', + 'move-vertical', + 'move', + 'music', + 'navigation-2', + 'navigation', + 'network', + 'octagon', + 'option', + 'outdent', + 'package-check', + 'package-minus', + 'package-plus', + 'package-search', + 'package-x', + 'package', + 'palette', + 'palmtree', + 'paperclip', + 'pause-circle', + 'pause-octagon', + 'pause', + 'pen-tool', + 'pencil', + 'percent', + 'person-standing', + 'phone-call', + 'phone-forwarded', + 'phone-incoming', + 'phone-missed', + 'phone-off', + 'phone-outgoing', + 'phone', + 'pie-chart', + 'piggy-bank', + 'pin', + 'pipette', + 'plane', + 'play-circle', + 'play', + 'plug-zap', + 'plus-circle', + 'plus-square', + 'plus', + 'pocket', + 'podcast', + 'pointer', + 'pound-sterling', + 'power-off', + 'power', + 'printer', + 'qr-code', + 'quote', + 'radio-receiver', + 'radio', + 'redo', + 'refresh-ccw', + 'refresh-cw', + 'regex', + 'repeat-1', + 'repeat', + 'reply-all', + 'reply', + 'rewind', + 'rocket', + 'rocking-chair', + 'rotate-ccw', + 'rotate-cw', + 'rss', + 'ruler', + 'russian-ruble', + 'save', + 'scale', + 'scan-line', + 'scan', + 'scissors', + 'screen-share-off', + 'screen-share', + 'search', + 'send', + 'separator-horizontal', + 'separator-vertical', + 'server-crash', + 'server-off', + 'server', + 'settings-2', + 'settings', + 'share-2', + 'share', + 'sheet', + 'shield-alert', + 'shield-check', + 'shield-close', + 'shield-off', + 'shield', + 'shirt', + 'shopping-bag', + 'shopping-cart', + 'shovel', + 'shrink', + 'shuffle', + 'sidebar-close', + 'sidebar-open', + 'sidebar', + 'sigma', + 'signal-high', + 'signal-low', + 'signal-medium', + 'signal-zero', + 'signal', + 'skip-back', + 'skip-forward', + 'skull', + 'slack', + 'slash', + 'sliders', + 'smartphone-charging', + 'smartphone', + 'smile', + 'snowflake', + 'sort-asc', + 'sort-desc', + 'speaker', + 'sprout', + 'square', + 'star-half', + 'star', + 'stop-circle', + 'stretch-horizontal', + 'stretch-vertical', + 'strikethrough', + 'subscript', + 'sun', + 'sunrise', + 'sunset', + 'superscript', + 'swiss-franc', + 'switch-camera', + 'table', + 'tablet', + 'tag', + 'target', + 'tent', + 'terminal-square', + 'terminal', + 'text-cursor-input', + 'text-cursor', + 'thermometer-snowflake', + 'thermometer-sun', + 'thermometer', + 'thumbs-down', + 'thumbs-up', + 'ticket', + 'timer-off', + 'timer-reset', + 'timer', + 'toggle-left', + 'toggle-right', + 'tornado', + 'trash-2', + 'trash', + 'trello', + 'trending-down', + 'trending-up', + 'triangle', + 'truck', + 'tv-2', + 'tv', + 'twitch', + 'twitter', + 'type', + 'umbrella', + 'underline', + 'undo', + 'unlink-2', + 'unlink', + 'unlock', + 'upload-cloud', + 'upload', + 'user-check', + 'user-minus', + 'user-plus', + 'user-x', + 'user', + 'users', + 'verified', + 'vibrate', + 'video-off', + 'video', + 'view', + 'voicemail', + 'volume-1', + 'volume-2', + 'volume-x', + 'volume', + 'wallet', + 'wand', + 'watch', + 'waves', + 'webcam', + 'wifi-off', + 'wifi', + 'wind', + 'wrap-text', + 'wrench', + 'x-circle', + 'x-octagon', + 'x-square', + 'x', + 'youtube', + 'zap-off', + 'zap', + 'zoom-in', + 'zoom-out', + 'search-large', + 'search', + 'activity', + 'airplay', + 'alarm-check', + 'alarm-clock-off', + 'alarm-clock', + 'alarm-minus', + 'alarm-plus', + 'album', + 'alert-circle', + 'alert-octagon', + 'alert-triangle', + 'align-center-horizontal', + 'align-center-vertical', + 'align-center', + 'align-end-horizontal', + 'align-end-vertical', + 'align-horizontal-distribute-center', + 'align-horizontal-distribute-end', + 'align-horizontal-distribute-start', + 'align-horizontal-justify-center', + 'align-horizontal-justify-end', + 'align-horizontal-justify-start', + 'align-horizontal-space-around', + 'align-horizontal-space-between', + 'align-justify', + 'align-left', + 'align-right', + 'align-start-horizontal', + 'align-start-vertical', + 'align-vertical-distribute-center', + 'align-vertical-distribute-end', + 'align-vertical-distribute-start', + 'align-vertical-justify-center', + 'align-vertical-justify-end', + 'align-vertical-justify-start', + 'align-vertical-space-around', + 'align-vertical-space-between', + 'anchor', + 'aperture', + 'archive', + 'arrow-big-down', + 'arrow-big-left', + 'arrow-big-right', + 'arrow-big-up', + 'arrow-down-circle', + 'arrow-down-left', + 'arrow-down-right', + 'arrow-down', + 'arrow-left-circle', + 'arrow-left-right', + 'arrow-left', + 'arrow-right-circle', + 'arrow-right', + 'arrow-up-circle', + 'arrow-up-left', + 'arrow-up-right', + 'arrow-up', + 'asterisk', + 'at-sign', + 'award', + 'axe', + 'banknote', + 'bar-chart-2', + 'bar-chart', + 'baseline', + 'battery-charging', + 'battery-full', + 'battery-low', + 'battery-medium', + 'battery', + 'beaker', + 'bell-minus', + 'bell-off', + 'bell-plus', + 'bell-ring', + 'bell', + 'bike', + 'binary', + 'bitcoin', + 'bluetooth-connected', + 'bluetooth-off', + 'bluetooth-searching', + 'bluetooth', + 'bold', + 'book-open', + 'book', + 'bookmark-minus', + 'bookmark-plus', + 'bookmark', + 'bot', + 'box-select', + 'box', + 'briefcase', + 'brush', + 'bug', + 'building-2', + 'building', + 'bus', + 'calculator', + 'calendar', + 'camera-off', + 'camera', + 'car', + 'carrot', + 'cast', + 'check-circle-2', + 'check-circle', + 'check-square', + 'check', + 'chevron-down', + 'chevron-first', + 'chevron-last', + 'chevron-left', + 'chevron-right', + 'chevron-up', + 'chevrons-down-up', + 'chevrons-down', + 'chevrons-left', + 'chevrons-right', + 'chevrons-up-down', + 'chevrons-up', + 'chrome', + 'circle-slashed', + 'circle', + 'clipboard-check', + 'clipboard-copy', + 'clipboard-list', + 'clipboard-x', + 'clipboard', + 'clock-1', + 'clock-10', + 'clock-11', + 'clock-12', + 'clock-2', + 'clock-3', + 'clock-4', + 'clock-5', + 'clock-6', + 'clock-7', + 'clock-8', + 'clock-9', + 'lucide-clock', + 'cloud-drizzle', + 'cloud-fog', + 'cloud-hail', + 'cloud-lightning', + 'cloud-moon', + 'cloud-off', + 'cloud-rain-wind', + 'cloud-rain', + 'cloud-snow', + 'cloud-sun', + 'lucide-cloud', + 'cloudy', + 'clover', + 'code-2', + 'code', + 'codepen', + 'codesandbox', + 'coffee', + 'coins', + 'columns', + 'command', + 'compass', + 'contact', + 'contrast', + 'cookie', + 'copy', + 'copyleft', + 'copyright', + 'corner-down-left', + 'corner-down-right', + 'corner-left-down', + 'corner-left-up', + 'corner-right-down', + 'corner-right-up', + 'corner-up-left', + 'corner-up-right', + 'cpu', + 'credit-card', + 'crop', + 'lucide-cross', + 'crosshair', + 'crown', + 'currency', + 'database', + 'delete', + 'dice-1', + 'dice-2', + 'dice-3', + 'dice-4', + 'dice-5', + 'dice-6', + 'disc', + 'divide-circle', + 'divide-square', + 'divide', + 'dollar-sign', + 'download-cloud', + 'download', + 'dribbble', + 'droplet', + 'droplets', + 'drumstick', + 'edit-2', + 'edit-3', + 'edit', + 'egg', + 'equal-not', + 'equal', + 'eraser', + 'euro', + 'expand', + 'external-link', + 'eye-off', + 'eye', + 'facebook', + 'fast-forward', + 'feather', + 'figma', + 'file-check-2', + 'file-check', + 'file-code', + 'file-digit', + 'file-input', + 'file-minus-2', + 'file-minus', + 'file-output', + 'file-plus-2', + 'file-plus', + 'file-search', + 'file-text', + 'file-x-2', + 'file-x', + 'file', + 'files', + 'film', + 'filter', + 'flag-off', + 'flag-triangle-left', + 'flag-triangle-right', + 'flag', + 'flame', + 'flashlight-off', + 'flashlight', + 'flask-conical', + 'flask-round', + 'folder-minus', + 'folder-open', + 'folder-plus', + 'lucide-folder', + 'form-input', + 'forward', + 'frame', + 'framer', + 'frown', + 'function-square', + 'gamepad-2', + 'gamepad', + 'gauge', + 'gavel', + 'gem', + 'ghost', + 'gift', + 'git-branch-plus', + 'git-branch', + 'git-commit', + 'git-fork', + 'git-merge', + 'git-pull-request', + 'github', + 'gitlab', + 'glasses', + 'globe-2', + 'globe', + 'grab', + 'graduation-cap', + 'grid', + 'grip-horizontal', + 'grip-vertical', + 'hammer', + 'hand-metal', + 'hand', + 'hard-drive', + 'hard-hat', + 'hash', + 'haze', + 'headphones', + 'heart', + 'help-circle', + 'hexagon', + 'highlighter', + 'history', + 'home', + 'image-minus', + 'image-off', + 'image-plus', + 'image', + 'import', + 'inbox', + 'indent', + 'indian-rupee', + 'infinity', + 'lucide-info', + 'inspect', + 'instagram', + 'italic', + 'japanese-yen', + 'key', + 'keyboard', + 'landmark', + 'lucide-languages', + 'laptop-2', + 'laptop', + 'lasso-select', + 'lasso', + 'layers', + 'layout-dashboard', + 'layout-grid', + 'layout-list', + 'layout-template', + 'layout', + 'library', + 'life-buoy', + 'lightbulb-off', + 'lightbulb', + 'link-2-off', + 'link-2', + 'lucide-link', + 'linkedin', + 'list-checks', + 'list-minus', + 'list-ordered', + 'list-plus', + 'list-x', + 'list', + 'loader-2', + 'loader', + 'locate-fixed', + 'locate-off', + 'locate', + 'lock', + 'log-in', + 'log-out', + 'mail', + 'map-pin', + 'map', + 'maximize-2', + 'maximize', + 'megaphone', + 'meh', + 'menu', + 'message-circle', + 'message-square', + 'mic-off', + 'mic', + 'minimize-2', + 'minimize', + 'minus-circle', + 'minus-square', + 'minus', + 'monitor-off', + 'monitor-speaker', + 'monitor', + 'moon', + 'more-horizontal', + 'more-vertical', + 'mountain-snow', + 'mountain', + 'mouse-pointer-2', + 'mouse-pointer-click', + 'mouse-pointer', + 'mouse', + 'move-diagonal-2', + 'move-diagonal', + 'move-horizontal', + 'move-vertical', + 'move', + 'music', + 'navigation-2', + 'navigation', + 'network', + 'octagon', + 'option', + 'outdent', + 'package-check', + 'package-minus', + 'package-plus', + 'package-search', + 'package-x', + 'package', + 'palette', + 'palmtree', + 'paperclip', + 'pause-circle', + 'pause-octagon', + 'pause', + 'pen-tool', + 'lucide-pencil', + 'percent', + 'person-standing', + 'phone-call', + 'phone-forwarded', + 'phone-incoming', + 'phone-missed', + 'phone-off', + 'phone-outgoing', + 'phone', + 'pie-chart', + 'piggy-bank', + 'lucide-pin', + 'pipette', + 'plane', + 'play-circle', + 'play', + 'plug-zap', + 'plus-circle', + 'plus-square', + 'plus', + 'pocket', + 'podcast', + 'pointer', + 'pound-sterling', + 'power-off', + 'power', + 'printer', + 'qr-code', + 'quote', + 'radio-receiver', + 'radio', + 'redo', + 'refresh-ccw', + 'refresh-cw', + 'regex', + 'repeat-1', + 'repeat', + 'reply-all', + 'reply', + 'rewind', + 'rocket', + 'rocking-chair', + 'rotate-ccw', + 'rotate-cw', + 'rss', + 'ruler', + 'russian-ruble', + 'save', + 'scale', + 'scan-line', + 'scan', + 'scissors', + 'screen-share-off', + 'screen-share', + 'lucide-search', + 'send', + 'separator-horizontal', + 'separator-vertical', + 'server-crash', + 'server-off', + 'server', + 'settings-2', + 'settings', + 'share-2', + 'share', + 'sheet', + 'shield-alert', + 'shield-check', + 'shield-close', + 'shield-off', + 'shield', + 'shirt', + 'shopping-bag', + 'shopping-cart', + 'shovel', + 'shrink', + 'shuffle', + 'sidebar-close', + 'sidebar-open', + 'sidebar', + 'sigma', + 'signal-high', + 'signal-low', + 'signal-medium', + 'signal-zero', + 'signal', + 'skip-back', + 'skip-forward', + 'skull', + 'slack', + 'slash', + 'sliders', + 'smartphone-charging', + 'smartphone', + 'smile', + 'snowflake', + 'sort-asc', + 'sort-desc', + 'speaker', + 'sprout', + 'square', + 'star-half', + 'lucide-star', + 'stop-circle', + 'stretch-horizontal', + 'stretch-vertical', + 'strikethrough', + 'subscript', + 'sun', + 'sunrise', + 'sunset', + 'superscript', + 'swiss-franc', + 'switch-camera', + 'table', + 'tablet', + 'tag', + 'target', + 'tent', + 'terminal-square', + 'terminal', + 'text-cursor-input', + 'text-cursor', + 'thermometer-snowflake', + 'thermometer-sun', + 'thermometer', + 'thumbs-down', + 'thumbs-up', + 'ticket', + 'timer-off', + 'timer-reset', + 'timer', + 'toggle-left', + 'toggle-right', + 'tornado', + 'trash-2', + 'lucide-trash', + 'trello', + 'trending-down', + 'trending-up', + 'triangle', + 'truck', + 'tv-2', + 'tv', + 'twitch', + 'twitter', + 'type', + 'umbrella', + 'underline', + 'undo', + 'unlink-2', + 'unlink', + 'unlock', + 'upload-cloud', + 'upload', + 'user-check', + 'user-minus', + 'user-plus', + 'user-x', + 'user', + 'users', + 'verified', + 'vibrate', + 'video-off', + 'video', + 'view', + 'voicemail', + 'volume-1', + 'volume-2', + 'volume-x', + 'volume', + 'wallet', + 'wand', + 'watch', + 'waves', + 'webcam', + 'wifi-off', + 'wifi', + 'wind', + 'wrap-text', + 'wrench', + 'x-circle', + 'x-octagon', + 'x-square', + 'x', + 'youtube', + 'zap-off', + 'zap', + 'zoom-in', + 'zoom-out', + 'search-large', + 'lucide-search', +]; diff --git a/src/utils/MediaTypeManager.ts b/src/utils/MediaTypeManager.ts index 2f88d5e..05bc4a3 100644 --- a/src/utils/MediaTypeManager.ts +++ b/src/utils/MediaTypeManager.ts @@ -1,25 +1,25 @@ -import {MediaDbPluginSettings} from '../settings/Settings'; -import {MediaType} from './MediaType'; -import {MediaTypeModel} from '../models/MediaTypeModel'; -import {replaceTags} from './Utils'; -import {App, TFile} from 'obsidian'; -import {MovieModel} from '../models/MovieModel'; -import {SeriesModel} from '../models/SeriesModel'; -import {GameModel} from '../models/GameModel'; -import {WikiModel} from '../models/WikiModel'; -import {MusicReleaseModel} from '../models/MusicReleaseModel'; -import {BoardGameModel} from '../models/BoardGameModel'; +import { MediaDbPluginSettings } from '../settings/Settings'; +import { MediaType } from './MediaType'; +import { MediaTypeModel } from '../models/MediaTypeModel'; +import { replaceTags } from './Utils'; +import { App, TAbstractFile, TFile, TFolder } from 'obsidian'; +import { MovieModel } from '../models/MovieModel'; +import { SeriesModel } from '../models/SeriesModel'; +import { GameModel } from '../models/GameModel'; +import { WikiModel } from '../models/WikiModel'; +import { MusicReleaseModel } from '../models/MusicReleaseModel'; +import { BoardGameModel } from '../models/BoardGameModel'; export const MEDIA_TYPES: MediaType[] = [MediaType.Movie, MediaType.Series, MediaType.Game, MediaType.Wiki, MediaType.MusicRelease, MediaType.BoardGame]; export class MediaTypeManager { mediaFileNameTemplateMap: Map; mediaTemplateMap: Map; + mediaFolderMap: Map; - constructor() { - } + constructor() {} - updateTemplates(settings: MediaDbPluginSettings) { + updateTemplates(settings: MediaDbPluginSettings): void { this.mediaFileNameTemplateMap = new Map(); this.mediaFileNameTemplateMap.set(MediaType.Movie, settings.movieFileNameTemplate); this.mediaFileNameTemplateMap.set(MediaType.Series, settings.seriesFileNameTemplate); @@ -37,18 +37,31 @@ export class MediaTypeManager { this.mediaTemplateMap.set(MediaType.BoardGame, settings.boardgameTemplate); } + updateFolders(settings: MediaDbPluginSettings): void { + this.mediaFolderMap = new Map(); + this.mediaFolderMap.set(MediaType.Movie, settings.movieFolder); + this.mediaFolderMap.set(MediaType.Series, settings.seriesFolder); + this.mediaFolderMap.set(MediaType.Game, settings.gameFolder); + this.mediaFolderMap.set(MediaType.Wiki, settings.wikiFolder); + this.mediaFolderMap.set(MediaType.MusicRelease, settings.musicReleaseFolder); + this.mediaFolderMap.set(MediaType.BoardGame, settings.boardgameFolder); + } + getFileName(mediaTypeModel: MediaTypeModel): string { return replaceTags(this.mediaFileNameTemplateMap.get(mediaTypeModel.getMediaType()), mediaTypeModel); } - async getTemplate(mediaTypeModel: MediaTypeModel, app: App) { + async getTemplate(mediaTypeModel: MediaTypeModel, app: App): Promise { const templateFileName = this.mediaTemplateMap.get(mediaTypeModel.getMediaType()); if (!templateFileName) { return ''; } - const templateFile: TFile = app.vault.getFiles().filter((f: TFile) => f.name === templateFileName).first(); + const templateFile: TFile = app.vault + .getFiles() + .filter((f: TFile) => f.name === templateFileName) + .first(); if (!templateFile) { return ''; @@ -59,6 +72,26 @@ export class MediaTypeManager { return replaceTags(template, mediaTypeModel); } + async getFolder(mediaTypeModel: MediaTypeModel, app: App): Promise { + let folderPath = this.mediaFolderMap.get(mediaTypeModel.getMediaType()); + + if (!folderPath) { + folderPath = `/`; + } + console.log(folderPath); + + if (!(await app.vault.adapter.exists(folderPath))) { + await app.vault.createFolder(folderPath); + } + const folder: TAbstractFile = app.vault.getAbstractFileByPath(folderPath); + + if (!(folder instanceof TFolder)) { + throw Error(`Expected ${folder} to be instance of TFolder`); + } + + return folder; + } + /** * Takes an object and a MediaType and turns the object into an instance of a MediaTypeModel corresponding to the MediaType passed in. * diff --git a/src/utils/ModalHelper.ts b/src/utils/ModalHelper.ts index 8ca3bee..808aa5e 100644 --- a/src/utils/ModalHelper.ts +++ b/src/utils/ModalHelper.ts @@ -1,12 +1,13 @@ -import {MediaDbAdvancedSearchModal} from '../modals/MediaDbAdvancedSearchModal'; -import {MediaDbIdSearchModal} from '../modals/MediaDbIdSearchModal'; -import {MediaTypeModel} from '../models/MediaTypeModel'; -import {MediaDbSearchResultModal} from '../modals/MediaDbSearchResultModal'; -import {Notice} from 'obsidian'; +import { MediaDbAdvancedSearchModal } from '../modals/MediaDbAdvancedSearchModal'; +import { MediaDbIdSearchModal } from '../modals/MediaDbIdSearchModal'; +import { MediaTypeModel } from '../models/MediaTypeModel'; +import { MediaDbSearchResultModal } from '../modals/MediaDbSearchResultModal'; +import { Notice } from 'obsidian'; import MediaDbPlugin from '../main'; -import {MediaDbPreviewModal} from 'src/modals/MediaDbPreviewModal'; -import {CreateNoteOptions} from './Utils'; - +import { MediaDbPreviewModal } from 'src/modals/MediaDbPreviewModal'; +import { CreateNoteOptions } from './Utils'; +import { MediaDbSearchModal } from '../modals/MediaDbSearchModal'; +import { MediaType } from './MediaType'; export enum ModalResultCode { SUCCESS, @@ -15,15 +16,26 @@ export enum ModalResultCode { ERROR, } +/** + * Object containing the data {@link ModalHelper.createSearchModal} returns. + * On {@link ModalResultCode.SUCCESS} this contains {@link SearchModalData}. + * On {@link ModalResultCode.ERROR} this contains a reference to that error. + */ +export interface SearchModalResult { + code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.ERROR; + data?: SearchModalData; + error?: Error; +} + /** * Object containing the data {@link ModalHelper.createAdvancedSearchModal} returns. * On {@link ModalResultCode.SUCCESS} this contains {@link AdvancedSearchModalData}. * On {@link ModalResultCode.ERROR} this contains a reference to that error. */ export interface AdvancedSearchModalResult { - code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.ERROR, - data?: AdvancedSearchModalData, - error?: Error, + code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.ERROR; + data?: AdvancedSearchModalData; + error?: Error; } /** @@ -32,9 +44,9 @@ export interface AdvancedSearchModalResult { * On {@link ModalResultCode.ERROR} this contains a reference to that error. */ export interface IdSearchModalResult { - code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.ERROR, - data?: IdSearchModalData, - error?: Error, + code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.ERROR; + data?: IdSearchModalData; + error?: Error; } /** @@ -43,9 +55,9 @@ export interface IdSearchModalResult { * On {@link ModalResultCode.ERROR} this contains a reference to that error. */ export interface SelectModalResult { - code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.SKIP | ModalResultCode.ERROR, - data?: SelectModalData, - error?: Error, + code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.SKIP | ModalResultCode.ERROR; + data?: SelectModalData; + error?: Error; } /** @@ -54,9 +66,19 @@ export interface SelectModalResult { * On {@link ModalResultCode.ERROR} this contains a reference to that error. */ export interface PreviewModalResult { - code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.ERROR, - data?: PreviewModalData, - error?: Error, + code: ModalResultCode.SUCCESS | ModalResultCode.CLOSE | ModalResultCode.ERROR; + data?: PreviewModalData; + error?: Error; +} + +/** + * The data the search modal returns. + * - query: the query string + * - types: the selected APIs + */ +export interface SearchModalData { + query: string; + types: MediaType[]; } /** @@ -65,8 +87,8 @@ export interface PreviewModalResult { * - apis: the selected APIs */ export interface AdvancedSearchModalData { - query: string, - apis: string[], + query: string; + apis: string[]; } /** @@ -75,8 +97,8 @@ export interface AdvancedSearchModalData { * - apis: the selected APIs */ export interface IdSearchModalData { - query: string, - api: string, + query: string; + api: string; } /** @@ -84,7 +106,7 @@ export interface IdSearchModalData { * - selected: the selected items */ export interface SelectModalData { - selected: MediaTypeModel[], + selected: MediaTypeModel[]; } /** @@ -92,7 +114,19 @@ export interface SelectModalData { * - confirmed: whether the selected element has been confirmed */ export interface PreviewModalData { - confirmed: boolean, + confirmed: boolean; +} + +/** + * Options for the search modal. + * - modalTitle: the title of the modal + * - preselectedTypes: a list of preselected Types + * - prefilledSearchString: prefilled query + */ +export interface SearchModalOptions { + modalTitle?: string; + preselectedTypes?: MediaType[]; + prefilledSearchString?: string; } /** @@ -102,9 +136,9 @@ export interface PreviewModalData { * - prefilledSearchString: prefilled query */ export interface AdvancedSearchModalOptions { - modalTitle?: string, - preselectedAPIs?: string[], - prefilledSearchString?: string, + modalTitle?: string; + preselectedAPIs?: string[]; + prefilledSearchString?: string; } /** @@ -114,9 +148,9 @@ export interface AdvancedSearchModalOptions { * - prefilledSearchString: prefilled query */ export interface IdSearchModalOptions { - modalTitle?: string, - preselectedAPI?: string, - prefilledSearchString?: string, + modalTitle?: string; + preselectedAPI?: string; + prefilledSearchString?: string; } /** @@ -127,10 +161,10 @@ export interface IdSearchModalOptions { * - skipButton: whether to add a skip button to the modal */ export interface SelectModalOptions { - modalTitle?: string, - elements?: MediaTypeModel[], - multiSelect?: boolean, - skipButton?: boolean, + modalTitle?: string; + elements?: MediaTypeModel[]; + multiSelect?: boolean; + skipButton?: boolean; } /** @@ -139,11 +173,17 @@ export interface SelectModalOptions { * - elements: the elements to preview */ export interface PreviewModalOptions { - modalTitle?: string, - elements?: MediaTypeModel[], - createNoteOptions?: CreateNoteOptions, + modalTitle?: string; + elements?: MediaTypeModel[]; + createNoteOptions?: CreateNoteOptions; } +export const SEARCH_MODAL_DEFAULT_OPTIONS: SearchModalOptions = { + modalTitle: 'Media DB Search', + preselectedTypes: [], + prefilledSearchString: '', +}; + export const ADVANCED_SEARCH_MODAL_DEFAULT_OPTIONS: AdvancedSearchModalOptions = { modalTitle: 'Media DB Advanced Search', preselectedAPIs: [], @@ -166,7 +206,7 @@ export const SELECT_MODAL_OPTIONS_DEFAULT: SelectModalOptions = { export const PREVIEW_MODAL_DEFAULT_OPTIONS: PreviewModalOptions = { modalTitle: 'Media DB Preview', elements: [], - createNoteOptions: {attachTemplate: true}, + createNoteOptions: { attachTemplate: true }, }; /** @@ -175,11 +215,71 @@ export const PREVIEW_MODAL_DEFAULT_OPTIONS: PreviewModalOptions = { export class ModalHelper { plugin: MediaDbPlugin; - constructor(plugin: MediaDbPlugin) { this.plugin = plugin; } + /** + * Creates an {@link MediaDbSearchModal}, then sets callbacks and awaits them, + * returning either the user input once submitted or nothing once closed. + * The modal needs ot be manually closed by calling `close()` on the modal reference. + * + * @param searchModalOptions the options for the modal, see {@link SEARCH_MODAL_DEFAULT_OPTIONS} + * @returns the user input or nothing and a reference to the modal. + */ + async createSearchModal(searchModalOptions: SearchModalOptions): Promise<{ searchModalResult: SearchModalResult; searchModal: MediaDbSearchModal }> { + const modal = new MediaDbSearchModal(this.plugin, searchModalOptions); + const res: SearchModalResult = await new Promise(resolve => { + modal.setSubmitCallback(res => resolve({ code: ModalResultCode.SUCCESS, data: res })); + modal.setCloseCallback(err => { + if (err) { + resolve({ code: ModalResultCode.ERROR, error: err }); + } + resolve({ code: ModalResultCode.CLOSE }); + }); + + modal.open(); + }); + return { searchModalResult: res, searchModal: modal }; + } + + /** + * Opens an {@link MediaDbSearchModal} and awaits its result, + * then executes the `submitCallback` returning the callbacks result and closing the modal. + * + * @param searchModalOptions the options for the modal, see {@link SEARCH_MODAL_DEFAULT_OPTIONS} + * @param submitCallback the callback that gets executed after the modal has been submitted, but after it has been closed + * @returns the user input or nothing and a reference to the modal. + */ + async openSearchModal(searchModalOptions: SearchModalOptions, submitCallback: (searchModalData: SearchModalData) => Promise): Promise { + const { searchModalResult, searchModal } = await this.createSearchModal(searchModalOptions); + console.debug(`MDB | searchModal closed with code ${searchModalResult.code}`); + + if (searchModalResult.code === ModalResultCode.ERROR) { + // there was an error in the modal itself + console.warn(searchModalResult.error); + new Notice(searchModalResult.error.toString()); + searchModal.close(); + return undefined; + } + + if (searchModalResult.code === ModalResultCode.CLOSE) { + // modal is already being closed + return undefined; + } + + try { + const callbackRes: MediaTypeModel[] = await submitCallback(searchModalResult.data); + searchModal.close(); + return callbackRes; + } catch (e) { + console.warn(e); + new Notice(e.toString()); + searchModal.close(); + return undefined; + } + } + /** * Creates an {@link MediaDbAdvancedSearchModal}, then sets callbacks and awaits them, * returning either the user input once submitted or nothing once closed. @@ -188,20 +288,22 @@ export class ModalHelper { * @param advancedSearchModalOptions the options for the modal, see {@link ADVANCED_SEARCH_MODAL_DEFAULT_OPTIONS} * @returns the user input or nothing and a reference to the modal. */ - async createAdvancedSearchModal(advancedSearchModalOptions: AdvancedSearchModalOptions): Promise<{ advancedSearchModalResult: AdvancedSearchModalResult, advancedSearchModal: MediaDbAdvancedSearchModal }> { + async createAdvancedSearchModal( + advancedSearchModalOptions: AdvancedSearchModalOptions + ): Promise<{ advancedSearchModalResult: AdvancedSearchModalResult; advancedSearchModal: MediaDbAdvancedSearchModal }> { const modal = new MediaDbAdvancedSearchModal(this.plugin, advancedSearchModalOptions); - const res: AdvancedSearchModalResult = await new Promise((resolve, reject) => { - modal.setSubmitCallback(res => resolve({code: ModalResultCode.SUCCESS, data: res})); + const res: AdvancedSearchModalResult = await new Promise(resolve => { + modal.setSubmitCallback(res => resolve({ code: ModalResultCode.SUCCESS, data: res })); modal.setCloseCallback(err => { if (err) { - resolve({code: ModalResultCode.ERROR, error: err}); + resolve({ code: ModalResultCode.ERROR, error: err }); } - resolve({code: ModalResultCode.CLOSE}); + resolve({ code: ModalResultCode.CLOSE }); }); modal.open(); }); - return {advancedSearchModalResult: res, advancedSearchModal: modal}; + return { advancedSearchModalResult: res, advancedSearchModal: modal }; } /** @@ -212,8 +314,12 @@ export class ModalHelper { * @param submitCallback the callback that gets executed after the modal has been submitted, but after it has been closed * @returns the user input or nothing and a reference to the modal. */ - async openAdvancedSearchModal(advancedSearchModalOptions: AdvancedSearchModalOptions, submitCallback: (advancedSearchModalData: AdvancedSearchModalData) => Promise): Promise { - const {advancedSearchModalResult, advancedSearchModal} = await this.createAdvancedSearchModal(advancedSearchModalOptions); + async openAdvancedSearchModal( + advancedSearchModalOptions: AdvancedSearchModalOptions, + submitCallback: (advancedSearchModalData: AdvancedSearchModalData) => Promise + ): Promise { + const { advancedSearchModalResult, advancedSearchModal } = await this.createAdvancedSearchModal(advancedSearchModalOptions); + console.debug(`MDB | advencedSearchModal closed with code ${advancedSearchModalResult.code}`); if (advancedSearchModalResult.code === ModalResultCode.ERROR) { // there was an error in the modal itself @@ -229,8 +335,7 @@ export class ModalHelper { } try { - let callbackRes: MediaTypeModel[]; - callbackRes = await submitCallback(advancedSearchModalResult.data); + const callbackRes: MediaTypeModel[] = await submitCallback(advancedSearchModalResult.data); advancedSearchModal.close(); return callbackRes; } catch (e) { @@ -249,20 +354,20 @@ export class ModalHelper { * @param idSearchModalOptions the options for the modal, see {@link ID_SEARCH_MODAL_DEFAULT_OPTIONS} * @returns the user input or nothing and a reference to the modal. */ - async createIdSearchModal(idSearchModalOptions: IdSearchModalOptions): Promise<{ idSearchModalResult: IdSearchModalResult, idSearchModal: MediaDbIdSearchModal }> { + async createIdSearchModal(idSearchModalOptions: IdSearchModalOptions): Promise<{ idSearchModalResult: IdSearchModalResult; idSearchModal: MediaDbIdSearchModal }> { const modal = new MediaDbIdSearchModal(this.plugin, idSearchModalOptions); - const res: IdSearchModalResult = await new Promise((resolve, reject) => { - modal.setSubmitCallback(res => resolve({code: ModalResultCode.SUCCESS, data: res})); + const res: IdSearchModalResult = await new Promise(resolve => { + modal.setSubmitCallback(res => resolve({ code: ModalResultCode.SUCCESS, data: res })); modal.setCloseCallback(err => { if (err) { - resolve({code: ModalResultCode.ERROR, error: err}); + resolve({ code: ModalResultCode.ERROR, error: err }); } - resolve({code: ModalResultCode.CLOSE}); + resolve({ code: ModalResultCode.CLOSE }); }); modal.open(); }); - return {idSearchModalResult: res, idSearchModal: modal}; + return { idSearchModalResult: res, idSearchModal: modal }; } /** @@ -273,8 +378,12 @@ export class ModalHelper { * @param submitCallback the callback that gets executed after the modal has been submitted, but after it has been closed * @returns the user input or nothing and a reference to the modal. */ - async openIdSearchModal(idSearchModalOptions: IdSearchModalOptions, submitCallback: (idSearchModalData: IdSearchModalData) => Promise): Promise { - const {idSearchModalResult, idSearchModal} = await this.createIdSearchModal(idSearchModalOptions); + async openIdSearchModal( + idSearchModalOptions: IdSearchModalOptions, + submitCallback: (idSearchModalData: IdSearchModalData) => Promise + ): Promise { + const { idSearchModalResult, idSearchModal } = await this.createIdSearchModal(idSearchModalOptions); + console.debug(`MDB | idSearchModal closed with code ${idSearchModalResult.code}`); if (idSearchModalResult.code === ModalResultCode.ERROR) { // there was an error in the modal itself @@ -290,8 +399,7 @@ export class ModalHelper { } try { - let callbackRes: MediaTypeModel; - callbackRes = await submitCallback(idSearchModalResult.data); + const callbackRes: MediaTypeModel = await submitCallback(idSearchModalResult.data); idSearchModal.close(); return callbackRes; } catch (e) { @@ -310,21 +418,21 @@ export class ModalHelper { * @param selectModalOptions the options for the modal, see {@link SELECT_MODAL_OPTIONS_DEFAULT} * @returns the user input or nothing and a reference to the modal. */ - async createSelectModal(selectModalOptions: SelectModalOptions): Promise<{ selectModalResult: SelectModalResult, selectModal: MediaDbSearchResultModal }> { + async createSelectModal(selectModalOptions: SelectModalOptions): Promise<{ selectModalResult: SelectModalResult; selectModal: MediaDbSearchResultModal }> { const modal = new MediaDbSearchResultModal(this.plugin, selectModalOptions); - const res: SelectModalResult = await new Promise((resolve, reject) => { - modal.setSubmitCallback(res => resolve({code: ModalResultCode.SUCCESS, data: res})); - modal.setSkipCallback(() => resolve({code: ModalResultCode.SKIP})); + const res: SelectModalResult = await new Promise(resolve => { + modal.setSubmitCallback(res => resolve({ code: ModalResultCode.SUCCESS, data: res })); + modal.setSkipCallback(() => resolve({ code: ModalResultCode.SKIP })); modal.setCloseCallback(err => { if (err) { - resolve({code: ModalResultCode.ERROR, error: err}); + resolve({ code: ModalResultCode.ERROR, error: err }); } - resolve({code: ModalResultCode.CLOSE}); + resolve({ code: ModalResultCode.CLOSE }); }); modal.open(); }); - return {selectModalResult: res, selectModal: modal}; + return { selectModalResult: res, selectModal: modal }; } /** @@ -336,7 +444,8 @@ export class ModalHelper { * @returns the user input or nothing and a reference to the modal. */ async openSelectModal(selectModalOptions: SelectModalOptions, submitCallback: (selectModalData: SelectModalData) => Promise): Promise { - const {selectModalResult, selectModal} = await this.createSelectModal(selectModalOptions); + const { selectModalResult, selectModal } = await this.createSelectModal(selectModalOptions); + console.debug(`MDB | selectModal closed with code ${selectModalResult.code}`); if (selectModalResult.code === ModalResultCode.ERROR) { // there was an error in the modal itself @@ -357,8 +466,7 @@ export class ModalHelper { } try { - let callbackRes: MediaTypeModel[]; - callbackRes = await submitCallback(selectModalResult.data); + const callbackRes: MediaTypeModel[] = await submitCallback(selectModalResult.data); selectModal.close(); return callbackRes; } catch (e) { @@ -369,25 +477,26 @@ export class ModalHelper { } } - async createPreviewModal(previewModalOptions: PreviewModalOptions): Promise<{ previewModalResult: PreviewModalResult, previewModal: MediaDbPreviewModal }> { + async createPreviewModal(previewModalOptions: PreviewModalOptions): Promise<{ previewModalResult: PreviewModalResult; previewModal: MediaDbPreviewModal }> { //todo: handle attachFile for existing files const modal = new MediaDbPreviewModal(this.plugin, previewModalOptions); - const res: PreviewModalResult = await new Promise((resolve, reject) => { - modal.setSubmitCallback(res => resolve({code: ModalResultCode.SUCCESS, data: res})); + const res: PreviewModalResult = await new Promise(resolve => { + modal.setSubmitCallback(res => resolve({ code: ModalResultCode.SUCCESS, data: res })); modal.setCloseCallback(err => { if (err) { - resolve({code: ModalResultCode.ERROR, error: err}); + resolve({ code: ModalResultCode.ERROR, error: err }); } - resolve({code: ModalResultCode.CLOSE}); + resolve({ code: ModalResultCode.CLOSE }); }); modal.open(); }); - return {previewModalResult: res, previewModal: modal}; + return { previewModalResult: res, previewModal: modal }; } async openPreviewModal(previewModalOptions: PreviewModalOptions, submitCallback: (previewModalData: PreviewModalData) => Promise): Promise { - const {previewModalResult, previewModal} = await this.createPreviewModal(previewModalOptions); + const { previewModalResult, previewModal } = await this.createPreviewModal(previewModalOptions); + console.debug(`MDB | previewModal closed with code ${previewModalResult.code}`); if (previewModalResult.code === ModalResultCode.ERROR) { // there was an error in the modal itself @@ -403,8 +512,7 @@ export class ModalHelper { } try { - let callbackRes: boolean; - callbackRes = await submitCallback(previewModalResult.data); + const callbackRes: boolean = await submitCallback(previewModalResult.data); previewModal.close(); return callbackRes; } catch (e) { @@ -415,4 +523,3 @@ export class ModalHelper { } } } - diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts index 12ee1e7..c4e4333 100644 --- a/src/utils/Utils.ts +++ b/src/utils/Utils.ts @@ -1,11 +1,10 @@ -import {MediaTypeModel} from '../models/MediaTypeModel'; -import {TFile, TFolder} from 'obsidian'; - +import { MediaTypeModel } from '../models/MediaTypeModel'; +import { TFile, TFolder } from 'obsidian'; export const pluginName: string = 'obsidian-media-db-plugin'; export const contactEmail: string = 'm.projects.code@gmail.com'; export const mediaDbTag: string = 'mediaDB'; -export const mediaDbVersion: string = '0.4.1'; +export const mediaDbVersion: string = '0.5.0'; export const debug: boolean = true; export function wrapAround(value: number, size: number): number { @@ -15,16 +14,6 @@ export function wrapAround(value: number, size: number): number { return mod(value, size); } -/** - * @deprecated use console.debug instead - * @param o - */ -export function debugLog(o: any): void { - if (debug) { - console.log(o); - } -} - export function containsOnlyLettersAndUnderscores(str: string): boolean { return /^[a-zA-Z_]+$/.test(str); } @@ -34,9 +23,7 @@ export function replaceIllegalFileNameCharactersInString(string: string): string } export function replaceTags(template: string, mediaTypeModel: MediaTypeModel): string { - const resolvedTemplate = template.replace(new RegExp('{{.*?}}', 'g'), (match: string) => replaceTag(match, mediaTypeModel)); - - return resolvedTemplate; + return template.replace(new RegExp('{{.*?}}', 'g'), (match: string) => replaceTag(match, mediaTypeModel)); } function replaceTag(match: string, mediaTypeModel: MediaTypeModel): string { @@ -45,11 +32,11 @@ function replaceTag(match: string, mediaTypeModel: MediaTypeModel): string { tag = tag.substring(0, tag.length - 2); tag = tag.trim(); - let parts = tag.split(':'); + const parts = tag.split(':'); if (parts.length === 1) { - let path = parts[0].split('.'); + const path = parts[0].split('.'); - let obj = traverseMetaData(path, mediaTypeModel); + const obj = traverseMetaData(path, mediaTypeModel); if (obj === undefined) { return '{{ INVALID TEMPLATE TAG - object undefined }}'; @@ -57,11 +44,11 @@ function replaceTag(match: string, mediaTypeModel: MediaTypeModel): string { return obj; } else if (parts.length === 2) { - let operator = parts[0]; + const operator = parts[0]; - let path = parts[1].split('.'); + const path = parts[1].split('.'); - let obj = traverseMetaData(path, mediaTypeModel); + const obj = traverseMetaData(path, mediaTypeModel); if (obj === undefined) { return '{{ INVALID TEMPLATE TAG - object undefined }}'; @@ -88,7 +75,7 @@ function replaceTag(match: string, mediaTypeModel: MediaTypeModel): string { function traverseMetaData(path: Array, mediaTypeModel: MediaTypeModel): any { let o: any = mediaTypeModel; - for (let part of path) { + for (const part of path) { if (o !== undefined) { o = o[part]; } @@ -98,12 +85,12 @@ function traverseMetaData(path: Array, mediaTypeModel: MediaTypeModel): } export function markdownTable(content: string[][]): string { - let rows = content.length; + const rows = content.length; if (rows === 0) { return ''; } - let columns = content[0].length; + const columns = content[0].length; if (columns === 0) { return ''; } @@ -113,7 +100,7 @@ export function markdownTable(content: string[][]): string { } } - let longestStringInColumns: number[] = []; + const longestStringInColumns: number[] = []; for (let i = 0; i < columns; i++) { let longestStringInColumn = 0; @@ -148,36 +135,18 @@ export function markdownTable(content: string[][]): string { return table; } -export function dateToString(date: Date) { +export function dateToString(date: Date): string { return `${date.getMonth() + 1}-${date.getDate()}-${date.getFullYear()}`; } -export function timeToString(time: Date) { +export function timeToString(time: Date): string { return `${time.getHours()}-${time.getMinutes()}-${time.getSeconds()}`; } -export function dateTimeToString(dateTime: Date) { +export function dateTimeToString(dateTime: Date): string { return `${dateToString(dateTime)} ${timeToString(dateTime)}`; } -/** - * @deprecated - */ -export class UserCancelError extends Error { - constructor(message: string) { - super(message); - } -} - -/** - * @deprecated - */ -export class UserSkipError extends Error { - constructor(message: string) { - super(message); - } -} - // js can't even implement modulo correctly... export function mod(n: number, m: number): number { return ((n % m) + m) % m; @@ -187,9 +156,6 @@ export function capitalizeFirstLetter(string: string): string { return string.charAt(0).toUpperCase() + string.slice(1); } -// credits to phibr0 on discord -export const ICON_LIST = ['activity', 'airplay', 'alarm-check', 'alarm-clock-off', 'alarm-clock', 'alarm-minus', 'alarm-plus', 'album', 'alert-circle', 'alert-octagon', 'alert-triangle', 'align-center-horizontal', 'align-center-vertical', 'align-center', 'align-end-horizontal', 'align-end-vertical', 'align-horizontal-distribute-center', 'align-horizontal-distribute-end', 'align-horizontal-distribute-start', 'align-horizontal-justify-center', 'align-horizontal-justify-end', 'align-horizontal-justify-start', 'align-horizontal-space-around', 'align-horizontal-space-between', 'align-justify', 'align-left', 'align-right', 'align-start-horizontal', 'align-start-vertical', 'align-vertical-distribute-center', 'align-vertical-distribute-end', 'align-vertical-distribute-start', 'align-vertical-justify-center', 'align-vertical-justify-end', 'align-vertical-justify-start', 'align-vertical-space-around', 'align-vertical-space-between', 'anchor', 'aperture', 'archive', 'arrow-big-down', 'arrow-big-left', 'arrow-big-right', 'arrow-big-up', 'arrow-down-circle', 'arrow-down-left', 'arrow-down-right', 'arrow-down', 'arrow-left-circle', 'arrow-left-right', 'arrow-left', 'arrow-right-circle', 'arrow-right', 'arrow-up-circle', 'arrow-up-left', 'arrow-up-right', 'arrow-up', 'asterisk', 'at-sign', 'award', 'axe', 'banknote', 'bar-chart-2', 'bar-chart', 'baseline', 'battery-charging', 'battery-full', 'battery-low', 'battery-medium', 'battery', 'beaker', 'bell-minus', 'bell-off', 'bell-plus', 'bell-ring', 'bell', 'bike', 'binary', 'bitcoin', 'bluetooth-connected', 'bluetooth-off', 'bluetooth-searching', 'bluetooth', 'bold', 'book-open', 'book', 'bookmark-minus', 'bookmark-plus', 'bookmark', 'bot', 'box-select', 'box', 'briefcase', 'brush', 'bug', 'building-2', 'building', 'bus', 'calculator', 'calendar', 'camera-off', 'camera', 'car', 'carrot', 'cast', 'check-circle-2', 'check-circle', 'check-square', 'check', 'chevron-down', 'chevron-first', 'chevron-last', 'chevron-left', 'chevron-right', 'chevron-up', 'chevrons-down-up', 'chevrons-down', 'chevrons-left', 'chevrons-right', 'chevrons-up-down', 'chevrons-up', 'chrome', 'circle-slashed', 'circle', 'clipboard-check', 'clipboard-copy', 'clipboard-list', 'clipboard-x', 'clipboard', 'clock-1', 'clock-10', 'clock-11', 'clock-12', 'clock-2', 'clock-3', 'clock-4', 'clock-5', 'clock-6', 'clock-7', 'clock-8', 'clock-9', 'clock', 'cloud-drizzle', 'cloud-fog', 'cloud-hail', 'cloud-lightning', 'cloud-moon', 'cloud-off', 'cloud-rain-wind', 'cloud-rain', 'cloud-snow', 'cloud-sun', 'cloud', 'cloudy', 'clover', 'code-2', 'code', 'codepen', 'codesandbox', 'coffee', 'coins', 'columns', 'command', 'compass', 'contact', 'contrast', 'cookie', 'copy', 'copyleft', 'copyright', 'corner-down-left', 'corner-down-right', 'corner-left-down', 'corner-left-up', 'corner-right-down', 'corner-right-up', 'corner-up-left', 'corner-up-right', 'cpu', 'credit-card', 'crop', 'cross', 'crosshair', 'crown', 'currency', 'database', 'delete', 'dice-1', 'dice-2', 'dice-3', 'dice-4', 'dice-5', 'dice-6', 'disc', 'divide-circle', 'divide-square', 'divide', 'dollar-sign', 'download-cloud', 'download', 'dribbble', 'droplet', 'droplets', 'drumstick', 'edit-2', 'edit-3', 'edit', 'egg', 'equal-not', 'equal', 'eraser', 'euro', 'expand', 'external-link', 'eye-off', 'eye', 'facebook', 'fast-forward', 'feather', 'figma', 'file-check-2', 'file-check', 'file-code', 'file-digit', 'file-input', 'file-minus-2', 'file-minus', 'file-output', 'file-plus-2', 'file-plus', 'file-search', 'file-text', 'file-x-2', 'file-x', 'file', 'files', 'film', 'filter', 'flag-off', 'flag-triangle-left', 'flag-triangle-right', 'flag', 'flame', 'flashlight-off', 'flashlight', 'flask-conical', 'flask-round', 'folder-minus', 'folder-open', 'folder-plus', 'folder', 'form-input', 'forward', 'frame', 'framer', 'frown', 'function-square', 'gamepad-2', 'gamepad', 'gauge', 'gavel', 'gem', 'ghost', 'gift', 'git-branch-plus', 'git-branch', 'git-commit', 'git-fork', 'git-merge', 'git-pull-request', 'github', 'gitlab', 'glasses', 'globe-2', 'globe', 'grab', 'graduation-cap', 'grid', 'grip-horizontal', 'grip-vertical', 'hammer', 'hand-metal', 'hand', 'hard-drive', 'hard-hat', 'hash', 'haze', 'headphones', 'heart', 'help-circle', 'hexagon', 'highlighter', 'history', 'home', 'image-minus', 'image-off', 'image-plus', 'image', 'import', 'inbox', 'indent', 'indian-rupee', 'infinity', 'info', 'inspect', 'instagram', 'italic', 'japanese-yen', 'key', 'keyboard', 'landmark', 'languages', 'laptop-2', 'laptop', 'lasso-select', 'lasso', 'layers', 'layout-dashboard', 'layout-grid', 'layout-list', 'layout-template', 'layout', 'library', 'life-buoy', 'lightbulb-off', 'lightbulb', 'link-2-off', 'link-2', 'link', 'linkedin', 'list-checks', 'list-minus', 'list-ordered', 'list-plus', 'list-x', 'list', 'loader-2', 'loader', 'locate-fixed', 'locate-off', 'locate', 'lock', 'log-in', 'log-out', 'mail', 'map-pin', 'map', 'maximize-2', 'maximize', 'megaphone', 'meh', 'menu', 'message-circle', 'message-square', 'mic-off', 'mic', 'minimize-2', 'minimize', 'minus-circle', 'minus-square', 'minus', 'monitor-off', 'monitor-speaker', 'monitor', 'moon', 'more-horizontal', 'more-vertical', 'mountain-snow', 'mountain', 'mouse-pointer-2', 'mouse-pointer-click', 'mouse-pointer', 'mouse', 'move-diagonal-2', 'move-diagonal', 'move-horizontal', 'move-vertical', 'move', 'music', 'navigation-2', 'navigation', 'network', 'octagon', 'option', 'outdent', 'package-check', 'package-minus', 'package-plus', 'package-search', 'package-x', 'package', 'palette', 'palmtree', 'paperclip', 'pause-circle', 'pause-octagon', 'pause', 'pen-tool', 'pencil', 'percent', 'person-standing', 'phone-call', 'phone-forwarded', 'phone-incoming', 'phone-missed', 'phone-off', 'phone-outgoing', 'phone', 'pie-chart', 'piggy-bank', 'pin', 'pipette', 'plane', 'play-circle', 'play', 'plug-zap', 'plus-circle', 'plus-square', 'plus', 'pocket', 'podcast', 'pointer', 'pound-sterling', 'power-off', 'power', 'printer', 'qr-code', 'quote', 'radio-receiver', 'radio', 'redo', 'refresh-ccw', 'refresh-cw', 'regex', 'repeat-1', 'repeat', 'reply-all', 'reply', 'rewind', 'rocket', 'rocking-chair', 'rotate-ccw', 'rotate-cw', 'rss', 'ruler', 'russian-ruble', 'save', 'scale', 'scan-line', 'scan', 'scissors', 'screen-share-off', 'screen-share', 'search', 'send', 'separator-horizontal', 'separator-vertical', 'server-crash', 'server-off', 'server', 'settings-2', 'settings', 'share-2', 'share', 'sheet', 'shield-alert', 'shield-check', 'shield-close', 'shield-off', 'shield', 'shirt', 'shopping-bag', 'shopping-cart', 'shovel', 'shrink', 'shuffle', 'sidebar-close', 'sidebar-open', 'sidebar', 'sigma', 'signal-high', 'signal-low', 'signal-medium', 'signal-zero', 'signal', 'skip-back', 'skip-forward', 'skull', 'slack', 'slash', 'sliders', 'smartphone-charging', 'smartphone', 'smile', 'snowflake', 'sort-asc', 'sort-desc', 'speaker', 'sprout', 'square', 'star-half', 'star', 'stop-circle', 'stretch-horizontal', 'stretch-vertical', 'strikethrough', 'subscript', 'sun', 'sunrise', 'sunset', 'superscript', 'swiss-franc', 'switch-camera', 'table', 'tablet', 'tag', 'target', 'tent', 'terminal-square', 'terminal', 'text-cursor-input', 'text-cursor', 'thermometer-snowflake', 'thermometer-sun', 'thermometer', 'thumbs-down', 'thumbs-up', 'ticket', 'timer-off', 'timer-reset', 'timer', 'toggle-left', 'toggle-right', 'tornado', 'trash-2', 'trash', 'trello', 'trending-down', 'trending-up', 'triangle', 'truck', 'tv-2', 'tv', 'twitch', 'twitter', 'type', 'umbrella', 'underline', 'undo', 'unlink-2', 'unlink', 'unlock', 'upload-cloud', 'upload', 'user-check', 'user-minus', 'user-plus', 'user-x', 'user', 'users', 'verified', 'vibrate', 'video-off', 'video', 'view', 'voicemail', 'volume-1', 'volume-2', 'volume-x', 'volume', 'wallet', 'wand', 'watch', 'waves', 'webcam', 'wifi-off', 'wifi', 'wind', 'wrap-text', 'wrench', 'x-circle', 'x-octagon', 'x-square', 'x', 'youtube', 'zap-off', 'zap', 'zoom-in', 'zoom-out', 'search-large', 'search', 'activity', 'airplay', 'alarm-check', 'alarm-clock-off', 'alarm-clock', 'alarm-minus', 'alarm-plus', 'album', 'alert-circle', 'alert-octagon', 'alert-triangle', 'align-center-horizontal', 'align-center-vertical', 'align-center', 'align-end-horizontal', 'align-end-vertical', 'align-horizontal-distribute-center', 'align-horizontal-distribute-end', 'align-horizontal-distribute-start', 'align-horizontal-justify-center', 'align-horizontal-justify-end', 'align-horizontal-justify-start', 'align-horizontal-space-around', 'align-horizontal-space-between', 'align-justify', 'align-left', 'align-right', 'align-start-horizontal', 'align-start-vertical', 'align-vertical-distribute-center', 'align-vertical-distribute-end', 'align-vertical-distribute-start', 'align-vertical-justify-center', 'align-vertical-justify-end', 'align-vertical-justify-start', 'align-vertical-space-around', 'align-vertical-space-between', 'anchor', 'aperture', 'archive', 'arrow-big-down', 'arrow-big-left', 'arrow-big-right', 'arrow-big-up', 'arrow-down-circle', 'arrow-down-left', 'arrow-down-right', 'arrow-down', 'arrow-left-circle', 'arrow-left-right', 'arrow-left', 'arrow-right-circle', 'arrow-right', 'arrow-up-circle', 'arrow-up-left', 'arrow-up-right', 'arrow-up', 'asterisk', 'at-sign', 'award', 'axe', 'banknote', 'bar-chart-2', 'bar-chart', 'baseline', 'battery-charging', 'battery-full', 'battery-low', 'battery-medium', 'battery', 'beaker', 'bell-minus', 'bell-off', 'bell-plus', 'bell-ring', 'bell', 'bike', 'binary', 'bitcoin', 'bluetooth-connected', 'bluetooth-off', 'bluetooth-searching', 'bluetooth', 'bold', 'book-open', 'book', 'bookmark-minus', 'bookmark-plus', 'bookmark', 'bot', 'box-select', 'box', 'briefcase', 'brush', 'bug', 'building-2', 'building', 'bus', 'calculator', 'calendar', 'camera-off', 'camera', 'car', 'carrot', 'cast', 'check-circle-2', 'check-circle', 'check-square', 'check', 'chevron-down', 'chevron-first', 'chevron-last', 'chevron-left', 'chevron-right', 'chevron-up', 'chevrons-down-up', 'chevrons-down', 'chevrons-left', 'chevrons-right', 'chevrons-up-down', 'chevrons-up', 'chrome', 'circle-slashed', 'circle', 'clipboard-check', 'clipboard-copy', 'clipboard-list', 'clipboard-x', 'clipboard', 'clock-1', 'clock-10', 'clock-11', 'clock-12', 'clock-2', 'clock-3', 'clock-4', 'clock-5', 'clock-6', 'clock-7', 'clock-8', 'clock-9', 'lucide-clock', 'cloud-drizzle', 'cloud-fog', 'cloud-hail', 'cloud-lightning', 'cloud-moon', 'cloud-off', 'cloud-rain-wind', 'cloud-rain', 'cloud-snow', 'cloud-sun', 'lucide-cloud', 'cloudy', 'clover', 'code-2', 'code', 'codepen', 'codesandbox', 'coffee', 'coins', 'columns', 'command', 'compass', 'contact', 'contrast', 'cookie', 'copy', 'copyleft', 'copyright', 'corner-down-left', 'corner-down-right', 'corner-left-down', 'corner-left-up', 'corner-right-down', 'corner-right-up', 'corner-up-left', 'corner-up-right', 'cpu', 'credit-card', 'crop', 'lucide-cross', 'crosshair', 'crown', 'currency', 'database', 'delete', 'dice-1', 'dice-2', 'dice-3', 'dice-4', 'dice-5', 'dice-6', 'disc', 'divide-circle', 'divide-square', 'divide', 'dollar-sign', 'download-cloud', 'download', 'dribbble', 'droplet', 'droplets', 'drumstick', 'edit-2', 'edit-3', 'edit', 'egg', 'equal-not', 'equal', 'eraser', 'euro', 'expand', 'external-link', 'eye-off', 'eye', 'facebook', 'fast-forward', 'feather', 'figma', 'file-check-2', 'file-check', 'file-code', 'file-digit', 'file-input', 'file-minus-2', 'file-minus', 'file-output', 'file-plus-2', 'file-plus', 'file-search', 'file-text', 'file-x-2', 'file-x', 'file', 'files', 'film', 'filter', 'flag-off', 'flag-triangle-left', 'flag-triangle-right', 'flag', 'flame', 'flashlight-off', 'flashlight', 'flask-conical', 'flask-round', 'folder-minus', 'folder-open', 'folder-plus', 'lucide-folder', 'form-input', 'forward', 'frame', 'framer', 'frown', 'function-square', 'gamepad-2', 'gamepad', 'gauge', 'gavel', 'gem', 'ghost', 'gift', 'git-branch-plus', 'git-branch', 'git-commit', 'git-fork', 'git-merge', 'git-pull-request', 'github', 'gitlab', 'glasses', 'globe-2', 'globe', 'grab', 'graduation-cap', 'grid', 'grip-horizontal', 'grip-vertical', 'hammer', 'hand-metal', 'hand', 'hard-drive', 'hard-hat', 'hash', 'haze', 'headphones', 'heart', 'help-circle', 'hexagon', 'highlighter', 'history', 'home', 'image-minus', 'image-off', 'image-plus', 'image', 'import', 'inbox', 'indent', 'indian-rupee', 'infinity', 'lucide-info', 'inspect', 'instagram', 'italic', 'japanese-yen', 'key', 'keyboard', 'landmark', 'lucide-languages', 'laptop-2', 'laptop', 'lasso-select', 'lasso', 'layers', 'layout-dashboard', 'layout-grid', 'layout-list', 'layout-template', 'layout', 'library', 'life-buoy', 'lightbulb-off', 'lightbulb', 'link-2-off', 'link-2', 'lucide-link', 'linkedin', 'list-checks', 'list-minus', 'list-ordered', 'list-plus', 'list-x', 'list', 'loader-2', 'loader', 'locate-fixed', 'locate-off', 'locate', 'lock', 'log-in', 'log-out', 'mail', 'map-pin', 'map', 'maximize-2', 'maximize', 'megaphone', 'meh', 'menu', 'message-circle', 'message-square', 'mic-off', 'mic', 'minimize-2', 'minimize', 'minus-circle', 'minus-square', 'minus', 'monitor-off', 'monitor-speaker', 'monitor', 'moon', 'more-horizontal', 'more-vertical', 'mountain-snow', 'mountain', 'mouse-pointer-2', 'mouse-pointer-click', 'mouse-pointer', 'mouse', 'move-diagonal-2', 'move-diagonal', 'move-horizontal', 'move-vertical', 'move', 'music', 'navigation-2', 'navigation', 'network', 'octagon', 'option', 'outdent', 'package-check', 'package-minus', 'package-plus', 'package-search', 'package-x', 'package', 'palette', 'palmtree', 'paperclip', 'pause-circle', 'pause-octagon', 'pause', 'pen-tool', 'lucide-pencil', 'percent', 'person-standing', 'phone-call', 'phone-forwarded', 'phone-incoming', 'phone-missed', 'phone-off', 'phone-outgoing', 'phone', 'pie-chart', 'piggy-bank', 'lucide-pin', 'pipette', 'plane', 'play-circle', 'play', 'plug-zap', 'plus-circle', 'plus-square', 'plus', 'pocket', 'podcast', 'pointer', 'pound-sterling', 'power-off', 'power', 'printer', 'qr-code', 'quote', 'radio-receiver', 'radio', 'redo', 'refresh-ccw', 'refresh-cw', 'regex', 'repeat-1', 'repeat', 'reply-all', 'reply', 'rewind', 'rocket', 'rocking-chair', 'rotate-ccw', 'rotate-cw', 'rss', 'ruler', 'russian-ruble', 'save', 'scale', 'scan-line', 'scan', 'scissors', 'screen-share-off', 'screen-share', 'lucide-search', 'send', 'separator-horizontal', 'separator-vertical', 'server-crash', 'server-off', 'server', 'settings-2', 'settings', 'share-2', 'share', 'sheet', 'shield-alert', 'shield-check', 'shield-close', 'shield-off', 'shield', 'shirt', 'shopping-bag', 'shopping-cart', 'shovel', 'shrink', 'shuffle', 'sidebar-close', 'sidebar-open', 'sidebar', 'sigma', 'signal-high', 'signal-low', 'signal-medium', 'signal-zero', 'signal', 'skip-back', 'skip-forward', 'skull', 'slack', 'slash', 'sliders', 'smartphone-charging', 'smartphone', 'smile', 'snowflake', 'sort-asc', 'sort-desc', 'speaker', 'sprout', 'square', 'star-half', 'lucide-star', 'stop-circle', 'stretch-horizontal', 'stretch-vertical', 'strikethrough', 'subscript', 'sun', 'sunrise', 'sunset', 'superscript', 'swiss-franc', 'switch-camera', 'table', 'tablet', 'tag', 'target', 'tent', 'terminal-square', 'terminal', 'text-cursor-input', 'text-cursor', 'thermometer-snowflake', 'thermometer-sun', 'thermometer', 'thumbs-down', 'thumbs-up', 'ticket', 'timer-off', 'timer-reset', 'timer', 'toggle-left', 'toggle-right', 'tornado', 'trash-2', 'lucide-trash', 'trello', 'trending-down', 'trending-up', 'triangle', 'truck', 'tv-2', 'tv', 'twitch', 'twitter', 'type', 'umbrella', 'underline', 'undo', 'unlink-2', 'unlink', 'unlock', 'upload-cloud', 'upload', 'user-check', 'user-minus', 'user-plus', 'user-x', 'user', 'users', 'verified', 'vibrate', 'video-off', 'video', 'view', 'voicemail', 'volume-1', 'volume-2', 'volume-x', 'volume', 'wallet', 'wand', 'watch', 'waves', 'webcam', 'wifi-off', 'wifi', 'wind', 'wrap-text', 'wrench', 'x-circle', 'x-octagon', 'x-square', 'x', 'youtube', 'zap-off', 'zap', 'zoom-in', 'zoom-out', 'search-large', 'lucide-search']; - export class PropertyMappingValidationError extends Error { constructor(message: string) { super(message); @@ -206,12 +172,13 @@ export class PropertyMappingNameConflictError extends Error { * - attachTemplate: whether to attach the template (DEFAULT: false) * - attachFie: a file to attach (DEFAULT: undefined) * - openNote: whether to open the note after creation (DEFAULT: false) + * - folder: folder to put the note in */ export interface CreateNoteOptions { - attachTemplate?: boolean, - attachFile?: TFile, - openNote?: boolean, - folder?: TFolder, + attachTemplate?: boolean; + attachFile?: TFile; + openNote?: boolean; + folder?: TFolder; } export function migrateObject(object: T, oldData: any, defaultData: T): void { @@ -219,3 +186,17 @@ export function migrateObject(object: T, oldData: any, default object[key] = oldData.hasOwnProperty(key) ? oldData[key] : defaultData[key]; } } + +export function unCamelCase(str: string): string { + return ( + str + // insert a space between lower & upper + .replace(/([a-z])([A-Z])/g, '$1 $2') + // space before last upper in a sequence followed by lower + .replace(/\b([A-Z]+)([A-Z])([a-z])/, '$1 $2$3') + // uppercase the first character + .replace(/^./, function (str) { + return str.toUpperCase(); + }) + ); +} diff --git a/styles.css b/styles.css index 5a7b78d..15cdeae 100644 --- a/styles.css +++ b/styles.css @@ -6,19 +6,17 @@ } .media-db-plugin-list-toggle { - } .media-db-plugin-list-text-wrapper { flex: 1; } - .media-db-plugin-list-text { display: block; } -small.media-db-plugin-list-text{ +small.media-db-plugin-list-text { color: var(--text-muted); } @@ -68,33 +66,33 @@ small.media-db-plugin-list-text{ /* region property mappings */ .media-db-plugin-property-mappings-model-container { - border: 1px solid var(--background-modifier-border); + border: 1px solid var(--background-modifier-border); border-radius: 5px; - padding: 10px; - width: 100%; + padding: 10px; + width: 100%; } .media-db-plugin-property-mappings-container { - margin: 10px 0; - display: flex; + margin: 10px 0; + display: flex; flex-direction: column; - gap: 5px; + gap: 5px; } .media-db-plugin-property-mapping-element { - display: flex; + display: flex; flex-direction: row; - gap: 10px; + gap: 10px; } .media-db-plugin-property-mapping-element-property-name-wrapper { - min-width: 160px; - background: var(--background-modifier-form-field); - padding: 2px 5px; + min-width: 160px; + background: var(--background-modifier-form-field); + padding: 2px 5px; border-radius: 5px; - display: flex; - align-items: center; + display: flex; + align-items: center; } .media-db-plugin-property-mapping-element-property-name { @@ -106,12 +104,12 @@ small.media-db-plugin-list-text{ } .media-db-plugin-property-mapping-to { - display: flex; + display: flex; align-items: center; } .media-db-plugin-property-mapping-validation { - color: var(--text-error); + color: var(--text-error); margin-bottom: 5px; } diff --git a/tsconfig.json b/tsconfig.json index 9300189..96725e8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,10 +1,6 @@ { "compilerOptions": { - "types": [ - "svelte", - "node", - "jest" - ], + "types": ["svelte", "node", "jest"], "baseUrl": ".", "inlineSourceMap": true, "inlineSources": true, @@ -17,14 +13,7 @@ "isolatedModules": true, "esModuleInterop": true, "resolveJsonModule": true, - "lib": [ - "DOM", - "ES5", - "ES6", - "ES7" - ] + "lib": ["DOM", "ES5", "ES6", "ES7"] }, - "include": [ - "**/*.ts" - ] + "include": ["**/*.ts"] } diff --git a/version-bump.mjs b/version-bump.mjs index d409fa0..3f6c905 100644 --- a/version-bump.mjs +++ b/version-bump.mjs @@ -1,14 +1,14 @@ -import { readFileSync, writeFileSync } from "fs"; +import { readFileSync, writeFileSync } from 'fs'; const targetVersion = process.env.npm_package_version; // read minAppVersion from manifest.json and bump version to target version -let manifest = JSON.parse(readFileSync("manifest.json", "utf8")); +let manifest = JSON.parse(readFileSync('manifest.json', 'utf8')); const { minAppVersion } = manifest; manifest.version = targetVersion; -writeFileSync("manifest.json", JSON.stringify(manifest, null, "\t")); +writeFileSync('manifest.json', JSON.stringify(manifest, null, '\t')); // update versions.json with target version and minAppVersion from manifest.json -let versions = JSON.parse(readFileSync("versions.json", "utf8")); +let versions = JSON.parse(readFileSync('versions.json', 'utf8')); versions[targetVersion] = minAppVersion; -writeFileSync("versions.json", JSON.stringify(versions, null, "\t")); +writeFileSync('versions.json', JSON.stringify(versions, null, '\t'));