From 7481747e6be9e01cabd707576d75be52271c0bc4 Mon Sep 17 00:00:00 2001 From: Michael Herstine Date: Wed, 16 Dec 2020 19:38:12 -0800 Subject: [PATCH] Address issue #2. This commit contains no new code or features; rather it is a significant re-work to the user docs (i.e. README.org) along with the provision of pre-built binaries & a Debian binary package. --- .github/workflows/ci.yml | 20 +- .github/workflows/release.yml | 48 ++- ChangeLog | 25 ++ Dockerfile-arch | 10 + LICENSE | 674 ++++++++++++++++++++++++++++++++++ NEWS | 7 + README.org | 291 +++++++++++++-- configure.ac | 2 +- mpdpopm/Cargo.toml.in | 30 ++ mpdpopm/src/.gitignore | 1 + 10 files changed, 1055 insertions(+), 53 deletions(-) create mode 100644 Dockerfile-arch create mode 100644 LICENSE diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c75be9..2408b40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,6 @@ jobs: set -x sudo apt-get update sudo apt-get install -y autoconf automake emacs - set +x - name: Install Tools (macOS) if: matrix.os == 'macos-10.15' @@ -64,7 +63,6 @@ jobs: set -x brew update brew install autoconf automake emacs - set +x - name: Install Rust uses: actions-rs/toolchain@v1 @@ -73,12 +71,16 @@ jobs: profile: minimal override: true + - name: Install additional Rust tooling + shell: bash + run: | + cargo install cargo-deb + - name: Configure mpdpopm shell: bash run: | set -x ./bootstrap && ./configure - set +x - name: Build mpdpopm run: make @@ -98,7 +100,6 @@ jobs: cat "$stderr" echo "=====" fi - set +x - name: Run unit test suite shell: bash @@ -107,8 +108,17 @@ jobs: cd mpdpopm pwd cargo test --verbose - set +x - name: Check the Autotools distribution shell: bash run: make distcheck + + - name: Check the Debian package + if: matrix.os == 'ubuntu-18.04' + shell: bash + run: | + set -x + cd mpdpopm + cargo deb + + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8bf805..3457888 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,15 +3,12 @@ # name: release on: - # TODO(sp1ff): I would *like* to allow this workflow to be triggered - # manually, which is what this event allegedly does - # - # but it doesn't work. I'm wondering if it has something to do with - # the fact that, at the time of this writing, I'm on the - # release-infra branch? + # This permits this workflow to be triggered manually. See the + # environment variable RELEASE_VERSION below, however. workflow_dispatch: - # Modifying the push event with 'branches' and 'tags' seems to be an OR operation (i.e. the workflow - # will run if either on branch release-infra *or* it has a tag of n.n.n) + # Modifying the push event with 'branches' and 'tags' seems to be an + # OR operation (i.e. the workflow will run if either on branch + # release-infra *or* it has a tag of n.n.n) push: # Un-comment this for testing # branches: @@ -89,8 +86,7 @@ jobs: run: | pwd set -x - sudo apt-get update - sudo apt-get install -y autoconf automake emacs + sudo apt-get install -y autoconf automake emacs liblzma-dev set +x - name: Install Tools (macOS) @@ -110,6 +106,11 @@ jobs: profile: minimal override: true + - name: Install additional Rust tooling + shell: bash + run: | + cargo install cargo-deb + - name: Configure mpdpopm shell: bash run: | @@ -142,6 +143,7 @@ jobs: - name: Strip release binary (linux and macos) if: matrix.build == 'linux' || matrix.build == 'macos' + shell: bash run: | cd mpdpopm strip target/release/mppopmd @@ -157,7 +159,6 @@ jobs: cp -v mpdpopm/target/release/mppopm{,d} "$staging/bin" tar czf "$staging.tar.gz" "$staging" echo "ASSET=$staging.tar.gz" >> $GITHUB_ENV - set +x - name: Upload release archive uses: actions/upload-release-asset@v1.0.1 @@ -201,3 +202,28 @@ jobs: asset_path: ${{ env.DISTRO_XZ }} asset_name: ${{ env.DISTRO_XZ }} asset_content_type: application/octet-stream + + - name: Make Debian package + if: matrix.os == 'ubuntu-18.04' + shell: bash + # You would think I can deduce the name of the package from + # RELEASE_VERSION, but Debian uses different designatures for + # architecture (amd64 instead of x86_64, e.g.) than those + # produced by `uname'. Since there will only be one .deb in the + # output directory, I'll just figure it out that way. + run: | + set -x + cd mpdpopm + cargo deb + echo "DEBIAN_PKG=$(ls target/debian/*.deb)" >> $GITHUB_ENV + + - name: Upload Debian package + if: matrix.os == 'ubuntu-18.04' + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ env.RELEASE_UPLOAD_URL }} + asset_path: ${{ env.DEBIAN_PKG }} + asset_name: ${{ env.DEBIAN_PKG }} + asset_content_type: application/octet-stream diff --git a/ChangeLog b/ChangeLog index 79e9dc6..4169f9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2020-12-16 Michael Herstine + + Address issue #2. + This commit contains no new code or features; rather it is a + significant re-work to the user docs (i.e. README.org) along + with the provision of pre-built binaries & a Debian binary + package. + +2020-11-24 Michael Herstine + + Hopefully, my final workflow commit. + 1. Re-comment the version + 2. Change the build-release job to only upload source Autotools + distros for Ubuntu + + Hard-coding the release version preparatory to forcing a release. + + Updated the README with up-to-date installation instructions. + + Adding a release workflow. + +2020-11-22 Michael Herstine + + Committing my first GitHub Actions workflow + 2020-11-18 Michael Herstine Bugfix for issue #1. diff --git a/Dockerfile-arch b/Dockerfile-arch new file mode 100644 index 0000000..ea90fa9 --- /dev/null +++ b/Dockerfile-arch @@ -0,0 +1,10 @@ +# -*- Dockerfile -*- +FROM archlinux:latest + +RUN useradd build && \ + passwd -d build && \ + mkdir /home/build && \ + chown build:build /home/ild && \ + pacman -Sy --noconfirm gcc sudo && \ + sudo -u build bash -c "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y" && \ + sudo -u build bash -c "source /home/build/.cargo/env && cargo install cargo-arch" diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU 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 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 +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 +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 +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 +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 +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 +know their rights. + + 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 +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 +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 +pattern of such abuse occurs in the area of products for individuals to +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 +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. +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 +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + 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 +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. + + 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 +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 +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 +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 +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 +. diff --git a/NEWS b/NEWS index d3eb90f..c9a7dab 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,12 @@ mpdpopm News -- history of user-visible changes -*- outline -*- +* 0.1.14 build + +** User-visible changes + +*** Complete re-write of the README + +*** Releases will now contain pre-built binaries & a Debian binary package * 0.1.13 build ** Bugfixes diff --git a/README.org b/README.org index c1c9fe7..e8312d2 100644 --- a/README.org +++ b/README.org @@ -1,8 +1,8 @@ #+TITLE: README -#+DESCRIPTION: mpdpopm #+AUTHOR: Michael Herstine +#+DESCRIPTION: mpdpopm #+EMAIL: sp1ff@pobox.com -#+DATE: <2020-11-24 Tue 18:01> +#+DATE: <2020-12-16 Wed 19:36> #+AUTODATE: t * Introduction @@ -11,27 +11,99 @@ * Prerequisites - - [[https://www.musicpd.org/][Music Player Daemon]]: "Music Player Daemon (MPD) is a flexible, powerful, server-side application for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol." +[[https://www.musicpd.org/][Music Player Daemon]]: "Music Player Daemon (MPD) is a flexible, powerful, server-side application for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol." If you're reading this, I assume you're already running MPD, so this document won't have much to say on installing & configuring it. -If you choose to use the pre-built [[https://github.com/sp1ff/mpdpopm/releases][binaries]], that's all you'll need-- you can jump down to [[#getting_started][Getting Started]], below (see [[#installing][Installing]], below). +If you choose to use the pre-built binaries or the Debian package (available under [[https://github.com/sp1ff/mpdpopm/releases][releases]]), that's all you'll need-- you can jump ahead to the section entitled [[#getting_started][Installing]], below. -If you choose to download [[https://github.com/sp1ff/mpdpopm][mpdpopm]] from [[https://crates.io/crates/mpdpopm][crates.io]], you'll need: +If you would prefer to download [[https://github.com/sp1ff/mpdpopm][mpdpopm]] from [[https://crates.io/crates/mpdpopm][crates.io]], you'll need need the [[https://www.rust-lang.org/tools/install][Rust]] toolchain ("Rust is a memory- & thread-safe language with no runtime or garbage collector"). Installing the toolchain is easy: - - [[https://www.rust-lang.org/tools/install][Rust]]: Rust is a memory- & thread-safe language with no runtime or garbage collector +#+BEGIN_SRC bash +curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh +#+END_SRC -If you would like to build from source, either from one of the source [[https://github.com/sp1ff/mpdpopm/releases][distributions]] or directly by cloning this repository, you'll also need the Gnu [[https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html][Autotools]] installed. +[[https://github.com/sp1ff/mpdpopm][mpdpopm]] is also available as an Autotools source distribution (also under [[https://github.com/sp1ff/mpdpopm/releases][releases]]), and of course you can just clone the repo & build the project from source. In either of those two cases you'll need the Gnu [[https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html][Autotools]] installed in addition to Rust. Again, if you're considering that route, I assume you're familiar with the Autotools & won't say much about them here. * Installing :PROPERTIES: :CUSTOM_ID: installing :END: -You can install [[https://github.com/sp1ff/mpdpopm][mpdpopm]] in a few different ways: +As mentioned above, you can install [[https://github.com/sp1ff/mpdpopm][mpdpopm]] in a few different ways. In increasing order of complexity: + +** Use the pre-built binaries + +Thanks to a suggestion by [[https://github.com/m040601][m040601]], you can download pre-built binaries for each [[https://github.com/sp1ff/mpdpopm/releases][release]]. At the time of this writing, only Linux & MacOS are supported, and only on x86_64 at that. If that works for you, you can do something like: + +#+BEGIN_SRC bash +cd /tmp +curl -L --output mpdpopm-0.1.14.tar.gz https://github.com/sp1ff/mpdpopm/releases/download/0.1.14/mpdpopm-0.1.14-x86_64-unknown-linux.tar.gz +tar xf mpdpopm-0.1.14.tar.gz +tree mpdpopm-0.1.14-x86_64-unknown-linux/ +mpdpopm-0.1.14-x86_64-unknown-linux/ +├── bin +│ ├── mppopm +│ └── mppopmd +└── doc + ├── AUTHORS + ├── ChangeLog + ├── COPYING + ├── NEWS + ├── README.org + └── THANKS + +2 directories, 8 files +#+END_SRC + +Copy the binaries =mppopmd= (the daemon) and =mppopm= (the CLI) to a convenient place (e.g. =/usr/local/bin= or =$HOME/.local/bin=) and proceed to [[#getting_started][Getting Started]], below. + +** Crates.io + +If you've got the Rust toolchain installed, just say =cargo install mpdpopm=. The binaries will now be in =$HOME/.cargo/bin=, and you can proceed to [[#getting_started][Getting Started]], below. + +** Use the Debian package + +If you're running on a Debian-based Linux distribution, and you're on an x86_64 processor, I've begun providing a Debian binary package, courtesy of the very cool [[https://github.com/mmstick/cargo-deb][cargo-deb]] Cargo helper command. Just do: + +#+BEGIN_SRC bash +cd /tmp +curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.1.14/mpdpopm_0.1.14_amd64.deb +sudo dpkg -i mpdpopm_0.1.14_amd64.deb +#+END_SRC - 1. due to a suggestion by [[https://github.com/m040601][m040601]], you can now download pre-built binaries for each [[https://github.com/sp1ff/mpdpopm/releases][release]]; only Linux & MacOS are supported, right now, and only on x86_64 at that - 2. you can download [[https://github.com/sp1ff/mpdpopm][mpdpopm]] from [[https://crates.io/crates/mpdpopm][crates.io]] (i.e. say =cargo install mpdpopm=) - 3. you can grab one of the source distributions under each [[https://github.com/sp1ff/mpdpopm/releases][release]]; in that case it's the usual =./configure && make && sudo make install= incantation - 4. if you clone the repo, make sure to run =./bootrap= before configuring +The binaries will be placed in =/usr/local/bin=, and you can proceed to [[#getting_started][Getting Started]], below. + +** Autotools source distributions + +If you've got the Rust toolchain as well as Autotools installed, you can build from source via Autotools: + +#+BEGIN_SRC bash +cd /tmp +curl -L -O https://github.com/sp1ff/mpdpopm/releases/download/0.1.14/mpdpopm-0.1.14.tar.xz +tar xf mpdpopm-0.1.14.tar.xz +cd mpdpopm-0.1.14 +./configure +make +make check +sudo make install +#+END_SRC + +All the usual =configure= options apply (=--prefix=, e.g.) + +** Building from source + +Finally, and again if you have the build toolchain (Rust & Autotools) installed, you can build from source: + +#+BEGIN_SRC bash +git clone git@github.com:sp1ff/mpdpopm.git +cd mpdpopm +./bootstrap +./configure +make +make check +sudo make install +#+END_SRC + +Notice the call to =./bootstrap=, in this case. * Getting Started :PROPERTIES: @@ -45,62 +117,209 @@ You can install [[https://github.com/sp1ff/mpdpopm][mpdpopm]] in a few different 1. =mppopmd= is the companion daemon process 2. =mppopm= is the associated command-line interface to the daemon -I still haven't provided a =systemd= service unit, so you'll have to run the daemon process manually (say =mppopmd --help= for the relevant options; you may want to run it in the foreground while you get it up & running). Once up, it will create an [[https://www.musicpd.org/][mpd]] channel for commands ("unwoundstack.com:commands" by default, but this is configurable) and begin monitoring [[https://www.musicpd.org/][mpd]] playback. Every time [[https://www.musicpd.org/][mpd]] plays a track, it will increment that track's playcount & last-played timestamp in the sticker database. If any [[https://www.musicpd.org/][mpd]] client sends the "rating" command to our channel, [[https://github.com/sp1ff/mpdpopm][mpdpopm]] will also update the corresponding sticker. +They both make use of the =mpd= [[https://www.musicpd.org/doc/html/protocol.html][protocol]], a simple text-based protocol by which clients can communicate with the =mpd= daemon and with one another. From the perspective of =mpd=, =mppopm= & =mppopmd= are just new clients. Via this protocol =mppopmd= will monitor =mpd= for song playback & note when songs complete; this is how it knows to increment the playcount & update the last played timestamp for each song to which you listen. + +Also via the protocol, =mpd= clients can communicate with one another by registering "channels" and subscribing to them; one client can send a message to a given channel, and all other clients subscribed to that channel will receive that message. In particular, if an =mpd= client sends the "rating" command to the =mppopmd= commands channel (the channel name is configurable, but defaults to "unwoundstack.com:commands"), =mppopmd= will set the rating for the given track. + +The mechanism by which =mppopmd= records this information (i.e play counts, last played and ratings) is =mpd= [[https://www.musicpd.org/doc/html/protocol.html#stickers][stickers]]. A sticker is a little bit of textual information which clients can attach to songs in the form of a name-value pair. [[https://github.com/sp1ff/mpdpopm][mpdpopm]] defines a new sticker name for each of these items & udpates the values for each song when & as requested. + +Of course, other =mpd= clients can't be aware of =mppopmd=, its command channel, or the stickers it sets: you the user will have to bridge that gap. You could of course just fire-up =netcat= & start sending commands, but that's not particularly convenient. That's where =mppopm= comes in. It is a small command-line tool for controlling [[https://github.com/sp1ff/mpdpopm][mpdpopm]] functionality; you could for instance say: + +#+BEGIN_SRC bash +mppopm set-rating '*****' +#+END_SRC -Of particular interest is the fact that the user can configure commands to be run when the playcount is updated or the rating is set. You might, for instance, use this feature to update the =PCNT= and/or =POPM= tags accordingly. +to rate the current track at five stars. Under the hood, it connects to the =mpd= daemon, sends a "rating" message to the =mppopmd= commands channel, and =mppopmd=, in turn, tells =mpd= to set the rating sticker for the curren track to 255 (more on the rating system below). -=mppopm= is a simple CLI that will let you get & set playcounts & ratings; say =mppopm --help= to see what it offers. +** Getting Set-up -** Configuration +*** MPD -=mppopmd= takes an optional configuration file. I haven't documented it fully yet-- here is mine: +If you're reading this, I assume you already have MPD up & running, so this section will be brief. One note, prompted by user [[https://github.com/m040601][m040601]], however: as mentioned above, [[https://github.com/sp1ff/mpdpopm][mpdpopm]] leverages the MPD sticker database. I was chagrined to find that if you do not configure MPD to maintain a sticker database, all sticker commands will simply be disabled. Therefore, before setting up [[https://github.com/sp1ff/mpdpopm][mpdpopm]], find your =mpd= configuration file and check to be sure you have a =sticker_file= entry; something like this: #+BEGIN_EXAMPLE - ((log . "/home/mgh/var/log/mppopmd.log") + sticker_file "/home/sp1ff/lib/mpd/sticker.sql" +#+END_EXAMPLE + +Check also that you have write access to the named file & its parent directory. + +*** mppopmd + +I haven't yet provided a =systemd= service unit, so you'll have to run the daemon process manually. That begins with preparing a configuration file, the installation of which I haven't implemented yet, either (so you'll have to do it by hand). + +**** Configuration + +The configuration file _is_ optional, so you can skip this part if you like. However, if you want to customize the behavior of the [[https://github.com/sp1ff/mpdpopm][mpdpopm]] daemon, you'll need to set one up, so I've documented it here in the form of a worked example. + +The format is a LISP S-expression in which individual, top-level items are expressed as cons cells: + +#+BEGIN_SRC elisp + ((log . "/home/sp1ff/var/log/mppopmd.log") (host . "192.168.1.6") (port . 6600) - (local_music_dir . "/mnt/Took-Hall/mp3") + (local_music_dir . "/mnt/my-nfs-server/mp3") (playcount_sticker . "unwoundstack.com:playcount") (lastplayed_sticker . "unwoundstack.com:lastplayed") (played_thresh . 0.6) (poll_interval_ms . 5000) - (playcount_command . "/home/mgh/bin/scribbu") + (playcount_command . "/home/sp1ff/bin/scribbu") (playcount_command_args . ("popm" "-a" "-A" "-b" "-o" "sp1ff@pobox.com" "-C" "%playcount" "%full-file")) (commands_chan . "unwoundstack.com:commands") (rating_sticker . "unwoundstack.com:rating") - (ratings_command . "/home/mgh/bin/scribbu") + (ratings_command . "/home/sp1ff/bin/scribbu") (ratings_command_args . ("popm" "-a" "-A" "-b" "-o" "sp1ff@pobox.com" "-r" "%rating" "%full-file"))) +#+END_SRC + +Entries: + + - log :: file to which the daemon will log when running in the background (if you specify the =-F= flag, to run it in the foreground, it will log to =stdout=); no log rotation is provided, so either setup =logrotate= or keep an eye on it so it doesn't grow too large. + - host :: IP address on which the MPD daemon is listening (should match =bind_to_address= in your =mpd= configuration file); defaults to "localhost" + - port :: port on which the =mpd= daemon is listening (should match =port= in your =mpd= configuration file); defaults to 6600 + - local_music_dir :: the root of your MPD music directory, as seen from this host + - playcount_sticker :: the sticker name mpdpopm will use to store play counts (defaults to "unwoundstack.com:playcount") + - lastplayed_sticker :: the sticker name mpdpopm will use to store the last played timestamp (defaults to "unwoundstack.com:lastplayed") + - rating_sticker :: the sticker name mpdpopm will use to store the rating (defaults to "unwoundstack.com:rating") + - played_thresh :: the percentage of a song's duration that must be played back in order for it to be considered as "played", expressed as number between 0 & 1 (defaults to 0.6) + - poll_interval_ms :: the amount of time, in milliseconds, between polls of =mpd= by =mppopmd= to check on playback progress + - commands_chan :: name of the MPD channel on which =mppopmd= shall listen for commands ("unwoundstack.com:commands" by default) + - playcount_command :: optional name of a program to run when the play count is incremented; this should be an absolute path. use playcount_command_args to specify arguments to this command + - playcount_command_args :: an array of arguments to specify to the playcount command; arguments may contain replacement parameters that will be filled in at the time of execution (on which more below) + - ratings :: optional name of a program to run when the rating is set; this should be an absolute path. use rating to specify arguments to this command + - ratings_command_args :: an array of arguments to specify to the ratings command; arguments may contain replacement parameters that will be filled in at the time of execution (on which more below) + +There is an additional configuration parameter not documented here: =gen_cmds=. That is described below. + +**** Starting the Daemon + +Once you've got your configuration file prepared, you should probably start the daemon in the foreground for ease of trouble-shooting. I suggest starting it with the =-v= flag ("verbose") the first time, as well (there's also a =-d= flag which will produce more copious debug output). You should expect to see something like this: + +#+BEGIN_SRC bash +mppopmd -v -F -c +[2020-12-12T15:26:19.620806454-08:00][mppopmd] mppopmd 0.1.14 logging at level Debug. +[2020-12-12T15:26:19.621395828-08:00][mpdpopm] mpdpopm 0.1.14 beginning. +[2020-12-12T15:26:19.621998677-08:00][mpdpopm::clients] Connected 0.22.0. +[2020-12-12T15:26:19.623398521-08:00][mpdpopm::clients] Connected 0.22.0. +[2020-12-12T15:26:19.623874861-08:00][mpdpopm::clients] Sent subscribe message for unwoundstack.com:commands; got `OK +'. +[2020-12-12T15:26:19.623888424-08:00][mpdpopm::clients] Subscribed to unwoundstack.com:commands. +[2020-12-12T15:26:19.624985027-08:00][mpdpopm] selecting... +[2020-12-12T15:26:19.628412738-08:00][mpdpopm] output status is Ok( + Output { + status: ExitStatus( + ExitStatus( + 0, + ), + ), + stdout: "/home/sp1ff\n", + stderr: "", + }, +) +[2020-12-12T15:26:19.628778521-08:00][mpdpopm] No database update needed +[2020-12-12T15:26:19.628817190-08:00][mpdpopm] No more commands to process. +#+END_SRC + +At this point the daemon is just sitting around, waiting for something to happen. Bring up your favorite =mpd= client & start playing a track. That should induce some activity: + +#+BEGIN_SRC bash +[2020-12-12T15:26:29.522581696-08:00][mpdpopm::clients] Sent idle message; got `changed: player +OK +'. +[2020-12-12T15:26:29.522756287-08:00][mpdpopm] subsystem Player changed +[2020-12-12T15:26:29.527064915-08:00][mpdpopm::playcounts] Updating status: 0.000% complete. +... +[2020-12-12T15:28:19.653519123-08:00][mpdpopm::playcounts] Updating status: 60.698% complete. +[2020-12-12T15:28:19.653569350-08:00][mpdpopm::playcounts] Increment play count for 'M/Miles Davis - Boplicity.mp3' (songid: 262) at 0.6069790770994554 played. +[2020-12-12T15:28:19.661696678-08:00][mpdpopm::clients] Sent message `sticker get song "M/Miles Davis - Boplicity.mp3" "unwoundstack.com:playcount"'; got `sticker: unwoundstack.com:playcount=3 +OK +' +[2020-12-12T15:28:19.661743547-08:00][mpdpopm::playcounts] Current PC is 3. +[2020-12-12T15:28:19.770956673-08:00][mpdpopm::clients] Sent `sticker set song "M/Miles Davis - Boplicity.mp3" "unwoundstack.com:lastplayed" "1607815699"'; got `OK +' +[2020-12-12T15:28:19.868244915-08:00][mpdpopm::clients] Sent `sticker set song "M/Miles Davis - Boplicity.mp3" "unwoundstack.com:playcount" "4"'; got `OK +' +... +#+END_SRC + +In this example, =mppopmd= noticed that "Boplicity" by Miles Davis started playing; when it was played 60% of the way through, the daemon updated the play count from 3 to 4 & set the last played timesetamp. + +Once things seem to be working, you might consider removing the =-F= flag & running =mppopmd= as a proper daemon. + +*** mppopm + +At this point, [[https://github.com/sp1ff/mpdpopm][mpdpopm]] will happily monitor your playback history & keep play counts & last played timestamps for you. If you would like to rate tracks, however, you will need to somehow induce your favorite mpd client to send a "rating" message to the [[https://github.com/sp1ff/mpdpopm][mpdpopm]] commands channel ("unwoundstack.com:commands" by default). Since this is unlikely to be convenient, I wrote an mpd client for the purpose: a little CLI called =mppopm=. You can simply execute + +#+BEGIN_SRC bash +mppopm set-rating '*****' +#+END_SRC + +to set the current track's rating to five "stars" (say =mppopm --help= for an explanation of the rating system; in brief-- it's Winamp's). NB. the set rating command by default produces no output; if you want confirmation that somethings happening, use the =-v= flag. + +The CLI offers "get" & "set" commands for play counts, last played timestamps & the rating. Say =mppopm --help= for a full list of options, including how to tell it where the mpd server can be found on your network. + +** Advanced Usage + +*** Keeping Other Repositories of Information Up-to-Date + +One problem that arises is that you may have the information managed by [[https://github.com/sp1ff/mpdpopm][mpdpopm]] replicated in other locations. For instance, I have play counts _also_ recorded in the =PCNT= & =POPM= ID3 tags attached to my music files. I record ratings in the =POPM= tag, as well. For that reason, =mppopmd= has the ability to run arbitrary commands after updating stickers. I developed this for the purpose of keeping my ID3 tags up-to-date, but one could do anything (pop up a notification, update a database &c). + +I will again illustrate through a worked example: keeping ID3 tags up-to-date. I use [[https://github.com/sp1ff/scribbu][scribbu]], a little ID3 tagging utility I wrote to keep my tags up-to-date. The following two lines, placed in your configuration file: + +#+BEGIN_EXAMPLE + (playcount_command . "/home/sp1ff/bin/scribbu") + (playcount_command_args . ("popm" "-a" "-A" "-b" "-o" "sp1ff@pobox.com" "-C" "%playcount" "%full-file")) #+END_EXAMPLE -** Generalized Commands +will cause =mppopmd= to invoke the command =/home/sp1ff/bin/scribbu popm -a -A -b -o sp1ff@pobox.com -C %playcount %full-file= every time it updates the play count sticker. The tokens %playcount & %full-file will be replaced with the new play count and the absolute path to the file backing the current song, respectively. -The admin can also configure arbitrary commands to be run server-side in response to messages received on the mpdpopm command channel. As an example, an entry in the configuration file like this: +There are two such options: =playcount_command= & =ratings_command=. Both support the replacement paramter %full-file, which, at the time of execution, will expand the the absolute path to the file backing the current song. The playcount command also provides the replacment parameter %playcount, which will expand to the new play count (expressed in base ten). The ratings command provides the %rating parameter, which will expand to the new rating, expressed as an integer betweern 0 & 255, inclusive (again in base ten). -#+BEGIN_EXAMPLE +*** Generalized Commands + +The idea of executing arbitrary commands proved useful enough to me that I generalized it: I set up a mechanism whereby the user can configure arbitrary server-side commands in response to messages received on the [[https://github.com/sp1ff/mpdpopm][mpdpopm]] commands channel. As an example, an entry in the configuration file like this: + +#+BEGIN_SRC elisp (gen_cmds . - (((name . "set-genre") - (formal_parameters . (Literal Track)) - (default_after . 1) - (cmd . "/home/mgh/bin/scribbu") - (args . ("genre" "-a" "-C" "-g" "%1" "%full-file")) - (update . TrackOnly))) -#+END_EXAMPLE + (((name . "set-genre") + (formal_parameters . (Literal Track)) + (default_after . 1) + (cmd . "/home/sp1ff/bin/scribbu") + (args . ("genre" "-a" "-C" "-g" "%1" "%full-file")) + (update . TrackOnly))) +#+END_SRC -will define a new command "set-genre", with two parameters, the second of which can be omitted (it will default to the current track). When mpdpopm receives this command (i.e. when a client says something like: +will define a new command "set-genre", with two parameters, the second of which can be omitted (it will default to the current track). When =mppopmd= receives this command (i.e. when a client says something like: #+BEGIN_EXAMPLE sendmessage unwoundstack.com:commands "set-genre Rock" #+END_EXAMPLE -mpdpopm will invoke =/home/mgh/bin/scribbu= like this: +=mppopmd= will invoke =/home/sp1ff/bin/scribbu= like this: #+BEGIN_EXAMPLE - /home/user/bin/mgh/scribbu genre -a -C -g Rock "${music-dir}/${song URI}" + /home/sp1ff/scribbu genre -a -C -g Rock "${music-dir}/${song URI}" #+END_EXAMPLE +where the "psuedo-variables" =music-dir= and =song URI= above will be replaced with the configured music directory and the current song's URI. + +The configuration is perforce more complex because we have to, at configuration-time, define a mapping between the actual parameters supplied by a client in the message to "unwoundstack.com:commands" and the replacement parameters used in the command arguments. The command's replacement parameters are defined by a simple list, given in =formal_parameters=, of parameter types. At this time, there are only two formal parameter types: + + 1. Literal :: the actual parameter shall be copied verbatim into the replacement parameters, under the name "%i" where i is the one-based index of this formal parameter, expressed in base ten + 2. Track :: the actual parameter will be interpreted as a song URI; it again may be referred in the replacement parameters as %i. Only one Track argument may appear in the list of formal parameters. + +Actual parameters after index =default_after= (counting from one) are optional; if not specified the replacement parameter will take the default value for its type ("" for literals, the currently playing song's URI for tracks). + +Two additional parameters are available: + + 1. current-file :: the absolute path to the currently playing track (if any) + 2. full-file :: if the list of formal parameters contains a Track argument in slot i, the actual parameter will be interpreted as a song URI, =%i= will return the absolute path to that file (i.e. with =music_dir= prepended to the actual argument), as will =%full-file= + +Finally, some commands (such as "set-genre=, above) may change your music collection in such a way as to necessitate an =mpd= database update after they complete. The =update= configuration item governs that: it may be set to "NoUpdate", "TrackOnly", or "FullDatabase" to indicate that this command will require no update, an update to the song named by the Track parameter only, or the full database, respectively. + * Status & Roadmap -I am currently using [[https://github.com/sp1ff/mpdpopm][mpdpopm]] day in & day out with my music collection, but it's early days. I have chosen the version number (0.1) in the hopes of indicating that. I'm considering adding another sticker for a tag cloud, and adding a filter feature that would extend the MPD "find" capability to allow queries that include the stickers that [[https://github.com/sp1ff/mpdpopm][mpdpopm]] manages-- so you could, for instance, say: +I am currently using [[https://github.com/sp1ff/mpdpopm][mpdpopm]] day in & day out with my music collection, but it's early days; I have chosen the version number (0.1) in the hopes of indicating that. Right now, mpdpopm is the bare-bones of an app: it's plumbing, not the sink. You can use the mppopm CLI to, say, rate the current song, but in order to actually _do_ anything with that rating in the future, you're going to have to write some kind of mpd client for yourself. For example, I have a shell script that queries the sticker database for all songs with no rating & queues 'em up for listening. I have some Emacs LISP that queues up all songs with a rating > 128. But these are quick-and-dirty ways to leverage [[https://github.com/sp1ff/mpdpopm][mpdpopm]] while I figure out where it should go. + +To that end, I plan to add a filter feature that would extend the MPD "find" capability to allow queries that include the stickers that [[https://github.com/sp1ff/mpdpopm][mpdpopm]] manages-- so you could, for instance, say: #+BEGIN_EXAMPLE find (artist =~ foo) and (rating > 175) @@ -110,4 +329,4 @@ MPD would handle the "artist =~" clause & [[https://github.com/sp1ff/mpdpopm][mp Windows support may be some time coming; the daemon depends on Unix signal handling, the MPD Unix socket, and the Unix daemon logic, especially =fork= & =exec=... if you'd like to run it on Windows, let me know-- if there's enough interest, and I can get some kind of Windows VM setup, I'll look at a port. -Suggestions, bug repors & PRs welcome! +Suggestions, bug reports & PRs welcome! diff --git a/configure.ac b/configure.ac index c2284a4..a9b1270 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([mpdpopm], [0.1.13], [sp1ff@pobox.com], [mpdpopm], [https://github.com/sp1ff/mpdpopm]) +AC_INIT([mpdpopm], [0.1.14], [sp1ff@pobox.com], [mpdpopm], [https://github.com/sp1ff/mpdpopm]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([mpdpopm/Cargo.toml.in]) AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability -Wno-override gnits std-options dist-bzip2 dist-xz]) diff --git a/mpdpopm/Cargo.toml.in b/mpdpopm/Cargo.toml.in index 1d80840..fb7879a 100644 --- a/mpdpopm/Cargo.toml.in +++ b/mpdpopm/Cargo.toml.in @@ -4,6 +4,7 @@ version = "@PACKAGE_VERSION@" authors = ["@PACKAGE_AUTHOR@"] edition = "2018" license = "GPL-3.0-or-later" +license-file = "../LICENSE" description = "Maintain ratings & playcounts for your mpd server" homepage = "https://github.com/sp1ff/mpdpopm" repository = "https://github.com/sp1ff/mpdpopm" @@ -28,3 +29,32 @@ serde = { version = "1.0", features = ["derive"] } serde-lexpr = "0.1.1" snafu = { version = "0.6.7", features = ["backtraces"] } tokio = { version = "0.2.22", features = ["dns", "io-util", "macros", "process", "rt-threaded", "signal", "tcp", "time", "uds"] } + +[package.metadata.deb] +maintainer = "@PACKAGE_AUTHOR@" +copyright = "Copyright (C) 2020 @PACKAGE_AUTHOR@" +extended-description = """ +mpdpopm provides a companion daemon to mpd / \ +for maintaining play counts, ratings and last-played timestamps, \ +along with an associated CLI for talking to the daemon. Similar to \ +mpdfav , but written in \ +Rust (which I prefer to Go), it will maintain this information in \ +your sticker database. Along the lines of mpdcron \ +, it will also allow you to keep that \ +information up-to-date in your tags by invoking external \ +(user-provided & -configured) commands.""" +section = "Sound" +priority = "optional" +# If I use "$auto", cargo-deb will choose a fairly recent version of +# libc6 (2.31); I've verified on the debian:slim-latest Docker package +# that it only needs 2.28-10 (and possibly much older). I'm going to +# roll the dice & just specify no version. +depends = "libc6" +assets = [ + ["target/release/mppopm", "usr/local/bin/", "755"], + ["target/release/mppopmd", "usr/local/bin/", "755"], + ["README.md", "usr/local/share/doc/mpdpopm/README", "644"], +] + +[package.metadata.arch] +arch = ["x86_64"] diff --git a/mpdpopm/src/.gitignore b/mpdpopm/src/.gitignore index 9203a6a..dc388a8 100644 --- a/mpdpopm/src/.gitignore +++ b/mpdpopm/src/.gitignore @@ -1,2 +1,3 @@ vars.rs vars.rs.am +flapdoodle.rs