refactor: save last video by file instead of index

Author: luisbocanegra

package/contents/config/main.xml

@@ -99,8 +99,8 @@
     <entry name="RandomMode" type="Bool">
       <default>False</default>
     </entry>
-    <entry name="LastVideoIndex" type="Int">
-      <default>0</default>
+    <entry name="LastVideo" type="String">
+      <default></default>
     </entry>
     <entry name="LastVideoPosition" type="Int">
       <default>0</default>
@@ -126,7 +126,7 @@
       <default>0</default>
     </entry>
     <entry name="ResumeLastVideo" type="Bool">
-      <label>Whether or not resume last playing video on startup</label>
+      <label>Whether or not to resume last playing video on startup</label>
       <default>True</default>
     </entry>
   </group>

package/contents/ui/FadePlayer.qml

@@ -268,6 +268,9 @@ Item {
                 PlasmaComponents.Label {
                     text: root.player.source
                 }
+                PlasmaComponents.Label {
+                    text: main.currentVideoIndex
+                }
                 PlasmaComponents.Label {
                     text: "changeWallpaperMode " + root.changeWallpaperMode
                 }

package/contents/ui/code/utils.js

@@ -32,6 +32,27 @@ function createVideo(filename) {
   };
 }
 
+/**
+ * 
+ * @param {String} filename File path
+ * @param {Array} videosConfig Videos config
+ * @returns {Object} Video properties
+ */
+function getVideoByFile(filename, videosConfig) {
+  const video = videosConfig.find((video) => video.filename === filename);
+  return video ?? createVideo("");
+}
+
+/**
+ * 
+ * @param {int} index Video index
+ * @param {Array} videosConfig Videos config
+ * @returns {Object} Video properties
+ */
+function getVideoByIndex(index, videosConfig) {
+  return videosConfig.length > 0 ? videosConfig[index] : createVideo("");
+}
+
 function dumpProps(obj) {
   console.log("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
   for (var k of Object.keys(obj)) {

package/contents/ui/main.qml

@@ -34,8 +34,14 @@ WallpaperItem {
     property bool isLoading: true
     property string videoUrls: main.configuration.VideoUrls
     property var videosConfig: getVideos()
-    property int currentVideoIndex: main.configuration.LastVideoIndex < videosConfig.length ? main.configuration.LastVideoIndex : 0
-    property var currentSource: videosConfig.length > 0 ? videosConfig[currentVideoIndex] : Utils.createVideo("")
+    property int currentVideoIndex: 0
+    property bool resumeLastVideo: main.configuration.ResumeLastVideo
+    property var currentSource: {
+        if (resumeLastVideo && main.configuration.LastVideo !== "") {
+            return Utils.getVideoByFile(main.configuration.LastVideo, videosConfig);
+        }
+        return Utils.getVideoByIndex(currentVideoIndex, videosConfig);
+    }
     property int pauseBatteryLevel: main.configuration.PauseBatteryLevel
     property bool shouldPlay: {
         if (lockScreenMode) {
@@ -351,7 +357,7 @@ WallpaperItem {
 
     function save() {
         // Save last video and position to resume from it on next login/lock
-        main.configuration.LastVideoIndex = main.currentVideoIndex;
+        main.configuration.LastVideo = main.currentSource.filename;
         main.configuration.LastVideoPosition = player.lastVideoPosition;
         main.configuration.writeConfig();
         printLog("Bye!");