From 9553893198feac72626c81463514f199207cba1d Mon Sep 17 00:00:00 2001 From: Craig Drummond Date: Fri, 25 Feb 2022 12:32:04 +0000 Subject: [PATCH] Add sample config files, and pacakge into zip. --- .github/workflows/build.yml | 12 ++---- configs/linux.ini | 3 ++ configs/macos.ini | 3 ++ configs/windows.ini | 3 ++ scripts/README.md | 2 - scripts/music-similarity-to-bliss.py | 57 ---------------------------- 6 files changed, 12 insertions(+), 68 deletions(-) create mode 100644 configs/linux.ini create mode 100644 configs/macos.ini create mode 100644 configs/windows.ini delete mode 100644 scripts/README.md delete mode 100755 scripts/music-similarity-to-bliss.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68d6195..ffd1a21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,7 @@ jobs: mkdir releases cp target/release/bliss-analyser releases/bliss-analyser cp UserGuide.md releases/README.md - mkdir releases/scripts - cp scripts/music-similarity-to-bliss.py releases/scripts - cp scripts/README.md releases/scripts + cp configs/linux.ini releases/config.ini - name: Upload artifacts uses: actions/upload-artifact@v2 @@ -57,9 +55,7 @@ jobs: strip target/release/bliss-analyser cp target/release/bliss-analyser releases/bliss-analyser cp UserGuide.md releases/README.md - mkdir releases/scripts - cp scripts/music-similarity-to-bliss.py releases/scripts - cp scripts/README.md releases/scripts + cp configs/macos.ini releases/config.ini - name: Upload artifacts uses: actions/upload-artifact@v2 @@ -99,9 +95,7 @@ jobs: cp target/release/bliss-analyser.exe releases/bliss-analyser.exe cp deps/bin/*.dll releases/ cp UserGuide.md releases/README.md - mkdir releases/scripts - cp scripts/music-similarity-to-bliss.py releases/scripts - cp scripts/README.md releases/scripts + cp configs/windows.ini releases/config.ini - name: Upload artifacts uses: actions/upload-artifact@v2 diff --git a/configs/linux.ini b/configs/linux.ini new file mode 100644 index 0000000..c4573ca --- /dev/null +++ b/configs/linux.ini @@ -0,0 +1,3 @@ +[Bliss] +music=/home/user/Music +lms=127.0.0.1 diff --git a/configs/macos.ini b/configs/macos.ini new file mode 100644 index 0000000..8847ea6 --- /dev/null +++ b/configs/macos.ini @@ -0,0 +1,3 @@ +[Bliss] +music=/Users/user/Music +lms=127.0.0.1 diff --git a/configs/windows.ini b/configs/windows.ini new file mode 100644 index 0000000..ccb09ea --- /dev/null +++ b/configs/windows.ini @@ -0,0 +1,3 @@ +[Bliss] +music=c:\Users\user\Music +lms=127.0.0.1 diff --git a/scripts/README.md b/scripts/README.md deleted file mode 100644 index d330090..0000000 --- a/scripts/README.md +++ /dev/null @@ -1,2 +0,0 @@ -`music-similarity-to-bliss.py` can be used to convert a [MusicSimilarity](https://github.com/CDrummond/music-similarity) -database file to one usable by bliss-mixer. diff --git a/scripts/music-similarity-to-bliss.py b/scripts/music-similarity-to-bliss.py deleted file mode 100755 index d210d71..0000000 --- a/scripts/music-similarity-to-bliss.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env python3 -import argparse, os, pickle, sqlite3, sys - -GENRE_SEPARATOR = ';' - -def convert(mp, bp): - msim = sqlite3.connect(mp) - bliss = sqlite3.connect(bp) - mc = msim.cursor() - bc = bliss.cursor() - bc.execute('''CREATE TABLE IF NOT EXISTS Tracks ( - File varchar UNIQUE NOT NULL, - Title varchar, - Artist varchar, - AlbumArtist varchar, - Album varchar, - Genre varchar, - Duration integer, - Ignore integer, - Tempo real, - Zcr real, - MeanSpectralCentroid real, - StdDevSpectralCentroid real, - MeanSpectralRolloff real, - StdDevSpectralRolloff real, - MeanSpectralFlatness real, - StdDevSpectralFlatness real, - MeanLoudness real, - StdDevLoudness real, - Chroma1 real, - Chroma2 real, - Chroma3 real, - Chroma4 real, - Chroma5 real, - Chroma6 real, - Chroma7 real, - Chroma8 real, - Chroma9 real, - Chroma10 real)''') - bc.execute('CREATE UNIQUE INDEX IF NOT EXISTS Tracks_idx ON Tracks(File)') - mc.execute('SELECT file, title, artist, albumartist, album, genre, duration, ignore, bliss FROM tracks') - rows = mc.fetchall() - for row in rows: - b = pickle.loads(row[8]) - bc.execute('INSERT into Tracks (File, Title, Artist, AlbumArtist, Album, Genre, Duration, Ignore, Tempo, Zcr, MeanSpectralCentroid, StdDevSpectralCentroid, MeanSpectralRolloff, StdDevSpectralRolloff, MeanSpectralFlatness, StdDevSpectralFlatness, MeanLoudness, StdDevLoudness, Chroma1, Chroma2, Chroma3, Chroma4, Chroma5, Chroma6, Chroma7, Chroma8, Chroma9, Chroma10) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', (row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11], b[12], b[13], b[14], b[15], b[16], b[17], b[18], b[19])) - - bliss.commit() - bc.close() - bliss.close() - - -if __name__=='__main__': - parser = argparse.ArgumentParser(description='Create Bliss DB from MusicSimilarity DB') - parser.add_argument('-m', '--msimdb', type=str, help='MusicSimilarity DB file', default='music-similarity.db') - parser.add_argument('-b', '--blissdb', type=str, help='Bliss DB file', default='bliss.db') - args = parser.parse_args() - convert(args.msimdb, args.blissdb)