Merge pull request #126 from Falldog/fix/issue-123-define__file__

feat: add __file__ into entry module

Author: Falldog

src/pyconcrete_exe/pyconcrete_exe.c

@@ -20,8 +20,9 @@
 
 
 int createAndInitPyconcreteModule();
-int execPycContent(PyObject* pyc_content);
+int execPycContent(PyObject* pyc_content, const char* filepath);
 int runFile(const char* filepath);
+PyObject* getFullPath(const char* filepath);
 
 
 int main(int argc, char *argv[])
@@ -136,7 +137,7 @@ int createAndInitPyconcreteModule()
     return ret;
 }
 
-int execPycContent(PyObject* pyc_content)
+int execPycContent(PyObject* pyc_content, const char* filepath)
 {
     int ret = RET_OK;
     PyObject* py_marshal = NULL;
@@ -169,11 +170,14 @@ int execPycContent(PyObject* pyc_content)
     }
 
     // setup global and exec loaded py_code
+    PyObject* py_full_filepath = getFullPath(filepath);
     PyDict_SetItemString(global, "__name__", main_name);
+    PyDict_SetItemString(global, "__file__", py_full_filepath);
     PyDict_SetItemString(global, "__builtins__", PyEval_GetBuiltins());
     PyEval_EvalCode(py_code, global, global);
 
 ERROR:
+    Py_XDECREF(py_full_filepath);
     Py_XDECREF(py_code);
     Py_XDECREF(global);
     Py_XDECREF(pyc_content_wo_magic);
@@ -220,8 +224,23 @@ int runFile(const char* filepath)
     }
     fclose(src);
 
-    ret = execPycContent(py_plaint_content);
+    ret = execPycContent(py_plaint_content, filepath);
 
     Py_DECREF(py_plaint_content);
     return ret;
 }
+
+PyObject* getFullPath(const char* filepath)
+{
+    // import os.path
+    // return os.path.abspath(filepath)
+    PyObject* path_module = PyImport_ImportModule("os.path");
+    PyObject* abspath_func = PyObject_GetAttrString(path_module, "abspath");
+    PyObject* args = Py_BuildValue("(s)", filepath);
+    PyObject* obj = PyObject_CallObject(abspath_func, args);
+
+    Py_XDECREF(path_module);
+    Py_XDECREF(abspath_func);
+    Py_XDECREF(args);
+    return obj;
+}

tests/conftest.py

@@ -62,9 +62,9 @@ def pyconcrete_exe(self):
         self._ensure_pyconcrete_exist()
         return join(self.bin_dir, exe_name('pyconcrete'))
 
-    def pyconcrete(self, *args: [str]):
+    def pyconcrete(self, *args: [str], cwd=None):
         self._ensure_pyconcrete_exist()
-        return subprocess.check_output([self.pyconcrete_exe, *args]).decode()
+        return subprocess.check_output([self.pyconcrete_exe, *args], cwd=cwd).decode()
 
     def pyconcrete_cli(self, *args: [str]):
         self._ensure_pyconcrete_exist()

tests/test_exe.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import os.path
 import subprocess
 
 
@@ -108,3 +109,33 @@ def test_exe__import_pyconcrete__venv_exe__validate__file__(venv_exe, pye_cli, t
 
     # verification
     assert pyconcrete__file__ == 'None'
+
+
+def test_exe__validate_main__file__full_path(venv_exe, pye_cli, tmpdir):
+    # prepare
+    pye_path = pye_cli.setup(tmpdir, 'test__file__').source_code("print(__file__)").get_encrypt_path()
+
+    # execution
+    output = venv_exe.pyconcrete(pye_path)
+    output = output.strip()
+    pye__file__ = output
+
+    # verification
+    assert pye__file__ == pye_path
+
+
+def test_exe__validate_main__file__relative_path(venv_exe, pye_cli, tmpdir):
+    # prepare
+    # simulate cmd as: `pyconcrete ../foo.pye`
+    # print(__file__) get correct full path
+    pye_full_path = pye_cli.setup(tmpdir, 'test__file__').source_code("print(__file__)").get_encrypt_path()
+    cwd = venv_exe.env_dir
+    pye_relative_path = os.path.relpath(pye_full_path, cwd)
+
+    # execution
+    output = venv_exe.pyconcrete(pye_relative_path, cwd=cwd)
+    output = output.strip()
+    pye__file__ = output
+
+    # verification
+    assert pye__file__ == pye_full_path