From ef99c4d6e24cef68175df743bcb6b7bff147cba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= <the.orleander@gmail.com>
Date: Tue, 9 Jul 2019 22:09:10 +0200
Subject: [PATCH] Move 'note' module

---
 smnp/module/__init__.py                             | 5 +++--
 smnp/module/note/__init__.py                        | 4 ++++
 smnp/module/note/function/__init__.py               | 0
 smnp/{library => module/note}/function/duration.py  | 1 +
 smnp/{library => module/note}/function/octave.py    | 1 +
 smnp/{library => module/note}/function/pause.py     | 0
 smnp/{library => module/note}/function/semitones.py | 1 +
 smnp/{library => module/note}/function/transpose.py | 1 +
 smnp/{library => module/note}/function/tuplet.py    | 1 +
 9 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 smnp/module/note/__init__.py
 create mode 100644 smnp/module/note/function/__init__.py
 rename smnp/{library => module/note}/function/duration.py (99%)
 rename smnp/{library => module/note}/function/octave.py (99%)
 rename smnp/{library => module/note}/function/pause.py (100%)
 rename smnp/{library => module/note}/function/semitones.py (99%)
 rename smnp/{library => module/note}/function/transpose.py (99%)
 rename smnp/{library => module/note}/function/tuplet.py (99%)

diff --git a/smnp/module/__init__.py b/smnp/module/__init__.py
index 54c5001..972816e 100644
--- a/smnp/module/__init__.py
+++ b/smnp/module/__init__.py
@@ -1,4 +1,5 @@
 import smnp.module.mic
+import smnp.module.note
 
-functions = [ *mic.functions ]
-methods = [ *mic.methods ]
\ No newline at end of file
+functions = [ *mic.functions, *note.functions ]
+methods = [ *mic.methods, *note.methods ]
\ No newline at end of file
diff --git a/smnp/module/note/__init__.py b/smnp/module/note/__init__.py
new file mode 100644
index 0000000..12c1698
--- /dev/null
+++ b/smnp/module/note/__init__.py
@@ -0,0 +1,4 @@
+from smnp.module.note.function import tuplet, transpose, semitones, pause, octave, duration
+
+functions = [ pause.function, semitones.function, transpose.function, tuplet.function ]
+methods = [ duration.function, octave.function ]
\ No newline at end of file
diff --git a/smnp/module/note/function/__init__.py b/smnp/module/note/function/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smnp/library/function/duration.py b/smnp/module/note/function/duration.py
similarity index 99%
rename from smnp/library/function/duration.py
rename to smnp/module/note/function/duration.py
index 4a47ae2..69ca255 100644
--- a/smnp/library/function/duration.py
+++ b/smnp/module/note/function/duration.py
@@ -2,6 +2,7 @@ from smnp.library.model import Function
 from smnp.library.signature import signature, ofType
 from smnp.type.model import Type
 
+
 _signature = signature(ofType(Type.NOTE), ofType(Type.INTEGER))
 def _function(env, note, duration):
     return Type.note(note.value.withDuration(duration.value))
diff --git a/smnp/library/function/octave.py b/smnp/module/note/function/octave.py
similarity index 99%
rename from smnp/library/function/octave.py
rename to smnp/module/note/function/octave.py
index 9f9a257..fb0d9f8 100644
--- a/smnp/library/function/octave.py
+++ b/smnp/module/note/function/octave.py
@@ -2,6 +2,7 @@ from smnp.library.model import Function
 from smnp.library.signature import signature, ofType
 from smnp.type.model import Type
 
+
 _signature = signature(ofType(Type.NOTE), ofType(Type.INTEGER))
 def _function(env, note, octave):
     return Type.note(note.value.withOctave(octave.value))
diff --git a/smnp/library/function/pause.py b/smnp/module/note/function/pause.py
similarity index 100%
rename from smnp/library/function/pause.py
rename to smnp/module/note/function/pause.py
diff --git a/smnp/library/function/semitones.py b/smnp/module/note/function/semitones.py
similarity index 99%
rename from smnp/library/function/semitones.py
rename to smnp/module/note/function/semitones.py
index dc1c236..8e58644 100644
--- a/smnp/library/function/semitones.py
+++ b/smnp/module/note/function/semitones.py
@@ -3,6 +3,7 @@ from smnp.library.signature import varargSignature, ofTypes, listOf
 from smnp.note.model import Note
 from smnp.type.model import Type
 
+
 _signature1 = varargSignature(ofTypes(Type.NOTE, Type.INTEGER))
 def _function1(env, vararg):
     withoutPauses = [note.value for note in vararg if note.type == Type.NOTE]
diff --git a/smnp/library/function/transpose.py b/smnp/module/note/function/transpose.py
similarity index 99%
rename from smnp/library/function/transpose.py
rename to smnp/module/note/function/transpose.py
index de4406f..ab6e755 100644
--- a/smnp/library/function/transpose.py
+++ b/smnp/module/note/function/transpose.py
@@ -2,6 +2,7 @@ from smnp.library.model import CombinedFunction, Function
 from smnp.library.signature import varargSignature, ofTypes, listOf
 from smnp.type.model import Type
 
+
 _signature1 = varargSignature(ofTypes(Type.INTEGER, Type.NOTE), ofTypes(Type.INTEGER))
 def _function1(env, value, vararg):
     transposed = [Type.note(arg.value.transpose(value.value)) if arg.type == Type.NOTE else arg for arg in vararg]
diff --git a/smnp/library/function/tuplet.py b/smnp/module/note/function/tuplet.py
similarity index 99%
rename from smnp/library/function/tuplet.py
rename to smnp/module/note/function/tuplet.py
index d28b816..b300a99 100644
--- a/smnp/library/function/tuplet.py
+++ b/smnp/module/note/function/tuplet.py
@@ -2,6 +2,7 @@ from smnp.library.model import CombinedFunction, Function
 from smnp.library.signature import signature, listOf, ofTypes, varargSignature
 from smnp.type.model import Type
 
+
 _signature1 = varargSignature(ofTypes(Type.NOTE), ofTypes(Type.INTEGER), ofTypes(Type.INTEGER))
 def _function1(env, n, m, vararg):
     t = [Type.note(arg.value.withDuration(int(arg.value.duration * n.value / m.value))) for arg in vararg]