Merge pull request #281 from axlt2002/master

Various improvements

plugin.video.alfa/channels/videolibrary.json

@@ -70,11 +70,33 @@
         "Toda la videoteca"
       ]
     },
+    {
+      "id": "addition",
+      "type": "label",
+      "label": "Añadir a la videoteca",
+      "enabled": true,
+      "visible": true
+    },
+    {
+      "id": "enable_filter",
+      "type": "bool",
+      "label": "    Excluir los streams que contienen etiquetas específicas",
+      "enabled": true,
+      "visible": true,
+      "default": false
+    },
+    {
+      "id": "filters",
+      "type": "text",
+      "label": "    Etiquetas",
+      "visible": true,
+      "enabled": "eq(-1,true)"
+    },
     {
       "id": "window_type",
       "type": "list",
       "label": "Mostrar los enlaces en",
-      "default": 0,
+      "default": 1,
       "enabled": true,
       "visible": true,
       "lvalues": [

plugin.video.alfa/channels/videolibrary.py

@@ -596,7 +596,12 @@ def mark_tvshow_as_updatable(item):
 
 def delete(item):
     def delete_all(_item):
-        filetools.rmdirtree(_item.path)
+        for file in filetools.listdir(_item.path):
+            if file.endswith(".strm") or file.endswith(".nfo") or file.endswith(".json"):
+                filetools.remove(filetools.join(_item.path, file))
+        raiz, carpeta_serie, ficheros = filetools.walk(_item.path).next()
+        if ficheros == []:
+            filetools.rmdir(_item.path)
 
         if config.is_xbmc():
             import xbmc