- Adding "\u" (show Unnamed Register) command

- Fixing some pep8 issues

Author: s-n-g

Changelog

@@ -1,6 +1,7 @@
 2020-12-06 s-n-g
     * Starting 0.8.8-beta7
     * Implementing "Create Playlist" (\n)
+    * Addind \u (show Unnamed Register) command
     * Revert to stations playlist if default one (set by
       config) does not exist
     * Second level config windows will not be displayed

README.html

@@ -328,7 +328,7 @@ <h2 id="copying-and-pasting---registers">Copying and pasting - Registers <span s
 <p>There are 36 named registers (name is <strong>a-z</strong>, <strong>0-9</strong>) and one unnamed register.</p>
 <ul>
 <li><strong>Named registers</strong> are actually files that contain stations and can be opened and edited as regular playlist files. There are some differences in handling them: they are accessible either individually or using a special window, they are automatically saved, and writing errors are ignored. The later means that registers should not be regarded as normal playlist files that can be safely saved and used forever; this is true as long as there’s no problem with writing to them; if a writing error occurs they may get overwritten or emptied. To permanently save a register, on would <strong>rename</strong> it to a normal playlist file.</p></li>
-<li>The <strong>unnamed register</strong> holds just one station (the one that has been copied or added to a register or deleted from a playlist), and it is the one used when pasting to a register or a playlist.</p></li>
+<li>The <strong>unnamed register</strong> holds just one station (the one that has been copied or added to a register or deleted from a playlist), and it is the one used when pasting to a register or a playlist. One can see its contents by pressing &quot;**&quot;.</p></li>
 </ul>
 <p>To <strong>copy</strong> a station to a register one would press “<strong>y</strong>” and:</p>
 <ul>

README.md

@@ -475,7 +475,7 @@ There are 36 named registers (name is **a-z**, **0-9**) and one unnamed register
 
 * **Named registers** are actually files that contain stations and can be opened and edited as regular playlist files. There are some differences in handling them: they are accessible either individually or using a special window, they are automatically saved, and writing errors are ignored. The later means that registers should not be regarded as normal playlist files that can be safely saved and used forever; this is true as long as there's no problem with writing to them; if a writing error occurs they may get overwritten or emptied. To permanently save a register, on would **rename** it to a normal playlist file.
 
-* The **unnamed register** holds just one station (the one that has been copied or added to a register or deleted from a playlist), and it is the one used when pasting to a register or a playlist.
+* The **unnamed register** holds just one station (the one that has been copied or added to a register or deleted from a playlist), and it is the one used when pasting to a register or a playlist. One can see its contents by pressing "**\u**".
 
 To **copy** a station to a register one would press "**y**" and:
 

devel/get_countries

@@ -11,7 +11,8 @@ curl -L https://github.com/umpirsky/country-list/raw/master/data/en_US/country.j
     sed -e 's/,/,\n/g' \
         -e 's/{"/{\n"/' \
         -e 's/}/\n}/' countries-new.py | \
-        sed -e 's/^"/    "/' > pyradio/countries.py
+        sed -e 's/^"/    "/' -e 's/":"/": "/' > pyradio/countries.py
+    echo >> pyradio/countries.py
     git add pyradio/countries.py
 } || {
 echo "

pyradio.1

@@ -551,7 +551,8 @@ There are 36 named registers (name is \fBa-z\fR, \fB0-9\fR) and one unnamed regi
 are actually files that contain stations and can be opened and edited as regular playlist files. There are some differences in handling them: they are accessible either individually or using a special window, they are automatically saved, and writing errors are ignored. The later means that registers should not be regarded as normal playlist files that can be safely saved and used forever; this is true as long as there's no problem with writing to them; if a writing error occurs they may get overwritten or emptied. To permanently save a register, on would \fBrename\fR it to a normal playlist file.
 
 .IP The\ \fBunnamed\ register\fR
-holds just one station (the one that has been copied or added to a register or deleted from a playlist), and it is the one used when pasting to a register or a playlist.
+holds just one station (the one that has been copied or added to a register or deleted from a playlist), and it is the one used when pasting to a register or a playlist. One can see its contents by pressing "\fB\\u\fR".
+
 
 .P
 To \fBcopy\fR a station to a register one would press "\fBy\fR" and:

pyradio/browser.py

@@ -8,7 +8,7 @@
 import threading
 import logging
 from .cjkwrap import cjklen, PY3
-#from os import get_terminal_size
+# from os import get_terminal_size
 
 import locale
 locale.setlocale(locale.LC_ALL, '')    # set your locale
@@ -325,7 +325,7 @@ def search(self, data):
         self._last_search = post_data
         url = 'http://www.radio-browser.info/webservice/json/stations/search'
         try:
-            #r = requests.get(url=url)
+            # r = requests.get(url=url)
             r = requests.get(url=url, headers=self._open_headers, json=post_data, timeout=self._search_timeout)
             r.raise_for_status()
             self._raw_stations = self._extract_data(json.loads(r.text))
@@ -370,9 +370,9 @@ def format_station_line(self, id_in_list, pad, width):
                 u' {0}{1}│{2}│{3}kb',
                 u' {0}{1}│{2}│{3}kb│{4}',
                 u' {0}{1}│{2}│{3}kb│{4}│{5}',
-        )
+                )
         self._get_output_format(width)
-        #logger.error('DE self._output_format = {}'.format(self._output_format))
+        # logger.error('DE self._output_format = {}'.format(self._output_format))
         out = ['{0}. '.format(str(id_in_list + 1).rjust(pad)), '', '']
 
         # format info field
@@ -535,12 +535,12 @@ def _populate_columns_separators(self, a_tuple, width):
         return ret
 
     def get_columns_separators(self,
-            width,
-            use_old_output_format=False,
-            adjust=0,
-            adjust_for_body=False,
-            adjust_for_header=False,
-            ):
+                               width,
+                               use_old_output_format=False,
+                               adjust=0,
+                               adjust_for_body=False,
+                               adjust_for_header=False,
+                               ):
         """Calculates columns separators for a given width
         based on self._output_format.
 

pyradio/cjkwrap.py

@@ -85,6 +85,7 @@ def _handle_long_word(self, reversed_chunks, cur_line, cur_len, width):
             reversed_chunks[-1] = chunk_end
         elif not cur_line:
             cur_line.append(reversed_chunks.pop())
+
     def _wrap_chunks(self, chunks):
         lines = []
         if self.width <= 0:
@@ -96,24 +97,34 @@ def _wrap_chunks(self, chunks):
         while chunks:
             cur_line = []
             cur_len = 0
+
             if lines:
                 indent = self.subsequent_indent
             else:
                 indent = self.initial_indent
             width = self.width - len(indent)
-            if self.drop_whitespace and chunks[-1].strip() == '' and lines:
+
+            if self.drop_whitespace and \
+                    chunks[-1].strip() == '' and \
+                    lines:
                 del chunks[-1]
+
             while chunks:
-                l = cjklen(chunks[-1])
-                if cur_len + l <= width:
+                chunk = cjklen(chunks[-1])
+                if cur_len + chunk <= width:
                     cur_line.append(chunks.pop())
-                    cur_len += l
+                    cur_len += chunk
                 else:
                     break
+
             if chunks and cjklen(chunks[-1]) > width:
                 self._handle_long_word(chunks, cur_line, cur_len, width)
-            if self.drop_whitespace and cur_line and cur_line[-1].strip() == '':
+
+            if self.drop_whitespace and \
+                    cur_line and \
+                    cur_line[-1].strip() == '':
                 del cur_line[-1]
+
             if cur_line:
                 lines.append(indent + ''.join(cur_line))
         return lines

pyradio/common.py

@@ -3,6 +3,7 @@
 """ Theming constants """
 def FOREGROUND(): return 0
 def BACKGROUND(): return 1
+
 # for pop up window
 CAPTION = 2
 BORDER = 3
@@ -14,14 +15,16 @@ def BACKGROUND(): return 1
 If > 0, get color from list item referred to by number
 Same for the background
 """
-THEME_ITEMS = ( ('PyRadio URL', 2, 0, 3),
-        ('Messages Border', 3, 0 ,3),
-        ('Status Bar', 7, 0, 0),
-        ('Stations', 5, 0 ,0),
-        ('Active Station', 4, 0, 3),
-        ('Normal Cursor', 6, 0, 0),
-        ('Active Cursor', 9, 0, 0),
-        ('Edit Cursor', 8, 0, 0 ) )
+THEME_ITEMS = (
+    ('PyRadio URL', 2, 0, 3),
+    ('Messages Border', 3, 0, 3),
+    ('Status Bar', 7, 0, 0),
+    ('Stations', 5, 0, 0),
+    ('Active Station', 4, 0, 3),
+    ('Normal Cursor', 6, 0, 0),
+    ('Active Cursor', 9, 0, 0),
+    ('Edit Cursor', 8, 0, 0)
+)
 
 """ Messages to display when player starts / stops
     Used in log to stop runaway threads from printing

pyradio/config.py

@@ -719,7 +719,7 @@ def paste_station_to_named_playlist(self, a_station, a_playlist):
                  -5: Error writing file
                  -6: Error renaming file
         """
-        if path.exists(self, a_station, a_playlist):
+        if path.exists(a_playlist):
             m_station = a_station[:]
             ch = ('  ', ',')
             for a_ch in ch: