Github user jasongin commented on a diff in the pull request:

    https://github.com/apache/cordova-lib/pull/429#discussion_r60482215
  
    --- Diff: cordova-common/src/FileUpdater.js ---
    @@ -0,0 +1,389 @@
    +/**
    +    Licensed to the Apache Software Foundation (ASF) under one
    +    or more contributor license agreements.  See the NOTICE file
    +    distributed with this work for additional information
    +    regarding copyright ownership.  The ASF licenses this file
    +    to you under the Apache License, Version 2.0 (the
    +    "License"); you may not use this file except in compliance
    +    with the License.  You may obtain a copy of the License at
    +
    +    http://www.apache.org/licenses/LICENSE-2.0
    +
    +    Unless required by applicable law or agreed to in writing,
    +    software distributed under the License is distributed on an
    +    "AS IS" BASIS, 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.
    +*/
    +
    +"use strict";
    +
    +var fs = require("fs");
    +var path = require("path");
    +var shell = require("shelljs");
    +var minimatch = require("minimatch");
    +
    +/**
    + * Updates a target file or directory with a source file or directory. 
(Directory updates are
    + * not recursive.) Stats for target and source items must be passed in. 
This is an internal
    + * helper function used by other methods in this module.
    + *
    + * @param {string|null} rootDir Root directory (such as a project) to 
which target and source
    + *     path parameters are relative, or null if the paths are absolute. 
The rootDir is omitted
    + *     from any logged paths, to make the logs easier to read.
    + * @param {string} targetPath Destination file or directory to be updated. 
If it does not exist,
    + *     it will be created.
    + * @param {fs.Stats|null} targetStats An instance of fs.Stats for the 
target path, or null if
    + *     the target does not exist.
    + * @param {string|null} sourcePath Source file or directory to be used to 
update the
    + *     destination. If the source is null, then the destination is deleted 
if it exists.
    + * @param {fs.Stats|null} sourceStats An instance of fs.Stats for the 
source path, or null if
    + *     the source does not exist.
    + * @param {boolean} force If target and source are both files, and the 
force flag is not
    + *     set, then the file will not be copied unless the source is newer 
than the target.
    + * @param {function} [log] Optional logging callback that takes a string 
message describing any
    + *     file operations that are performed.
    + * @return {boolean} true if any changes were made, or false if the force 
flag is not set
    + *     and everything was up to date
    + */
    +function updatePathWithStats(
    +        rootDir, targetPath, targetStats, sourcePath, sourceStats, force, 
log) {
    +    log = log || function(message) { };
    +    var updated = false;
    +
    +    var targetFullPath = path.join(rootDir || "", targetPath);
    +
    +    if (sourceStats) {
    +        var sourceFullPath = path.join(rootDir || "", sourcePath);
    +
    +        if (targetStats) {
    +            // The target exists. But if the directory status doesn't 
match the source, delete it.
    +            if (targetStats.isDirectory() && !sourceStats.isDirectory()) {
    +                log("rmdir " + targetPath + " (source is a file)");
    +                shell.rm("-rf", targetFullPath);
    +                targetStats = null;
    +                updated = true;
    +            } else if (!targetStats.isDirectory() && 
sourceStats.isDirectory()) {
    +                log("delete " + targetPath + " (source is a directory)");
    +                shell.rm("-f", targetFullPath);
    +                targetStats = null;
    +                updated = true;
    +            }
    +        }
    +
    +        if (!targetStats) {
    +            if (sourceStats.isDirectory()) {
    +                // The target directory does not exist, so it should be 
created.
    +                log("mkdir " + targetPath);
    +                shell.mkdir("-p", targetFullPath);
    +                updated = true;
    +            } else if (sourceStats.isFile()) {
    +                // The target file does not exist, so it should be copied 
from the source.
    +                log("copy " + sourcePath + " " + targetPath +
    +                    (!force ? " (new file)" : ""));
    +                shell.cp("-f", sourceFullPath, targetFullPath);
    +                updated = true;
    +            }
    +        } else if (sourceStats.isFile() && targetStats.isFile() &&
    +                (force || sourceStats.mtime > targetStats.mtime)) {
    +            // When the source and target paths both exist and are files, 
update
    +            // the file if the source is newer or if doing a forced update.
    +            log("copy " + sourcePath + " " + targetPath +
    +                (!force ? " (updated file)" : ""));
    +            shell.cp("-f", sourceFullPath, targetFullPath);
    +            updated = true;
    +        }
    +    } else if (targetStats) {
    +        // The target exists but the source is null, so the target should 
be deleted.
    +        if (targetStats.isDirectory()) {
    +            log("rmdir " + targetPath + " (no source)");
    +            shell.rm("-rf", targetFullPath);
    +        } else {
    +            log("delete " + targetPath + " (no source)");
    +            shell.rm("-f", targetFullPath);
    +        }
    +        updated = true;
    +    }
    +
    +    return updated;
    +}
    +
    +/**
    + * Updates a target file or directory with a source file or directory. 
(Directory updates are
    + * not recursive.)
    + *
    + * @param {string|null} rootDir Root directory (such as a project) to 
which target and source
    + *     path parameters are relative, or null if the paths are absolute. 
The rootDir is omitted
    + *     from any logged paths, to make the logs easier to read.
    + * @param {string} targetPath Destination file or directory to be updated. 
If it does not exist,
    + *     it will be created.
    + * @param {string|null} sourcePath Source file or directory to be used to 
update the
    + *     destination. If the source is null, then the destination is deleted 
if it exists.
    + * @param {boolean} force If target and source are both files, and the 
force flag is not
    + *     set, then the file will not be copied unless the source is newer 
than the target.
    + * @param {function} [log] Optional logging callback that takes a string 
message describing any
    + *     file operations that are performed.
    + * @return {boolean} true if any changes were made, or false if the force 
flag is not set
    + *     and everything was up to date
    + */
    +function updatePath(rootDir, targetPath, sourcePath, force, log) {
    +    rootDir = rootDir || "";
    +    if (typeof(rootDir) !== "string") {
    +        throw new Error("A root directory path is required.");
    +    }
    +
    +    if (!targetPath || typeof(targetPath) !== "string") {
    +        throw new Error("A target path is required.");
    +    }
    +
    +    if (sourcePath && typeof(sourcePath) !== "string") {
    +        throw new Error("A source path (or null) is required.");
    +    }
    +
    +    log = log || function(message) { };
    +
    +    var targetFullPath = path.join(rootDir, targetPath);
    --- End diff --
    
    I see your point about handling an absolute path, but I don't think I want 
a relative path to be always resolved to an absolute path. As documented, the 
caller should not specify a rootDir when using absolute paths.
    
    ---
    In reply to: 
[60396878](https://github.com/apache/cordova-lib/pull/429#discussion_r60396878) 
[](ancestors = 60396878)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org

Reply via email to