diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcaddon.py b/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcaddon.py index 1a04ed0b98e..c378cc0e7fb 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcaddon.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcaddon.py @@ -10,7 +10,7 @@ def __init__(self, id: Optional[str] = None) -> None: pass def getLocalizedString(self, id: int) -> str: - # for MythTV, testall/scrapertest needs only 1 message from + # only testall.py / scrapertest.py needs only 1 message from # resources/language/resource.language.en_us/strings.po if (id == 32163): return "Testing: %s" diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcgui.py b/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcgui.py index 6cfe03571c1..2a6d1eab9f8 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcgui.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcgui.py @@ -2,7 +2,7 @@ # ever refers to other functions, simply copy them in here from # original Kodistubs and update where needed like below. -# for MythtTV, show "dialog" on stderr +# show "dialog" on stderr for testall.py / scrapertest.py import sys class Dialog: @@ -30,7 +30,7 @@ def close(self) -> None: pass def iscanceled(self) -> bool: - # for MythTV, not cancelled is needed to continue the scrapertest.py + # not cancelled is needed to continue the testall.py / scrapertest.py return False class Window: diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcvfs.py b/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcvfs.py index 73c1644f4f0..8878e5ea7e5 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcvfs.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/Kodistubs/xbmcvfs.py @@ -5,7 +5,7 @@ from typing import Union, Optional import os.path -# for MythTV, embedlrc.py and musixmatchlrc.py need some File access +# embedlrc.py and musixmatchlrc.py need some File access class File: diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/LICENSE.txt b/mythtv/programs/scripts/metadata/Music/lyrics/LICENSE.txt new file mode 100644 index 00000000000..4f8e8eb30cc --- /dev/null +++ b/mythtv/programs/scripts/metadata/Music/lyrics/LICENSE.txt @@ -0,0 +1,282 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + END OF TERMS AND CONDITIONS +------------------------------------------------------------------------- diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/README b/mythtv/programs/scripts/metadata/Music/lyrics/README index 6e24630a3c2..fa4c93f9cf3 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/README +++ b/mythtv/programs/scripts/metadata/Music/lyrics/README @@ -9,16 +9,18 @@ The included grabbers are sourced from the CU LRC Kodi addon: https://gitlab.com/ronie/script.cu.lrclyrics +Copyright / LICENSE +=================== + +CU LRC and therefore this directory are licensed under the terms of +the GNU GPL version 2, see ./LICENSE.txt for details. + + Grabbers as/of 2024/01, Their Priority And Whether Synchronized =============================================================== - Local - EmbeddedLyrics 50 Yes/No FileLyrics 90 Yes/No - - CU LRC - musixmatchlrc 100 Yes NEW in v34 lrclib 110 Yes NEW in v34 lyricsify 130 Yes NEW in v34 @@ -46,6 +48,11 @@ add a new ./*.py for any new scraper in lib/culrcscrapers adjust the fields of info{} as needed +overwrite ./changelog.txt from the source so its head is updated and +copy this version into the header of ./common/culrcwrap.py + +./testlyrics -k -t + That's all! As of v34 in 2024/01 this is how we use CU LRC unmodified: diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/azlyrics.py b/mythtv/programs/scripts/metadata/Music/lyrics/azlyrics.py index 787bf1a7ddb..24a9b59603f 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/azlyrics.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/azlyrics.py @@ -5,10 +5,9 @@ # make sure this-------^^^^^^^^^ matches this file's basename info = { - 'command': 'azlyrics.py', 'name': 'AZLyrics', 'description': 'Search https://azlyrics.com for lyrics', - 'author': 'Paul Harrison and ronie', + 'author': 'ronie', 'priority': '230', 'syncronized': False, 'artist': 'La Dispute', diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/lrclib.py b/mythtv/programs/scripts/metadata/Music/lyrics/lrclib.py index f74f8ddf6e0..6a5e3b69a27 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/lrclib.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/lrclib.py @@ -7,7 +7,7 @@ info = { 'name': '*LrcLib', 'description': 'Search https://lrclib.net for synchronized lyrics', - 'author': 'Paul Harrison and ronie', + 'author': 'ronie', 'priority': '110', 'syncronized': True, 'artist': 'CHVRCHES', diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/lyricsify.py b/mythtv/programs/scripts/metadata/Music/lyrics/lyricsify.py index 45e348883bd..6b96885e910 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/lyricsify.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/lyricsify.py @@ -7,7 +7,7 @@ info = { 'name': '*Lyricsify', 'description': 'Search https://lyricsify.com for synchronized lyrics', - 'author': 'Paul Harrison and ronie', + 'author': 'ronie', 'priority': '130', 'syncronized': True, 'artist': 'Madonna', diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/megalobiz.py b/mythtv/programs/scripts/metadata/Music/lyrics/megalobiz.py index 44254c6165d..be6d3558339 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/megalobiz.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/megalobiz.py @@ -7,7 +7,7 @@ info = { 'name': '*Megalobiz', 'description': 'Search https://megalobiz.com for synchronized lyrics', - 'author': 'Paul Harrison and ronie', + 'author': 'ronie', 'priority': '140', 'syncronized': True, 'artist': 'Michael Jackson', diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/music163.py b/mythtv/programs/scripts/metadata/Music/lyrics/music163.py index 817f0df154f..cbf56e9736b 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/music163.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/music163.py @@ -7,14 +7,17 @@ info = { 'name': '*Music163', 'description': 'Search http://music.163.com for synchronized lyrics', - 'author': 'Paul Harrison and ronie', + 'author': 'ronie', 'priority': '120', 'syncronized': True, 'artist': 'Madonna', 'title': 'Vogue', } -# its reporting author only so I need move it last -twitham, 2024/01 +# -a Rainmakers -n Doomsville, for example, reports author only which +# is incomplete and stops the search so I need to move it last. +# Simply comment this if you prefer the above 120 from CU LRC +# -twitham, 2024/01 info['priority'] = '500' if __name__ == '__main__': diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/musixmatch.py b/mythtv/programs/scripts/metadata/Music/lyrics/musixmatch.py index ded5fc61e3f..2713683fac9 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/musixmatch.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/musixmatch.py @@ -7,7 +7,7 @@ info = { 'name': 'Musixmatch', 'description': 'Search https://musixmatch.com for lyrics', - 'author': 'Paul Harrison and ronie', + 'author': 'ronie', 'priority': '210', 'syncronized': False, 'artist': 'Kate Bush', diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/musixmatchlrc.py b/mythtv/programs/scripts/metadata/Music/lyrics/musixmatchlrc.py index a6645006252..cd9109d7298 100644 --- a/mythtv/programs/scripts/metadata/Music/lyrics/musixmatchlrc.py +++ b/mythtv/programs/scripts/metadata/Music/lyrics/musixmatchlrc.py @@ -11,7 +11,7 @@ info = { 'name': '*Musixmatchlrc', 'description': 'Search https://musixmatch.com for synchronized lyrics', - 'author': 'Paul Harrison and ronie', + 'author': 'ronie', 'priority': '100', 'syncronized': True, 'artist': 'Kate Bush', diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/testlyrics.pl b/mythtv/programs/scripts/metadata/Music/lyrics/testlyrics.pl index 779bb0c89b2..2cce1403444 100755 --- a/mythtv/programs/scripts/metadata/Music/lyrics/testlyrics.pl +++ b/mythtv/programs/scripts/metadata/Music/lyrics/testlyrics.pl @@ -23,7 +23,8 @@ my @opt = qw(k|keepgoing v|version t|test s|search d|debug a|artist=s b|album=s n|title=s f|filename=s); my %opt; -my $usage = "usage: $0 [-k] [-v | -t | -a artist -n title] +my $usage = "usage: $0 [-d] [-k] [-v | -t | -a artist -n title] +-d | --debug extra debugging lines to stderr -k | --keepgoing don't stop at the first match -v | --version show scraper version headers -t | --test lookup known good artist/title @@ -42,14 +43,15 @@ if (open FILE, $py) { while () { m/'priority':\s*'(\d+)'/ - and $pri{$py} = $1; - m/info.'priority'.\s*=\s*'(\d+)'/ - and $pri{$py} = $1; + and $pri{$py} = $1; + m/info.'priority'.\s*=\s*'(\d+)'/ + and $pri{$py} = $1; m/'syncronized':\s*(\S+)/ and $sync{$py} = $1; } } } +closedir DIR; my(%found, %time, %lines); @opt = map { $opt{$_} ? ("-$_", $opt{$_}) : () } qw/a b n f v d t/; @@ -60,7 +62,7 @@ my $out = ''; open PIPE, '-|', @cmd; while () { - $out .= $_; + $out .= $_; } close PIPE; $lines{$py} = $out =~ s///g;