Accept non-existing files on the command line

Author: mitya57

ReText/__main__.py

@@ -21,13 +21,12 @@
 import multiprocessing
 import signal
 import sys
-from os.path import exists, isdir, join
+from os.path import abspath, isdir, join
 
 import markups
 from PyQt6.QtCore import (
     QCommandLineOption,
     QCommandLineParser,
-    QFileInfo,
     QLibraryInfo,
     Qt,
     QTranslator,
@@ -43,7 +42,7 @@
 def canonicalize(option):
     if option == '-':
         return option
-    return QFileInfo(option).canonicalFilePath()
+    return abspath(option)
 
 def main():
     multiprocessing.set_start_method('spawn')
@@ -131,13 +130,13 @@ def main():
             window.treeView.setRootIndex(window.fileSystemModel.index(fileName))
             window.actionShowDirectoryTree.setChecked(True)
             window.treeView.setVisible(True)
-        elif exists(fileName):
+        elif fileName == '-':
+            readStdIn = True
+        else:
             window.openFileWrapper(fileName)
             if parser.isSet(previewOption):
                 window.actionPreview.setChecked(True)
                 window.preview(True)
-        elif fileName == '-':
-            readStdIn = True
 
     inputData = ''
     if readStdIn and sys.stdin is not None:

ReText/tab.py

@@ -17,8 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import locale
+import os
 import time
-from os.path import exists, splitext
+from os.path import dirname, exists, isdir, isfile, splitext
 
 from markups import find_markup_class_by_name, get_markup_for_file_name
 from markups.common import MODULE_HOME_PAGE
@@ -52,6 +53,11 @@ class ReTextTab(QSplitter):
     def fileName(self):
         return self._fileName
 
+    @fileName.setter
+    def fileName(self, newFileName):
+        self._fileName = newFileName
+        self.fileNameChanged.emit()
+
     def __init__(self, parent, fileName, previewState=PreviewDisabled):
         super().__init__(Qt.Orientation.Horizontal, parent=parent)
         self.p = parent
@@ -527,7 +533,15 @@ def createFile(self, fileToCreate):
             return False
 
     def autoSaveActive(self) -> bool:
-        return (globalSettings.autoSave
-                and not self.forceDisableAutoSave
-                and self.fileName is not None
-                and QFileInfo(self.fileName).isWritable())
+        if not globalSettings.autoSave:
+            return False
+        if self.forceDisableAutoSave:
+            return False
+        if self.fileName is None:
+            return False
+
+        if isfile(self.fileName):
+            return os.access(self.fileName, os.W_OK)
+        else:
+            dirName = dirname(self.fileName)
+            return isdir(dirName) and os.access(dirName, os.W_OK)

ReText/window.py

@@ -942,15 +942,15 @@ def openFile(self):
     def openFileWrapper(self, fileName):
         if not fileName:
             return
-        fileName = QFileInfo(fileName).canonicalFilePath()
+        fileName = os.path.abspath(fileName)
         exists = False
         for i, tab in enumerate(self.iterateTabs()):
             if tab.fileName == fileName:
                 exists = True
                 ex = i
         if exists:
             self.tabWidget.setCurrentIndex(ex)
-        elif QFile.exists(fileName):
+        else:
             noEmptyTab = (
                 (self.ind is None) or
                 self.currentTab.fileName or
@@ -966,7 +966,10 @@ def openFileWrapper(self, fileName):
                 self.preview(True)
             if fileName:
                 self.fileSystemWatcher.addPath(fileName)
-            self.currentTab.readTextFromFile(fileName)
+            if QFile.exists(fileName):
+                self.currentTab.readTextFromFile(fileName)
+            else:
+                self.currentTab.fileName = fileName
             self.moveToTopOfRecentFileList(self.currentTab.fileName)
 
     def showEncodingDialog(self):

tests/test_window.py

@@ -166,7 +166,8 @@ def test_windowTitleAndTabs_afterLoadingFile(self, getOpenFileNamesMock):
         # Check that file is opened in the existing empty tab
         self.assertEqual(1, self.window.tabWidget.count())
         self.assertEqual('existing_file.md[*]', self.window.windowTitle())
-        self.assertTrue(self.window.currentTab.fileName.endswith('tests/testdata/existing_file.md'))
+        fileName = os.path.join('tests', 'testdata', 'existing_file.md')
+        self.assertTrue(self.window.currentTab.fileName.endswith(fileName))
         self.assertEqual(self.window.tabWidget.tabText(0), 'existing_file')
         self.assertFalse(self.window.isWindowModified())
 
@@ -224,7 +225,8 @@ def test_activeTab_afterLoadingFileThatIsAlreadyOpenInOtherTab(self, getOpenFile
 
         # Check that we have indeed been switched back to the previous tab
         self.assertIs(self.window.currentTab, tab_with_file)
-        self.assertTrue(self.window.currentTab.fileName.endswith('tests/testdata/existing_file.md'))
+        fileName = os.path.join('tests', 'testdata', 'existing_file.md')
+        self.assertTrue(self.window.currentTab.fileName.endswith(fileName))
 
     def test_markupDependentWidgetStates_afterStartWithEmptyTabAndMarkdownAsDefaultMarkup(self):
         self.window = ReTextWindow()