Changeset 1241

Timestamp:

01/15/10 20:48:18 (11 years ago)

Author:

landlord

Message:

Now the new 'oscam.srvid' format supports comments and empty lines, too, thanks to alno

Location:

trunk

Files:

• Distribution/doc/example/oscam.srvid (modified) (12 diffs)
• Distribution/doc/man/oscam.srvid.5 (modified) (1 diff)
• Distribution/doc/txt/oscam.srvid.txt (modified) (1 diff)
• oscam-config.c (modified) (1 diff)

trunk/Distribution/doc/example/oscam.srvid

@@ +1 @@
+#
+# Sky Deutschland
+# 
+
 1702,1722,1833,1834,09C4:000C|Sky|Nat Geo Wild|TV|Sky Welt
 1702,1722,1833,1834,09C4:000D|Sky|National Geographic Channel|TV|Sky Welt
@@ -19 +23 @@
 1702,1722,1833,1834,09C4:00A8|Sky|Motorvision TV|TV|Sky Welt
 1702,1722,1833,1834,09C4:0206|Sky|Goldstar TV|TV|Sky Welt
+
 1702,1722,1833,1834,09C4:0096|Sky|Deutsche Charts|Radio|Sky MCE
 1702,1722,1833,1834,09C4:0097|Sky|Rock Hymnen|Radio|Sky MCE
@@ -26 +31 @@
 1702,1722,1833,1834,09C4:009B|Sky|R&B/Hip Hop|Radio|Sky MCE
 1702,1722,1833,1834,09C4:009C|Sky|Country|Radio|Sky MCE
+
 1702,1722,1833,1834,09C4:0008|Sky|Sky Comedy|TV|Sky Film
 1702,1722,1833,1834,09C4:0009|Sky|Sky Action|TV|Sky Film
@@ -36 +42 @@
 1702,1722,1833,1834,09C4:0203|Sky|MGM|TV|Sky Film
 1702,1722,1833,1834,09C4:0204|Sky|Sky Nostalgie|TV|Sky Film
+
 1702,1722,1833,1834,09C4:0011|Sky|Sky Sport Info|TV|Sky Sport
 1702,1833,09C4:0035|Sky|Sky Sport Austria|TV|Sky Sport
@@ -51 +58 @@
 1702,1722,1833,1834,09C4:016B|Sky|Sky Sport 016B|TV|Sky Sport
 1702,1722,1833,1834,09C4:0175|Sky|Sky Sport 0175|TV|Sky Sport
+
 1702,1722,1833,1834,09C4:00DF|Sky|Sky Bundesliga|TV|Sky Bundesliga
 1702,1722,1833,1834,09C4:00FC|Sky|Sky Bundesliga 00FC|TV|Sky Bundesliga
@@ -63 +71 @@
 1702,1722,1833,1834,09C4:0156|Sky|Sky Bundesliga 0156|TV|Sky Bundesliga
 1702,1722,1833,1834,09C4:0160|Sky|Sky Bundesliga 0160|TV|Sky Bundesliga
+
 1702,1722,1833,1834,09C4:00FB|Sky|Sky Select 00FB|TV|Sky Select
 1702,1722,1833,1834,09C4:00FE|Sky|Sky Select 00FE|TV|Sky Select
@@ -74 +83 @@
 1702,1722,1833,1834,09C4:0141|Sky|Sky Select 0141|TV|Sky Select
 1702,1722,1833,1834,09C4:014B|Sky|Sky Select 014B|TV|Sky Select
+
 1702,1722,1833,1834,09C4:007E|Sky|Disney Cinemagic HD|TV|Sky HD
 1702,1722,1833,1834,09C4:007F|Sky|National Geographic HD|TV|Sky HD
@@ -81 +91 @@
 1702,1722,1833,1834,09C4:0083|Sky|Sky Cinema HD|TV|Sky HD
 1702,1722,1833,1834,09C4:0084|Sky|Eurosport HD|TV|Sky HD
+
 1702,1833,09C4:003C|Sky|Kinowelt TV|TV|Sky Welt Extra
 1702,1833,09C4,0D22:003D|Sky|TNT Film (TCM)|TV|Sky Welt Extra
@@ -99 +110 @@
 1702,1833,09C4,0D00:7009|Sky|MTV Entertainment|TV|Sky Welt Extra
 1702,1833,09C4,0D00:700A|Sky|Nick Premium|TV|Sky Welt Extra
+
 1702,1722,1833,1834,09C4:000F|Sky|BigBrother|TV|Sky sonstige
+
 1702,1722,1833,1834,1836,09C4:0201|Sky|Blue Movie Info|TV|Sky Erotik
 1702,1722,1833,1834,1836,09C4:0159|Sky|Blue Movie 1|TV|Sky Erotik
 1702,1722,1833,1834,1836,09C4:0163|Sky|Blue Movie 2|TV|Sky Erotik
 1702,1722,1833,1834,1836,09C4:016D|Sky|Blue Movie 3|TV|Sky Erotik
+
+#
+# Kabel Deutschland
+#
+
 1722,1801:C3B5|KD|Fashion TV|TV|
 1722,1801:C3B6|KD|Motors TV|TV|
@@ -282 +300 @@
 1722,1801:CFD3|KD|ATV Avrupa|TV|turkish
 1722,1801:CFD5|KD|Euro D|TV|turkish
+
+#
+# ORF
+# 
+
 0D05:32C9|ORF|ORF1|TV|
 0D05:32CA|ORF|ORF2|TV|
@@ -293 +316 @@
 0D05:32D2|ORF|ORF2 St|TV|
 0D05:32D3|ORF|ORF2 K|TV|
+
 0D05:32D4|ORF|ATV+|TV|
 0D05:3332|ORF|Austria 9 TV|TV|
 0D05:4E27|ORF|Puls 4 Austria|TV|
+
 0D05:132F|ORF|ORF1 HD|TV|
 0D05:1330|ORF|ORF2 HD|TV|
+
+#
+# MTV Unlimited
+#
+
 0B00:6FF3|MTV Unlimited|MTV TWO|TV|
 0B00:6FEE|MTV Unlimited|MTV Hits|TV|
@@ -304 +334 @@
 0B00:6FF0|MTV Unlimited|VH1 Europe|TV|
 0B00:6FFF|MTV Unlimited|MTV Music|TV|
+
+#
+# Schweizer Fernsehen
+#
+
 0500:0385|Schweizer Fernsehen|SF1|TV|
 0500:038F|Schweizer Fernsehen|SF info|TV|
 0500:038B|Schweizer Fernsehen|SF zwei|TV|
+
 0500:03DE|Schweizer Fernsehen|HD suisse|TV|
+
 0500&023800:36B2|Television Suisse Romande|TSR1|TV|
 0500&023800:36B8|Television Suisse Romande|TSR2|TV|
+
 0500&023800:36B3|Televisione svizzera di lingua italiana|TSI1|TV|
 0500&023800:36B9|Televisione svizzera di lingua italiana|TSI1|TV|
+
+#
+# Astra HD+
+# 
+
 1830:EF10|Astra HD+|RTL HD|TV|
 1830:EF11|Astra HD+|VOX HD|TV|
 1830:277E|Astra HD+|. (SD)|TV|
+
+#
+# Unity Media
+# 
+
 1722:71ad|UM|Record Internacional Europa|TV|
 1722:71ae|UM|Tkshow TV|TV|

trunk/Distribution/doc/man/oscam.srvid.5

@@ -11 +11 @@
 mapping between CAID, service ID, provider, name, type and description of service
 .RE
-
-\fIEmpty lines are not allowed in \fBoscam.srvid\fP.\fR
 .SH EXAMPLES
  0001,0002,0003:000a|my provider 1|tv name 1|tv|my tv package

trunk/Distribution/doc/txt/oscam.srvid.txt

@@ -15 +15 @@
       tion of service
 
-       Empty lines are not allowed in oscam.srvid.
-
 EXAMPLES
     0001,0002,0003:000a|my provider 1|tv name 1|tv|my tv package

trunk/oscam-config.c

@@ -1033 +1033 @@
         int l;
         void *ptr;
-        if ((l=strlen(trim(token))) < 6) continue;
+                char *tmp;
+                tmp = trim(token);
+
+                if (tmp[0] == '#') continue;
+                if ((l=strlen(tmp)) < 6) continue;
         if (!(payload=strchr(token, '|'))) continue;
         *payload++ = '\0';
-        //if (strlen(token)!=4) continue;
 
         if (!(ptr = malloc(sizeof(struct s_srvid)))) {