fix setup

jeanslack · Oct 22, 2021 · 23d2549 · 23d2549
1 parent f55ec5b
commit 23d2549
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# **Videomass** is a cross-platform GUI for FFmpeg and youtube-dl.
+# **Videomass** is a cross-platform GUI for FFmpeg and youtube-dl / yt-dlp.
 [![Image](https://img.shields.io/static/v1?label=python&logo=python&message=3.7%20|%203.8|%203.9&color=blue)](https://www.python.org/downloads/)
 [![image](https://img.shields.io/badge/wxpython-phoenix-green)](https://www.wxpython.org/)
 [![Image](https://img.shields.io/badge/license-GPLv3-orange)](https://github.com/jeanslack/Videomass/blob/master/LICENSE)

diff --git a/setup.py b/setup.py
@@ -8,8 +8,8 @@
 Writer: Gianluca Pernigotto <[email protected]>
 Copyright: (c) 2014-2021 Gianluca Pernigotto <[email protected]>
 license: GPL3
-Rev: Oct.01.2021
-Code checker: pycodestyle, flake8, pylint .
+Rev: Oct.22.2021
+Code checker: flake8, pylint
 ########################################################
 
 This file is part of Videomass.
@@ -56,7 +56,9 @@ def source_build():
                      "wheel>=0.34.2",
                      "twine>=3.1.1"
                      ]
-        long_descript = open('README.md').read()
+        with open('README.md', 'r', encoding='utf8') as readme:
+            long_descript = readme.read()
+
         long_description_ct = 'text/markdown'
 
     else:  # e.g. to make a Debian source package, include wxpython.
@@ -108,10 +110,10 @@ def source_build():
           package_data={"videomass": ["art/icons/*", "locale/*"]
                         },
           exclude_package_data={"videomass": ["art/videomass.icns",
-                                               "art/videomass.ico",
-                                               "locale/README",
-                                               "locale/videomass.pot"
-                                               ]
+                                              "art/videomass.ico",
+                                              "locale/README",
+                                              "locale/videomass.pot"
+                                              ]
                                 },
           include_package_data=True,
           zip_safe=False,

diff --git a/videomass/gui_app.py b/videomass/gui_app.py
@@ -8,7 +8,6 @@
 license: GPL3
 Rev: Oct.01.2021
 Code checker:
-    - pycodestyle
     - flake8: --ignore F821, W504, F401
     - pylint: --ignore E0602, E1101, C0415, E0401, C0103
 
@@ -122,15 +121,11 @@ def OnInit(self):
 
     def check_youtube_dl(self):
         """
-        check youtube-dl based on operative
-        system and bultin package
+        Check for `youtube_dl` / `yt_dlp` modules.
+        NOTE that since Videomass v3.4.5, youtube-dl is
+        no longer used as an executable, but only as a python module.
 
         """
-        if self.appset['ostype'] == 'Windows':
-            execname = f"{self.appset['downloader'][1]}.exe"
-        else:
-            execname = self.appset['downloader'][1]
-
         if self.appset['downloader'][0] == 'Disable all':
             self.appset['PYLIBYDL'] = 'no module loaded'
         else:
@@ -198,7 +193,7 @@ def check_ffmpeg(self):
     def wizard(self, wizardicon):
         """
         Show an initial dialog to setup the application
-        during the first launch.
+        during the first start-up.
 
         """
         from videomass.vdms_dialogs.wizard_dlg import Wizard

diff --git a/videomass/vdms_dialogs/playlist_indexing.py b/videomass/vdms_dialogs/playlist_indexing.py
@@ -184,16 +184,22 @@ def getvalue(self):
     def on_edit_end(self, event):
         """
         Checking event-entered strings using REGEX:
+
             Allows min 0 to max 999 digits and does not allow
             numbers with leading zeroes like 07 or 005, allows
             a number separated by hyphen like 22-33 and supports
-            comma followed by a white space.
+            comma followed by a white space. Note that all white
+            spaces are stripped before come to parsing by REGEX:
+            see `string` var below.
+
+        Some event examples:
 
         row_id = event.GetIndex()  # Get the current row
         col_id = event.GetColumn()  # Get the current column
         new_data = event.GetLabel()  # Get the changed data
         cols = self.lctrl.GetColumnCount()  # Get the total number of col
         rows = self.lctrl.GetItemCount()  # Get the total number of rows
+
         """
         wxd = wx.DateTime.Now()
         date = wxd.Format('%H:%M:%S')
@@ -222,7 +228,8 @@ def on_edit_end(self, event):
 
     def on_edit_begin(self, event):
         """
-        Columns 0 and 1 must not be editable for link without playlist.
+        Columns 0 and 1 must not be editable for
+        link without playlist.
         """
         row_id = event.GetIndex()
 

diff --git a/videomass/vdms_sys/msg_info.py b/videomass/vdms_sys/msg_info.py
@@ -40,7 +40,7 @@ def current_release():
     release_name = 'Videomass'
     program_name = 'videomass'
     version = '3.5.1'
-    release = 'Oct 10 2021'
+    release = 'Oct 22 2021'
     copyr = '2013-2021'
     website = 'http://jeanslack.github.io/Videomass/'
     author = ('Gianluca Pernigotto', '(aka jeanslack)')