build.sh

@@ -4,7 +4,7 @@ if [ -d unpack ]; then
   sudo rm -rf unpack
 fi
 
-version="1.0.5"
+version="1.0.1"
 
 mkdir -p unpack/DEBIAN
 
@@ -12,11 +12,7 @@ cp debian/control unpack/DEBIAN/
 cp -r usr unpack/
 
 cd unpack
-find usr -type f | xargs md5sum > DEBIAN/md5sums
+find . -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 ..
 dpkg-deb -b unpack/ "sonist-${version}.deb"

debian/control

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

usr/lib/sonist/about_app.py

@@ -21,12 +21,13 @@ 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.5')
+    self.set_version('1.0.1')
-    self.set_website('https://git.wkit.fun/appcat/sonist-gtk')
+    self.set_website('https://github.com/app-cat/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
 
-        matches = ERROR_PATTERN.match(error)
+        match = ERROR_PATTERN.match(error)
-        if matches:
+        if match:
-            self.errno = FailureResponseCode(int(matches.group("errno")))
+            self.errno = FailureResponseCode(int(match.group("errno")))
-            self.offset = int(matches.group("offset"))
+            self.offset = int(match.group("offset"))
-            self.command = matches.group("command")
+            self.command = match.group("command")
-            self.msg = matches.group("msg")
+            self.msg = match.group("msg")
 
 
 class CommandListError(Exception):

usr/lib/sonist/sonist.py

@@ -18,16 +18,13 @@ home_dir = os.getenv('HOME')
 
 
 def get_music_dir():
-  mpd_config = f'{home_dir}/.mpd/mpd.conf'
+  with open(f'{home_dir}/.mpd/mpd.conf', 'r') as f:
+    data = f.read()
 
-  if os.path.isfile(mpd_config):
+  matches = re.search('music_directory\s*"(.*)"', data).groups()
-    with open(f'{home_dir}/.mpd/mpd.conf', 'r') as f:
+  if len(matches) > 0:
-      data = f.read()
+    return matches[0]
-
+  
-    matches = re.search('music_directory\s*"(.*)"', data).groups()
-    if len(matches) > 0:
-      return matches[0]
-    
   return '/data/music'
 
 
@@ -103,9 +100,7 @@ class Application(Gtk.Application):
 
 
 if __name__ == "__main__":
-  try:
+  app = Application()
-    app = Application()
+  app.run(sys.argv)
-    app.run(sys.argv)
+
-  except:
-    pass
 

usr/lib/sonist/ui/disk_box.py

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

usr/lib/sonist/ui/topbar.py

@@ -1,38 +0,0 @@
-#!/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,13 +9,12 @@ 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.disk_box import DiskBox
+from ui.option_menu import OptionMenu
 
 
 
@@ -37,18 +36,6 @@ 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())
@@ -58,20 +45,47 @@ 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()
 
-    # 内嵌的标题栏
+    # 菜单按钮
-    bar = Topbar(app, self)
+    menu_btn = ImageButton(image_dict['menu'])
-    layout.put(bar, 0, 0)
+    popup_menu = OptionMenu(app)
+    menu_btn.connect('clicked', lambda btn: popup_menu.show(btn))
+    layout.put(menu_btn, 276, 6)
     
     # 唱片
-    disk = DiskBox()
+    disk = ScaleImage(image_dict['disk'])
-    self.disk = disk
+    handler = ScaleImage(image_dict['handler'])
-    layout.put(disk, 48, 16)
+    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)
 
 
     # title
     self.title_box = TitleText()
+
     layout.put(self.title_box, 27, 244)
 
 
@@ -115,6 +129,7 @@ class SonistWindow(Gtk.Window):
     #ImageButton:hover {{
       background-color: rgba(255,255,255,.1);
       outline: transparent;
+      box-shadow:none;
     }}
 
     #Slider {{
@@ -137,6 +152,8 @@ 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()
@@ -171,31 +188,35 @@ class SonistWindow(Gtk.Window):
 
 
   def ctrl_clicked(self, box, btn):
-    if btn == 'play_btn':
+    match(btn):
-      self.toggle_play()
+      case 'play_btn':
+        self.toggle_play()
 
-    elif btn == 'mode_btn':
+      case 'mode_btn':
-      # repeat all
+        # repeat all
-      if self.ctrl_box.curr_mode == 0:
+        if self.ctrl_box.curr_mode == 0:
-        self.mpd.random(0)
+          self.mpd.repeat(1)
-        self.mpd.single(0)
+          self.mpd.random(0)
-      # random
+          self.mpd.single(0)
-      elif self.ctrl_box.curr_mode == 1:
+        # random
-        self.mpd.random(1)
+        elif self.ctrl_box.curr_mode == 1:
-        self.mpd.single(0)
+          self.mpd.repeat(0)
-      # single
+          self.mpd.random(1)
-      else:
+          self.mpd.single(0)
-        self.mpd.random(0)
+        # single
-        self.mpd.single(1)
+        else:
+          self.mpd.repeat(0)
+          self.mpd.random(0)
+          self.mpd.single(1)
       
-    elif btn == 'prev_btn':
+      case 'prev_btn':
-      self.prev_song()
+        self.prev_song()
 
-    elif btn == 'next_btn':
+      case 'next_btn':
-      self.next_song()
+        self.next_song()
 
-    elif btn == 'vol_btn':
+      case 'vol_btn':
-      self.toggle_play()
+        self.toggle_play()
 
 
 
@@ -231,7 +252,14 @@ class SonistWindow(Gtk.Window):
   @idle
   def update_play_stat(self, is_play = True):
     
-    self.disk.update_state(is_play)
+    if is_play:
+      self.handler.reset(image_dict['handler_a'])
+      # song = self.mpd.currentsong()
+      # 更新歌曲信息
+      # self.title_box.update(f"{song.get('artist')} - {song.get('title')}")
+    else:
+      self.handler.reset(image_dict['handler'])
+
     # 切换播放按钮状态
     self.ctrl_box.toggle_play_btn(is_play)
 
@@ -258,25 +286,20 @@ class SonistWindow(Gtk.Window):
 
     # 首次启动时, 更新数据库
     if first:
-      self.mpd.update()
+      if self.app.config_data['auto_scan']:
-      self.mpd.repeat(1)
+        self.mpd.update()
-      song_num = int(self.mpd.stats().get('songs') or 0)
+        song_num = int(self.mpd.stats().get('songs'))
-      playlist = [it['file'] for it in self.mpd.playlistinfo()]
+        playlist = [it['file'] for it in self.mpd.playlistinfo()]
+        
+        # 这里只做添加, 不做删除, 重建播放列表在设置里
+        if 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()
-      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')
@@ -288,16 +311,19 @@ class SonistWindow(Gtk.Window):
         self.ctrl_box.toggle_mode_btn(mode = 'random')
 
 
-    song = song or self.mpd.currentsong()
 
-    if song.get('id'):
+
+    if state != 'stop':
+
+      song = song or self.mpd.currentsong()
       # 更新歌曲信息
       self.title_box.update(f"{song.get('artist')} - {song.get('title')}")
 
-      title_hex = base64.b64encode(song.get('title').encode()).hex()
+      title = song['file']
+      title_hex = base64.b64encode(title.encode()).hex()
 
       filepath = f"{self.app.album_cache_dir}/{title_hex}.png"
-      songpath = f"{self.app.music_dir}/{song.get('file')}"
+      songpath = f"{self.app.music_dir}/{title}"
 
       if os.path.isfile(filepath):
         self.update_album(filepath)
@@ -329,9 +355,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.disk.update_album(filepath)
+    self.album.reset(filepath, True).set_radius(64)