Merge pull request #34 from ua0lnj/master

Added function for deleting files and empty directory. Version 1.5.0.

Author: ua0lnj

README

@@ -150,7 +150,8 @@ In the browser mode you can use
 
 Red:                    Play selected file
 Green:                  Play selected directory, playlist mode
-Yellow:                 Shuffle playlist
+Yellow:                 Remove selected file or empty directory
+Blue:                   Shuffle playlist
 
 The following remote keys are supported in normal operation (no disc menu active)
 

filebrowser.c

@@ -88,9 +88,9 @@ void cMpvFilebrowser::ShowDirectory(string Path)
     MenuTitle += " (" + Path.substr(rootDir.size() + 1, string::npos) + ")";
   SetTitle(MenuTitle.c_str());
 #ifdef USE_DISC
-  SetHelp(tr("Disc"), Directories.size() ? tr("PlayDir") : NULL, tr("Shuffle"), NULL);
+  SetHelp(tr("Disc"), Directories.size() ? tr("PlayDir") : NULL, tr("Remove"), tr("Shuffle"));
 #else
-  SetHelp(NULL, Directories.size() ? tr("PlayDir") : NULL, tr("Shuffle"), NULL);
+  SetHelp(NULL, Directories.size() ? tr("PlayDir") : NULL, tr("Remove"), tr("Shuffle"));
 #endif
   Display();
 }
@@ -134,19 +134,23 @@ int cMpvFilebrowser::PlayListCreate(string Path, FILE *fdPl)
 
   if (!PlayDirectories.size() && !PlayFiles.size()) return -1;
 
-  sort(PlayDirectories.begin(), PlayDirectories.end());
-  sort(PlayFiles.begin(), PlayFiles.end());
-
-  for (unsigned int i=0; i<PlayDirectories.size(); i++)
+  if (fdPl)
   {
-    string Filedir = Path + "/" + PlayDirectories[i];
-    PlayListCreate(Filedir, fdPl);
-  }
 
-  for (unsigned int i=0; i<PlayFiles.size(); i++)
-  {
-    string Filename = Path + "/" + PlayFiles[i];
-    fprintf(fdPl, "%s\n", Filename.c_str());
+    sort(PlayDirectories.begin(), PlayDirectories.end());
+    sort(PlayFiles.begin(), PlayFiles.end());
+
+    for (unsigned int i=0; i<PlayDirectories.size(); i++)
+    {
+      string Filedir = Path + "/" + PlayDirectories[i];
+      PlayListCreate(Filedir, fdPl);
+    }
+
+    for (unsigned int i=0; i<PlayFiles.size(); i++)
+    {
+      string Filename = Path + "/" + PlayFiles[i];
+      fprintf(fdPl, "%s\n", Filename.c_str());
+    }
   }
   return 0;
 }
@@ -204,9 +208,9 @@ eOSState cMpvFilebrowser::ProcessKey(eKeys Key)
       if (!item) break;
       currentItem = item->Text();
 #ifdef USE_DISC
-      SetHelp(tr("Disc"), item->IsDirectory() ? tr("PlayDir") : NULL, tr("Shuffle"), NULL);
+      SetHelp(tr("Disc"), item->IsDirectory() ? tr("PlayDir") : NULL, tr("Remove"), tr("Shuffle"));
 #else
-      SetHelp(NULL, item->IsDirectory() ? tr("PlayDir") : NULL, tr("Shuffle"), NULL);
+      SetHelp(NULL, item->IsDirectory() ? tr("PlayDir") : NULL, tr("Remove"), tr("Shuffle"));
 #endif
     return State;
 
@@ -215,7 +219,7 @@ eOSState cMpvFilebrowser::ProcessKey(eKeys Key)
         return osEnd;
     break;
 
-    case kYellow:
+    case kBlue:
       item = (cMpvFilebrowserMenuItem *) Get(Current());
       if (!item) break;
       newPath = item->Path() + "/" + item->Text();
@@ -257,6 +261,46 @@ eOSState cMpvFilebrowser::ProcessKey(eKeys Key)
       }
     break;
 
+    case kYellow:
+      item = (cMpvFilebrowserMenuItem *) Get(Current());
+      if (!item) break;
+      newPath = item->Path() + "/" + item->Text();
+      if (item->IsDirectory())
+      {
+        int res;
+        res = PlayListCreate(newPath, NULL);
+        if (res != -1)
+        {
+          Skins.Message(mtError, tr("Not empty directory, can't remove!"));
+        }
+        else
+        {
+          if (Skins.Message(mtWarning, tr("Remove empty directory?"), 5) == kOk)
+          {
+            res = rmdir(newPath.c_str());
+            if (res)
+            {
+              Skins.Message(mtError, tr("Unable to remove directory!"));
+            }
+          }
+        }
+        ShowDirectory(currentDir);
+      }
+      else
+      {
+        if (Skins.Message(mtWarning, tr("Remove file?"), 5) == kOk)
+        {
+          int res;
+          res = remove(newPath.c_str());
+          if (res)
+          {
+            Skins.Message(mtError, tr("Unable to remove file!"));
+          }
+        }
+      }
+      return osContinue;
+    break;
+
     default:
     break;
   }

mpv.c

@@ -19,7 +19,7 @@
 #include "menu_options.h"
 #include "mpv_service.h"
 
-static const char *VERSION = "1.4.4"
+static const char *VERSION = "1.5.0"
 #ifdef GIT_REV
     "-GIT" GIT_REV
 #endif

po/ru_RU.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-mpv 0.0.4\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2021-02-11 22:53+1000\n"
+"POT-Creation-Date: 2024-01-07 14:59+1000\n"
 "PO-Revision-Date: 2020-01-12 01:04+1000\n"
 "Last-Translator: ua0lnj\n"
 "Language-Team: ua0lnj\n"
@@ -56,12 +56,30 @@ msgstr "Диск"
 msgid "PlayDir"
 msgstr "Проиграть"
 
+msgid "Remove"
+msgstr "Удалить"
+
 msgid "Shuffle"
 msgstr "Смешать"
 
 msgid "Playlist cannot be created!"
 msgstr "Нельзя создать плейлист!"
 
+msgid "Not empty directory, can't remove!"
+msgstr "Не пустая папка, нельзя удалить!"
+
+msgid "Remove empty directory?"
+msgstr "Удалить пустую папку?"
+
+msgid "Unable to remove directory!"
+msgstr "Не могу удалить папку!"
+
+msgid "Remove file?"
+msgstr "Удалить файл?"
+
+msgid "Unable to remove file!"
+msgstr "Не могу удалить файл!"
+
 msgid "Options"
 msgstr "Опции"