impl: Add logging to the program

Author: IoeCmcomc

.gitignore

@@ -343,6 +343,7 @@ Downloaded song/
 
 *build/
 dist/
+logs/
 main.dist/
 .mscbackup/
 

audio_common.py

@@ -0,0 +1,12 @@
+from functools import lru_cache
+
+from pydub import AudioSegment
+
+
+@lru_cache(maxsize=32)
+def load_sound(path: str) -> AudioSegment:
+    """A patched version of nbswave.audio.load_song() which caches loaded sounds"""
+    if not path:
+        return AudioSegment.empty()
+    else:
+        return AudioSegment.from_file(path)

common.py

@@ -20,10 +20,6 @@
 import sys
 from collections import namedtuple
 from os.path import abspath, dirname, join, normpath
-from functools import lru_cache
-from typing import Optional
-
-from pydub import AudioSegment
 
 # from main import __file__ as __mainfile__
 
@@ -232,7 +228,7 @@
 SOUND_FOLDER = "sounds"
 
 BASE_RESOURCE_PATH = ''
-if getattr(sys, 'frozen', False): # PyInstaller
+if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'): # PyInstaller
     BASE_RESOURCE_PATH = sys._MEIPASS # type: ignore
 elif '__compiled__' in globals(): # Nuitka
     BASE_RESOURCE_PATH = dirname(__file__)
@@ -241,12 +237,4 @@
 assert BASE_RESOURCE_PATH != ''
 
 def resource_path(*args: str):
-    return normpath(join(BASE_RESOURCE_PATH, *args))
-
-@lru_cache(maxsize=32)
-def load_sound(path: str) -> AudioSegment:
-    """A patched version of nbswave.audio.load_song() which caches loaded sounds"""
-    if not path:
-        return AudioSegment.empty()
-    else:
-        return AudioSegment.from_file(path)
+    return normpath(join(BASE_RESOURCE_PATH, *args))

customwidgets/builder.py

@@ -25,8 +25,12 @@
 except ImportError as e:
     from pygubu import BuilderObject, register_widget # type: ignore
 
-from wrapmessage import WrapMessage
-from checkablelabelframe import CheckableLabelFrame
+try:
+    from wrapmessage import WrapMessage
+    from checkablelabelframe import CheckableLabelFrame
+except ModuleNotFoundError:
+    from .wrapmessage import WrapMessage
+    from .checkablelabelframe import CheckableLabelFrame
 
 class WrapMessageBuilder(BuilderObject): # type: ignore
     class_ = WrapMessage

main.py

@@ -25,14 +25,15 @@
 from pydub import AudioSegment
 from pynbs import File, Header, Instrument, Layer, Note
 
-from common import load_sound
-
 from nbswave import SongRenderer, audio, nbs
 from nbswave.main import MissingInstrumentException
 
-from common import resource_path, SOUND_FOLDER
 from nbsio import VANILLA_INSTS, NbsSong
 
+from audio_common import load_sound
+from common import resource_path, SOUND_FOLDER
+
+
 audio.load_sound = load_sound
 
 def convert(data: NbsSong) -> File:

nbs2audio.py

@@ -28,20 +28,25 @@
 from functools import total_ordering
 from os import path
 from asyncio import sleep
+from warnings import warn
 
 from pydub import AudioSegment
 from pydub.effects import normalize
 
 from nbsio import Note as NbsNote
 from nbsio import NbsSong, Layer, Instrument, VANILLA_INSTS
 
-from common import load_sound, SOUND_FOLDER
+from common import SOUND_FOLDER
+from audio_common import load_sound
+
 
 DEFAULT_PATTERN_LENGTH = 64
 TRACKER_VERSION = 0xa00a
 SAMPLE_PITCH_SHIFT = -10
 LAST_SAMPLE_PITCH_SHIFT = 6  # The last need special treatment
 DEFAULT_SPEED = 6
+MAX_LENGTH = 40000
+MAX_CHANNEL = 127
 
 BYTE = Struct("<b")
 UBYTE = Struct("<B")
@@ -227,7 +232,7 @@ def delete_missing_instruments(song: NbsSong, insts: list):
     for i in reversed(range(len(insts))):
         inst = insts[i]
         if not inst.filePath or get_audio_segment(inst.filePath) is None:
-            print(f"Missing instrument: {inst.filePath}")
+            warn(f"Missing instrument: {inst.filePath}")
             missing_indexes.add(i)
             del insts[i]
 
@@ -248,11 +253,15 @@ def delete_missing_instruments(song: NbsSong, insts: list):
 async def nbs2it(song: NbsSong, fn: str, dialog=None) -> None:
     song.correctData()
     header = song.header
-    layers = song.layers
 
     if not fn.endswith('.it'):
         fn += '.it'
 
+    song.notes = list(
+        filter(lambda note: note.tick < MAX_LENGTH and note.layer < MAX_CHANNEL, song.notes))
+    song.correctData()
+    layers = song.layers
+
     all_instruments = VANILLA_INSTS[:header.vani_inst] + song.customInsts
     delete_missing_instruments(song, all_instruments)
 
@@ -269,20 +278,13 @@ async def nbs2it(song: NbsSong, fn: str, dialog=None) -> None:
 
     instrument_mapping = {index: i for i,
                           index in enumerate(instrument_indexes)}
-
     instrument_count = len(instruments)
+
     pattern_length = DEFAULT_PATTERN_LENGTH
     pattern_count = ceil(header.length / pattern_length)
     while pattern_count > 200 and pattern_length <= 200:
         pattern_length += 16
         pattern_count = ceil(header.length / pattern_length)
-    if pattern_length > 200:
-        pattern_length = 200
-        max_length = 40000
-        song.notes = list(
-            filter(lambda note: note.tick < max_length, song.notes))
-        song.correctData()
-        pattern_count = ceil(header.length / pattern_length)
 
     order_count = pattern_count + 1
     time_sign = 4
@@ -456,7 +458,11 @@ async def nbs2it(song: NbsSong, fn: str, dialog=None) -> None:
             dialog.currentProgress.set(60)
             await sleep(0.001)
 
-        channels = tuple(map(Channel.from_instance, layers))
+        channels = list(map(Channel.from_instance, layers))
+        dummy_channel = Channel("")
+        if len(channels) < song.maxLayer + 1:
+            for _ in range(song.maxLayer + 1 - len(channels)):
+                channels.append(dummy_channel)
 
         def note_converter(note): return Note.from_instance(
             note, pattern_length)

nbs2impulsetracker.py

@@ -16,6 +16,7 @@ lxml = ">=4.9.1"
 lark = ">=1.0.0"
 jsonschema = ">=4.17.3"
 nbswave = {git = "https://github.com/Bentroen/nbswave.git"}
+loguru = "^0.7.2"
 
 [tool.poetry.dev-dependencies]