Project

General

Profile

Bug #1736 » vdrmanager-spec-chars-in-name.patch

yarda, 02/23/2014 12:09 AM

View differences:

vdr-vdrmanager/helpers.cpp
snprintf(number, sizeof(number) - 1, "C%d", channel->Number());
result += number;
result += ":";
result += channel->Name();
result += MapSpecialChars(channel->Name());
result += ":";
result += channel->Provider();
result += MapSpecialChars(channel->Provider());
result += ":";
result += channel->GetChannelID().ToString();
result += ":";
vdrmanager/src/de/bjusystems/vdrmanager/data/Channel.java
import de.bjusystems.vdrmanager.StringUtils;
import de.bjusystems.vdrmanager.app.C;
import static de.bjusystems.vdrmanager.gui.Utils.mapSpecialChars;
@DatabaseTable
public class Channel implements Parcelable {
......
C.DATA_SEPARATOR);
this.number = Integer.valueOf(words[0].substring(1));
if (words.length > 2) {
this.name = words[1];
this.provider = words[2];
this.name = mapSpecialChars(words[1]);
this.provider = mapSpecialChars(words[2]);
this.id = words[3];
this.rawAudio = words[4];
if (words.length > 5) {
......
this.source = "Default";
}
} else {
this.name = words[1];
this.name = mapSpecialChars(words[1]);
this.id = "-1";
this.provider = "Unknown";
this.rawAudio = "";
vdrmanager/src/de/bjusystems/vdrmanager/data/Epg.java
final String[] words = StringUtils.splitPreserveAllTokens(line,
C.DATA_SEPARATOR);
channelNumber = Long.valueOf(words[0].substring(1));
channelName = words[1];
channelName = mapSpecialChars(words[1]);
start = new Date(Long.parseLong(words[2]) * 1000);
stop = new Date(Long.parseLong(words[3]) * 1000);
title = mapSpecialChars(words[4]);
(2-2/2)