Some good or messy changes..

.gitignore

@@ -1,8 +1,14 @@
 venv/
 *.pyc
 *.mp3
+*.m4a
 *.wav
 splits/
 __pycache__/
 .idea
-tracks.txt
+tracks.txt
+build/
+dist/
+./split
+./split.exe
+*.txt

.zedstate

@@ -0,0 +1 @@
+{"split":"1","session.current":["/make_install.bat"],"session.open":{"/make_install.bat":{"scrollTop":0,"scrollLeft":0,"selection":{"start":{"row":8,"column":5},"end":{"row":8,"column":5}},"lastUse":1598207031092,"undo":[[{"group":"doc","deltas":[{"action":"insertText","range":{"start":{"row":5,"column":14},"end":{"row":5,"column":15}},"text":"d"}]}]],"redo":[]},"/clean.bat":{"scrollTop":0,"scrollLeft":0,"selection":{"start":{"row":0,"column":0},"end":{"row":0,"column":0}},"lastUse":1598207028537,"undo":[],"redo":[]},"/Makefile":{"scrollTop":0,"scrollLeft":0,"selection":{"start":{"row":17,"column":21},"end":{"row":17,"column":21}},"lastUse":1598206879904,"undo":[],"redo":[]},"/split.py":{"scrollTop":0,"scrollLeft":0,"selection":{"start":{"row":0,"column":0},"end":{"row":0,"column":0}},"lastUse":1598206841919,"undo":[],"redo":[]},"/split.exe":{"scrollTop":6600,"scrollLeft":0,"selection":{"start":{"row":20,"column":34},"end":{"row":20,"column":34}},"lastUse":1598206826524,"undo":[],"redo":[]},"/setup.cfg":{"scrollTop":0,"scrollLeft":0,"selection":{"start":{"row":3,"column":0},"end":{"row":3,"column":0}},"lastUse":1598206809204,"undo":[],"redo":[]},"/clean.sh":{"scrollTop":0,"scrollLeft":0,"selection":{"start":{"row":0,"column":0},"end":{"row":0,"column":0}},"lastUse":1598206763280,"undo":[],"redo":[]}},"window":{"width":1207,"height":1041,"top":32,"left":677,"isMaximized":false}}

Makefile

@@ -0,0 +1,19 @@
+CC=pyinstaller
+PYOPT=PYTHONOPTIMIZE=1
+INST_DIR=/usr/local/bin/
+UTILS=./utils/__init__.py ./utils/ffmpeg_utils.py ./utils/parsed_result.py ./utils/time_to_seconds.py ./utils/tracks_editor.py ./utils/update_time_change.py ./utils/find.py ./utils/split_song.py ./utils/track_parser.py ./utils/tracks_parser.py ./utils/write_tracks_to_file.py
+METADATA=./MetaDataProviders/Amazon.py ./MetaDataProviders/Wikipedia.py
+DEPS=split.py split.spec split_init.py $(UTILS) $(METADATA)
+OUTF_NAME=album-split
+
+split: $(DEPS)
+	$(PYOPT) $(CC) ./split.spec
+	cp -vf ./dist/split ./$(OUTF_NAME)
+
+install: $(OUTF_NAME)
+	rsync -av ./$(OUTF_NAME) $(INST_DIR)
+
+all: split
+
+clean:
+	. ./clean.sh

MetaDataProviders/Amazon.py

@@ -10,23 +10,26 @@
 
 VALID_URL = "https?://(?:\w+\.)?amazon\..*/.*"
 
+class Amazon:
+    def __init__(self):
+        pass
 
-def lookup(url, tracks_filename):
-    opener = build_opener()
-    opener.addheaders = [('User-agent', 'Album-Splitter')]
-    page_html = opener.open(url).read()
-    page = BeautifulSoup(page_html, 'html.parser')
-    song_table = page.find(id='dmusic_tracklist_content')
-    if not song_table:
-        return None
+    def lookup(self, url, tracks_filename):
+        opener = build_opener()
+        opener.addheaders = [('User-agent', 'Album-Splitter')]
+        page_html = opener.open(url).read()
+        page = BeautifulSoup(page_html, 'html.parser')
+        song_table = page.find(id='dmusic_tracklist_content')
+        if not song_table:
+            return None
 
-    song_lines = song_table.findAll('tr')
-    # first line of table is a header
-    del(song_lines[0])
-    track_titles = []
-    track_times = []
-    for line in song_lines:
-        track_titles.append(line.find(attrs={'class': 'TitleLink'}).text.strip())
-        track_times.append(line.find(id=re.compile("dmusic_tracklist_duration.*")).text.strip())
-    utils.write_tracks_to_file(track_times, track_titles, tracks_filename)
-    return True
+        song_lines = song_table.findAll('tr')
+        # first line of table is a header
+        del(song_lines[0])
+        track_titles = []
+        track_times = []
+        for line in song_lines:
+            track_titles.append(line.find(attrs={'class': 'TitleLink'}).text.strip())
+            track_times.append(line.find(id=re.compile("dmusic_tracklist_duration.*")).text.strip())
+        utils.write_tracks_to_file(track_times, track_titles, tracks_filename)
+        return True

MetaDataProviders/Wikipedia.py

@@ -9,33 +9,36 @@
 
 VALID_URL = "https?://(?:\w+\.)?wikipedia\..*/.*"
 
-
-def lookup(url, tracks_filename):
-    opener = build_opener()
-    opener.addheaders = [('User-agent', 'Album-Splitter')]
-    page_html = opener.open(url).read()
-    soup = BeautifulSoup(page_html, 'html.parser')
-    song_table = soup.find_all(class_='tracklist')
-    if not song_table:
-        return None
-
-    rows = song_table[0].find_all('tr')
-    # first line of table is a headerrows[0]
-    number_of_columns = find_number_of_columns(rows[0])
-    del(rows[0])
-
-    track_titles = []
-    track_times = []
-    for row in rows:
-        tds = row.find_all('td')
-        if len(tds) == number_of_columns:
-            try:
-                track_titles.append(tds[1].get_text())
-            except TypeError:
-                break
-            track_times.append(tds[number_of_columns-1].get_text())
-    write_tracks_to_file(track_times, track_titles, tracks_filename)
-    return True
+class Wikipedia:
+    def __init__(self):
+        pass
+
+    def lookup(self, url, tracks_filename):
+        opener = build_opener()
+        opener.addheaders = [('User-agent', 'Album-Splitter')]
+        page_html = opener.open(url).read()
+        soup = BeautifulSoup(page_html, 'html.parser')
+        song_table = soup.find_all(class_='tracklist')
+        if not song_table:
+            return None
+
+        rows = song_table[0].find_all('tr')
+        # first line of table is a headerrows[0]
+        number_of_columns = find_number_of_columns(rows[0])
+        del(rows[0])
+
+        track_titles = []
+        track_times = []
+        for row in rows:
+            tds = row.find_all('td')
+            if len(tds) == number_of_columns:
+                try:
+                    track_titles.append(tds[1].get_text())
+                except TypeError:
+                    break
+                track_times.append(tds[number_of_columns-1].get_text())
+        write_tracks_to_file(track_times, track_titles, tracks_filename)
+        return True
 
 
 def find_number_of_columns(table_header):

MetaDataProviders/__init__.py

@@ -0,0 +1,2 @@
+from .Amazon import Amazon
+from .Wikipedia import Wikipedia

clean.bat

@@ -0,0 +1,10 @@
+@echo off
+del /Q /F .\*.wav .\*.mp3 .\*.m4a .\*.opus .\*.ogg .\*.flac 2>nul
+rmdir /S /Q .\build 2>nul
+rmdir /S /Q .\dist 2>nul
+rmdir /S /Q .\splits 2>nul
+del /Q /F .\tracks.txt .\*_tracks.txt 2>nul
+del /Q /F *.webm.part 2>nul
+del /Q /F .\split.exe 2>nul
+del /Q /F .\__pycache__ .\utils\__pycache__ .\MetadataProviders\__pycache__ 2>nul
+

clean.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+rm -rvf ./*.wav ./*.mp4 ./*.m4a ./*.mp3 ./*.opus ./*.ogg ./*.flac
+rm -rvf ./build ./dist
+rm -rvf ./splits/*
+rm -rvf ./tracks.txt ./*_tracks.txt
+rm -rvf ./*.webm.part
+rm -rfv ./split
+rm -rvf ./__pycache__ ./utils/__pycache__ ./MetadataProviders/__pycache__

make_install.bat

@@ -0,0 +1,9 @@
+@echo off
+rem pip install -U pyinstaller
+set PYTHONOPTIMIZE=1 && pyinstaller .\split.spec
+copy /Y .\dist\split.exe .\
+
+if %1 == "build" GOTO DONE
+copy /Y .\split.exe "C:\FFMpeg\bin"
+
+:DONE

requirements/conda.txt

@@ -0,0 +1 @@
+conda create -n albumsplit python=3.9 flake8 pyinstaller beautifulsoup4 ffmpeg

requirements/dev.txt

@@ -1,2 +1,3 @@
 -r prod.txt
-flake8==3.3.0
+flake8
+pyinstaller

requirements/prod.txt

@@ -1,5 +1,7 @@
-beautifulsoup4==4.4.0
-mutagen==1.31
-pydub==0.14.2
-urlparse3==1.0.3
-youtube-dl
+beautifulsoup4
+mutagen
+pydub
+urlparse3
+PyQt5>=5.6
+sip
+yt_dlp