删除mutagen

Readme.md

@@ -6,19 +6,25 @@
   <h1>Sonist - 基于mpd后端的音乐播放器</h1>
 </div>
 
-### 感觉以下第三方库
 
-- [`python3-mpd2`](https://github.com/Mic92/python-mpd2), 本项目内置了修改版的`python3-mpd2`, 加入了Gtk的信号与槽机制的支持, 并更加友好的方式处理异常, 减少程序崩溃。
-- [`python3-mutagen`](https://github.com/quodlibet/mutagen), 用于获取歌曲文件内嵌的封面。
+### 开发计划
+- [x] ~~支持mpd基本操作~~
+- [x] ~~支持读取歌曲内置封面~~
+- [ ] 自动查找网络专辑封面
+- [ ] 桌面歌词和顶栏歌词
+- [ ] 自动查找网络歌词
 
 
 ### 项目依赖
 以`debian 12`为例
 
 - `python3`
+- `python3-gi` gobject
 - `gir1.2-gtk-3.0`  Gtk3
 - `python3-mutagen` 获取歌曲标签信息的库
-- `python3-mpd2` MPD连接库(已内置修改版)
+- `python3-mpd2` MPD连接库(已内置修改版,接入Gtk的信号与槽机制, 并优化了异常处理)
+- `python3-pil` 图像处理库
+- `python3-gi-cairo` 图像处理库
 
 
 

build.sh

@@ -4,15 +4,21 @@ if [ -d unpack ]; then
   sudo rm -rf unpack
 fi
 
+version="1.0.5"
+
 mkdir -p unpack/DEBIAN
 
 cp debian/control unpack/DEBIAN/
 cp -r usr unpack/
 
 cd unpack
-find . -type f | xargs md5sum > DEBIAN/md5sums
+find usr -type f | xargs md5sum > DEBIAN/md5sums
+
+_size=$(du -d 0 usr | cut -f1)
+sed -i "s/{{size}}/${_size}/" DEBIAN/control
+sed -i "s/{{version}}/${version}/" DEBIAN/control
 
 cd ..
-apt deb unpack
+dpkg-deb -b unpack/ "sonist-${version}.deb"
 
-mv unpack.deb sonist-1.0.0.deb
+sudo rm -rf unpack

debian/control

@@ -1,12 +1,12 @@
 Package: sonist
-Version: 1.0.0
+Version: {{version}}
 Section: X11
 Architecture: all
 Author: Yutent
 Maintainer: Yutent <yutent.io@gmail.com>
-Depends: gir1.2-gtk-3.0, python3-mutagen, mpd
+Depends: python3-gi, gir1.2-gtk-3.0, python3-pil, python3-gi-cairo, python3-mutagen, mpd
 Priority: optional
-Installed-Size: 5644
-Homepage: https://github.com/app-cat/sonist-gtk
+Installed-Size: {{size}}
+Homepage: https://git.wkit.fun/appcat/sonist-gtk
 Description: Sonist - 基于mpd后端的音乐播放器.
  高颜值且轻量的 MPD GUI客户端.

usr/lib/sonist/about_app.py

@@ -21,13 +21,12 @@ class AboutWindow(Gtk.AboutDialog):
       self.set_logo(GdkPixbuf.Pixbuf.new_from_file(image_dict['sonist']))
 
     self.set_license_type(Gtk.License.MIT_X11)
-    self.set_version('1.0.0')
-    self.set_website('https://github.com/app-cat/sonist-gtk')
+    self.set_version('1.0.5')
+    self.set_website('https://git.wkit.fun/appcat/sonist-gtk')
     self.set_website_label('官网')
     self.set_authors([
       'Yutent <yutent.io@gmail.com> (Sonist)',
       'Mic92 <https://github.com/Mic92/python-mpd2> (python-mpd2)',
-      'quodlibet <https://github.com/quodlibet/mutagen> (python-mutagen)'
     ])
     self.set_copyright('© 2023 Yutent <yutent.io@gmail.com>')
     self.set_comments('Sonist-Gtk 是一个界面美观, 基于MPD后端的音乐播放器, 使用python + gtk3开发。')

usr/lib/sonist/mpd.py

@@ -67,12 +67,12 @@ class CommandError(Exception):
         self.command = None
         self.msg = None
 
-        match = ERROR_PATTERN.match(error)
-        if match:
-            self.errno = FailureResponseCode(int(match.group("errno")))
-            self.offset = int(match.group("offset"))
-            self.command = match.group("command")
-            self.msg = match.group("msg")
+        matches = ERROR_PATTERN.match(error)
+        if matches:
+            self.errno = FailureResponseCode(int(matches.group("errno")))
+            self.offset = int(matches.group("offset"))
+            self.command = matches.group("command")
+            self.msg = matches.group("msg")
 
 
 class CommandListError(Exception):
@@ -799,10 +799,9 @@ class MPDClient(MPDClientBase, GObject.Object):
             self.emit('state_changed', state)
             self.current_state = state
           
-
+            
           if song.get('id') != self.current_song_id:
-            if self.current_song_id is not None:
-              self.emit('song_changed', status, song)
+            self.emit('song_changed', status, song)
             self.current_song_id = song.get('id')
           
           
@@ -825,6 +824,7 @@ class MPDClient(MPDClientBase, GObject.Object):
     self._try_connect()
     if self.connected:
       self.emit('online')
+      self.current_song_id = self.currentsong().get('id')
       self.heart_beat()
 
 

usr/lib/sonist/preferences.py

@@ -23,20 +23,21 @@ class PreferencesWindow(Gtk.Dialog):
     txt1 = Gtk.Label('MPD地址: ')
     txt2 = Gtk.Label('MPD端口: ')
     txt3 = Gtk.Label('音乐目录: ')
-    txt4 = Gtk.Label('自动扫描: ')
-    txt5 = Gtk.Label('   开启时, App启动时会自动扫描音乐变化')
+    txt4 = Gtk.Label('更新数据库: ')
+    txt5 = Gtk.Label('  重新扫描会清空播放列表并停止播放')
     txt6 = Gtk.Label('当前歌曲数: ')
     txt7 = Gtk.Label('0 首')
     input1 = Gtk.Entry(placeholder_text = '默认 127.0.0.1')
     input2 = Gtk.SpinButton.new_with_range(min = 1024, max = 65535, step = 1)
     input3 = Gtk.Entry(placeholder_text = '默认读取 $HOME/.mpd/mpd.conf 中定义的目录')
-    switch = Gtk.Switch()
+    btn = Gtk.Button(label = '重新扫描并重建播放列表')
+    btn.connect('clicked', self.scan_music)
 
     input1.set_size_request(312, -1)
     input1.set_text(config['host'])
     input2.set_value(config['port'])
     input3.set_text(config['music_directory'])
-    switch.set_active(config['auto_scan'])
+
 
 
     grid.attach(txt1, 0, 0, 1, 1)
@@ -50,8 +51,7 @@ class PreferencesWindow(Gtk.Dialog):
 
     grid.attach(txt4, 0, 3, 1, 1)
     box = Gtk.Box()
-    box.add(switch)
-    box.add(txt5)
+    box.add(btn)
     grid.attach(box, 2, 3, 1, 1)
 
     grid.attach(txt6, 0, 4, 1, 1)
@@ -62,7 +62,7 @@ class PreferencesWindow(Gtk.Dialog):
     self.host_input = input1
     self.port_input = input2
     self.dir_input = input3
-    self.switch_input = switch
+    self.scan_input = btn
 
     self.layout.set_border_width(32)
     self.layout.add(grid)
@@ -78,9 +78,26 @@ class PreferencesWindow(Gtk.Dialog):
     mpd.connect('online', lambda o: self.get_mpd_music())
 
 
-  def get_mpd_music(self):
+  def get_mpd_music(self, force = False):
     res = self.mpd.stats()
-    self.scan_result.set_text(f"{res.get('songs')} 首")
+    tips = '扫描完成... 共' if force else ''
+    self.scan_result.set_text(f"{tips}{res.get('songs')} 首")
+
+
+  def scan_music(self, btn):
+    need_resume = self.mpd.status().get('state') == 'play'
+    self.mpd.update()
+    self.mpd.stop()
+    self.mpd.clear()
+    songs = self.mpd.listall()
+
+    for it in songs:
+      self.mpd.add(it['file'])
+    
+    self.get_mpd_music(True)
+
+    if need_resume:
+      self.mpd.play()
 
 
   def show(self):
@@ -100,8 +117,9 @@ class PreferencesWindow(Gtk.Dialog):
       data['host'] = self.host_input.get_text()
       data['port'] = int(self.port_input.get_value())
       data['music_directory'] = self.dir_input.get_text()
-      data['auto_scan'] = self.switch_input.get_active()
+      
       self.app.config_data = data
+
       with open(self.app.config_file, 'w') as f:
         buff = json.dumps(data)
         f.write(buff)

usr/lib/sonist/sonist.py

@@ -18,13 +18,16 @@ home_dir = os.getenv('HOME')
 
 
 def get_music_dir():
-  with open(f'{home_dir}/.mpd/mpd.conf', 'r') as f:
-    data = f.read()
+  mpd_config = f'{home_dir}/.mpd/mpd.conf'
 
-  matches = re.search('music_directory\s*"(.*)"', data).groups()
-  if len(matches) > 0:
-    return matches[0]
-  
+  if os.path.isfile(mpd_config):
+    with open(f'{home_dir}/.mpd/mpd.conf', 'r') as f:
+      data = f.read()
+
+    matches = re.search('music_directory\s*"(.*)"', data).groups()
+    if len(matches) > 0:
+      return matches[0]
+    
   return '/data/music'
 
 
@@ -48,8 +51,7 @@ class Application(Gtk.Application):
     self.config_data = {
       "host": '127.0.0.1',
       "port": 6600,
-      "music_directory": self.music_dir,
-      "auto_scan": True
+      "music_directory": self.music_dir
     }
 
     if os.path.isfile(self.config_file):
@@ -70,9 +72,10 @@ class Application(Gtk.Application):
 
   @run_async
   def connect_mpd(self):
-    
     self.mpd.start()
 
+
+
   def do_activate(self):
     print('hello mpc')
     self.set_app_menu(None)
@@ -100,7 +103,9 @@ class Application(Gtk.Application):
 
 
 if __name__ == "__main__":
-  app = Application()
-  app.run(sys.argv)
-
+  try:
+    app = Application()
+    app.run(sys.argv)
+  except:
+    pass
 

usr/lib/sonist/ui/disk_box.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk
+
+from .image import ScaleImage
+
+from assets import image_dict
+
+class DiskBox(Gtk.Fixed):
+
+  def __init__(self):
+    Gtk.Fixed.__init__(self)
+
+
+    disk = ScaleImage(image_dict['disk'])
+    handler = ScaleImage(image_dict['handler'])
+    album = ScaleImage()
+
+    disk.resize(192, 192)
+    album.clip_resize(128).set_radius(64)
+
+    handler.resize(48, 96)
+    self.handler = handler
+    self.album = album
+
+    self.put(disk, 16, 16)
+    self.put(album, 48, 48)
+    self.put(handler, 0, 16)
+
+
+  def update_state(self, played = False):
+    if played:
+      self.handler.reset(image_dict['handler_a'])
+    else:
+      self.handler.reset(image_dict['handler'])
+
+    return self
+  
+
+  def update_album(self, filepath = None):
+    self.album.reset(filepath, True).set_radius(64)
+    return self

usr/lib/sonist/ui/option_menu.py

@@ -48,23 +48,22 @@ class OptionMenu(Gtk.Menu):
 
 
   def on_menu_select(self, item):
-    match(item.name):
-      case '首选项':
-        self.app.preferences.show()
+    if item.name == '首选项':
+      self.app.preferences.show()
 
-      case '窗口置顶':
-        self.on_top = not self.on_top
-        self.app.window.set_keep_above(self.on_top)
-        if self.on_top:
-          item.select()
-        else:
-          item.deselect()
+    elif item.name == '窗口置顶':
+      self.on_top = not self.on_top
+      self.app.window.set_keep_above(self.on_top)
+      if self.on_top:
+        item.select()
+      else:
+        item.deselect()
 
-      case '退出应用':
-        self.app.quit_all()
+    elif item.name == '退出应用':
+      self.app.quit_all()
 
-      case '关于播放器':
-        self.app.about.present()
+    elif item.name == '关于播放器':
+      self.app.about.present()
         
 
 

usr/lib/sonist/ui/topbar.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk, Gdk
+
+from .image_button import ImageButton
+from .option_menu import OptionMenu
+
+from assets import image_dict
+
+class Topbar(Gtk.EventBox):
+
+  def __init__(self, app, win):
+    Gtk.EventBox.__init__(self)
+
+    self.window = win
+
+    self.set_size_request(320, 26)
+
+    box = Gtk.Fixed()
+
+    menu_btn = ImageButton(image_dict['menu'])
+    popup_menu = OptionMenu(app)
+    menu_btn.connect('clicked', lambda btn: popup_menu.show(btn))
+    box.put(menu_btn, 276, 6)
+
+    self.connect("button-press-event", self.on_drag)
+    self.add(box)
+
+
+  def on_drag(self, widget, event):
+    if event.button == Gdk.BUTTON_PRIMARY:
+      self.window.begin_move_drag(
+        event.button,
+        int(event.x_root),
+        int(event.y_root),
+        event.time)

usr/lib/sonist/window.py

@@ -9,12 +9,13 @@ from utils import blur_image, pic_to_pixbuf, base64_to_pixbuf, idle
 
 from assets import image_dict
 
+from ui.topbar import Topbar
 from ui.image import ScaleImage
 from ui.image_button import ImageButton
 from ui.title_text import TitleText
 from ui.ctrl_box import CtrlBox
 from ui.timebar import Timebar
-from ui.option_menu import OptionMenu
+from ui.disk_box import DiskBox
 
 
 
@@ -36,6 +37,18 @@ class SonistWindow(Gtk.Window):
     self.css_provider = None
     self.set_default_style()
 
+    self.set_position(Gtk.WindowPosition.CENTER)
+    self.set_decorated(False) # 隐藏系统标题栏
+    self.set_name('SonistWindow')
+    self.set_title('Sonist')
+    self.set_default_size(320, 384)
+    self.set_resizable(False)
+    self.set_wmclass('Sonist', 'Sonist')
+
+    self.set_background_image(image_dict['disk'])
+
+
+
     self.connect("destroy", lambda win: app.remove_window(win))
 
     self.mpd.connect('offline', lambda o: self.reset_player())
@@ -45,47 +58,20 @@ class SonistWindow(Gtk.Window):
     self.mpd.connect('volume_changed', lambda o, vol: self.update_volume(vol))
     self.mpd.connect('playing', lambda o, stat, song: self.update_playtime(stat))
 
-    self.set_name('SonistWindow')
-    self.set_title('Sonist')
-    self.set_default_size(320, 384)
-    self.set_resizable(False)
-    self.set_wmclass('Sonist', 'Sonist')
-
-    self.set_opacity(0.9)
-
-    self.set_background_image(image_dict['disk'])
-
     layout = Gtk.Layout()
 
-    # 菜单按钮
-    menu_btn = ImageButton(image_dict['menu'])
-    popup_menu = OptionMenu(app)
-    menu_btn.connect('clicked', lambda btn: popup_menu.show(btn))
-    layout.put(menu_btn, 276, 6)
+    # 内嵌的标题栏
+    bar = Topbar(app, self)
+    layout.put(bar, 0, 0)
     
     # 唱片
-    disk = ScaleImage(image_dict['disk'])
-    handler = ScaleImage(image_dict['handler'])
-    album = ScaleImage()
-
-    disk.resize(192, 192)
-    album.clip_resize(128).set_radius(64)
-
-    handler.resize(48, 96)
-    self.handler = handler
-    self.album = album
-
-    box = Gtk.Fixed()
-    box.put(disk, 16, 16)
-    box.put(album, 48, 48)
-    box.put(handler, 0, 16)
-
-    layout.put(box, 48, 16)
+    disk = DiskBox()
+    self.disk = disk
+    layout.put(disk, 48, 16)
 
 
     # title
     self.title_box = TitleText()
-
     layout.put(self.title_box, 27, 244)
 
 
@@ -129,7 +115,6 @@ class SonistWindow(Gtk.Window):
     #ImageButton:hover {{
       background-color: rgba(255,255,255,.1);
       outline: transparent;
-      box-shadow:none;
     }}
 
     #Slider {{
@@ -152,8 +137,6 @@ class SonistWindow(Gtk.Window):
     self.style_context.add_provider_for_screen(self.screen, provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
 
 
-
-
   def get_mpd_stat(self):
     try:
       self.stat = self.mpd.status()
@@ -188,35 +171,31 @@ class SonistWindow(Gtk.Window):
 
 
   def ctrl_clicked(self, box, btn):
-    match(btn):
-      case 'play_btn':
-        self.toggle_play()
+    if btn == 'play_btn':
+      self.toggle_play()
 
-      case 'mode_btn':
-        # repeat all
-        if self.ctrl_box.curr_mode == 0:
-          self.mpd.repeat(1)
-          self.mpd.random(0)
-          self.mpd.single(0)
-        # random
-        elif self.ctrl_box.curr_mode == 1:
-          self.mpd.repeat(0)
-          self.mpd.random(1)
-          self.mpd.single(0)
-        # single
-        else:
-          self.mpd.repeat(0)
-          self.mpd.random(0)
-          self.mpd.single(1)
+    elif btn == 'mode_btn':
+      # repeat all
+      if self.ctrl_box.curr_mode == 0:
+        self.mpd.random(0)
+        self.mpd.single(0)
+      # random
+      elif self.ctrl_box.curr_mode == 1:
+        self.mpd.random(1)
+        self.mpd.single(0)
+      # single
+      else:
+        self.mpd.random(0)
+        self.mpd.single(1)
       
-      case 'prev_btn':
-        self.prev_song()
+    elif btn == 'prev_btn':
+      self.prev_song()
 
-      case 'next_btn':
-        self.next_song()
+    elif btn == 'next_btn':
+      self.next_song()
 
-      case 'vol_btn':
-        self.toggle_play()
+    elif btn == 'vol_btn':
+      self.toggle_play()
 
 
 
@@ -252,34 +231,54 @@ class SonistWindow(Gtk.Window):
   @idle
   def update_play_stat(self, is_play = True):
     
-    if is_play:
-      self.handler.reset(image_dict['handler_a'])
-    else:
-      self.handler.reset(image_dict['handler'])
-
+    self.disk.update_state(is_play)
     # 切换播放按钮状态
     self.ctrl_box.toggle_play_btn(is_play)
 
+
   @idle
   def update_playtime(self, stat = {}):
     self.stat = stat
-    times = stat['time'] or '0:0'
+    times = stat.get('time') or '0:0'
     times = times.split(':')
     self.timebar.update_time(int(times[0]), int(times[1]))
 
+
   @idle
   def update_volume(self, vol = 100):
     self.ctrl_box.set_volume(vol)
     
+
   @idle
   def sync_state(self, stat = None, song = None, first = False):
     self.ctrl_box.disabled = False
     
     self.stat = stat or self.get_mpd_stat()
-
     state = self.stat.get('state')
 
+    # 首次启动时, 更新数据库
     if first:
+      self.mpd.update()
+      self.mpd.repeat(1)
+      song_num = int(self.mpd.stats().get('songs') or 0)
+      playlist = [it['file'] for it in self.mpd.playlistinfo()]
+
+
+      if song_num == 0:
+        self.ctrl_box.disabled = True
+        return
+      
+      # 这里只做添加, 不做删除, 重建播放列表在设置里
+      if song_num > 0 and len(playlist) < song_num:
+        songs = self.mpd.listall()
+        for it in songs:
+          if it['file'] in playlist:
+            continue
+          self.mpd.add(it['file'])
+
+      self.get_mpd_stat()
+      
+
       self.update_play_stat(state == 'play')
       self.update_volume(int(self.stat.get('volume') or 100))
 
@@ -289,17 +288,16 @@ class SonistWindow(Gtk.Window):
         self.ctrl_box.toggle_mode_btn(mode = 'random')
 
 
-    if state != 'stop':
-      song = song or self.mpd.currentsong()
+    song = song or self.mpd.currentsong()
+
+    if song.get('id'):
       # 更新歌曲信息
       self.title_box.update(f"{song.get('artist')} - {song.get('title')}")
-      self.update_playtime(self.stat)
 
-      title = song['file']
-      title_hex = base64.b64encode(title.encode()).hex()
+      title_hex = base64.b64encode(song.get('title').encode()).hex()
 
       filepath = f"{self.app.album_cache_dir}/{title_hex}.png"
-      songpath = f"{self.app.music_dir}/{title}"
+      songpath = f"{self.app.music_dir}/{song.get('file')}"
 
       if os.path.isfile(filepath):
         self.update_album(filepath)
@@ -331,9 +329,9 @@ class SonistWindow(Gtk.Window):
     self.timebar.update_time()
     self.update_album()
 
-  @idle
+
   def update_album(self, filepath = None):
     self.set_background_image(filepath or image_dict['disk'])
-    self.album.reset(filepath, True).set_radius(64)
+    self.disk.update_album(filepath)