luci-app-openlist: rename from luci-app-alist

See https://github.com/openwrt/packages/pull/26855 for more information.

Signed-off-by: Tianling Shen <redacted>

diff --git a/applications/luci-app-alist/root/usr/share/luci/menu.d/luci-app-alist.json b/applications/luci-app-alist/root/usr/share/luci/menu.d/luci-app-alist.json
deleted file mode 100644 (file)
index 084085a..0000000
--- a/applications/luci-app-alist/root/usr/share/luci/menu.d/luci-app-alist.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-       "admin/services/alist": {
-               "title": "AList",
-               "action": {
-                       "type": "firstchild"
-               },
-               "depends": {
-                       "acl": [ "luci-app-alist" ],
-                       "uci": { "alist": true }
-               }
-       },
-       "admin/services/alist/config": {
-               "title": "Settings",
-               "order": 10,
-               "action": {
-                       "type": "view",
-                       "path": "alist/config"
-               }
-       },
-       "admin/services/alist/log": {
-               "title": "Log",
-               "order": 20,
-               "action": {
-                       "type": "view",
-                       "path": "alist/log"
-               }
-       }
-}

diff --git a/applications/luci-app-alist/root/usr/share/rpcd/acl.d/luci-app-alist.json b/applications/luci-app-alist/root/usr/share/rpcd/acl.d/luci-app-alist.json
deleted file mode 100644 (file)
index 991dfa0..0000000
--- a/applications/luci-app-alist/root/usr/share/rpcd/acl.d/luci-app-alist.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-       "luci-app-alist": {
-               "description": "Grant UCI access for luci-app-alist",
-               "read": {
-                       "file": {
-                               "/var/run/alist/log/alist.log": [ "read" ]
-                       },
-                       "ubus": {
-                               "service": [ "list" ]
-                       },
-                       "uci": [ "alist" ]
-               },
-               "write": {
-                       "uci": [ "alist" ]
-               }
-       }
-}

diff --git a/applications/luci-app-alist/Makefile b/applications/luci-app-openlist/Makefile
similarity index 75%
rename from applications/luci-app-alist/Makefile
rename to applications/luci-app-openlist/Makefile
index a0a922e7ac8a8efbd81b9a8f31752d1c87c7baae..88db5098af07ed75bf1491c180b55f5695949adf 100644 (file)
--- a/applications/luci-app-alist/Makefile
+++ b/applications/luci-app-openlist/Makefile
@@ -6,10 +6,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_LICENSE:=Apache-2.0
 
-LUCI_TITLE:=LuCI app for AList
-LUCI_DEPENDS:=+alist
+LUCI_TITLE:=LuCI app for OpenList
+LUCI_DEPENDS:=+openlist
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+PKG_PROVIDES:=luci-app-alist
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-alist/htdocs/luci-static/resources/view/alist/config.js b/applications/luci-app-openlist/htdocs/luci-static/resources/view/openlist/config.js
similarity index 89%
rename from applications/luci-app-alist/htdocs/luci-static/resources/view/alist/config.js
rename to applications/luci-app-openlist/htdocs/luci-static/resources/view/openlist/config.js
index 7cda53d3ff3f38df26730752e35133c49f60a40d..319c659e124a6b20d8b5d1281c0fe3f0e0113323 100644 (file)
--- a/applications/luci-app-alist/htdocs/luci-static/resources/view/alist/config.js
+++ b/applications/luci-app-openlist/htdocs/luci-static/resources/view/openlist/config.js
@@ -16,10 +16,10 @@ const callServiceList = rpc.declare({
 });
 
 function getServiceStatus() {
-       return L.resolveDefault(callServiceList('alist'), {}).then(function (res) {
+       return L.resolveDefault(callServiceList('openlist'), {}).then(function (res) {
                var isRunning = false;
                try {
-                       isRunning = res['alist']['instances']['instance1']['running'];
+                       isRunning = res['openlist']['instances']['instance1']['running'];
                } catch (e) { }
                return isRunning;
        });
@@ -31,9 +31,9 @@ function renderStatus(isRunning, port) {
        if (isRunning) {
                var button = String.format('&#160;<a class="btn cbi-button" href="http://%s:%s" target="_blank" rel="noreferrer noopener">%s</a>',
                        window.location.hostname, port, _('Open Web Interface'));
-               renderHTML = spanTemp.format('green', _('AList'), _('RUNNING')) + button;
+               renderHTML = spanTemp.format('green', _('OpenList'), _('RUNNING')) + button;
        } else {
-               renderHTML = spanTemp.format('red', _('AList'), _('NOT RUNNING'));
+               renderHTML = spanTemp.format('red', _('OpenList'), _('NOT RUNNING'));
        }
 
        return renderHTML;
@@ -55,7 +55,7 @@ var stubValidator = {
 return view.extend({
        load: function() {
                return Promise.all([
-                       uci.load('alist')
+                       uci.load('openlist')
                ]);
        },
 
@@ -63,7 +63,7 @@ return view.extend({
                let m, s, o;
                var webport = uci.get(data[0], 'config', 'listen_http_port') || '5244';
 
-               m = new form.Map('alist', _('AList'),
+               m = new form.Map('openlist', _('OpenList'),
                        _('A file list/WebDAV program that supports multiple storages, powered by Gin and Solidjs.') + '<br />' +
                        _('Default webUI/WebDAV login username is %s and password is %s.').format('<code>admin</code>', '<code>password</code>'));
 
@@ -82,7 +82,7 @@ return view.extend({
                        ]);
                }
 
-               s = m.section(form.NamedSection, 'config', 'alist');
+               s = m.section(form.NamedSection, 'config', 'openlist');
 
                o = s.option(form.Flag, 'enabled', _('Enable'));
                o.default = o.disabled;

diff --git a/applications/luci-app-alist/htdocs/luci-static/resources/view/alist/log.js b/applications/luci-app-openlist/htdocs/luci-static/resources/view/openlist/log.js
similarity index 95%
rename from applications/luci-app-alist/htdocs/luci-static/resources/view/alist/log.js
rename to applications/luci-app-openlist/htdocs/luci-static/resources/view/openlist/log.js
index da646baaf7e6df2d7ca01902557551e68336cd55..b98f6f79807a689bd43bbbd0a1341ee2e35a98b2 100644 (file)
--- a/applications/luci-app-alist/htdocs/luci-static/resources/view/alist/log.js
+++ b/applications/luci-app-openlist/htdocs/luci-static/resources/view/openlist/log.js
@@ -33,7 +33,7 @@ return view.extend({
                );
 
                poll.add(L.bind(function() {
-                       return fs.read_direct('/var/run/alist/log/alist.log', 'text')
+                       return fs.read_direct('/var/run/openlist/log/openlist.log', 'text')
                        .then(function(res) {
                                var log = E('pre', { 'wrap': 'pre' }, [
                                        res.trim() || _('Log is empty.')

diff --git a/applications/luci-app-alist/po/ar/alist.po b/applications/luci-app-openlist/po/ar/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ar/alist.po
rename to applications/luci-app-openlist/po/ar/openlist.po

diff --git a/applications/luci-app-alist/po/bg/alist.po b/applications/luci-app-openlist/po/bg/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/bg/alist.po
rename to applications/luci-app-openlist/po/bg/openlist.po

diff --git a/applications/luci-app-alist/po/bn_BD/alist.po b/applications/luci-app-openlist/po/bn_BD/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/bn_BD/alist.po
rename to applications/luci-app-openlist/po/bn_BD/openlist.po

diff --git a/applications/luci-app-alist/po/ca/alist.po b/applications/luci-app-openlist/po/ca/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ca/alist.po
rename to applications/luci-app-openlist/po/ca/openlist.po

diff --git a/applications/luci-app-alist/po/cs/alist.po b/applications/luci-app-openlist/po/cs/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/cs/alist.po
rename to applications/luci-app-openlist/po/cs/openlist.po

diff --git a/applications/luci-app-alist/po/da/alist.po b/applications/luci-app-openlist/po/da/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/da/alist.po
rename to applications/luci-app-openlist/po/da/openlist.po

diff --git a/applications/luci-app-alist/po/de/alist.po b/applications/luci-app-openlist/po/de/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/de/alist.po
rename to applications/luci-app-openlist/po/de/openlist.po

diff --git a/applications/luci-app-alist/po/el/alist.po b/applications/luci-app-openlist/po/el/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/el/alist.po
rename to applications/luci-app-openlist/po/el/openlist.po

diff --git a/applications/luci-app-alist/po/es/alist.po b/applications/luci-app-openlist/po/es/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/es/alist.po
rename to applications/luci-app-openlist/po/es/openlist.po

diff --git a/applications/luci-app-alist/po/fa/alist.po b/applications/luci-app-openlist/po/fa/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/fa/alist.po
rename to applications/luci-app-openlist/po/fa/openlist.po

diff --git a/applications/luci-app-alist/po/fi/alist.po b/applications/luci-app-openlist/po/fi/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/fi/alist.po
rename to applications/luci-app-openlist/po/fi/openlist.po

diff --git a/applications/luci-app-alist/po/fr/alist.po b/applications/luci-app-openlist/po/fr/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/fr/alist.po
rename to applications/luci-app-openlist/po/fr/openlist.po

diff --git a/applications/luci-app-alist/po/ga/alist.po b/applications/luci-app-openlist/po/ga/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ga/alist.po
rename to applications/luci-app-openlist/po/ga/openlist.po

diff --git a/applications/luci-app-alist/po/he/alist.po b/applications/luci-app-openlist/po/he/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/he/alist.po
rename to applications/luci-app-openlist/po/he/openlist.po

diff --git a/applications/luci-app-alist/po/hi/alist.po b/applications/luci-app-openlist/po/hi/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/hi/alist.po
rename to applications/luci-app-openlist/po/hi/openlist.po

diff --git a/applications/luci-app-alist/po/hu/alist.po b/applications/luci-app-openlist/po/hu/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/hu/alist.po
rename to applications/luci-app-openlist/po/hu/openlist.po

diff --git a/applications/luci-app-alist/po/it/alist.po b/applications/luci-app-openlist/po/it/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/it/alist.po
rename to applications/luci-app-openlist/po/it/openlist.po

diff --git a/applications/luci-app-alist/po/ja/alist.po b/applications/luci-app-openlist/po/ja/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ja/alist.po
rename to applications/luci-app-openlist/po/ja/openlist.po

diff --git a/applications/luci-app-alist/po/ko/alist.po b/applications/luci-app-openlist/po/ko/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ko/alist.po
rename to applications/luci-app-openlist/po/ko/openlist.po

diff --git a/applications/luci-app-alist/po/lt/alist.po b/applications/luci-app-openlist/po/lt/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/lt/alist.po
rename to applications/luci-app-openlist/po/lt/openlist.po

diff --git a/applications/luci-app-alist/po/mr/alist.po b/applications/luci-app-openlist/po/mr/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/mr/alist.po
rename to applications/luci-app-openlist/po/mr/openlist.po

diff --git a/applications/luci-app-alist/po/ms/alist.po b/applications/luci-app-openlist/po/ms/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ms/alist.po
rename to applications/luci-app-openlist/po/ms/openlist.po

diff --git a/applications/luci-app-alist/po/nb_NO/alist.po b/applications/luci-app-openlist/po/nb_NO/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/nb_NO/alist.po
rename to applications/luci-app-openlist/po/nb_NO/openlist.po

diff --git a/applications/luci-app-alist/po/nl/alist.po b/applications/luci-app-openlist/po/nl/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/nl/alist.po
rename to applications/luci-app-openlist/po/nl/openlist.po

diff --git a/applications/luci-app-alist/po/pl/alist.po b/applications/luci-app-openlist/po/pl/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/pl/alist.po
rename to applications/luci-app-openlist/po/pl/openlist.po

diff --git a/applications/luci-app-alist/po/pt/alist.po b/applications/luci-app-openlist/po/pt/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/pt/alist.po
rename to applications/luci-app-openlist/po/pt/openlist.po

diff --git a/applications/luci-app-alist/po/pt_BR/alist.po b/applications/luci-app-openlist/po/pt_BR/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/pt_BR/alist.po
rename to applications/luci-app-openlist/po/pt_BR/openlist.po

diff --git a/applications/luci-app-alist/po/ro/alist.po b/applications/luci-app-openlist/po/ro/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ro/alist.po
rename to applications/luci-app-openlist/po/ro/openlist.po

diff --git a/applications/luci-app-alist/po/ru/alist.po b/applications/luci-app-openlist/po/ru/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ru/alist.po
rename to applications/luci-app-openlist/po/ru/openlist.po

diff --git a/applications/luci-app-alist/po/sk/alist.po b/applications/luci-app-openlist/po/sk/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/sk/alist.po
rename to applications/luci-app-openlist/po/sk/openlist.po

diff --git a/applications/luci-app-alist/po/sv/alist.po b/applications/luci-app-openlist/po/sv/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/sv/alist.po
rename to applications/luci-app-openlist/po/sv/openlist.po

diff --git a/applications/luci-app-alist/po/ta/alist.po b/applications/luci-app-openlist/po/ta/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/ta/alist.po
rename to applications/luci-app-openlist/po/ta/openlist.po

diff --git a/applications/luci-app-alist/po/templates/alist.pot b/applications/luci-app-openlist/po/templates/openlist.pot
similarity index 100%
rename from applications/luci-app-alist/po/templates/alist.pot
rename to applications/luci-app-openlist/po/templates/openlist.pot

diff --git a/applications/luci-app-alist/po/tr/alist.po b/applications/luci-app-openlist/po/tr/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/tr/alist.po
rename to applications/luci-app-openlist/po/tr/openlist.po

diff --git a/applications/luci-app-alist/po/uk/alist.po b/applications/luci-app-openlist/po/uk/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/uk/alist.po
rename to applications/luci-app-openlist/po/uk/openlist.po

diff --git a/applications/luci-app-alist/po/vi/alist.po b/applications/luci-app-openlist/po/vi/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/vi/alist.po
rename to applications/luci-app-openlist/po/vi/openlist.po

diff --git a/applications/luci-app-alist/po/zh_Hans/alist.po b/applications/luci-app-openlist/po/zh_Hans/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/zh_Hans/alist.po
rename to applications/luci-app-openlist/po/zh_Hans/openlist.po

diff --git a/applications/luci-app-alist/po/zh_Hant/alist.po b/applications/luci-app-openlist/po/zh_Hant/openlist.po
similarity index 100%
rename from applications/luci-app-alist/po/zh_Hant/alist.po
rename to applications/luci-app-openlist/po/zh_Hant/openlist.po

diff --git a/applications/luci-app-openlist/root/usr/share/luci/menu.d/luci-app-openlist.json b/applications/luci-app-openlist/root/usr/share/luci/menu.d/luci-app-openlist.json
new file mode 100644 (file)
index 0000000..cdbfcc1
--- /dev/null
+++ b/applications/luci-app-openlist/root/usr/share/luci/menu.d/luci-app-openlist.json
@@ -0,0 +1,28 @@
+{
+       "admin/services/openlist": {
+               "title": "OpenList",
+               "action": {
+                       "type": "firstchild"
+               },
+               "depends": {
+                       "acl": [ "luci-app-openlist" ],
+                       "uci": { "openlist": true }
+               }
+       },
+       "admin/services/openlist/config": {
+               "title": "Settings",
+               "order": 10,
+               "action": {
+                       "type": "view",
+                       "path": "openlist/config"
+               }
+       },
+       "admin/services/openlist/log": {
+               "title": "Log",
+               "order": 20,
+               "action": {
+                       "type": "view",
+                       "path": "openlist/log"
+               }
+       }
+}

diff --git a/applications/luci-app-openlist/root/usr/share/rpcd/acl.d/luci-app-openlist.json b/applications/luci-app-openlist/root/usr/share/rpcd/acl.d/luci-app-openlist.json
new file mode 100644 (file)
index 0000000..6ece7f0
--- /dev/null
+++ b/applications/luci-app-openlist/root/usr/share/rpcd/acl.d/luci-app-openlist.json
@@ -0,0 +1,17 @@
+{
+       "luci-app-openlist": {
+               "description": "Grant UCI access for luci-app-openlist",
+               "read": {
+                       "file": {
+                               "/var/run/openlist/log/openlist.log": [ "read" ]
+                       },
+                       "ubus": {
+                               "service": [ "list" ]
+                       },
+                       "uci": [ "openlist" ]
+               },
+               "write": {
+                       "uci": [ "openlist" ]
+               }
+       }
+}