preference

Author: peppy0510

makebuild.spec

@@ -11,9 +11,9 @@ import glob
 import os
 
 
-debug = True
+debug = False
 upx = True
-onefile = True
+onefile = False
 
 
 PYZ = PYZ  # noqa
@@ -94,7 +94,7 @@ if onefile:
     # runtime_tmpdir='%HOMEPATH%\\AppData\\Local\\Temp\\' + name
 else:
     exe = EXE(pyz, a.scripts, name=path.output, icon=path.icon,
-              uac_admin=True, uac_uiaccess=True, upx=upx, strip=None,
+              upx=upx, strip=None,
               debug=debug, console=debug, exclude_binaries=1)
     dist = COLLECT(exe, a.binaries, a.zipfiles, a.datas,
                    upx=upx, strip=None, name=__appname__)

makeinstaller.iss

@@ -2,25 +2,25 @@
 
 [Setup]
 AppName="PyMusicPlayer"
-AppVerName="PyMusicPlayer 1.0.51"
+AppVerName="PyMusicPlayer 1.1.0"
 DefaultDirName="{pf}\PyMusicPlayer"
 DefaultGroupName="PyMusicPlayer"
-AppVersion="1.0.51"
+AppVersion="1.1.0"
 AppCopyright="Taehong Kim"
 AppPublisher="Taehong Kim"
 UninstallDisplayIcon="{app}\PyMusicPlayer.exe"
 Compression=lzma2/max
 SolidCompression=yes
 OutputDir="dist"
-OutputBaseFilename="PyMusicPlayer-1.0.51-Setup"
-; VersionInfoVersion="1.0.51"
-VersionInfoProductVersion="1.0.51"
+OutputBaseFilename="PyMusicPlayer-1.1.0-Setup"
+; VersionInfoVersion="1.1.0"
+VersionInfoProductVersion="1.1.0"
 VersionInfoCompany="Taehong Kim"
 VersionInfoCopyright="Taehong Kim"
 ArchitecturesInstallIn64BitMode="x64"
 
 [Files]
-Source: "dist\*"; DestDir: "{app}"; Flags: recursesubdirs
+Source: "dist\PyMusicPlayer\*"; DestDir: "{app}"; Flags: recursesubdirs
 
 [Icons]
 Name: "{group}\PyMusicPlayer"; Filename: "{app}\PyMusicPlayer.exe"

source/listbox.py

@@ -48,6 +48,7 @@
 from macroboxlib import UserInputDialogBox
 from operator import itemgetter
 from utilities import Struct
+from utilities import get_user_appdata_path
 from utilities import get_user_docapp_path
 
 

source/listboxtab.py

@@ -42,6 +42,7 @@
 from macroboxlib import UserInputDialogBox
 from operator import itemgetter
 from utilities import Struct
+from utilities import get_user_appdata_path
 from utilities import get_user_docapp_path
 
 

source/macroboxlib.py

@@ -28,6 +28,7 @@
 from utilities import compress_object
 from utilities import decompress_object
 from utilities import get_user_docapp_path
+from utilities import get_user_appdata_path
 from utilities import open_shelve
 from utilities import open_shelves
 from utilities import save_shelve
@@ -54,7 +55,8 @@
 
 TITLE = '%s %s' % (PRODUCT_NAME, PRODUCT_EDITION)
 # PREFERENCE_DB = os.path.sep.join([get_user_docapp_path(), 'macroboxplayer.db'])
-PREFERENCE_DB = os.path.sep.join([get_user_docapp_path(), 'macroboxplayer'])
+# PREFERENCE_DB = os.path.sep.join([get_user_docapp_path(), 'macroboxplayer'])
+PREFERENCE_DB = os.path.sep.join([get_user_docapp_path(), 'settings'])
 # PREFERENCE_DB = os.path.sep.join([os.path.expanduser(r'~'), 'AppData', 'Local', 'PyMusicPlayer'])
 # PREFERENCE_DB = os.path.join(os.path.expanduser(r'~'), 'AppData', 'Local', 'PyMusicPlayer', 'settings')
 

source/main.pyw

@@ -2,7 +2,7 @@
 
 
 __appname__ = 'PyMusicPlayer'
-__version__ = '1.0.51'
+__version__ = '1.1.0'
 __author__ = 'Taehong Kim'
 __email__ = 'peppy0510@hotmail.com'
 __license__ = ''

source/mfeats.py

@@ -39,7 +39,7 @@
 from utilities import set_process_priority
 
 
-MFEATS_DB = os.path.join(get_user_docapp_path(), 'macroboxplayer.mfeats')
+MFEATS_DB = os.path.join(get_user_docapp_path(), 'database.db')
 
 
 MFEATS_VERSION = '1.0.1'

source/pybass/__init__.py

@@ -55,11 +55,11 @@
     #     pass
 
 
-# from .pybass import *
-# from .pybass_vst import *
-# from .pybassmidi import *
-# from .pybassmix import *
-# from .pytags import *
+from .pybass import *  # noqa
+from .pybass_vst import *  # noqa
+from .pybassmidi import *  # noqa
+from .pybassmix import *  # noqa
+from .pytags import *  # noqa
 
 
 if __name__ == '__main__':

source/utilities.py

@@ -302,21 +302,29 @@ def open_shelves(keys, shelve_path):
 
 
 def set_master_path():
-    filename = 'macroboxplayer'
+    filename = 'settings'
+    # filename = 'macroboxplayer'
     # filename = 'macroboxplayer.db'
     shelve_path = os.path.join(get_user_docapp_path(), filename)
     save_shelve('master_path', os.getcwd(), shelve_path)
 
 
 def get_master_path():
-    filename = 'macroboxplayer'
+    filename = 'settings'
+    # filename = 'macroboxplayer'
     # filename = 'macroboxplayer.db'
     shelve_path = os.path.join(get_user_docapp_path(), filename)
     return open_shelve('master_path', shelve_path)
 
 
+# def get_user_docapp_path():
+#     path = os.path.join(get_user_document_path(), 'muteklab')
+#     if os.path.isdir(path) is False:
+#         os.mkdir(path)
+#     return path
+
 def get_user_docapp_path():
-    path = os.path.join(get_user_document_path(), 'muteklab')
+    path = os.path.join(get_user_appdata_path(), 'PyMusicPlayer')
     if os.path.isdir(path) is False:
         os.mkdir(path)
     return path
@@ -341,6 +349,21 @@ def get_user_document_path():
         return None
 
 
+def get_user_appdata_path():
+    if sys.platform.startswith('win'):
+        path = os.path.abspath(os.path.join(
+            os.path.expanduser('~'), 'AppData', 'Local'))
+        if os.path.isdir(path):
+            return path
+        return None
+    elif sys.platform.startswith('darwin'):
+        path = os.path.abspath(os.path.join(
+            os.path.expanduser(r'~'), r'Documents'))
+        if os.path.isdir(path):
+            return path
+        return None
+
+
 def get_path_where_iamin():
     return os.path.dirname(os.path.abspath(__name__))