Changeset 138 for trunk/Modules/TV/UPageTV.pas

Timestamp:

Sep 9, 2022, 8:20:25 PM (21 months ago)

Author:

chronos

Message:

• Modified: Removed TemplateGenerics package. Generics usage replaced by standard Generics.Collections.

File:

• trunk/Modules/TV/UPageTV.pas (modified) (3 diffs)

trunk/Modules/TV/UPageTV.pas

@@ -56 +56 @@
   with TWebSession(HandlerData) do begin
     ModuleUser.LoadUserInfo;
-    with HtmlDocument.Body, THtmlString(SubItems.AddNew(THtmlString.Create)) do begin
+    with HtmlDocument.Body, SubItems.AddString do begin
       Text := 'Stažení přehrávače: <a href="http://www.videolan.org/vlc/">VLC Media Player</a><br/>' +
     'Seznam všech kanálů do přehrávače: <a href="playlist/">Playlist</a><br/>' +
@@ -70 +70 @@
         with DbRows[I] do begin
           TuneUp := '&nbsp;';
-          if Values['StreamWeb'] <> '' then
-            TuneUp := MakeLink('Naladit', Values['StreamWeb']);
-          if Values['Stream'] <> '' then
-            TuneUp := MakeLink('Naladit', NavigationLink('/tv/playlist?id=' + Values['ShortName']));
-          Text := Text + '<tr><td>' + MakeLink(Values['Name'], Values['Homepage']) +
+          if Items['StreamWeb'] <> '' then
+            TuneUp := MakeLink('Naladit', Items['StreamWeb']);
+          if Items['Stream'] <> '' then
+            TuneUp := MakeLink('Naladit', NavigationLink('/tv/playlist?id=' + Items['ShortName']));
+          Text := Text + '<tr><td>' + MakeLink(Items['Name'], Items['Homepage']) +
             '</td><td align="center">' +
-            Values['Language'] + '</td><td align="center">' + Values['Category'] + '</td>' +
+            Items['Language'] + '</td><td align="center">' + Items['Category'] + '</td>' +
             '<td>' + TuneUp + '</td></tr>';
         end;
@@ -99 +99 @@
   I: Integer;
   Text: string;
+  Id: string;
 begin
   with TWebSession(HandlerData) do begin
-      Response.Headers.Add('Content-Type', 'audio/mpegurl');
-      Response.Headers.Add('Content-Disposition', 'attachment; filename=playlist.m3u');
-      try
-        DbRows := TDbRows.Create;
+    Response.Headers.Add('Content-Type', 'audio/mpegurl');
+    Response.Headers.Add('Content-Disposition', 'attachment; filename=playlist.m3u');
+    try
+      DbRows := TDbRows.Create;
 
       Text := '#EXTM3U' + LineEnding;
-      if Request.Query.SearchKey('id') <> -1 then begin
-        Database.Select(DbRows, 'TV', '*', ' (`Stream` <> "") AND (`ShortName`="' + Database.EscapeString(Request.Query.Values['id']) + '") ');
+      if Request.Query.TryGetValue('id', Id) then begin
+        Database.Select(DbRows, 'TV', '*', ' (`Stream` <> "") AND (`ShortName`="' + Database.EscapeString(Id) + '") ');
         if DbRows.Count > 0 then begin
-          Text := Text + '#EXTINF:0,' + DbRows[0].Values['Name'] + LineEnding
-          + DbRows[0].Values['Stream'] + LineEnding;
+          Text := Text + '#EXTINF:0,' + DbRows[0].Items['Name'] + LineEnding
+          + DbRows[0].Items['Stream'] + LineEnding;
         end;
       end else begin
         Database.Select(DbRows, 'TV', '*', ' (`Stream` <> "") ORDER BY `Name` ');
         for I := 0 to DbRows.Count - 1 do begin
-          Text := Text + '#EXTINF:0,' + DbRows[I].Values['Name'] + LineEnding
-          + DbRows[I].Values['Stream'] + LineEnding;
+          Text := Text + '#EXTINF:0,' + DbRows[I].Items['Name'] + LineEnding
+          + DbRows[I].Items['Stream'] + LineEnding;
         end;
       end;
       Response.Content.WriteString(Text);
 
-      finally
-        DbRows.Free;
-      end
+    finally
+      DbRows.Free;
+    end
   end;
 end;