Merge branch 'master' into add-username-in-sidebar

cmd/utils.go

@@ -87,16 +87,23 @@ func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
 		data := pythonData{hadDB: true}
 
 		path := getParam(cmd.Flags(), "database")
+		absPath, err := filepath.Abs(path)
+		if err != nil {
+			panic(err)
+		}
 		exists, err := dbExists(path)
 
 		if err != nil {
 			panic(err)
 		} else if exists && cfg.noDB {
-			log.Fatal(path + " already exists")
+			log.Fatal(absPath + " already exists")
 		} else if !exists && !cfg.noDB && !cfg.allowNoDB {
-			log.Fatal(path + " does not exist. Please run 'filebrowser config init' first.")
+			log.Fatal(absPath + " does not exist. Please run 'filebrowser config init' first.")
+		} else if !exists && !cfg.noDB {
+			log.Println("Warning: filebrowser.db can't be found. Initialing in " + strings.TrimSuffix(absPath, "filebrowser.db"))
 		}
 
+		log.Println("Using database: " + absPath)
 		data.hadDB = exists
 		db, err := storm.Open(path)
 		checkErr(err)

frontend/src/components/prompts/Delete.vue

@@ -45,6 +45,7 @@ export default {
     submit: async function () {
       buttons.loading("delete");
 
+      window.sessionStorage.setItem("modified", "true");
       try {
         if (!this.isListing) {
           await api.remove(this.$route.path);

frontend/src/components/prompts/Rename.vue

@@ -88,6 +88,7 @@ export default {
       newLink =
         url.removeLastDir(oldLink) + "/" + encodeURIComponent(this.name);
 
+      window.sessionStorage.setItem("modified", "true");
       try {
         await api.move([{ from: oldLink, to: newLink }]);
         if (!this.isListing) {

frontend/src/css/mobile.css

@@ -2,10 +2,6 @@
   nav {
     width: 10em
   }
-  /* Mobile Only fix div hidden by bottom navigation bar of mobile browser when using height: 100vh */
-  #previewer .preview {
-    height: calc(100% - 4em) !important;
-  }
 }
 
 @media (max-width: 1024px) {

frontend/src/css/styles.css

@@ -153,7 +153,6 @@ main .spinner .bounce2 {
 
 #previewer {
   background-color: rgba(0, 0, 0, 0.99);
-  padding-top: 4em;
   position: fixed;
   top: 0;
   left: 0;
@@ -166,15 +165,25 @@ main .spinner .bounce2 {
 #previewer header {
   background: none;
   color: #fff;
+  border-bottom: 0px;
+  box-shadow: 0px 0px 0px;
+  z-index: 19999;
 }
 
 #previewer header > .action i {
   color: #fff;
+  text-shadow: 1px 1px 1px #000000;
+}
+
+#previewer header > title {
+  white-space: nowrap; 
+  text-shadow: 1px 1px 1px #000000;
 }
 
 @media (min-width: 738px) {
   #previewer header #dropdown .action i {
     color: #fff;
+  text-shadow: 1px 1px 1px #000000;
   }
 }
 
@@ -188,7 +197,7 @@ main .spinner .bounce2 {
 
 #previewer .preview {
   text-align: center;
-  height: calc(100vh - 4em);
+  height: 100%;
 }
 
 #previewer .preview pre {
@@ -203,6 +212,12 @@ main .spinner .bounce2 {
   margin: 0;
 }
 
+#previewer .preview audio {
+  width: 95%;
+  height: 88%;
+}
+
+
 #previewer .preview video {
   height: 100%;
 }
@@ -247,7 +262,7 @@ main .spinner .bounce2 {
 #previewer > button {
   margin: 0;
   position: fixed;
-  top: calc(50% + 1.85em);
+  top: 50%;
   transform: translateY(-50%);
   background-color: rgba(80, 80, 80, 0.5);
   color: white;

frontend/src/views/Files.vue

@@ -54,8 +54,7 @@ export default {
     currentView() {
       if (this.req.type == undefined || this.req.isDir) {
         return null;
-      }
+      } else if (
-      else if (
         this.req.type === "text" ||
         this.req.type === "textImmutable"
       ) {
@@ -72,11 +71,11 @@ export default {
     $route: function (to, from) {
       if (from.path.endsWith("/")) { 
         if (to.path.endsWith("/"))   {
-          window.sessionStorage.setItem('listFrozen', "false");
+          window.sessionStorage.setItem("listFrozen", "false");
           this.fetchData();
           return;
         } else {
-          window.sessionStorage.setItem('listFrozen', "true");
+          window.sessionStorage.setItem("listFrozen", "true");
           this.fetchData();
           return;        
         }
@@ -117,7 +116,7 @@ export default {
       this.$store.commit("closeHovers");
 
       // Set loading to true and reset the error.
-      if (window.sessionStorage.getItem('listFrozen') !=="true"){ 
+      if (window.sessionStorage.getItem("listFrozen") !=="true" && window.sessionStorage.getItem("modified") !=="true"){ 
         this.setLoading(true);
       }
       this.error = null;

frontend/src/views/files/Editor.vue

@@ -1,5 +1,9 @@
 <template>
-  <div id="editor-container">
+  <div 
+    id="editor-container"
+    @touchmove.prevent.stop 
+    @wheel.prevent.stop
+  >
     <header-bar>
       <action icon="close" :label="$t('buttons.close')" @action="close()" />
       <title>{{ req.name }}</title>

frontend/src/views/files/Listing.vue

@@ -383,7 +383,7 @@ export default {
   },
   watch: {
     req: function () {
-      if (window.sessionStorage.getItem('listFrozen') !=="true"){
+      if (window.sessionStorage.getItem("listFrozen") !=="true" && window.sessionStorage.getItem("modified") !=="true"){
         // Reset the show value
         this.showLimit = 50;
 
@@ -397,7 +397,8 @@ export default {
         });
       }
       if (this.req.isDir) {
-        window.sessionStorage.setItem('listFrozen', "false"); 
+        window.sessionStorage.setItem("listFrozen", "false");
+        window.sessionStorage.setItem("modified", "false"); 
       }
     },
   },

frontend/src/views/files/Preview.vue

@@ -6,7 +6,7 @@
     @mousemove="toggleNavigation"
     @touchstart="toggleNavigation"
   >
-    <header-bar>
+    <header-bar  v-if="showNav">
       <action icon="close" :label="$t('buttons.close')" @action="close()" />
       <title>{{ name }}</title>
       <action