From b922d86fa016cfe3899acf45d8b07be013d29fad Mon Sep 17 00:00:00 2001
From: Marvin Scholz <epirat07@gmail.com>
Date: Fri, 5 Nov 2021 19:56:14 +0100
Subject: [PATCH] lua: httprequests: do not use deprecated module function

(cherry picked from commit 82dd26ccaf241ad6ae9463c8b9c320b17fdd9daa)
Signed-off-by: Marvin Scholz <epirat07@gmail.com>
---
 share/lua/http/requests/browse.json     |  2 +-
 share/lua/http/requests/browse.xml      |  2 +-
 share/lua/http/requests/playlist.json   |  2 +-
 share/lua/http/requests/playlist.xml    |  4 ++--
 share/lua/http/requests/status.json     |  2 +-
 share/lua/http/requests/status.xml      |  2 +-
 share/lua/intf/modules/httprequests.lua | 17 ++++++++++++++++-
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/share/lua/http/requests/browse.json b/share/lua/http/requests/browse.json
index f92e1b7858..ddcddae6b3 100644
--- a/share/lua/http/requests/browse.json
+++ b/share/lua/http/requests/browse.json
@@ -26,7 +26,7 @@ vim:syntax=lua
 <?vlc
 
 --package.loaded.httprequests = nil --uncomment to debug changes
-require "httprequests"
+local httprequests = require "httprequests"
 
 httprequests.processcommands()
 
diff --git a/share/lua/http/requests/browse.xml b/share/lua/http/requests/browse.xml
index ce347e2870..87e80f33c2 100644
--- a/share/lua/http/requests/browse.xml
+++ b/share/lua/http/requests/browse.xml
@@ -27,7 +27,7 @@ vim:syntax=lua
 <?vlc
 
 --package.loaded.httprequests = nil --uncomment to debug changes
-require "httprequests"
+local httprequests = require "httprequests"
 
 httprequests.processcommands()
 
diff --git a/share/lua/http/requests/playlist.json b/share/lua/http/requests/playlist.json
index 68bff5c3ec..03e6ea93c1 100644
--- a/share/lua/http/requests/playlist.json
+++ b/share/lua/http/requests/playlist.json
@@ -26,7 +26,7 @@ vim:syntax=lua
 <?vlc
 
 --package.loaded.httprequests = nil --uncomment to debug changes
-require "httprequests"
+local httprequests = require "httprequests"
 
 httprequests.processcommands()
 
diff --git a/share/lua/http/requests/playlist.xml b/share/lua/http/requests/playlist.xml
index 85a83384c8..71cf29cc7c 100644
--- a/share/lua/http/requests/playlist.xml
+++ b/share/lua/http/requests/playlist.xml
@@ -28,7 +28,7 @@ vim:syntax=lua
 <?vlc
 
 --package.loaded.httprequests = nil --uncomment to debug changes
-require "httprequests"
+local httprequests = require "httprequests"
 
 local printleaf = function(item)
 	print ("\n<leaf")
@@ -88,4 +88,4 @@ local pt=httprequests.playlisttable()
 printitem(pt)
 
 
-?>
\ No newline at end of file
+?>
diff --git a/share/lua/http/requests/status.json b/share/lua/http/requests/status.json
index d707117258..61399858f6 100644
--- a/share/lua/http/requests/status.json
+++ b/share/lua/http/requests/status.json
@@ -26,7 +26,7 @@ vim:syntax=lua
 <?vlc
 
 --package.loaded.httprequests = nil --uncomment to debug changes
-require "httprequests"
+local httprequests = require "httprequests"
 
 httprequests.processcommands()
 
diff --git a/share/lua/http/requests/status.xml b/share/lua/http/requests/status.xml
index 626c559583..7ad968e679 100644
--- a/share/lua/http/requests/status.xml
+++ b/share/lua/http/requests/status.xml
@@ -28,7 +28,7 @@ vim:syntax=lua
 <?vlc
 
 --package.loaded.httprequests = nil --uncomment to debug changes
-require "httprequests"
+local httprequests = require "httprequests"
 
 httprequests.processcommands()
 
diff --git a/share/lua/intf/modules/httprequests.lua b/share/lua/intf/modules/httprequests.lua
index 77ebba8d6c..3b8e847688 100644
--- a/share/lua/intf/modules/httprequests.lua
+++ b/share/lua/intf/modules/httprequests.lua
@@ -21,7 +21,7 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 --]==========================================================================]
 
-module("httprequests",package.seeall)
+local httprequests = {}
 
 local common = require ("common")
 local dkjson = require ("dkjson")
@@ -38,6 +38,7 @@ function round(what, precision)
     end
     return nil
 end
+httprequests.round = round
 
 --split text where it matches the delimiter
 function strsplit(text, delimiter)
@@ -63,6 +64,7 @@ function strsplit(text, delimiter)
     end
     return list
 end
+httprequests.strsplit = strsplit
 
 --main function to process commands sent with the request
 
@@ -206,6 +208,7 @@ processcommands = function ()
     local val = nil
 
 end
+httprequests.processcommands = processcommands
 
 --utilities for formatting output
 
@@ -218,6 +221,7 @@ function xmlString(s)
         return tostring(s)
     end
 end
+httprequests.xmlString = xmlString
 
 --dkjson outputs numbered tables as arrays
 --so we don't need the array indicators
@@ -237,6 +241,7 @@ function removeArrayIndicators(dict)
 
     return newDict
 end
+httprequests.removeArrayIndicators = removeArrayIndicators
 
 printTableAsJson = function (dict)
     dict=removeArrayIndicators(dict)
@@ -244,6 +249,7 @@ printTableAsJson = function (dict)
     local output=dkjson.encode (dict, { indent = true })
     print(output)
 end
+httprequests.printTableAsJson = printTableAsJson
 
 local printXmlKeyValue = function (k,v,indent)
     print("\n")
@@ -269,12 +275,14 @@ local printXmlKeyValue = function (k,v,indent)
         end
     end
 end
+httprequests.printXmlKeyValue = printXmlKeyValue
 
 printTableAsXml = function (dict,indent)
     for k,v in pairs(dict) do
         printXmlKeyValue(k,v,indent)
     end
 end
+httprequests.printTableAsXml = printTableAsXml
 
 --[[
 function logTable(t,pre)
@@ -309,6 +317,7 @@ getplaylist = function ()
 
     return p
 end
+httprequests.getplaylist = getplaylist
 
 parseplaylist = function (item)
     if item.flags.disabled then return end
@@ -357,6 +366,7 @@ parseplaylist = function (item)
     end
 
 end
+httprequests.parseplaylist = parseplaylist
 
 playlisttable = function ()
 
@@ -364,6 +374,7 @@ playlisttable = function ()
 
     return parseplaylist(basePlaylist)
 end
+httprequests.playlisttable = playlisttable
 
 getbrowsetable = function ()
 
@@ -441,6 +452,7 @@ getbrowsetable = function ()
 
     return result;
 end
+httprequests.getbrowsetable = getbrowsetable
 
 
 getstatus = function (includecategories)
@@ -553,4 +565,7 @@ getstatus = function (includecategories)
     end
     return s
 end
+httprequests.getstatus = getstatus
 
+_G.httprequests = httprequests
+return httprequests