Command line support added

Dnyarri · Dnyarri · commit d38fea7df6b2 · 2025-08-04T19:22:50.000+03:00
diff --git a/viewer.py b/viewer.py
@@ -15,13 +15,17 @@
 __copyright__ = '(c) 2025 Ilya Razmanov'
 __credits__ = 'Ilya Razmanov'
 __license__ = 'unlicense'
-__version__ = '2.19.1.7'
+__version__ = '2.20.4.20'
 __maintainer__ = 'Ilya Razmanov'
 __email__ = 'ilyarazmanov@gmail.com'
 __status__ = 'Production'
 
+from pathlib import Path
 from platform import python_version
-from tkinter import Button, Frame, Label, Menu, PhotoImage, Tk, filedialog
+from sys import argv
+from time import ctime  # Used to show file info only
+from tkinter import Button, Frame, Label, Menu, PhotoImage, Tk
+from tkinter.filedialog import askopenfilename, asksaveasfilename
 from tkinter.messagebox import showinfo
 
 from pypnm import pnmlpnm
@@ -32,6 +36,14 @@ def DisMiss(event=None) -> None:
     sortir.destroy()
 
 
+def BindAll() -> None:
+    """Binding events needed even with no image open"""
+    sortir.bind_all('<Button-3>', ShowMenu)
+    sortir.bind_all('<Alt-f>', ShowMenu)
+    sortir.bind_all('<Control-o>', GetSource)
+    sortir.bind_all('<Control-q>', DisMiss)
+
+
 def UINormal() -> None:
     """Normal UI state"""
     zanyato.config(state='normal')
@@ -54,41 +66,41 @@ def ShowInfo(event=None) -> None:
     showinfo(
         title='General information',
         message=f'PNMViewer ver. {__version__}\nPython: {python_version()}\nModules:\n{pnmlpnm.__name__} ver. {pnmlpnm.__version__}',
-        detail=f'Image: {sourcefilename}\nX={X}, Y={Y}, Z={Z}, maxcolors={maxcolors}',
+        detail=f'File:\n{sourcefilename}\nSize: {(Path(sourcefilename).stat().st_size / 1024):.2f} kb\nCreated: {ctime(Path(sourcefilename).stat().st_birthtime)}\nModified: {ctime(Path(sourcefilename).stat().st_mtime)}\n\nImage: X={X}, Y={Y}, Z={Z}, maxcolors={maxcolors}',
     )
 
 
 def GetSource(event=None) -> None:
     """Opening source image and redefining other controls state"""
     global zoom_factor, zoom_do, zoom_show, preview, preview_data
-    global X, Y, Z, maxcolors, image3D, sourcefilename
+    global X, Y, Z, maxcolors, image3D, sourcefilename, filename_from_command
     zoom_factor = 0
 
-    sourcefilename = filedialog.askopenfilename(title='Open PPM/PGM file to view', filetypes=[('Portable map formats', '.ppm .pgm .pbm')])
-    if sourcefilename == '':
-        return
+    # ↓ Trying to receive file name from command line, if None, opening GUI
+    if filename_from_command is None:
+        sourcefilename = askopenfilename(title='Open PPM/PGM file to view', filetypes=[('Portable map formats', '.ppm .pgm .pbm')], initialfile=filename_from_command)
+        if sourcefilename == '':
+            return
+    else:
+        sourcefilename = filename_from_command
+        filename_from_command = None  # Removing file name after first open
 
     UIBusy()
 
-    """ ┌────────────────────────────────────────┐
-        │ Loading file, converting data to list. │
-        │  NOTE: maxcolors, image3D are GLOBALS! │
-        │  They are used during save!            │
-        └────────────────────────────────────────┘ """
-
+    # ↓ Loading file, converting data to list.
+    #   NOTE: maxcolors, image3D are GLOBALS!
+    #   They are used during save!
     X, Y, Z, maxcolors, image3D = pnmlpnm.pnm2list(sourcefilename)
 
-    """ ┌─────────────────────────────────────────────────────────────────────────┐
-        │ Converting list to bytes of PPM-like structure "preview_data" in memory │
-        └────────────────────────────────────────────────────────────────────────-┘ """
+    # ↓ Converting list to bytes of PPM-like structure "preview_data" in memory
     preview_data = pnmlpnm.list2bin(image3D, maxcolors)
 
-    """ ┌────────────────────────────────────────────────┐
-        │ Now showing "preview_data" bytes using Tkinter │
-        └────────────────────────────────────────────────┘ """
+    # ↓ Now showing "preview_data" bytes using Tkinter
     preview = PhotoImage(data=preview_data)
-
-    zoom_show = {  # Text to show below preview
+    # ↓ Adding filename to window title a-la Photoshop
+    sortir.title(f'PNMViewer: {Path(sourcefilename).name}')
+    # ↓ Dictionary of zoom label texts
+    zoom_show = {
         -4: 'Zoom 1:5',
         -3: 'Zoom 1:4',
         -2: 'Zoom 1:3',
@@ -99,7 +111,8 @@ def GetSource(event=None) -> None:
         3: 'Zoom 4:1',
         4: 'Zoom 5:1',
     }
-    zoom_do = {  # Actions to zoom preview; "zoom" zooms in, "subsample" zooms out
+    # ↓ Dictionary of zoom functions, corresponding to "zoom_show" above
+    zoom_do = {
         -4: preview.subsample(5, 5),
         -3: preview.subsample(4, 4),
         -2: preview.subsample(3, 3),
@@ -113,21 +126,22 @@ def GetSource(event=None) -> None:
 
     preview = zoom_do[zoom_factor]
     zanyato.config(image=preview, compound='none', borderwidth=1, background=zanyato.master['background'])
-    # binding zoom on preview click
+    # ↓ binding zoom on preview click
     zanyato.bind('<Control-Button-1>', zoomIn)  # Ctrl + left click
     zanyato.bind('<Double-Control-Button-1>', zoomIn)  # Ctrl + left click too fast
     zanyato.bind('<Alt-Button-1>', zoomOut)  # Alt + left click
     zanyato.bind('<Double-Alt-Button-1>', zoomOut)  # Alt + left click too fast
     sortir.bind_all('<MouseWheel>', zoomWheel)  # Wheel
     sortir.bind_all('<Control-i>', ShowInfo)
-    # enabling zoom buttons
+    # ↓ enabling zoom buttons
     butt_plus.config(state='normal', cursor='hand2')
     butt_minus.config(state='normal', cursor='hand2')
-    # updating zoom label display
+    # ↓ updating zoom label display
     label_zoom.config(text=zoom_show[zoom_factor])
-    # enabling "Save as..."
+    # ↓ enabling "Save as..."
     menu01.entryconfig('Save binary PNM...', state='normal')  # Instead of name numbers from 0 may be used
     menu01.entryconfig('Save ascii PNM...', state='normal')
+    menu01.entryconfig('Info', state='normal')
 
     UINormal()
 
@@ -143,18 +157,16 @@ def SaveAsPNM(bin: bool) -> None:
         extension = ('Portable pixel map', '.ppm')
         filetype = 'PPM'
 
-    # Open "Save as..." file
-    savefilename = filedialog.asksaveasfilename(
+    # ↓ Open "Save as..." file
+    savefilename = asksaveasfilename(
         title=f'Save {filetype} file',
         filetypes=format,
         defaultextension=extension,
     )
     if savefilename == '':
         return
 
-    """ ┌────────────────────────────────────────────────────┐
-        │ Saving "savefilename" in format depending on "bin" │
-        └───────────────────────────────────────────────────-┘ """
+    # ↓ Saving "savefilename" in PNM format depending on "bin"
     UIBusy()
     pnmlpnm.list2pnm(savefilename, image3D, maxcolors, bin)
     UINormal()
@@ -167,9 +179,9 @@ def zoomIn(event=None) -> None:
     preview = PhotoImage(data=preview_data)
     preview = zoom_do[zoom_factor]
     zanyato.config(image=preview, compound='none')
-    # updating zoom factor display
+    # ↓ updating zoom factor display
     label_zoom.config(text=zoom_show[zoom_factor])
-    # reenabling +/- buttons
+    # ↓ reenabling +/- buttons
     butt_minus.config(state='normal', cursor='hand2')
     if zoom_factor == 4:  # max zoom 5
         butt_plus.config(state='disabled', cursor='arrow')
@@ -184,9 +196,9 @@ def zoomOut(event=None) -> None:
     preview = PhotoImage(data=preview_data)
     preview = zoom_do[zoom_factor]
     zanyato.config(image=preview, compound='none')
-    # updating zoom factor display
+    # ↓ updating zoom factor display
     label_zoom.config(text=zoom_show[zoom_factor])
-    # reenabling +/- buttons
+    # ↓ reenabling +/- buttons
     butt_plus.config(state='normal', cursor='hand2')
     if zoom_factor == -4:  # min zoom 1/5
         butt_minus.config(state='disabled', cursor='arrow')
@@ -210,12 +222,9 @@ def zoomWheel(event) -> None:
 sourcefilename = X = Y = Z = maxcolors = None
 
 sortir = Tk()
-
 sortir.title('PNMViewer')
 sortir.geometry('+200+100')
 sortir.minsize(128, 128)
-
-# Main dialog icon is PPM as well!
 sortir.iconphoto(True, PhotoImage(data=b'P6\n2 2\n255\n\xff\x00\x00\xff\xff\x00\x00\x00\xff\x00\xff\x00'))
 
 menu01 = Menu(sortir, tearoff=False)  # Main menu, currently one "File" entry
@@ -225,15 +234,10 @@ def zoomWheel(event) -> None:
 menu01.add_command(label='Save binary PNM...', state='disabled', command=lambda: SaveAsPNM(bin=True))
 menu01.add_command(label='Save ascii PNM...', state='disabled', command=lambda: SaveAsPNM(bin=False))
 menu01.add_separator()
-menu01.add_command(label='Info', accelerator='Ctrl+I', command=ShowInfo)
+menu01.add_command(label='Info', accelerator='Ctrl+I', state='disabled', command=ShowInfo)
 menu01.add_separator()
 menu01.add_command(label='Exit', state='normal', accelerator='Ctrl+Q', command=DisMiss)
 
-sortir.bind('<Button-3>', ShowMenu)
-sortir.bind_all('<Alt-f>', ShowMenu)
-sortir.bind_all('<Control-o>', GetSource)
-sortir.bind_all('<Control-q>', DisMiss)
-
 frame_img = Frame(sortir, borderwidth=2, relief='groove')
 frame_img.pack(side='top')
 
@@ -265,4 +269,19 @@ def zoomWheel(event) -> None:
 label_zoom = Label(frame_zoom, text='Zoom 1:1', font=('courier', 8), state='disabled')
 label_zoom.pack(side='left', anchor='n', padx=2, pady=0, fill='both')
 
+BindAll()
+
+# ↓ Command line part
+if len(argv) == 2:
+    try_to_open = argv[1]
+    if Path(try_to_open).exists() and Path(try_to_open).is_file() and (Path(try_to_open).suffix in ('.ppm', '.pgm', '.pbm')):
+        filename_from_command = str(Path(try_to_open).resolve())
+        GetSource()
+    else:
+        filename_from_command = None
+    sortir.focus_force()  # Otherwise loses focus when run from command line
+else:
+    filename_from_command = None
+    sortir.focus_force()  # Otherwise loses focus when run from command line
+
 sortir.mainloop()
