diff --git a/.gitignore b/.gitignore index 8c4306bf..9087352a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,30 +14,43 @@ FoxDot/lib/Settings/conf.txt FoxDot/lib/Workspace/tmp/tempfile.txt changed_files.txt +# To-do list -# Sphinx build dir -docs/_build/ -*.txt - -# To-do list TODO.txt -# Tracks -FoxDot/Tracks/* -# Make directory and autodoc scripts + + autodoc.py + snd/mkdir.py + + # PIP Registration file + + .pypirc + + # Directory created by pip install -e + + /*.egg-info + + # Compiled Python file + + *.pyc +# Sphinx build dir +docs/_build/ + +*.txt + # Windows image file caches Thumbs.db ehthumbs.db diff --git a/FoxDot/lib/.version b/FoxDot/lib/.version index 091f0b88..5592e6e7 100644 --- a/FoxDot/lib/.version +++ b/FoxDot/lib/.version @@ -1 +1 @@ -0.7.34 \ No newline at end of file +0.7.35 \ No newline at end of file diff --git a/FoxDot/lib/Patterns/Main.py b/FoxDot/lib/Patterns/Main.py index 6970d5a0..ab18cb09 100644 --- a/FoxDot/lib/Patterns/Main.py +++ b/FoxDot/lib/Patterns/Main.py @@ -1095,6 +1095,22 @@ def flatten(self): values.append(item) return PGroup(values) + def concat(self, data): + """ Concatonates this patterns stream with another """ + new = PGroup() + if isinstance(data, PGroup): + new.data = self.data + data.data + # Creates a pattern + elif isinstance(data, Pattern): + new = PGroup(*self.data, data) + elif isinstance(data, (list, str)): + new.data = list(self.data) + new.data.extend(map(convert_nested_data, data)) + else: + new.data = list(self.data) + new.append(data) + return new + def _get_step(self, dur): return dur diff --git a/setup.py b/setup.py index 90d63f86..b3735999 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ long_description=long_description, long_description_content_type="text/markdown", entry_points={'gui_scripts' : ['FoxDot = FoxDot.__init__:main']}, + data_files=[('', 'LICENSE')], package_data = {'FoxDot': ['snd/*/*/*.*', 'snd/_loop_/foxdot.wav', 'snd/_loop_/drums130.wav', @@ -51,7 +52,6 @@ 'lib/Extensions/*/*/*.*', 'lib/.version', 'README.md', - 'LICENSE' ], 'FoxDot.lib.Workspace': ['img/*', 'tmp/*'], 'FoxDot.lib.Settings' : ['conf.txt']})