From 63ba5a8dc2aa4ec3e6f203b0ba4db249ecf0b00e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 27 Jul 2016 21:33:09 +0200 Subject: [PATCH] Rename helpers to music_sampler --- .gitignore | 2 +- music_sampler.kv | 2 +- music_sampler.py | 16 ++++++++-------- music_sampler.spec | 2 +- {helpers => music_sampler}/__init__.py | 0 {helpers => music_sampler}/action.py | 0 {helpers => music_sampler}/actions/__init__.py | 0 .../actions/interrupt_wait.py | 0 {helpers => music_sampler}/actions/pause.py | 0 {helpers => music_sampler}/actions/play.py | 0 .../actions/run_command.py | 0 {helpers => music_sampler}/actions/seek.py | 0 {helpers => music_sampler}/actions/stop.py | 0 .../actions/stop_all_actions.py | 0 {helpers => music_sampler}/actions/unpause.py | 0 {helpers => music_sampler}/actions/volume.py | 0 {helpers => music_sampler}/actions/wait.py | 0 {helpers => music_sampler}/key.py | 0 {helpers => music_sampler}/lock.py | 0 {helpers => music_sampler}/mapping.py | 0 {helpers => music_sampler}/mixer.py | 0 {helpers => music_sampler}/music_effect.py | 0 {helpers => music_sampler}/music_file.py | 0 {helpers => music_sampler}/sysfont.py | 0 24 files changed, 11 insertions(+), 11 deletions(-) rename {helpers => music_sampler}/__init__.py (100%) rename {helpers => music_sampler}/action.py (100%) rename {helpers => music_sampler}/actions/__init__.py (100%) rename {helpers => music_sampler}/actions/interrupt_wait.py (100%) rename {helpers => music_sampler}/actions/pause.py (100%) rename {helpers => music_sampler}/actions/play.py (100%) rename {helpers => music_sampler}/actions/run_command.py (100%) rename {helpers => music_sampler}/actions/seek.py (100%) rename {helpers => music_sampler}/actions/stop.py (100%) rename {helpers => music_sampler}/actions/stop_all_actions.py (100%) rename {helpers => music_sampler}/actions/unpause.py (100%) rename {helpers => music_sampler}/actions/volume.py (100%) rename {helpers => music_sampler}/actions/wait.py (100%) rename {helpers => music_sampler}/key.py (100%) rename {helpers => music_sampler}/lock.py (100%) rename {helpers => music_sampler}/mapping.py (100%) rename {helpers => music_sampler}/mixer.py (100%) rename {helpers => music_sampler}/music_effect.py (100%) rename {helpers => music_sampler}/music_file.py (100%) rename {helpers => music_sampler}/sysfont.py (100%) diff --git a/.gitignore b/.gitignore index 0aa4e4c..a313440 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ build/ dist/ -helpers/__pycache__/ +music_sampler/__pycache__/ __pycache__/ .pyinstaller_commit diff --git a/music_sampler.kv b/music_sampler.kv index a18eb4e..9057532 100644 --- a/music_sampler.kv +++ b/music_sampler.kv @@ -1,5 +1,5 @@ #:import math math -#:import h helpers +#:import h music_sampler : pad_col_sep: 0 if not self.pad_cols else self.parent.pad_x diff --git a/music_sampler.py b/music_sampler.py index f5df2bf..714598a 100644 --- a/music_sampler.py +++ b/music_sampler.py @@ -1,6 +1,6 @@ -import helpers +import music_sampler -helpers.parse_args() +music_sampler.parse_args() import kivy kivy.require("1.9.1") @@ -11,10 +11,10 @@ from kivy.properties import ListProperty, StringProperty from kivy.clock import Clock from kivy.core.window import Window from kivy.lang import Builder -from helpers.key import Key -from helpers.mapping import Mapping +from music_sampler.key import Key +from music_sampler.mapping import Mapping -helpers.register_fonts() +music_sampler.register_fonts() class KeyList(RelativeLayout): keylist = ListProperty([]) @@ -51,8 +51,8 @@ class PlayList(RelativeLayout): continue text = "{}/{}".format( - helpers.duration_to_min_sec(music_file.sound_position), - helpers.duration_to_min_sec(music_file.sound_duration)) + music_sampler.duration_to_min_sec(music_file.sound_position), + music_sampler.duration_to_min_sec(music_file.sound_duration)) if music_file.is_loaded_paused(): self.playlist.append(["⏸", music_file.name, text, False]) @@ -87,5 +87,5 @@ class MusicSamplerApp(App): return Screen() if __name__ == '__main__': - Builder.load_file(helpers.path() + "/music_sampler.kv") + Builder.load_file(music_sampler.path() + "/music_sampler.kv") MusicSamplerApp().run() diff --git a/music_sampler.spec b/music_sampler.spec index 0d99dca..3794397 100644 --- a/music_sampler.spec +++ b/music_sampler.spec @@ -5,7 +5,7 @@ from kivy.tools.packaging.pyinstaller_hooks import get_deps_minimal,\ import importlib.machinery sysfont = importlib.machinery\ - .SourceFileLoader('sysfont', os.getcwd() + '/helpers/sysfont.py') \ + .SourceFileLoader('sysfont', os.getcwd() + '/music_sampler/sysfont.py') \ .load_module() excluded_and_hidden_modules = get_deps_minimal( diff --git a/helpers/__init__.py b/music_sampler/__init__.py similarity index 100% rename from helpers/__init__.py rename to music_sampler/__init__.py diff --git a/helpers/action.py b/music_sampler/action.py similarity index 100% rename from helpers/action.py rename to music_sampler/action.py diff --git a/helpers/actions/__init__.py b/music_sampler/actions/__init__.py similarity index 100% rename from helpers/actions/__init__.py rename to music_sampler/actions/__init__.py diff --git a/helpers/actions/interrupt_wait.py b/music_sampler/actions/interrupt_wait.py similarity index 100% rename from helpers/actions/interrupt_wait.py rename to music_sampler/actions/interrupt_wait.py diff --git a/helpers/actions/pause.py b/music_sampler/actions/pause.py similarity index 100% rename from helpers/actions/pause.py rename to music_sampler/actions/pause.py diff --git a/helpers/actions/play.py b/music_sampler/actions/play.py similarity index 100% rename from helpers/actions/play.py rename to music_sampler/actions/play.py diff --git a/helpers/actions/run_command.py b/music_sampler/actions/run_command.py similarity index 100% rename from helpers/actions/run_command.py rename to music_sampler/actions/run_command.py diff --git a/helpers/actions/seek.py b/music_sampler/actions/seek.py similarity index 100% rename from helpers/actions/seek.py rename to music_sampler/actions/seek.py diff --git a/helpers/actions/stop.py b/music_sampler/actions/stop.py similarity index 100% rename from helpers/actions/stop.py rename to music_sampler/actions/stop.py diff --git a/helpers/actions/stop_all_actions.py b/music_sampler/actions/stop_all_actions.py similarity index 100% rename from helpers/actions/stop_all_actions.py rename to music_sampler/actions/stop_all_actions.py diff --git a/helpers/actions/unpause.py b/music_sampler/actions/unpause.py similarity index 100% rename from helpers/actions/unpause.py rename to music_sampler/actions/unpause.py diff --git a/helpers/actions/volume.py b/music_sampler/actions/volume.py similarity index 100% rename from helpers/actions/volume.py rename to music_sampler/actions/volume.py diff --git a/helpers/actions/wait.py b/music_sampler/actions/wait.py similarity index 100% rename from helpers/actions/wait.py rename to music_sampler/actions/wait.py diff --git a/helpers/key.py b/music_sampler/key.py similarity index 100% rename from helpers/key.py rename to music_sampler/key.py diff --git a/helpers/lock.py b/music_sampler/lock.py similarity index 100% rename from helpers/lock.py rename to music_sampler/lock.py diff --git a/helpers/mapping.py b/music_sampler/mapping.py similarity index 100% rename from helpers/mapping.py rename to music_sampler/mapping.py diff --git a/helpers/mixer.py b/music_sampler/mixer.py similarity index 100% rename from helpers/mixer.py rename to music_sampler/mixer.py diff --git a/helpers/music_effect.py b/music_sampler/music_effect.py similarity index 100% rename from helpers/music_effect.py rename to music_sampler/music_effect.py diff --git a/helpers/music_file.py b/music_sampler/music_file.py similarity index 100% rename from helpers/music_file.py rename to music_sampler/music_file.py diff --git a/helpers/sysfont.py b/music_sampler/sysfont.py similarity index 100% rename from helpers/sysfont.py rename to music_sampler/sysfont.py -- 2.41.0