v2.1.0 update

drgerg · drgerg · commit c0d47aa4e48b · 2024-03-26T20:34:34.000-05:00
diff --git a/code/README.txt b/code/README.txt
@@ -1,23 +1,10 @@
-Minimal MPD Client - v2.0.9
+Minimal MPD Client - v2.1.0
 
-Check out the offline help under the Help menu. (updated for v2.0.9)
+Check out the offline help under the Help menu. (updated for v2.1.0)
 
-v2.0.9 
-  - Expanded commands that can be used in search windows.  'help;' tells all.
-  - Renamed menus to names I like. Moved options around so they almost make sense.
-  - Discovered and fixed bugs related to art window.
-  - Improved Linux experience. Configuration changes exit MMC4W. Reload applies them.
-  - In Linux, Mode button also exits so reloading can pick up titlebar change.
-      More testing on other WM's needed.
-  - Finally got "scaling factor" working.  Set scale factor by sizing main win. In Config menu.
-  - Massive redo of the help document.  New pics required.
-  - Resolved Help and About window sizing on scaled displays.
-  - Resolved a couple of bugs uncovered by LuSP19 related to brand new MPD installs.
-  - Resolved a path issue when Pyinstaller is not used. (just copying mmc4w.py)
-
-v2.0.8 
-  - Added a 'Close' button to Outputs and Server windows.
-  - This allows you to make multiple changes to outputs 
-    and change your mind about which server you want.
+v2.1.0 
+  - Provided a kinder solution when trying to run MMC4W against a server that is not running.
+  - Added Config menu option to delete the debug log file.
+  - Corrected bug preventing logo from being displayed when there is no album art.
 
 
diff --git a/code/_internal/mmc4w_help.html b/code/_internal/mmc4w_help.html
@@ -2,7 +2,7 @@
 <html>
 <body>
 <h1>MMC4W - Minimal MPD Client for Windows</h1>
-<p>This help file was updated for the v2.0.9 release.  As of v2.0.8 the same Python code runs in Linux without needing any tweaks.</p>
+<p>This help file was updated for the v2.1.0 release.  As of v2.0.8 the same Python code runs in Linux without needing any tweaks.</p>
 <p>I recommend reading the <strong>First Run Process</strong> section below before installing.</p>
 <h1>Putting the Music First</h1>
 <p><strong>MMC4W</strong> is first and foremost <strong>Minimal</strong>.  That may be a little misleading, because it does quite a lot.  The GUI is minimal so as to quietly go about its business. This is about the music. That was the original point of this exercise.</p>
@@ -24,6 +24,7 @@ <h3>The <strong>'Config'</strong> menu contains these functions:</h3>
 <li><strong>Select a Server</strong> : Allows you to select a server from the list in mmc4w.ini. Prompts you to select a playlist also.</li>
 <li><strong>Toggle an Output</strong> : Allows you to enable and disable configured outputs on the MPD server.</li>
 <li><strong>Toggle Logging</strong> : Toggles logging On or Off.  Restart the app after toggling.</li>
+<li><strong>Delete Debug Log</strong> : If you are not currently logging in debug mode, deletes the log for you.</li>
 <li><strong>Reset Win Positions</strong> : Puts the two primary windows back where they were originally.</li>
 <li><strong>Get Scaling Factors</strong> : Calculates and saves two values based on display scaling.</li>
 <li><strong>Apply Scaling Factors</strong> : Updates window geometry numbers based on saved Scaling Factors.</li>
@@ -78,7 +79,7 @@ <h2>First Run Process</h2>
 <p><img alt="inside the mmc4w.ini file" src="./config_ini_basics.png" /></p>
 <p>If you have more than one server, just string those IP addresses together as seen there.</p>
 <p>After typing your server IP address(es) in the [basic] section, save and close the file.</p>
-<p>Restart <strong>MMC4W</strong>.  When it starts, you will get a dialog showing you the first IP address you provided.  If the connection is not successful, an error will be displayed.  In this case, you'll need to verify your server's IP address is correctly entered into mmc4w.ini file.  Open the text editor you were using to input that IP address.  You should be able to find mmc4w.ini in the recent files list.</p>
+<p>Restart <strong>MMC4W</strong>.  When it starts, you will get a dialog showing you the first IP address you provided.  If the connection is not successful, an error will be displayed.  In this case, you'll need to verify your server's IP address is correctly entered into mmc4w.ini file.  The process opens mmc4w.ini for editing.</p>
 <p>Once you have a valid server IP under the serverlist key of the basic section, run MMC4W again.</p>
 <h3>Position and size windows to your liking.</h3>
 <p>The first time you run MMC4W, it runs with titlebars on.  You can move and size the windows to your liking.  When you have things to your liking, hit the <strong>mode</strong> button.  If you are running in Linux, mmc4w.py will exit. Restart the app. </p>
@@ -141,7 +142,7 @@ <h3>Search and Play directly from the music library</h3>
 <p><strong>Note:</strong> The Search window is resizeable.  If you want, type 'savewin;' in the Search: bar to save size and placement.</p>
 <p><strong>Play a Single</strong> opens the Search window and allows you to type some search term.  This is a <strong>Title</strong> search.  If any song title in the entire library contains the search term, it will be displayed when you press <strong>[enter]</strong>.</p>
 <p><img alt="Title Search." src="./search_title.png" /></br><span style="color:green; font-size:smaller;">Song title search.</span></p>
-<p>When you click on one of them, it plays that one title then stops.  Use another <strong>'Look'</strong> menu option to do something else.</p>
+<p>When you click on one of them, it plays that one title then stops.  Use another <strong>'Lists'</strong> menu option to do something else.</p>
 <p><strong>Play an Album</strong> opens the same Search window.  This time you are searching for text contained in <strong>Album</strong> names.</p>
 <p>Clicking on a list entry loads up the songs on that album and plays them sequentially, first to last.  You will notice the text area turns blue with white text.  That is the visual indicator that <strong>Random Mode</strong> has been turned off.  </p>
 <p><img alt="Album Search." src="./album_mode.png" /></br><span style="color:green; font-size:smaller;">True Blue Album Mode.</span></p>
@@ -153,7 +154,7 @@ <h3>Search and Play directly from the music library</h3>
 <h2>Working with Saved Playlists</h2>
 <p>Saved playlists are the heart of <strong>MMC4W</strong>. To differentiate between <strong>saved playlists</strong> and the list of songs currently being played, the latter is called <strong>"the queue"</strong>.  <strong>Playlists</strong> are lists of songs saved to a file on disk with some meaningful name.</p>
 <p>You load playlists into the queue and then MPD plays that queue using the settings in force at the moment.  </p>
-<p><strong>MMC4W</strong> will create a special playlist called "Everything" that contains all the songs in your library.  That option is found in the <strong>'Look'</strong> Menu.</p>
+<p><strong>MMC4W</strong> will create a special playlist called "Everything" that contains all the songs in your library.  That option is found in the <strong>'Lists'</strong> Menu.</p>
 <h3>You can manipulate playlists in these ways:</h3>
 <ul>
 <li>Load a playlist into the queue.  <strong>Lists Menu</strong> - Select a Playlist.</li>
diff --git a/code/_internal/mmc4w_help.md b/code/_internal/mmc4w_help.md
@@ -3,7 +3,7 @@
 <body markdown="1">
 # MMC4W - Minimal MPD Client for Windows
 
-This help file was updated for the v2.0.9 release.  As of v2.0.8 the same Python code runs in Linux without needing any tweaks.
+This help file was updated for the v2.1.0 release.  As of v2.0.8 the same Python code runs in Linux without needing any tweaks.
 
 I recommend reading the **First Run Process** section below before installing.
 
@@ -29,6 +29,7 @@ The interface contains the basic required buttons to control a MPD server:
 - **Select a Server** : Allows you to select a server from the list in mmc4w.ini. Prompts you to select a playlist also.
 - **Toggle an Output** : Allows you to enable and disable configured outputs on the MPD server.
 - **Toggle Logging** : Toggles logging On or Off.  Restart the app after toggling.
+- **Delete Debug Log** : If you are not currently logging in debug mode, deletes the log for you.
 - **Reset Win Positions** : Puts the two primary windows back where they were originally.
 - **Get Scaling Factors** : Calculates and saves two values based on display scaling.
 - **Apply Scaling Factors** : Updates window geometry numbers based on saved Scaling Factors.
@@ -93,7 +94,7 @@ If you have more than one server, just string those IP addresses together as see
 
 After typing your server IP address(es) in the [basic] section, save and close the file.
 
-Restart **MMC4W**.  When it starts, you will get a dialog showing you the first IP address you provided.  If the connection is not successful, an error will be displayed.  In this case, you'll need to verify your server's IP address is correctly entered into mmc4w.ini file.  Open the text editor you were using to input that IP address.  You should be able to find mmc4w.ini in the recent files list.
+Restart **MMC4W**.  When it starts, you will get a dialog showing you the first IP address you provided.  If the connection is not successful, an error will be displayed.  In this case, you'll need to verify your server's IP address is correctly entered into mmc4w.ini file.  The process opens mmc4w.ini for editing.
 
 Once you have a valid server IP under the serverlist key of the basic section, run MMC4W again.
 
@@ -201,7 +202,7 @@ Anywhere you see a Search: bar, you can use colon-separated key:value pairs for
 
 ![Title Search.](./search_title.png)</br><span style="color:green; font-size:smaller;">Song title search.</span>
 
- When you click on one of them, it plays that one title then stops.  Use another **'Look'** menu option to do something else.
+ When you click on one of them, it plays that one title then stops.  Use another **'Lists'** menu option to do something else.
 
  **Play an Album** opens the same Search window.  This time you are searching for text contained in **Album** names.
 
@@ -225,7 +226,7 @@ Saved playlists are the heart of **MMC4W**. To differentiate between **saved pla
 
 You load playlists into the queue and then MPD plays that queue using the settings in force at the moment.  
 
-**MMC4W** will create a special playlist called "Everything" that contains all the songs in your library.  That option is found in the **'Look'** Menu.
+**MMC4W** will create a special playlist called "Everything" that contains all the songs in your library.  That option is found in the **'Lists'** Menu.
 
 ### You can manipulate playlists in these ways:
 
diff --git a/code/mmc4w.py b/code/mmc4w.py
@@ -32,7 +32,8 @@
     ctypes.windll.shcore.SetProcessDpiAwareness(0)
     ctypes.windll.user32.SetProcessDPIAware()
 
-version = "v2.0.9"
+version = "v2.1.0"
+# v2.1.0 - Gently handle attempting to run with no server. Add 'delete debug log'.
 # v2.0.9 - Finally get scale factors working. Renamed menus. Browse help.html.
 # v2.0.8 - Use buttons in search windows for added flexibility.
 # v2.0.7 - Trade pathlib for os.path. Deal with 'already connected' error.
@@ -124,11 +125,10 @@
 serverip = confparse.get('serverstats', 'lastsrvr')
 serverport = confparse.get('basic','serverport')
 firstrun = confparse.get('basic','firstrun')
-if firstrun == '1':
-    ran = 'r'
-    rpt = 'p'
-    sin = 's'
-    con = 'c'
+ran = 'r'
+rpt = 'p'
+sin = 's'
+con = 'c'
 if serverlist == "":
     proceed = messagebox.askokcancel("Edit Config File","OK closes the app and opens mmc4w.ini for editing.")
     if proceed == True:
@@ -344,6 +344,18 @@ def getscalefactors():
     with open(mmc4wIni, 'w') as SLcnf:
         confparse.write(SLcnf)
 
+def deletedebuglog():
+    if os.path.isfile(path_to_dat / "mmc4w_DEBUG.log"):
+        ddlsure = messagebox.askyesno("Delete Debug Log","Are you sure?")
+        if ddlsure == True:
+            try:
+                os.remove(path_to_dat / "mmc4w_DEBUG.log")
+                messagebox.showinfo("Debug Log Deleted","mmc4w_DEBUG.log has been removed.")
+            except:
+                messagebox.showinfo("File in Use","Toggle Logging before attempting to delete the log.")
+    else:
+        messagebox.showinfo("No Debug Log Found","The operating system reports no such file.")
+
 def loadplsongs(song,album):
     connext()
     pls_on_srvr = []
@@ -395,6 +407,10 @@ def connext():  ## Checks connection, then connects if necessary.
                 if err2var == 'Already connected':
                     cxstat = 1
                     pass
+                if 'WinError' in str(err2var) or 'Not connected' in str(err2var):
+                    messagebox.showinfo("Server Down","The server you selected is not responding. Edit mmc4w.ini to ensure the 'lastsrvr' IP address is for a running server.")
+                    cxstat = 0
+                    configurator("Double-check all the IP addresses. OK sends you to edit mmc4w.ini.")
                 else:
                     logger.debug("D1| Second level errvar: {}".format(err2var))
                     cxstat = 0
@@ -762,7 +778,7 @@ def getcurrsong():
             lastpl = confparse.get('serverstats','lastsetpl')
         logger.debug('D2| Headed to getaartpic(**cs).')
         getaartpic(**cs)
-        aart = artWindow(1)
+        aart = artWindow(aartvar)
         if aatgl == '1':
             artw.aartLabel.configure(image=aart)
         if 'volume' in stat:
@@ -865,6 +881,7 @@ def getaartpic(**cs):
         aartvar = 0
     if aatgl == '1':
         logger.info('2) Bottom of getaartpic(). Headed to artWindow(). aartvar is {}, len(eadict) is {}, len(fadict) is {}.'.format(aartvar,len(eadict),len(fadict)))
+
         artWindow(aartvar)
     else:
         logger.debug('D6| aartvar is: {}, len(eadict) is {}, len(fadict) is {}.'.format(aartvar,len(eadict),len(fadict)))
@@ -895,29 +912,35 @@ def songtitlefollower():
                 logger.info(" - - - - -  songtitlefollower - - - - - - ")
                 getcurrsong()
 
-def configurator():
-    proceed = messagebox.askokcancel("Edit Config File","OK closes the app and opens mmc4w.ini for editing.")
+def configurator(confmsg):
+    if confmsg == '':
+        confmsg = "OK closes the app and opens mmc4w.ini for editing."
+    proceed = messagebox.askokcancel("Edit Config File",confmsg)
     if proceed == True:
         if sys.platform == "win32":
             os.startfile(mmc4wIni)
         else:
             subprocess.run(["xdg-open", mmc4wIni])
         sleep(1)
         exit()
+    else:
+        sys.exit()
 
 def logtoggler():
     confparse.read(mmc4wIni)
     logtog = confparse.get("program","logging")
+    loglevel = confparse.get("program","loglevel")
     if logtog.upper() == "ON":
-        confparse.set('program','logging','off')
-        msg = 'Logging turned OFF.'
+        newlog = "off"
+        confparse.set('program','logging',newlog)
     elif logtog.upper() == 'OFF':
-        confparse.set('program','logging','on')
-        msg = 'Logging turned ON.'
-    logger.debug("{}. Wrote to .ini file.".format(msg))
+        newlog = "on"
+        confparse.set('program','logging',newlog)
+    logger.debug("{}. Wrote to .ini file.".format(newlog))
     with open(mmc4wIni, 'w') as SLcnf:
         confparse.write(SLcnf)
-    displaytext1(msg)
+    messagebox.showinfo("Logging Toggled","Logging is now " + newlog + ".\nLogging level is " + loglevel + ".\nExiting. Restart to refresh config.")
+    exit()
 
 def getcurrstat():
     connext()
@@ -1342,7 +1365,6 @@ def pushret(event,lookupT):
         connext()
         dispitems = []
         srchterm = editing_item.get().replace('Search: ','')
-        print(srchterm.upper())
         valid_list = ['file','title','artist','album','genre','date']
         editing_item.set('Search: ')
         if srchterm.upper() == "HELP;":
@@ -1357,7 +1379,6 @@ def pushret(event,lookupT):
         if srchterm.upper() == "KEYS;":
             findit = valid_list
             dispitems = []
-            print(findit)
             for f in findit:
                 dispitems.append(f)
             plsngwin.listbx.delete(0,tk.END)
@@ -1555,6 +1576,7 @@ def rtnplsel(ipvar):
             confparse.write(SLcnf)
         logger.info('0) Connected to server {}.'.format(serverip))
         getcurrsong()
+
     def outputtggl(outputvar):
         selection = srvrw.listbx.curselection()[0]
         outputs = getoutputs()[1]
@@ -1579,7 +1601,6 @@ def outputtggl(outputvar):
     if swaction == 'output':
         srvrw.listbx.bind('<<ListboxSelect>>', outputtggl)
         outputs = getoutputs()[1]
-        print("initial outputs: {}".format(outputs))
         srvrw.listbx.delete(0,tk.END)
         srvrw.listbx.update()
         srvrw.listvar.set(outputs)
@@ -1745,10 +1766,11 @@ def browserplayer():
 window.config(menu=menu)
 nnFont = Font(family="Segoe UI", size=10)          ## Set the base font
 confMenu = tk.Menu(menu, tearoff=False)
-confMenu.add_command(label="Edit mmc4w.ini", command=configurator)
+confMenu.add_command(label="Edit mmc4w.ini", command=lambda: configurator(''))
 confMenu.add_command(label="Select a Server", command=lambda: SrvrWindow('server'))
 confMenu.add_command(label="Toggle an Output", command=lambda: SrvrWindow('output'))
 confMenu.add_command(label='Toggle Logging', command=logtoggler)
+confMenu.add_command(label='Delete Debug Log',command=deletedebuglog)
 confMenu.add_command(label='Reset Win Positions', command=resetwins)
 confMenu.add_command(label="Get Scaling Factors",command=getscalefactors)
 confMenu.add_command(label="Apply Scaling Factors",command=applyscalefactors)
@@ -1828,6 +1850,9 @@ def browserplayer():
 # Make all threads daemon threads, and whenever the main thread dies all threads will die with it.
 ## tk.END THREADING NOTES =====================================
 #
+cxstat = connext()
+if cxstat == 0:
+    SrvrWindow('server')
 t1 = threading.Thread(target=songtitlefollower)
 t1.daemon = True
 t1.start()
diff --git a/code/mmc4w_help.md b/code/mmc4w_help.md
diff --git a/code/mmc4w_v2.0.8.py b/code/mmc4w_v2.0.8.py
