- Disabling station editing for python 2 when station name contains

non-ASCII characters
- Starting CJK editing

Author: s-n-g

README.html

@@ -47,6 +47,7 @@ <h2 id="table-of-contents">Table of contents <span style="padding-left: 10px;"><
 <li><a href="#cleaning-up">Cleaning up</a></li>
 <li><a href="#debug-mode">Debug mode</a></li>
 <li><a href="#reporting-bugs">Reporting bugs</a></li>
+<li><a href="#acknowlegement">Acknowlegement</a></li>
 </ul>
 <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <ul>
@@ -211,7 +212,7 @@ <h3 id="station-by-station-encoding-declaration">Station by station encoding dec
 <p>Finally, we insert the new station to the playlist:</p>
 <pre>Station1,Station1_URL,
 Station2,Station2_URL,iso-8859-7</pre>
-<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> Using the <strong><em>-a</em></strong> command line option will save you all this trouble, as it will automatically take care of creating a valid <strong><em>CSV</em></strong> file. Alternatively, you can change the selected station’s encoding by pressing “<strong><em>e</em></strong>” while in <strong>PyRadio</strong>.</p>
+<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> Using the <strong><em>-a</em></strong> command line option will save you all this trouble, as it will automatically take care of creating a valid <strong><em>CSV</em></strong> file. Alternatively, you can change the selected station’s encoding by pressing “<strong><em>E</em></strong>” while in <strong>PyRadio</strong>.</p>
 <h3 id="global-encoding-declaration">Global encoding declaration</h3>
 <p><strong>PyRadio</strong>’s configuration file contains the parameter <strong><em>default_encoding</em></strong>, which by default is set to <strong>utf-8</strong>.</p>
 <p>Setting this parameter to a different encoding, will permit <strong>PyRadio</strong> to successfully decode such stations.</p>
@@ -315,5 +316,10 @@ <h2 id="reporting-bugs">Reporting bugs <span style="padding-left: 10px;"><sup st
 $ pyradio -d</pre>
 <p>Then try to reproduce the bug and exit <strong>pyradio</strong>.</p>
 <p>Finally, include the file produced in your report.</p>
+<h2 id="acknowlegement">Acknowlegement <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
+<p><strong>PyRadio</strong> uses code frorm the following projects:</p>
+<ol type="1">
+<li><a target="_blank" href="https://gitlab.com/fgallaire/cjkwrap">CJKwrap</a> by Florent Gallaire - A library for wrapping and filling UTF-8 CJK text.</li>
+</ol>
 </body>
 </html>

README.md

@@ -23,6 +23,7 @@ Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
 * [Cleaning up](#cleaning-up)
 * [Debug mode](#debug-mode)
 * [Reporting bugs](#reporting-bugs)
+* [Acknowlegement](#acknowlegement)
 
 ## Requirements
 
@@ -280,7 +281,7 @@ Station2,Station2_URL,iso-8859-7
 ```
 
 **Note:**
-Using the ***-a*** command line option will save you all this trouble, as it will automatically take care of creating a valid ***CSV*** file. Alternatively, you can change the selected station's encoding by pressing "***e***" while in **PyRadio**.
+Using the ***-a*** command line option will save you all this trouble, as it will automatically take care of creating a valid ***CSV*** file. Alternatively, you can change the selected station's encoding by pressing "***E***" while in **PyRadio**.
 
 ### Global encoding declaration
 
@@ -464,3 +465,9 @@ To create it, enter the following commands in a terminal:
 Then try to reproduce the bug and exit **pyradio**.
 
 Finally, include the file produced in your report.
+
+## Acknowlegement
+
+**PyRadio** uses code frorm the following projects:
+
+1. [CJKwrap](https://gitlab.com/fgallaire/cjkwrap) by Florent Gallaire - A library for wrapping and filling UTF-8 CJK text.

pyradio.1

@@ -1,7 +1,7 @@
 .\" Copyright (C) 2011 Ben Dowling <http://www.coderholic.com/pyradio>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH PYRADIO 1 "September 2019"
+.TH PYRADIO 1 "October 2019"
 
 .SH NAME
 .PP
@@ -321,7 +321,7 @@ Finally, we insert the new station to the playlist:
 Station2\fB,\fIStation2_URL\fB,\fIiso-8859-7
 
 .IP \fBNote\fR
-Using the \fB-a\fR command line option will save you all this trouble, as it will automatically take care of creating a valid \fBCSV\fR file. Alternatively, you can change the selected station's encoding by pressing "\fIe\fR" while in \fBpyradio\fR.
+Using the \fB-a\fR command line option will save you all this trouble, as it will automatically take care of creating a valid \fBCSV\fR file. Alternatively, you can change the selected station's encoding by pressing "\fIE\fR" while in \fBpyradio\fR.
 
 
 .PP
@@ -536,6 +536,16 @@ Then try to reproduce the bug and exit pyradio.
 
 Finally, include the file produced in your report.
 
+.SH ACKNOWLEGEMENT
+
+.PP
+\fBpyradio\fR uses code frorm the following projects:
+
+.RS 5
+
+.IP 1.
+\fBCJKwrap\fR (\fIhttps://gitlab.com/fgallaire/cjkwrap\fR) by Florent Gallaire - A library for wrapping and filling UTF-8 CJK text.
+
 .SH FILES
 .PP
 .I /usr/share/doc/pyradio/README.md

pyradio/edit.py

@@ -52,8 +52,10 @@ def show(self, parent_win, repaint=False):
                 except:
                     pass
         if not repaint:
-            self.string = ''
-            self._curs_pos = 0
+            self.string = self._displayed_string = ''
+            self._curs_pos = self._disp_curs_pos = 0
+            self._edit_win.erase()
+            self._edit_win.chgat(0, 0, 1, self.cursor_color)
             if self._has_history:
                 self._input_history.reset_index()
         self._caption_win.refresh()
@@ -62,16 +64,12 @@ def show(self, parent_win, repaint=False):
     def _get_history_next(self):
         """ callback function for key down """
         if self._has_history:
-            ret = self._input_history.return_history(1)
-            self.string = ret
-            self._curs_pos = len(ret)
+            self.string = self._input_history.return_history(1)
 
     def _get_history_previous(self):
         """ callback function for key up """
         if self._has_history:
-            ret = self._input_history.return_history(-1)
-            self.string = ret
-            self._curs_pos = len(ret)
+            self.string = self._input_history.return_history(-1)
 
     def get_next(self, a_list, start=0, stop=None):
         if self.string:
@@ -379,7 +377,6 @@ def _show_title(self):
             self._win.chgat(0, x, 2, curses.color_pair(3))
         self._win.refresh()
 
-
     def _show_buttons(self):
         sid = 3
         if self._focus == sid:

pyradio/radio.py

@@ -46,6 +46,10 @@
 def rel(path):
     return os.path.join(os.path.abspath(os.path.dirname(__file__)), path)
 
+
+def is_ascii(s):
+    return all(ord(c) < 128 for c in s)
+
 class PyRadio(object):
     ws = Window_Stack()
 
@@ -190,6 +194,7 @@ def __init__(self, pyradio_config, play=False, req_player='', theme=''):
                 self.ws.LINE_EDITOR_HELP: self._show_line_editor_help,
                 self.ws.EDIT_STATION_NAME_ERROR: self._print_editor_name_error,
                 self.ws.EDIT_STATION_URL_ERROR: self._print_editor_url_error,
+                self.ws.PY2_EDITOR_ERROR: self._print_py2_editor_error,
                 }
 
         """ list of help functions """
@@ -1404,6 +1409,23 @@ def _print_playlist_reload_error(self):
                 prompt = ' Press any key ',
                 is_message=True)
 
+    def _print_py2_editor_error(self):
+        txt ='''Non-ASCII characters editing is |not supported!|
+
+            You running |PyRadio| on |Python 2|. As a result, the
+            station editor only supports |ASCII characters|, but
+            the station name you are trying to edit contains
+            |non-ASCII| characters.
+
+            To edit this station, either run |PyRadio| on |Python 3|,
+            or edit the playlist with an external editor and then
+            reload the playlist.
+            '''
+        self._show_help(txt, self.ws.PY2_EDITOR_ERROR,
+                caption = ' Error ',
+                prompt = ' Press any key ',
+                is_message=True)
+
     def _print_playlist_reload_confirmation(self):
         if self._cnf.locked:
             txt ='''This playlist has not been modified within
@@ -2912,6 +2934,10 @@ def keypress(self, char):
                     self.ws.operation_mode = self.ws.ADD_STATION_MODE
 
                 elif char == ord('e'):
+                    if python_version[0] == '2':
+                        if not is_ascii(self.stations[self.selection][0]):
+                            self._print_py2_editor_error()
+                            return
                     self._station_editor = PyRadioEditor(self.stations, self.selection, self.bodyWin, adding=False)
                     self._station_editor.show(self.stations[self.selection])
                     self.ws.operation_mode = self.ws.EDIT_STATION_MODE