Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osdlyrics for openSUSE:Factory checked in at 2021-10-26 20:13:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osdlyrics (Old) and /work/SRC/openSUSE:Factory/.osdlyrics.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osdlyrics" Tue Oct 26 20:13:52 2021 rev:5 rq:927448 version:0.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/osdlyrics/osdlyrics.changes 2020-06-12 21:47:14.816918064 +0200 +++ /work/SRC/openSUSE:Factory/.osdlyrics.new.1890/osdlyrics.changes 2021-10-26 20:14:35.754038399 +0200 @@ -1,0 +2,8 @@ +Tue Oct 26 05:38:40 UTC 2021 - Hillwood Yang <[email protected]> + +- Update version to 0.5.5 + * Fix D-Bus race-condition + * Enhance metadata parsing + * Update romanian translation + +------------------------------------------------------------------- Old: ---- osdlyrics-0.5.5-rc2.tar.gz New: ---- osdlyrics-0.5.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osdlyrics.spec ++++++ --- /var/tmp/diff_new_pack.C0kaLo/_old 2021-10-26 20:14:36.290038683 +0200 +++ /var/tmp/diff_new_pack.C0kaLo/_new 2021-10-26 20:14:36.294038684 +0200 @@ -1,7 +1,7 @@ # # spec file for package osdlyrics # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,14 @@ # -%define with_mpd 0 -# %define commit 18cc4a872c3a18e99a33ac233f7c8cb2f5dfc624 -# %define shortcommit 18cc4a8 -%define _version 0.5.5-rc2 - Name: osdlyrics -Version: 0.4.99.2 +Version: 0.5.5 Release: 0 Summary: A third-party lyrics display program License: GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Visualization URL: https://github.com/osdlyrics/osdlyrics -Source0: https://github.com/osdlyrics/osdlyrics/archive/%{_version}/%{name}-%{_version}.tar.gz +Source0: https://github.com/osdlyrics/osdlyrics/archive/%{version}/%{name}-%{version}.tar.gz # Source0: https://github.com/osdlyrics/osdlyrics/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: %{name}.appdata.xml BuildRequires: fdupes @@ -57,9 +52,6 @@ Requires: sqlite3 Recommends: %{name}-lang Recommends: python3-%{name} -%if %{with_mpd} -BuildRequires: mpd -%endif %description OSD Lyrics is a lyrics show compatible with various media players. It is not a @@ -80,17 +72,12 @@ %lang_package %prep -%setup -q -n %{name}-%{_version} +%setup -q -n %{name}-%{version} %build NOCONFIGURE=1 ./autogen.sh %configure --enable-appindicator \ - PYTHON=/usr/bin/python3 \ -%if %{with_mpd} - --enable-mpd -%else - --disable-mpd -%endif + PYTHON=/usr/bin/python3 %make_build @@ -102,7 +89,7 @@ %suse_update_desktop_file %{name} %find_lang %{name} -%fdupes %{buildroot} +%fdupes %{buildroot}%{_datadir} %files %license LICENSE ++++++ osdlyrics-0.5.5-rc2.tar.gz -> osdlyrics-0.5.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.5-rc2/README.md new/osdlyrics-0.5.5/README.md --- old/osdlyrics-0.5.5-rc2/README.md 2019-04-07 17:14:31.000000000 +0200 +++ new/osdlyrics-0.5.5/README.md 2021-05-19 14:09:33.000000000 +0200 @@ -19,28 +19,16 @@ ## How to install -OSD Lyrics is available for Ubuntu in [our PPA](https://launchpad.net/~osd-lyrics/+archive/ubuntu/ppa) and for ArchLinux through [community repo](https://www.archlinux.org/packages/community/x86_64/osdlyrics) and through [AUR](https://aur.archlinux.org/packages/osdlyrics-git). +OSD Lyrics is available for Ubuntu, Debian, Fedora, OpenSUSE, FreeBSD and ArchLinux. +A list of packages' names, versions, and install instructions for each distribution is [available at pkgs.org](https://pkgs.org/search/?q=osdlyrics). ## Build instructions ### Requirements -On Ubuntu, the following packages need to be installed to compile OSD Lyrics: - -- Python 2.6+/3.4+ -- `libdbus-glib-1-dev` -- `intltool` -- `libappindicator-dev` (optional) - -### Runtime Dependencies - -- Python (either one): - - Python 2: python (>= 2.6), python-future, python-gi (>= 3.11.1) - - Python 3: python3 (>= 3.4), python3-future, python3-gi (>= 3.11.1) -- Supported players: - - MPRIS2 - - MPRIS - - [MPD](https://www.musicpd.org): mpd (>= 0.16.0), python-mpd +* On Ubuntu, dependencies are listed on the [Ubuntu Universe page](https://packages.ubuntu.com/source/focal/osdlyrics). +* On Debian, dependencies are listed on the [Sid packages' page](https://packages.debian.org/sid/osdlyrics). +* On ArchLinux, dependencies are listed on the [AUR package](https://aur.archlinux.org/packages/osdlyrics-git). ## Cloning repository @@ -56,7 +44,7 @@ ``` ./autogen.sh -./configure --prefix=/usr PYTHON=/usr/bin/python2 +./configure --prefix=/usr PYTHON=/usr/bin/python3 make sudo make install ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.5-rc2/configure.ac new/osdlyrics-0.5.5/configure.ac --- old/osdlyrics-0.5.5-rc2/configure.ac 2019-04-07 17:14:31.000000000 +0200 +++ new/osdlyrics-0.5.5/configure.ac 2021-05-19 14:09:33.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. m4_define([OL_MAJOR_VER], [0]) m4_define([OL_MINOR_VER], [5]) -m4_define([OL_MICRO_VER], [0]) +m4_define([OL_MICRO_VER], [5]) m4_define([OL_BUILD], [-git]) m4_define(OL_BUILD_VER, m4_esyscmd_s([if test 'x]OL_BUILD[' = 'x-git'; then (git log -1 --format=format:%ad --date=short 2>/dev/null || date -u -r ChangeLog +%Y%m%d) | sed 's/-//g'; fi])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.5-rc2/po/ro.po new/osdlyrics-0.5.5/po/ro.po --- old/osdlyrics-0.5.5-rc2/po/ro.po 2019-04-07 17:14:31.000000000 +0200 +++ new/osdlyrics-0.5.5/po/ro.po 2021-05-19 14:09:33.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2011-05-14 04:13+0000\n" +"PO-Revision-Date: 2021-05-17 14:49+0200\n" "Last-Translator: Tuhut Vladut Emanuel <Unknown>\n" "Language-Team: Romanian <[email protected]>\n" "Language: ro\n" @@ -18,7 +18,7 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" "X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Generator: Poedit 2.4.3\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -26,32 +26,32 @@ #: ../src/ol_menu.c:125 msgid "Choose LRC file to assign" -msgstr "Alege??i fi??ierul LRC pentru atribuire" +msgstr "Alege??i fi??ierul LRC de atribuit" #: ../src/ol_main.c:60 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" msgstr "" -"Nivelul de depanare a mesajelor din jurnal, poate fi \"nici unul\", \"eroare" +"Nivelul mesajelor de depanare pentru jurnalizare, poate fi ???none???, \"error" "\", \"debug\", sau \"info\"" #: ../src/ol_main.c:62 msgid "Show version information" -msgstr "" +msgstr "Arat?? informa??iile despre versiune" #: ../src/ol_main.c:147 msgid "Download failed" msgstr "Desc??rcare e??uat??" #: ../src/ol_main.c:162 -#, fuzzy, c-format +#, c-format msgid "Searching lyrics from %s" -msgstr "Se caut?? versuri pentru %s..." +msgstr "Se caut?? versuri pentru %s" #: ../src/ol_main.c:185 msgid "Cannot create the lyric directory" -msgstr "Nu se poate crea directorul cu versuri" +msgstr "Nu s-a putut crea directorul cu versuri" #: ../src/ol_main.c:201 msgid "Lyrics not found" @@ -60,19 +60,18 @@ #: ../src/ol_main.c:507 #, c-format msgid "No supported player is running, exit.\n" -msgstr "Un player nesuportat ruleaz??, i??ire\n" +msgstr "Nu ruleaz?? niciun player suportat, se iese.\n" #: ../src/ol_main.c:652 -#, fuzzy msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"Nivelul de depanare a mesajelor din jurnal, poate fi \"nici unul\", \"eroare" -"\", \"debug\", sau \"info\"" +"nivelul de depanare trebuie s?? fie unul dintre ???none???, ???error???, ???debug???, " +"sau ???info???" #: ../src/ol_main.c:675 msgid "Another OSD Lyrics is running, exit." -msgstr "Un alt OSD Lyrics ruleaz??, ie??ire" +msgstr "Un alt OSD Lyrics ruleaz??, se iese." #: ../src/ol_trayicon.c:36 ../src/ol_notify.c:26 msgid "Unknown title" @@ -88,7 +87,7 @@ #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Alege la pornire" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, @@ -109,7 +108,7 @@ #: ../src/ol_lrc_fetch_xiami.c:237 msgid "Xiami" -msgstr "" +msgstr "Xiami" #: ../src/ol_lrc_candidate_list.c:43 msgid "Title" @@ -122,11 +121,11 @@ #: ../src/ol_search_dialog.c:31 #, c-format msgid "Searching lyrics from %s..." -msgstr "Se caut?? versuri pentru %s..." +msgstr "Caut?? versuri pentru %s..." #: ../src/ol_search_dialog.c:32 msgid "Ooops, no lyric found :(" -msgstr "Ooops, versuri neg??site :(" +msgstr "Ups, nu s-au g??sit versuri :(" #: ../src/ol_search_dialog.c:33 #, c-format @@ -135,60 +134,58 @@ #: ../src/ol_player_chooser.c:243 msgid "Supported players" -msgstr "" +msgstr "Playere suportate" #: ../src/ol_player_chooser.c:244 msgid "All players" -msgstr "" +msgstr "Toate playerele" #: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy msgid "Choose a player to launch" -msgstr "Alege??i fi??ierul LRC pentru atribuire" +msgstr "Alege??i un player pentru lansare" #: ../src/ol_player_chooser.c:264 -#, fuzzy msgid "Use command:" -msgstr "Comand?? pla_yer:" +msgstr "Utilizeaz?? comanda:" #: ../src/ol_player_chooser.c:268 msgid "Launch" -msgstr "" +msgstr "Lanseaz??" #: ../src/ol_player_chooser.c:281 msgid "Remember my choice" -msgstr "" +msgstr "??ine minte alegerea mea" #: ../src/ol_player_chooser.c:387 #, c-format msgid "Failed to launch %s" -msgstr "" +msgstr "E??ec la lansarea %s" #: ../src/ol_player_chooser.c:397 #, c-format msgid "Launching %s" -msgstr "" +msgstr "Se lanseaz?? %s" #: ../src/ol_player_chooser.c:399 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" +"OSD Lyrics ??ncearc?? s?? lanseze ??i s?? se conecteze la %s. A??tepta??i un " +"moment." #: ../src/ol_player_chooser.c:510 -#, fuzzy msgid "There is no supported player running" -msgstr "Un player nesuportat ruleaz??, i??ire\n" +msgstr "Un player nesuportat ruleaz??" #: ../src/ol_player_chooser.c:511 -#, fuzzy msgid "Please choose a player below to launch" -msgstr "Alege??i fi??ierul LRC pentru atribuire" +msgstr "Alege??i un player de mai jos pentru a-l lansa" #: ../src/ol_player_chooser.c:515 #, c-format msgid "Failed to connect to %s" -msgstr "" +msgstr "E??ec la conectarea la %s" #: ../src/ol_player_chooser.c:517 #, c-format @@ -196,20 +193,23 @@ "%s is not supported by OSD Lyrics, or not running. Please launch another " "player" msgstr "" +"%s nu este suportat de OSD Lyriccs, sau nu ruleaz??. Alege??i un alt player" #: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 msgid "Unnamed" -msgstr "" +msgstr "Nedenumit" #: ../src/ol_scroll_window.c:52 msgid "" "Drag to move the window\n" "Hold CTRL to seek" msgstr "" +"Trage??i pentru a muta fereastra\n" +"Men??ine??i ap??sat CTRL pentru a derula" #: ../src/ol_scroll_window.c:53 msgid "Drag to move the window" -msgstr "" +msgstr "Trage??i pentru a muta fereastra" #: ../data/dialogs.glade.h:2 #, no-c-format @@ -223,7 +223,7 @@ " %t - Titlu\n" " %p - Artist\n" " %a - Album\n" -" %n - Num??r melodie\n" +" %n - Num??r pies??\n" " %f - Nume fi??ier (f??r?? extensie)" #: ../data/dialogs.glade.h:8 @@ -239,7 +239,7 @@ #: ../data/dialogs.glade.h:12 #, no-c-format msgid "%n - Track number" -msgstr "%n - Num??r melodie" +msgstr "%n - Num??r pies??" #: ../data/dialogs.glade.h:14 #, no-c-format @@ -257,7 +257,7 @@ #: ../data/dialogs.glade.h:18 msgid "<b>Download</b>" -msgstr "<b>Descarc??</b>" +msgstr "<b>Desc??rc??ri</b>" #: ../data/dialogs.glade.h:19 msgid "<b>Lyric _Alignment</b>" @@ -286,15 +286,15 @@ #: ../data/dialogs.glade.h:26 #, no-c-format msgid "A single \"%\" means the directory where the playing music is." -msgstr "Un singur \"%\" reprezint?? directorul de unde se afl?? muzica" +msgstr "Un singur ???%??? reprezint?? directorul de unde se afl?? muzica." #: ../data/dialogs.glade.h:27 msgid "Ac_tive color:" -msgstr "Culoare ac_tiv??" +msgstr "Culoare ac_tiv??:" #: ../data/dialogs.glade.h:28 msgid "Acti_ve lyrics:" -msgstr "Versuri acty_ve" +msgstr "Versuri acti_ve:" #: ../data/dialogs.glade.h:29 msgid "Adjust lyric delay by +0.2 s" @@ -322,11 +322,11 @@ #: ../data/dialogs.glade.h:35 msgid "Au_to-detect system settings" -msgstr "Au_to-detecteaz?? set??tile sistemului" +msgstr "Detecteaz?? au_tomat configur??rile sistemului" #: ../data/dialogs.glade.h:36 msgid "Auto la_unch player:" -msgstr "Auto ru_leaz?? player:" +msgstr "La_nseaz?? automat playerul:" #: ../data/dialogs.glade.h:37 msgid "By lines" @@ -338,7 +338,7 @@ #: ../data/dialogs.glade.h:39 msgid "Choose LRC file to download" -msgstr "Alege??i fi??ierul LRC pentru desc??rcare" +msgstr "Alege??i fi??ierul LRC de desc??rcat" #: ../data/dialogs.glade.h:40 msgid "Colo_r:" @@ -346,25 +346,24 @@ #: ../data/dialogs.glade.h:41 msgid "Color _Theme:" -msgstr "Culoare_Tem??" +msgstr "_Tem?? de culori:" #: ../data/dialogs.glade.h:42 -#, fuzzy msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Drepturi de autor 2009 Proiectul OSD Lyrics." +msgstr "Drepturi de autor 2009-2011 ?? Proiectul OSD Lyrics." #: ../data/dialogs.glade.h:44 msgid "D_on't ask me again" -msgstr "N_u m?? mai ??ntreba" +msgstr "N_u mai ??ntreba" #: ../data/dialogs.glade.h:45 msgid "Display mode:" -msgstr "Mod afi??are" +msgstr "Mod de afi??are:" #. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 msgid "Do_wnload the first candidate" -msgstr "De_scarc?? primul fi??ier" +msgstr "De_scarc?? primul candidat" #: ../data/dialogs.glade.h:48 msgid "Doc_k" @@ -372,11 +371,11 @@ #: ../data/dialogs.glade.h:49 msgid "Don't assign lyric to this music" -msgstr "Nu asocia versuri melodiei" +msgstr "Nu asocia versuri acestei melodii" #: ../data/dialogs.glade.h:50 msgid "F_irst line:" -msgstr "P_rima linie" +msgstr "P_rima linie:" #: ../data/dialogs.glade.h:51 msgid "GPL v3" @@ -392,32 +391,31 @@ #: ../data/dialogs.glade.h:54 msgid "If locked, you can't move OSD window by mouse" -msgstr "Dac?? este blocat, nu pute??i muta fereastra OSD cu mausul" +msgstr "Dac?? este blocat??, nu pute??i muta fereastra OSD cu mausul" #: ../data/dialogs.glade.h:55 msgid "" "If there are more than one lrc files matched with the search condition, " "download the first one without prompting the user." msgstr "" -"Dac?? sunt mai multe fi??iere LRC se potrivesc c??ut??rii, descarc?? primul " -"fi??ier f??r?? a interoga utilizatorul." +"Dac?? mai multe fi??iere LRC se potrivesc c??ut??rii, descarc?? primul fi??ier " +"f??r?? a interoga utilizatorul." #: ../data/dialogs.glade.h:56 msgid "Inactiv_e lyrics:" -msgstr "Versuri inactiv_e" +msgstr "Versuri inactiv_e:" #: ../data/dialogs.glade.h:57 -#, fuzzy msgid "Lyric _sites:" -msgstr "Linii versuri:" +msgstr "_Situri cu versuri:" #: ../data/dialogs.glade.h:58 msgid "Lyric delay +" -msgstr "Sincronizare versuri +" +msgstr "Decalaj versuri +" #: ../data/dialogs.glade.h:59 msgid "Lyric delay -" -msgstr "Sincronizare versuri -" +msgstr "Decalaj versuri -" #: ../data/dialogs.glade.h:60 msgid "Lyric lines:" @@ -437,7 +435,7 @@ #: ../data/dialogs.glade.h:64 msgid "OSD _mode" -msgstr "mod_OSD" +msgstr "mod _OSD" #: ../data/dialogs.glade.h:65 msgid "OS_D" @@ -454,11 +452,11 @@ #. The outline width of text in OSD window #: ../data/dialogs.glade.h:69 msgid "Out_line:" -msgstr "Con_tur" +msgstr "Con_tur:" #: ../data/dialogs.glade.h:70 msgid "Passwo_rd:" -msgstr "Parol_??" +msgstr "Parol_??:" #: ../data/dialogs.glade.h:71 msgid "Pla_yer command:" @@ -486,23 +484,23 @@ #: ../data/dialogs.glade.h:77 msgid "Scroll _mode:" -msgstr "Mod_derulare" +msgstr "Mod de _derulare:" #: ../data/dialogs.glade.h:78 msgid "Scrolling _mode" -msgstr "Mod_derulare" +msgstr "_Mod derulare" #: ../data/dialogs.glade.h:79 msgid "Search lyrics" -msgstr "Se caut?? versuri" +msgstr "Caut?? versuri" #: ../data/dialogs.glade.h:80 msgid "Search lyrics from Internet" -msgstr "Se caut?? versuri pe Internet" +msgstr "Caut?? versuri pe Internet" #: ../data/dialogs.glade.h:81 msgid "Show _bubble notification" -msgstr "Afi??eaz??_notificarea balon" +msgstr "Afi??eaz?? notificarea _balon" #: ../data/dialogs.glade.h:82 msgid "Show passwor_d" @@ -514,7 +512,7 @@ #: ../data/dialogs.glade.h:84 msgid "Strong" -msgstr "" +msgstr "Puternic" #: ../data/dialogs.glade.h:85 msgid "T_ranslucent on mouse over" @@ -546,11 +544,11 @@ #: ../data/dialogs.glade.h:92 msgid "Use _manual settings" -msgstr "Set??tile utilizatorului" +msgstr "Configur??rile _manuale ale utilizatorului" #: ../data/dialogs.glade.h:93 msgid "Weak" -msgstr "" +msgstr "S??pt??m??n??" #: ../data/dialogs.glade.h:94 msgid "_Artist:" @@ -558,19 +556,19 @@ #: ../data/dialogs.glade.h:95 msgid "_Assign lyric..." -msgstr "_Asociere versuri..." +msgstr "_Asociaz?? versuri..." #: ../data/dialogs.glade.h:96 msgid "_Blur:" -msgstr "" +msgstr "_Neclaritate:" #: ../data/dialogs.glade.h:97 msgid "_Double lines" -msgstr "_Linii duble" +msgstr "Linii _duble" #: ../data/dialogs.glade.h:98 msgid "_Download" -msgstr "_Desc??rcare" +msgstr "_Descarc??" #: ../data/dialogs.glade.h:99 msgid "_Font:" @@ -591,15 +589,15 @@ #: ../data/dialogs.glade.h:104 msgid "_Host:" -msgstr "_Gazd??" +msgstr "_Gazd??:" #: ../data/dialogs.glade.h:105 msgid "_Inactive color:" -msgstr "_Culoare inactiv" +msgstr "Culoarea _inactiv:" #: ../data/dialogs.glade.h:106 msgid "_Lock Position" -msgstr "_Pozi??ie blocat??" +msgstr "B_locheaz?? pozi??ia" #: ../data/dialogs.glade.h:107 msgid "_Lyric Location" @@ -627,11 +625,11 @@ #: ../data/dialogs.glade.h:113 msgid "_Search lyric..." -msgstr "_Se caut?? versuri" +msgstr "Caut?? ver_suri..." #: ../data/dialogs.glade.h:114 msgid "_Second line:" -msgstr "_A doua linie" +msgstr "_A doua linie:" #: ../data/dialogs.glade.h:115 msgid "_Title:" @@ -660,7 +658,9 @@ #: ../data/dialogs.glade.h:122 msgid "translator-credits" msgstr "" -"Launchpad Contributions:\n" +"Daniel ??erb??nescu <daniel [at] serbanescu [dot] dk>, 2021\n" +"\n" +"Contribu??ii Launchpad:\n" " Tuhut Vladut Emanuel https://launchpad.net/~ithreexas"; #~ msgid "Searching lyrics" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.5-rc2/src/ol_lyric_source.c new/osdlyrics-0.5.5/src/ol_lyric_source.c --- old/osdlyrics-0.5.5-rc2/src/ol_lyric_source.c 2019-04-07 17:14:31.000000000 +0200 +++ new/osdlyrics-0.5.5/src/ol_lyric_source.c 2021-05-19 14:09:33.000000000 +0200 @@ -531,7 +531,21 @@ ol_lyric_source_info_free (info); } source_ids = g_list_reverse (source_ids); - task = ol_lyric_source_search (source, metadata, source_ids); + + // create a new metadata with real title and artist to search + OlMetadata * search_metadata = ol_metadata_dup (metadata); + ol_metadata_set_artist (search_metadata, + ol_metadata_get_search_artist(metadata)); + ol_metadata_set_title (search_metadata, + ol_metadata_get_search_title(metadata)); + task = ol_lyric_source_search (source, search_metadata, source_ids); + + // comment out original call + // task = ol_lyric_source_search (source, metadata, source_ids); + + // free created metadata + ol_metadata_free (search_metadata); + for (; source_ids; source_ids = g_list_delete_link (source_ids, source_ids)) { g_free (source_ids->data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.5-rc2/src/ol_main.c new/osdlyrics-0.5.5/src/ol_main.c --- old/osdlyrics-0.5.5-rc2/src/ol_main.c 2019-04-07 17:14:31.000000000 +0200 +++ new/osdlyrics-0.5.5/src/ol_main.c 2021-05-19 14:09:33.000000000 +0200 @@ -620,9 +620,9 @@ #ifndef GLIB_VERSION_2_32 g_thread_init(NULL); #endif + g_set_prgname (_(PROGRAM_NAME)); gtk_init (&argc, &argv); _parse_cmd_args (&argc, &argv); - g_set_prgname (_(PROGRAM_NAME)); initialized = FALSE; g_bus_own_name (G_BUS_TYPE_SESSION, OL_CLIENT_BUS_NAME, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.5-rc2/src/ol_metadata.c new/osdlyrics-0.5.5/src/ol_metadata.c --- old/osdlyrics-0.5.5-rc2/src/ol_metadata.c 2019-04-07 17:14:31.000000000 +0200 +++ new/osdlyrics-0.5.5/src/ol_metadata.c 2021-05-19 14:09:33.000000000 +0200 @@ -501,3 +501,178 @@ g_variant_builder_unref (builder); return ret; } + +/* + chech whether tag artist is valid + */ +static gboolean artist_valid(const OlMetadata *metadata) +{ + ol_assert_ret (metadata != NULL, FALSE); + + // no artist name list + char * arts[] = {"unknown", "??????", "??????", NULL}; + + if (metadata->artist == NULL || strlen(metadata->artist) == 0) + { + return FALSE; + } + + gboolean valid = TRUE; + char * artist = g_ascii_strdown(metadata->artist, -1); + for (char ** a = arts; *a; a++) + { + if (g_strstr_len (artist, -1, *a) != NULL) + { + valid = FALSE; + break; + } + } + g_free(artist); + + return valid; +} + +/* + get real title: + if tag artist is valid, assume tag title is correct and return it, else parse it and return real title + support tag title formats: + %n.%p-%t, %n.%t--%p, %n.%t, %p-%t, %t--%p, %t + intend to be called in search action + */ +const char * +ol_metadata_get_search_title (const OlMetadata *metadata) +{ + ol_assert_ret (metadata != NULL, NULL); + + if (metadata->title == NULL) + { + return metadata->title; + } + + gboolean valid_artist = artist_valid(metadata); + + char * title = NULL; + char * title1 = NULL; + + // get title without track number + gchar **pathv = g_strsplit (metadata->title, ".", 0); + gchar **p; + if (g_strv_length (pathv) == 2) + { + p = pathv; + p++; + title = g_strstrip(g_strdup(*p)); + } + else + { + title = g_strdup(metadata->title); + } + g_free(pathv); + + // if tag artist is valid, assume the title is correct + if (valid_artist) { + return title; + } + + // parse title from tag title + gchar **pathv2 = g_strsplit (title, "--", 0); + gchar **p2; + if (g_strv_length (pathv2) == 2) + { + p2 = pathv2; + title1 = g_strstrip(g_strdup(*p2)); + } + else + { + gchar **pathv3 = g_strsplit (title, "-", 0); + gchar **p3; + if (g_strv_length (pathv3) == 2) + { + p3 = pathv3; + p3++; + title1 = g_strstrip(g_strdup(*p3)); + } + else + { + title1 = g_strdup(title); + } + g_free(pathv3); + } + g_free(pathv2); + g_free(title); + + return title1; +} + +/* + get real artist: + if tag artist is valid, return it, else parse tag title and return real artist + support tag title formats: + %n.%p-%t, %n.%t--%p, %n.%t, %p-%t, %t--%p, %t + intend to be called in search action + */ +const char * +ol_metadata_get_search_artist (const OlMetadata *metadata) +{ + ol_assert_ret (metadata != NULL, NULL); + + if (metadata->title == NULL) + { + return metadata->artist; + } + + gboolean valid_artist = artist_valid(metadata); + + // if tag artist is valid, return + if (valid_artist) + { + return metadata->artist; + } + + char * title = NULL; + char * artist = NULL; + + // get title without track number + gchar **pathv = g_strsplit (metadata->title, ".", 0); + gchar **p; + if (g_strv_length (pathv) == 2) + { + p = pathv; + p++; + title = g_strstrip(g_strdup(*p)); + } + else + { + title = g_strdup(metadata->title); + } + g_free(pathv); + + // get artist from title + gchar **pathv2 = g_strsplit (title, "--", 0); + gchar **p2; + if (g_strv_length (pathv2) == 2) + { + p2 = pathv2; + p2++; + artist = g_strstrip(g_strdup(*p2)); + } + else + { + gchar **pathv3 = g_strsplit (title, "-", 0); + gchar **p3; + if (g_strv_length (pathv3) == 2) + { + p3 = pathv3; + artist = g_strstrip(g_strdup(*p3)); + } + else + { + artist = ""; + } + g_free(pathv3); + } + g_free(pathv2); + g_free(title); + + return artist; +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.5-rc2/src/ol_metadata.h new/osdlyrics-0.5.5/src/ol_metadata.h --- old/osdlyrics-0.5.5-rc2/src/ol_metadata.h 2019-04-07 17:14:31.000000000 +0200 +++ new/osdlyrics-0.5.5/src/ol_metadata.h 2021-05-19 14:09:33.000000000 +0200 @@ -192,3 +192,9 @@ */ GVariant *ol_metadata_to_variant (OlMetadata *metadata); #endif /* _OL_METADATA_H_ */ + +// get real title +const char *ol_metadata_get_search_title (const OlMetadata *metadata); + +// get real artist +const char *ol_metadata_get_search_artist (const OlMetadata *metadata); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osdlyrics-0.5.5-rc2/src/ol_search_dialog.c new/osdlyrics-0.5.5/src/ol_search_dialog.c --- old/osdlyrics-0.5.5-rc2/src/ol_search_dialog.c 2019-04-07 17:14:31.000000000 +0200 +++ new/osdlyrics-0.5.5/src/ol_search_dialog.c 2021-05-19 14:09:33.000000000 +0200 @@ -282,10 +282,20 @@ if (global_metadata == NULL) global_metadata = ol_metadata_new (); ol_metadata_copy (global_metadata, ol_app_get_current_music ()); + +/* fill with real title and artist gtk_entry_set_text (widgets.title, ol_metadata_get_title (global_metadata)); gtk_entry_set_text (widgets.artist, ol_metadata_get_artist (global_metadata)); +*/ +// + gtk_entry_set_text (widgets.title, + ol_metadata_get_search_title (global_metadata)); + gtk_entry_set_text (widgets.artist, + ol_metadata_get_search_artist (global_metadata)); +// + gtk_widget_set_sensitive (widgets.download, FALSE); gtk_label_set_text (widgets.msg, "");
