diff --git a/.gitignore b/.gitignore index a22b4b0..c053955 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ node_modules Images-c9dbce3b-Results Results +slideshow/random-results sync.ffs_db diff --git a/.vscode/settings.json b/.vscode/settings.json index 4f5b17f..f660050 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "cSpell.words": [ + "Immich", "onlinepngtools" ], "files.watcherExclude": { diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..5c1df17 Binary files /dev/null and b/favicon.ico differ diff --git a/index.html b/index.html index 4503df2..8c2efb5 100644 --- a/index.html +++ b/index.html @@ -11,10 +11,10 @@
-

Slideshow

-

Slideshow (Last)

-

Slideshow (Time)

-

Slideshow (No Sleep)

+

Slideshow

+

Slideshow (Last)

+

Slideshow (Time)

+

Slideshow (No Sleep)

diff --git a/slideshow/favicon.ico b/slideshow/favicon.ico new file mode 100644 index 0000000..5c1df17 Binary files /dev/null and b/slideshow/favicon.ico differ diff --git a/slideshow/index.html b/slideshow/index.html index 41dd7e0..ab175f2 100644 --- a/slideshow/index.html +++ b/slideshow/index.html @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/slideshow/index.json b/slideshow/index.json index 6e6864a..8efc92f 100644 --- a/slideshow/index.json +++ b/slideshow/index.json @@ -1,9 +1,17 @@ { - "ImageInterval": 21234, + "ImageIntervalX": 9123, + "ImageIntervalXX": 21234, + "ImageInterval": 15123, "JsonInterval": 59000, "ImageZero": "images/1x1_00000000.png", "DataDirectoryX": "../.random", - "DataDirectory": "../Images-c9dbce3b-Results/F)Random/c9dbce3b/[]", + "DataDirectoryXX": "../Images-c9dbce3b-Results/F)Random/c9dbce3b/[]", + "DataDirectory": "random-results", + "ImmichUrlX": "http://192.168.11.2:3001/api/assets/", + "ImmichUrlXX": "https://immich.phares.duckdns.org/api/assets/", + "RandomPathsUrlX": "http://192.168.11.2:5009/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d/random-paths/", + "RandomPathsUrlXX": "https://immichtoslideshow.phares.duckdns.org/api/v1/assets/5f0b1052-466d-44de-a554-226d7256850d/random-paths/", "RootX": "../.original", - "Root": "../Images-c9dbce3b-Results/thumbs" + "RootXX": "../Images-c9dbce3b-Results/thumbs", + "Root": "5f0b1052-466d-44de-a554-226d7256850d/" } diff --git a/slideshow/scripts/index.js b/slideshow/scripts/index.js index b1987bc..3286c9e 100644 --- a/slideshow/scripts/index.js +++ b/slideshow/scripts/index.js @@ -5,6 +5,7 @@ var _RootAlt; var _ImageZero; var _DataDirectory; + var _RandomPathsUrl; var _Pause = 0; var _Images = []; @@ -24,13 +25,14 @@ if (window.location.href.indexOf('time') > 0) { time.innerText = mm + '-' + dd + '.json'; } - var url = _DataDirectory + '/' + mm + '-' + dd + '.json?nocache=2024-11-16-09-19'; + var url = _DataDirectory + '/' + mm + '-' + dd + '.json?nocache=2024-11-23-22-25'; console.log(url); $.getJSON(url, function (data) { console.log('success', data.length); _Images = []; $.each(data, function (_, value) { - _Images.push(value.replaceAll("\\", "/")); + // _Images.push(value.replaceAll("\\", "/")); + _Images.push(value); }); }) .done(function () { console.log('second success'); }) @@ -62,7 +64,7 @@ if (_Images.length > 0 && _Pause === 0) { var currentDate = new Date(); var currentHours = currentDate.getHours(); - if (currentHours >= 22 || currentHours <= 6) { + if (currentHours >= 23 || currentHours <= 6) { _DeviceReadyDiv.attr('style', 'background-color: #191717;'); } else { @@ -167,7 +169,7 @@ } if (window.location.href.indexOf('last') > 0) { - var url = '../log-nginx/access.log?nocache=2024-11-16-09-19'; + var url = '../log-nginx/access.log?nocache=2024-11-23-22-25'; $.get(url, function (data) { var arrayOfUrl = []; var arrayOfIndex = []; @@ -196,7 +198,7 @@ document.addEventListener('keyup', getInput, false); - var url = '../slideshow/index.json?nocache=2024-11-16-09-19'; + var url = '../slideshow/index.json?nocache=2024-11-23-22-25'; console.log(url); var _ = $.getJSON(url, function (data) { console.log(url + ' downloaded successfully');