Fix some issues with music:org

README.md

@@ -162,7 +162,7 @@ All steps below are to be executed as the `music` user.
 
 1. Run `beet import /var/lib/yggdrasil/home/music/rip`. This will move the music files to
    `/var/lib/yggdrasil/data/music/flac`.
-2. Run `beet convert <match>`, where `<match>` is used to narrow down to new music only. This will
-   convert the flac files into mp3 files for sharing via Nextcloud.
+2. Run `beet convert -a <match>`, where `<match>` is used to narrow down to new music only. This
+   will convert the flac files into mp3 files for sharing via Nextcloud.
 3. Run `nextcloud-upload /var/tmp/music/mp3/<artist>` for every artist to upload to Nextcloud.
 4. Remove the `/var/tmp/music/mp3/<artist>` directory.

inventory/host_vars/yggdrasil/vars.yml

@@ -114,7 +114,8 @@ music_user_backups_snapshots_skip_parent: true
 # --------------------------------------------------------------------------------------------------
 # music:org
 # --------------------------------------------------------------------------------------------------
-music_user_nextcloud_url: "https://cloud.wojciechkozlowski.eu/public.php/webdav"
+music_user_nextcloud_domain: "cloud.wojciechkozlowski.eu"
+music_user_nextcloud_url: "https://{{ music_user_nextcloud_domain }}/public.php/webdav"
 music_user_nextcloud_user: "{{ vault_music_user_nextcloud_user }}"
 music_user_nextcloud_pswd: "{{ vault_music_user_nextcloud_pswd }}"
 

playbooks/music.yml

@@ -31,6 +31,7 @@
         backups_restic_user_data_dataset: "{{ music_user_data_dataset }}"
         backups_restic_user_data_directory: "{{ music_user_data_directory }}"
         backups_restic_user_aws_bucket_prefix: "the-nine-worlds---{{ music_user_name }}"
+        music_org_nextcloud_ip_address: "{{ services_all_services.lrproxy.address }}"
       tags:
         - "music:backups"
         - "music:backups:restic"

playbooks/roles/music/org/files/nextcloud-upload

@@ -76,7 +76,8 @@ class WebDavManager:
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="upload files to nextcloud")
 
-    parser.add_argument("--config", type=str, default="~/.config/nextcloud-upload/config.yml",
+    parser.add_argument("--config", type=str,
+                        default=f"{os.path.expanduser('~')}/.config/nextcloud-upload/config.yml",
                         help="path to configuration")
     parser.add_argument("target", type=str, help="file or folder to upload")
 

playbooks/roles/music/org/meta/argument_specs.yml

@@ -11,3 +11,9 @@ argument_specs:
       music_user_data_directory:
         type: "str"
         required: true
+      music_user_nextcloud_domain:
+        type: "str"
+        required: true
+      music_org_nextcloud_ip_address:
+        type: "str"
+        required: true

playbooks/roles/music/org/tasks/main.yml

@@ -11,6 +11,12 @@
     dest: "/usr/local/bin/nextcloud-upload"
     mode: 0755
 
+- name: "resolve nextcloud-upload via hosts file"
+  ansible.builtin.lineinfile:
+    path: "/etc/hosts"
+    line: "{{ music_org_nextcloud_ip_address }} {{ music_user_nextcloud_domain }}"
+    insertafter: "EOF"
+
 - block:
 
     - name: "create beets config directory"

playbooks/roles/music/org/templates/beets.yml

@@ -1,4 +1,4 @@
-plugins: convert
+plugins: convert fetchart
 library: {{ music_user_data_directory }}/flac/library.db
 
 directory: {{ music_user_data_directory }}/flac
@@ -8,3 +8,9 @@ import:
 
 convert:
   dest: /var/tmp/{{ music_user_name }}/mp3
+  copy_album_art: yes
+  embed: yes
+
+fetchart:
+  sources:
+    - filesystem

playbooks/roles/music/rip/tasks/include/samba.yml

@@ -5,7 +5,7 @@
       - "samba"
       - "samba-client"
 
-- name: "samba : configure samba share"
+- name: "samba : configure \"music-rip\" samba share"
   ansible.builtin.blockinfile:
     path: "/etc/samba/smb.conf"
     mode: 0644
@@ -20,7 +20,21 @@
          guest ok = no
          create mask = 0644
          directory mask = 0755
-  register: music_rip_samba_config
+  register: music_rip_samba_rip_config
+
+- name: "samba : configure \"music-archive\" samba share"
+  ansible.builtin.blockinfile:
+    path: "/etc/samba/smb.conf"
+    mode: 0644
+    insertafter: "EOF"
+    marker: "# {mark} ANSIBLE MANAGED BLOCK MUSIC:ARCHIVE"
+    block: |
+      [music-archive]
+         comment = Music archive
+         path = {{ music_user_data_directory }}/flac
+         browseable = yes
+         read only = yes
+  register: music_rip_samba_archive_config
 
 - name: "samba : check for \"{{ music_user_name }}\" user"
   ansible.builtin.shell: "pdbedit --user={{ music_user_name }} || /usr/bin/true"
@@ -50,5 +64,6 @@
     name: "smbd"
     state: "restarted"
   when:
-    music_rip_samba_config.changed and
+    (music_rip_samba_rip_config.changed or
+    music_rip_samba_archive_config.changed) and
     not music_rip_samba_start.changed